diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 150d06eb6cb6..68271e4ca190 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -999,6 +999,13 @@ pref("security.sandbox.content.level", 1);
 // allow stack tracing.  This does not require a restart to take effect.
 pref("security.sandbox.windows.log.stackTraceDepth", 0);
 #endif
+
+// This controls the strength of the Windows GPU process sandbox.  Changes
+// will require restart.
+// For information on what the level number means, see
+// SetSecurityLevelForGPUProcess() in
+// security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+pref("security.sandbox.gpu.level", 1);
 #endif
 
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX) && defined(MOZ_CONTENT_SANDBOX)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d741251cf00e..c963fd73e286 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5103,7 +5103,8 @@ nsBrowserAccess.prototype = {
   _openURIInNewTab(aURI, aReferrer, aReferrerPolicy, aIsPrivate,
                              aIsExternal, aForceNotRemote = false,
                              aUserContextId = Ci.nsIScriptSecurityManager.DEFAULT_USER_CONTEXT_ID,
-                             aOpener = null, aTriggeringPrincipal = null) {
+                             aOpener = null, aTriggeringPrincipal = null,
+                             aNextTabParentId = 0) {
     let win, needToFocusWin;
 
     // try the current window.  if we're in a popup, fall back on the most recent browser window
@@ -5136,6 +5137,7 @@ nsBrowserAccess.prototype = {
                                       inBackground: loadInBackground,
                                       forceNotRemote: aForceNotRemote,
                                       opener: aOpener,
+                                      nextTabParentId: aNextTabParentId,
                                       });
     let browser = win.gBrowser.getBrowserForTab(tab);
 
@@ -5238,7 +5240,8 @@ nsBrowserAccess.prototype = {
     return newWindow;
   },
 
-  openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aFlags) {
+  openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aFlags,
+                                                  aNextTabParentId) {
     if (aWhere != Ci.nsIBrowserDOMWindow.OPEN_NEWTAB) {
       dump("Error: openURIInFrame can only open in new tabs");
       return null;
@@ -5257,7 +5260,8 @@ nsBrowserAccess.prototype = {
                                         aParams.isPrivate,
                                         isExternal, false,
                                         userContextId, null,
-                                        aParams.triggeringPrincipal);
+                                        aParams.triggeringPrincipal,
+                                        aNextTabParentId);
     if (browser)
       return browser.QueryInterface(Ci.nsIFrameLoaderOwner);
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 1748ac7eaa31..077e64c49f5a 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -165,6 +165,7 @@
            hidden="true"
            orient="vertical"
            noautofocus="true"
+           noautohide="true"
            consumeoutsideclicks="false"
            level="parent"
            tabspecific="true">
@@ -1071,6 +1072,17 @@
   <deck id="content-deck" flex="1">
     <hbox flex="1" id="browser">
       <vbox id="browser-border-start" hidden="true" layer="true"/>
+      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
+        <sidebarheader id="sidebar-header" align="center">
+          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
+          <image id="sidebar-throbber"/>
+          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
+        </sidebarheader>
+        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
+                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
+      </vbox>
+
+      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
       <vbox id="appcontent" flex="1">
         <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
         <tabbrowser id="content"
@@ -1081,16 +1093,6 @@
                     selectmenulist="ContentSelectDropdown"
                     datetimepicker="DateTimePickerPanel"/>
       </vbox>
-      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
-      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
-        <sidebarheader id="sidebar-header" align="center">
-          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
-          <image id="sidebar-throbber"/>
-          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
-        </sidebarheader>
-        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
-                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
-      </vbox>
       <vbox id="browser-border-end" hidden="true" layer="true"/>
     </hbox>
 #include ../../components/customizableui/content/customizeMode.inc.xul
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 698477750755..6b2df38d16b1 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1488,6 +1488,7 @@
             var aOriginPrincipal;
             var aOpener;
             var aCreateLazyBrowser;
+            var aNextTabParentId;
             if (arguments.length == 2 &&
                 typeof arguments[1] == "object" &&
                 !(arguments[1] instanceof Ci.nsIURI)) {
@@ -1512,6 +1513,7 @@
               aOpener                   = params.opener;
               aIsPrerendered            = params.isPrerendered;
               aCreateLazyBrowser        = params.createLazyBrowser;
+              aNextTabParentId          = params.nextTabParentId;
             }
 
             var bgLoad = (aLoadInBackground != null) ? aLoadInBackground :
@@ -1538,7 +1540,8 @@
                                   originPrincipal: aOriginPrincipal,
                                   sameProcessAsFrameLoader: aSameProcessAsFrameLoader,
                                   opener: aOpener,
-                                  isPrerendered: aIsPrerendered });
+                                  isPrerendered: aIsPrerendered,
+                                  nextTabParentId: aNextTabParentId });
             if (!bgLoad)
               this.selectedTab = tab;
 
@@ -1974,6 +1977,11 @@
 
             b.setAttribute("autoscrollpopup", this._autoScrollPopup.id);
 
+            if (aParams.nextTabParentId) {
+              // Gecko is going to read this attribute and use it.
+              b.setAttribute("nextTabParentId", aParams.nextTabParentId.toString());
+            }
+
             if (aParams.sameProcessAsFrameLoader) {
               b.sameProcessAsFrameLoader = aParams.sameProcessAsFrameLoader;
             }
@@ -2218,6 +2226,7 @@
             var aOpener;
             var aCreateLazyBrowser;
             var aSkipBackgroundNotify;
+            var aNextTabParentId;
             if (arguments.length == 2 &&
                 typeof arguments[1] == "object" &&
                 !(arguments[1] instanceof Ci.nsIURI)) {
@@ -2245,6 +2254,7 @@
               aIsPrerendered            = params.isPrerendered;
               aCreateLazyBrowser        = params.createLazyBrowser;
               aSkipBackgroundNotify     = params.skipBackgroundNotify;
+              aNextTabParentId          = params.nextTabParentId;
             }
 
             // if we're adding tabs, we're past interrupt mode, ditch the owner
@@ -2353,7 +2363,8 @@
                                         userContextId: aUserContextId,
                                         sameProcessAsFrameLoader: aSameProcessAsFrameLoader,
                                         opener: aOpener,
-                                        isPrerendered: aIsPrerendered });
+                                        isPrerendered: aIsPrerendered,
+                                        nextTabParentId: aNextTabParentId });
             }
 
             t.linkedBrowser = b;
diff --git a/browser/base/content/test/general/browser_documentnavigation.js b/browser/base/content/test/general/browser_documentnavigation.js
index 81dcce0a4cfa..fd10068ab0b7 100644
--- a/browser/base/content/test/general/browser_documentnavigation.js
+++ b/browser/base/content/test/general/browser_documentnavigation.js
@@ -145,27 +145,25 @@ add_task(function* () {
   let sidebar = document.getElementById("sidebar");
 
   let loadPromise = BrowserTestUtils.waitForEvent(sidebar, "load", true);
-  let focusPromise = BrowserTestUtils.waitForEvent(sidebar, "focus", true);
   SidebarUI.toggle("viewBookmarksSidebar");
   yield loadPromise;
-  yield focusPromise;
+
 
   gURLBar.focus();
-
-  yield* expectFocusOnF6(false, "html1", "html1",
-                                true, "focus with sidebar open content");
   yield* expectFocusOnF6(false, "bookmarksPanel",
                                 sidebar.contentDocument.getElementById("search-box").inputField,
                                 false, "focus with sidebar open sidebar");
+  yield* expectFocusOnF6(false, "html1", "html1",
+                                true, "focus with sidebar open content");
   yield* expectFocusOnF6(false, "main-window", gURLBar.inputField,
                                 false, "focus with sidebar urlbar");
 
   // Now go backwards
+  yield* expectFocusOnF6(true, "html1", "html1",
+                               true, "back focus with sidebar open content");
   yield* expectFocusOnF6(true, "bookmarksPanel",
                                sidebar.contentDocument.getElementById("search-box").inputField,
                                false, "back focus with sidebar open sidebar");
-  yield* expectFocusOnF6(true, "html1", "html1",
-                               true, "back focus with sidebar open content");
   yield* expectFocusOnF6(true, "main-window", gURLBar.inputField,
                                false, "back focus with sidebar urlbar");
 
diff --git a/browser/base/content/test/popupNotifications/browser_popupNotification_keyboard.js b/browser/base/content/test/popupNotifications/browser_popupNotification_keyboard.js
index e1156adebf62..1723c0ae1fbb 100644
--- a/browser/base/content/test/popupNotifications/browser_popupNotification_keyboard.js
+++ b/browser/base/content/test/popupNotifications/browser_popupNotification_keyboard.js
@@ -201,8 +201,8 @@ var tests = [
         });
 
         notification.remove();
-        goNext();
       });
+      goNext();
     },
   },
 ];
diff --git a/browser/components/extensions/test/browser/browser_ext_omnibox.js b/browser/components/extensions/test/browser/browser_ext_omnibox.js
index e81f885a5589..5a0323b8ca74 100644
--- a/browser/components/extensions/test/browser/browser_ext_omnibox.js
+++ b/browser/components/extensions/test/browser/browser_ext_omnibox.js
@@ -118,6 +118,26 @@ add_task(function* () {
     EventUtils.synthesizeKey(" ", {});
     yield expectEvent("on-input-started-fired");
 
+    // Test canceling the input before any changed events fire.
+    EventUtils.synthesizeKey("VK_BACK_SPACE", {});
+    yield expectEvent("on-input-cancelled-fired");
+
+    EventUtils.synthesizeKey(" ", {});
+    yield expectEvent("on-input-started-fired");
+
+    // Test submitting the input before any changed events fire.
+    EventUtils.synthesizeKey("VK_RETURN", {});
+    yield expectEvent("on-input-entered-fired");
+
+    gURLBar.focus();
+
+    // Start an input session by typing in <keyword><space>.
+    for (let letter of keyword) {
+      EventUtils.synthesizeKey(letter, {});
+    }
+    EventUtils.synthesizeKey(" ", {});
+    yield expectEvent("on-input-started-fired");
+
     // We should expect input changed events now that the keyword is active.
     EventUtils.synthesizeKey("b", {});
     yield expectEvent("on-input-changed-fired", {text: "b"});
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index 867149d6444e..5ee8f38a2fce 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -780,24 +780,10 @@ BrowserGlue.prototype = {
   },
 
   _firstWindowTelemetry(aWindow) {
-    let SCALING_PROBE_NAME = "";
-    switch (AppConstants.platform) {
-      case "win":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_MSWIN";
-        break;
-      case "macosx":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_OSX";
-        break;
-      case "linux":
-        SCALING_PROBE_NAME = "DISPLAY_SCALING_LINUX";
-        break;
-    }
-    if (SCALING_PROBE_NAME) {
-      let scaling = aWindow.devicePixelRatio * 100;
-      try {
-        Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
-      } catch (ex) {}
-    }
+    let scaling = aWindow.devicePixelRatio * 100;
+    try {
+      Services.telemetry.getHistogramById("DISPLAY_SCALING").add(scaling);
+    } catch (ex) {}
   },
 
   // the first browser window has finished initializing
diff --git a/browser/components/originattributes/test/browser/browser.ini b/browser/components/originattributes/test/browser/browser.ini
index fb56e877af95..1093c841c21e 100644
--- a/browser/components/originattributes/test/browser/browser.ini
+++ b/browser/components/originattributes/test/browser/browser.ini
@@ -65,6 +65,7 @@ support-files =
 [browser_favicon_userContextId.js]
 [browser_firstPartyIsolation.js]
 [browser_firstPartyIsolation_aboutPages.js]
+[browser_firstPartyIsolation_blobURI.js]
 [browser_firstPartyIsolation_js_uri.js]
 [browser_localStorageIsolation.js]
 [browser_blobURLIsolation.js]
diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
index 1f2e82263003..3f9fce56eca7 100644
--- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
+++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
@@ -5,6 +5,7 @@ add_task(function* setup() {
   Services.prefs.setBoolPref("privacy.firstparty.isolate", true);
   registerCleanupFunction(function() {
     Services.prefs.clearUserPref("privacy.firstparty.isolate");
+    Services.cookies.removeAll();
   });
 });
 
diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation_blobURI.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_blobURI.js
new file mode 100644
index 000000000000..79abc9067e93
--- /dev/null
+++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_blobURI.js
@@ -0,0 +1,76 @@
+add_task(function* setup() {
+  Services.prefs.setBoolPref("privacy.firstparty.isolate", true);
+
+  registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("privacy.firstparty.isolate");
+    Services.cookies.removeAll();
+  });
+});
+
+/**
+ * First we generate a Blob URI by using URL.createObjectURL(new Blob(..));
+ * then we navigate to this Blob URI, hence to make the top-level document URI
+ * is Blob URI.
+ * Later we create an iframe on this Blob: document, and we test that the iframe
+ * has correct firstPartyDomain.
+ */
+add_task(function* test_blob_uri_inherit_oa_from_content() {
+  const BASE_URI = "http://mochi.test:8888/browser/browser/components/" +
+                   "originattributes/test/browser/dummy.html";
+  const BASE_DOMAIN = "mochi.test";
+
+  // First we load a normal web page.
+  let win = yield BrowserTestUtils.openNewBrowserWindow({ remote: true });
+  let browser = win.gBrowser.selectedBrowser;
+  browser.loadURI(BASE_URI);
+  yield BrowserTestUtils.browserLoaded(browser);
+
+  // Then navigate to the blob: URI.
+  yield ContentTask.spawn(browser, { firstPartyDomain: BASE_DOMAIN }, function* (attrs) {
+    info("origin " + content.document.nodePrincipal.origin);
+    Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
+                 attrs.firstPartyDomain, "The document should have firstPartyDomain");
+
+    // Now we use createObjectURL to generate a blob URI and navigate to it.
+    let url = content.window.URL.createObjectURL(new content.window.Blob([
+      `<script src="http://mochi.test:8888/browser/browser/components/originattributes/test/browser/test.js"></script>`],
+      {"type": "text/html"}));
+    content.document.location = url;
+  });
+
+  // Wait for the Blob: URI to be loaded.
+  yield BrowserTestUtils.browserLoaded(browser, false, function(url) {
+    info("BrowserTestUtils.browserLoaded url=" + url);
+    return url.startsWith("blob:http://mochi.test:8888/");
+  });
+
+  // We verify the blob document has correct origin attributes.
+  // Then we inject an iframe to it.
+  yield ContentTask.spawn(browser, { firstPartyDomain: BASE_DOMAIN }, function* (attrs) {
+    Assert.ok(content.document.documentURI.startsWith("blob:http://mochi.test:8888/"),
+              "the document URI should be a blob URI.");
+    info("origin " + content.document.nodePrincipal.origin);
+    Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
+                 attrs.firstPartyDomain, "The document should have firstPartyDomain");
+
+    let iframe = content.document.createElement("iframe");
+    iframe.src = "http://example.com";
+    iframe.id = "iframe1";
+    content.document.body.appendChild(iframe);
+  });
+
+  // Wait for the iframe to be loaded.
+//  yield BrowserTestUtils.browserLoaded(browser, true, function(url) {
+//    info("BrowserTestUtils.browserLoaded iframe url=" + url);
+//    return url == "http://example.com/";
+//  });
+
+  // Finally we verify the iframe has correct origin attributes.
+  yield ContentTask.spawn(browser, { firstPartyDomain: BASE_DOMAIN }, function* (attrs) {
+    let iframe = content.document.getElementById("iframe1");
+    Assert.equal(iframe.contentDocument.nodePrincipal.originAttributes.firstPartyDomain,
+                 attrs.firstPartyDomain, "iframe should inherit firstPartyDomain from blob: URI");
+  });
+
+  win.close();
+});
diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index 82cf4723c621..de442c41c42b 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -750,6 +750,9 @@
 #ifdef MOZ_DATA_REPORTING
 #ifdef MOZ_CRASHREPORTER
 <groupbox id="crashReporterGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
+#ifndef MOZ_TELEMETRY_REPORTING
+<caption><label>&reports.label;</label></caption>
+#endif
   <hbox align="center">
     <checkbox id="automaticallySubmitCrashesBox"
               preference="browser.crashReports.unsubmittedCheck.autoSubmit"
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
index e73d64a2e7d8..7fba44065d3d 100644
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -30,7 +30,6 @@ XPIDL_MODULE = 'shellservice'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
-        '../../../other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
         'nsWindowsShellService.cpp',
     ]
     LOCAL_INCLUDES += [
diff --git a/browser/extensions/formautofill/skin/linux/autocomplete-item.css b/browser/extensions/formautofill/skin/linux/autocomplete-item.css
index 82234e91b8f6..136bd369a24d 100644
--- a/browser/extensions/formautofill/skin/linux/autocomplete-item.css
+++ b/browser/extensions/formautofill/skin/linux/autocomplete-item.css
@@ -6,7 +6,7 @@
 
 
 .profile-item-box > .profile-item-col > .profile-label {
-  font-size: .9em;
+  font-size: .84em;
 }
 
 .profile-item-box > .profile-item-col > .profile-comment {
diff --git a/browser/extensions/formautofill/skin/osx/autocomplete-item.css b/browser/extensions/formautofill/skin/osx/autocomplete-item.css
index 868fd857586e..d2c09b790370 100644
--- a/browser/extensions/formautofill/skin/osx/autocomplete-item.css
+++ b/browser/extensions/formautofill/skin/osx/autocomplete-item.css
@@ -6,7 +6,7 @@
 
 
 .profile-item-box > .profile-item-col > .profile-label {
-  font-size: 1.18em;
+  font-size: 1.09em;
 }
 
 .profile-item-box > .profile-item-col > .profile-comment {
diff --git a/browser/extensions/formautofill/skin/shared/autocomplete-item.css b/browser/extensions/formautofill/skin/shared/autocomplete-item.css
index c25a8bab2ad8..5138af8d8585 100644
--- a/browser/extensions/formautofill/skin/shared/autocomplete-item.css
+++ b/browser/extensions/formautofill/skin/shared/autocomplete-item.css
@@ -10,13 +10,27 @@ xul|richlistitem[originaltype="autofill-profile"][selected="true"] > .profile-it
   background-color: #F2F2F2;
 }
 
+.profile-item-box {
+  --item-padding-vertical: 6px;
+  --item-padding-horizontal: 10px;
+  --col-spacer: 7px;
+  --item-width: calc(50% - (var(--col-spacer) / 2));
+}
+
+.profile-item-box[size="small"] {
+  --item-padding-vertical: 7px;
+  --col-spacer: 0px;
+  --row-spacer: 3px;
+  --item-width: 100%;
+}
+
 .profile-item-box {
   box-sizing: border-box;
+  margin: 0;
   border-bottom: 1px solid rgba(38,38,38,.15);
-  padding-top: 6px;
-  padding-bottom: 6px;
-  padding-inline-start: 16px;
-  padding-inline-end: 10px;
+  padding: var(--item-padding-vertical) 0;
+  padding-inline-start: var(--item-padding-horizontal);
+  padding-inline-end: var(--item-padding-horizontal);
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
@@ -33,34 +47,24 @@ xul|richlistitem[originaltype="autofill-profile"][selected="true"] > .profile-it
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 50%;
+  width: var(--item-width);
 }
 
 .profile-item-box > .profile-label-col {
-  padding-inline-end: 10px;
   text-align: start;
 }
 
 .profile-item-box > .profile-comment-col {
+  margin-inline-start: var(--col-spacer);
   text-align: end;
   color: GrayText;
 }
 
 .profile-item-box[size="small"] {
-  padding-top: 10px;
-  padding-bottom: 10px;
   flex-direction: column;
 }
 
-.profile-item-box[size="small"] > .profile-item-col {
-  width: 100%;
-}
-
-.profile-item-box[size="small"] > .profile-label-col {
-  padding-inline-end: 0;
-}
-
 .profile-item-box[size="small"] > .profile-comment-col {
-  margin-top: 7px;
+  margin-top: var(--row-spacer);
   text-align: start;
 }
diff --git a/browser/extensions/formautofill/skin/windows/autocomplete-item.css b/browser/extensions/formautofill/skin/windows/autocomplete-item.css
index 91c117e98408..1be4489517ae 100644
--- a/browser/extensions/formautofill/skin/windows/autocomplete-item.css
+++ b/browser/extensions/formautofill/skin/windows/autocomplete-item.css
@@ -6,10 +6,6 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 
-.profile-item-box > .profile-item-col > .profile-label {
-  font-size: 1.08em;
-}
-
 .profile-item-box > .profile-item-col > .profile-comment {
   font-size: .83em;
 }
diff --git a/browser/extensions/pocket/bootstrap.js b/browser/extensions/pocket/bootstrap.js
index e2655ef17173..5614e4217cce 100644
--- a/browser/extensions/pocket/bootstrap.js
+++ b/browser/extensions/pocket/bootstrap.js
@@ -16,7 +16,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
                                   "resource:///modules/RecentWindow.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
                                   "resource:///modules/CustomizableUI.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
+XPCOMUtils.defineLazyModuleGetter(this, "AddonManagerPrivate",
                                   "resource://gre/modules/AddonManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
                                   "resource://gre/modules/ReaderMode.jsm");
@@ -477,21 +477,20 @@ function prefObserver(aSubject, aTopic, aData) {
 }
 
 function startup(data, reason) {
-  AddonManager.getAddonByID("isreaditlater@ideashower.com", addon => {
-    if (addon && addon.isActive)
-      return;
-    setDefaultPrefs();
-    // migrate enabled pref
-    if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) {
-      Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled"));
-      Services.prefs.clearUserPref("browser.pocket.enabled");
-    }
-    // watch pref change and enable/disable if necessary
-    Services.prefs.addObserver("extensions.pocket.enabled", prefObserver);
-    if (!Services.prefs.getBoolPref("extensions.pocket.enabled"))
-      return;
-    PocketOverlay.startup(reason);
-  });
+  if (AddonManagerPrivate.addonIsActive("isreaditlater@ideashower.com"))
+    return;
+
+  setDefaultPrefs();
+  // migrate enabled pref
+  if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) {
+    Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled"));
+    Services.prefs.clearUserPref("browser.pocket.enabled");
+  }
+  // watch pref change and enable/disable if necessary
+  Services.prefs.addObserver("extensions.pocket.enabled", prefObserver);
+  if (!Services.prefs.getBoolPref("extensions.pocket.enabled"))
+    return;
+  PocketOverlay.startup(reason);
 }
 
 function shutdown(data, reason) {
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 0cc15c5f6b1d..a888171ddbd9 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -68,6 +68,7 @@ DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 # Set MSVC dlls version to package, if any.
 ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
+ifndef MOZ_ARTIFACT_BUILDS
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
@@ -76,6 +77,7 @@ ifdef WIN_UCRT_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1
 endif
 endif
+endif
 
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
diff --git a/browser/locales/searchplugins/rakuten.xml b/browser/locales/searchplugins/rakuten.xml
index 85c5b81b32ad..942a5dbd9504 100644
--- a/browser/locales/searchplugins/rakuten.xml
+++ b/browser/locales/searchplugins/rakuten.xml
@@ -7,7 +7,7 @@
 <Description>楽天市場 商品検索</Description>
 <InputEncoding>EUC-JP</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQALMOAOefn9psbMswMMMQEPjj4/PPz++/v+OPj99/f9+AgMcgIM9AQOuvr////wAAAL8AACH5BAEAAA4ALAAAAAAQABAAAARf0EnJ0FqIze2YemCoaBsQniEwMeIloOQHJk1NvKDSnTRQNIZThddYPAiNk4UYCDQIpwux1ghEEUTGc6BkhWiLA1DokD3Ag5/1odvlFlzFAkdymFAn1caDH3FWFhh1EhEAOw==</Image>
-<Url type="text/html" method="GET" template="http://pt.afl.rakuten.co.jp/c/013ca98b.cd7c5f0c/" resultdomain="rakuten.co.jp">
+<Url type="text/html" method="GET" template="https://pt.afl.rakuten.co.jp/c/013ca98b.cd7c5f0c/" resultdomain="rakuten.co.jp">
   <Param name="sitem" value="{searchTerms}"/>
   <Param name="sv" value="2"/>
   <Param name="p" value="0"/>
diff --git a/browser/modules/ExtensionsUI.jsm b/browser/modules/ExtensionsUI.jsm
index 8ce086ba560d..5196e7c956de 100644
--- a/browser/modules/ExtensionsUI.jsm
+++ b/browser/modules/ExtensionsUI.jsm
@@ -398,7 +398,9 @@ this.ExtensionsUI = {
         label: strings.acceptText,
         accessKey: strings.acceptKey,
         callback: () => {
-          this.histogram.add(histkey + "Accepted");
+          if (histkey) {
+            this.histogram.add(histkey + "Accepted");
+          }
           resolve(true);
         },
       };
@@ -407,7 +409,9 @@ this.ExtensionsUI = {
           label: strings.cancelText,
           accessKey: strings.cancelKey,
           callback: () => {
-            this.histogram.add(histkey + "Rejected");
+            if (histkey) {
+              this.histogram.add(histkey + "Rejected");
+            }
             resolve(false);
           },
         },
diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp
index 9ee38822e33a..93137d5dabf9 100644
--- a/caps/OriginAttributes.cpp
+++ b/caps/OriginAttributes.cpp
@@ -10,6 +10,7 @@
 #include "mozilla/dom/quota/QuotaManager.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsIURI.h"
+#include "nsIURIWithPrincipal.h"
 
 namespace mozilla {
 
@@ -52,16 +53,29 @@ OriginAttributes::SetFirstPartyDomain(const bool aIsTopLevelDocument,
 
   nsAutoCString baseDomain;
   nsresult rv = tldService->GetBaseDomain(aURI, 0, baseDomain);
-  if (NS_FAILED(rv)) {
-    nsAutoCString scheme;
-    rv = aURI->GetScheme(scheme);
-    NS_ENSURE_SUCCESS_VOID(rv);
-    if (scheme.EqualsLiteral("about")) {
-      baseDomain.AssignLiteral(ABOUT_URI_FIRST_PARTY_DOMAIN);
-    }
+  if (NS_SUCCEEDED(rv)) {
+    mFirstPartyDomain = NS_ConvertUTF8toUTF16(baseDomain);
+    return;
   }
 
-  mFirstPartyDomain = NS_ConvertUTF8toUTF16(baseDomain);
+  nsAutoCString scheme;
+  rv = aURI->GetScheme(scheme);
+  NS_ENSURE_SUCCESS_VOID(rv);
+  if (scheme.EqualsLiteral("about")) {
+    mFirstPartyDomain.AssignLiteral(ABOUT_URI_FIRST_PARTY_DOMAIN);
+  } else if (scheme.EqualsLiteral("blob")) {
+    nsCOMPtr<nsIURIWithPrincipal> uriPrinc = do_QueryInterface(aURI);
+    if (uriPrinc) {
+      nsCOMPtr<nsIPrincipal> principal;
+      rv = uriPrinc->GetPrincipal(getter_AddRefs(principal));
+      NS_ENSURE_SUCCESS_VOID(rv);
+
+      MOZ_ASSERT(principal, "blob URI but no principal.");
+      if (principal) {
+        mFirstPartyDomain = principal->OriginAttributesRef().mFirstPartyDomain;
+      }
+    }
+  }
 }
 
 void
diff --git a/config/rules.mk b/config/rules.mk
index cfdb1e435480..39825c8b692d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -46,7 +46,7 @@ EXEC			= exec
 # ELOG prints out failed command when building silently (gmake -s). Pymake
 # prints out failed commands anyway, so ELOG just makes things worse by
 # forcing shell invocations.
-ifneq (,$(findstring s, $(filter-out --%, $(MAKEFLAGS))))
+ifneq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS))))
   ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
 else
   ELOG :=
@@ -953,9 +953,12 @@ ifdef MOZ_MSVCBITS
 # a 32-bit MozillaBuild shell on a 64-bit machine will try to use
 # the 32-bit compiler/linker for everything, while cargo/rustc wants
 # to use the 64-bit linker for build.rs scripts. This conflict results
-# in a build failure (see bug 1350001). Clearing out *just* the changes
-# from vcvars.bat is hard, so we just clear out the whole environment.
-environment_cleaner = -i
+# in a build failure (see bug 1350001). So we clear out the environment
+# variables that are actually relevant to 32- vs 64-bit builds.
+environment_cleaner = PATH='' LIB='' LIBPATH=''
+# The servo build needs to know where python is, and we're removing the PATH
+# so we tell it explicitly via the PYTHON env var.
+environment_cleaner += PYTHON='$(shell which $(PYTHON))'
 else
 environment_cleaner =
 endif
diff --git a/devtools/client/aboutdebugging/aboutdebugging.css b/devtools/client/aboutdebugging/aboutdebugging.css
index f6840594775e..4c81627e94cd 100644
--- a/devtools/client/aboutdebugging/aboutdebugging.css
+++ b/devtools/client/aboutdebugging/aboutdebugging.css
@@ -249,6 +249,25 @@ button {
   font-weight: 600;
 }
 
+.addon-target-info {
+  display: grid;
+  font-size: 14px;
+  grid-template-columns: 128px 1fr;
+}
+
+.addon-target-info-label {
+  padding-inline-end: 8px;
+  padding-bottom: 8px;
+}
+
+.addon-target-info-label:last-of-type {
+  padding-bottom: 16px;
+}
+
+.addon-target-info-content {
+  margin: 0;
+}
+
 .addon-target-button {
   background: none;
   border: none;
@@ -289,3 +308,18 @@ button {
    * lines up with the icon. */
   margin-inline-start: -4px;
 }
+
+/* We want the ellipsis on the left-hand-side, so make the parent RTL
+ * with an ellipsis and the child can be LTR. */
+.file-path {
+  direction: rtl;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-path-inner {
+  direction: ltr;
+  unicode-bidi: plaintext;
+}
diff --git a/devtools/client/aboutdebugging/components/addons/panel.js b/devtools/client/aboutdebugging/components/addons/panel.js
index 451335151c89..e7ffc097248e 100644
--- a/devtools/client/aboutdebugging/components/addons/panel.js
+++ b/devtools/client/aboutdebugging/components/addons/panel.js
@@ -76,7 +76,8 @@ module.exports = createClass({
             icon: addon.iconURL || ExtensionIcon,
             addonID: addon.id,
             addonActor: addon.actor,
-            temporarilyInstalled: addon.temporarilyInstalled
+            temporarilyInstalled: addon.temporarilyInstalled,
+            url: addon.url,
           };
         });
 
diff --git a/devtools/client/aboutdebugging/components/addons/target.js b/devtools/client/aboutdebugging/components/addons/target.js
index bd7a888f7b4b..caa44f1961fc 100644
--- a/devtools/client/aboutdebugging/components/addons/target.js
+++ b/devtools/client/aboutdebugging/components/addons/target.js
@@ -20,6 +20,25 @@ loader.lazyRequireGetter(this, "DebuggerClient",
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
+function filePathForTarget(target) {
+  // Only show file system paths, and only for temporarily installed add-ons.
+  if (!target.temporarilyInstalled || !target.url || !target.url.startsWith("file://")) {
+    return [];
+  }
+  let path = target.url.slice("file://".length);
+  return [
+    dom.dt(
+      { className: "addon-target-info-label" },
+      Strings.GetStringFromName("location")),
+    // Wrap the file path in a span so we can do some RTL/LTR swapping to get
+    // the ellipsis on the left.
+    dom.dd(
+      { className: "addon-target-info-content file-path" },
+      dom.span({ className: "file-path-inner", title: path }, path),
+    ),
+  ];
+}
+
 module.exports = createClass({
   displayName: "AddonTarget",
 
@@ -31,7 +50,8 @@ module.exports = createClass({
       addonID: PropTypes.string.isRequired,
       icon: PropTypes.string,
       name: PropTypes.string.isRequired,
-      temporarilyInstalled: PropTypes.bool
+      temporarilyInstalled: PropTypes.bool,
+      url: PropTypes.string,
     }).isRequired
   },
 
@@ -68,6 +88,10 @@ module.exports = createClass({
         }),
         dom.span({ className: "target-name", title: target.name }, target.name)
       ),
+      dom.dl(
+        { className: "addon-target-info" },
+        ...filePathForTarget(target),
+      ),
       dom.div({className: "addon-target-actions"},
         dom.button({
           className: "debug-button addon-target-button",
diff --git a/devtools/client/aboutdebugging/test/browser.ini b/devtools/client/aboutdebugging/test/browser.ini
index 5e9a949c2116..a10c34986d74 100644
--- a/devtools/client/aboutdebugging/test/browser.ini
+++ b/devtools/client/aboutdebugging/test/browser.ini
@@ -20,6 +20,7 @@ support-files =
   !/devtools/client/framework/test/shared-head.js
 
 [browser_addons_debug_bootstrapped.js]
+[browser_addons_debug_info.js]
 [browser_addons_debug_webextension.js]
 tags = webextensions
 [browser_addons_debug_webextension_inspector.js]
diff --git a/devtools/client/aboutdebugging/test/browser_addons_debug_info.js b/devtools/client/aboutdebugging/test/browser_addons_debug_info.js
new file mode 100644
index 000000000000..77d7e7b1ed3e
--- /dev/null
+++ b/devtools/client/aboutdebugging/test/browser_addons_debug_info.js
@@ -0,0 +1,28 @@
+"use strict";
+
+const ADDON_ID = "test-devtools@mozilla.org";
+const ADDON_NAME = "test-devtools";
+
+add_task(function* () {
+  let { tab, document } = yield openAboutDebugging("addons");
+  yield waitForInitialAddonList(document);
+
+  yield installAddon({
+    document,
+    path: "addons/unpacked/install.rdf",
+    name: ADDON_NAME,
+  });
+
+  let container = document.querySelector(`[data-addon-id="${ADDON_ID}"]`);
+  let filePath = container.querySelector(".file-path");
+  let expectedFilePath = "browser/devtools/client/aboutdebugging/test/addons/unpacked/";
+
+  // Verify that the path to the install location is shown next to its label.
+  ok(filePath, "file path is in DOM");
+  ok(filePath.textContent.endsWith(expectedFilePath), "file path is set correctly");
+  is(filePath.previousElementSibling.textContent, "Location", "file path has label");
+
+  yield uninstallAddon({document, id: ADDON_ID, name: ADDON_NAME});
+
+  yield closeAboutDebugging(tab);
+});
diff --git a/devtools/client/commandline/test/browser_cmd_qsa.js b/devtools/client/commandline/test/browser_cmd_qsa.js
index 551d47739a4e..32bcd11f4bca 100644
--- a/devtools/client/commandline/test/browser_cmd_qsa.js
+++ b/devtools/client/commandline/test/browser_cmd_qsa.js
@@ -1,33 +1,33 @@
-/* Any copyright is dedicated to the Public Domain.
-* http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Tests that the qsa commands work as they should.
-
-const TEST_URI = "data:text/html;charset=utf-8,<body></body>";
-
-function test() {
-  helpers.addTabWithToolbar(TEST_URI, function (options) {
-    return helpers.audit(options, [
-      {
-        setup: "qsa",
-        check: {
-          input:  "qsa",
-          hints:  " [query]",
-          markup: "VVV",
-          status: "VALID"
-        }
-      },
-      {
-        setup: "qsa body",
-        check: {
-          input:  "qsa body",
-          hints:  "",
-          markup: "VVVVVVVV",
-          status: "VALID"
-        }
-      }
-    ]);
-  }).then(finish, helpers.handleError);
-}
+/* Any copyright is dedicated to the Public Domain.
+* http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests that the qsa commands work as they should.
+
+const TEST_URI = "data:text/html;charset=utf-8,<body></body>";
+
+function test() {
+  helpers.addTabWithToolbar(TEST_URI, function (options) {
+    return helpers.audit(options, [
+      {
+        setup: "qsa",
+        check: {
+          input:  "qsa",
+          hints:  " [query]",
+          markup: "VVV",
+          status: "VALID"
+        }
+      },
+      {
+        setup: "qsa body",
+        check: {
+          input:  "qsa body",
+          hints:  "",
+          markup: "VVVVVVVV",
+          status: "VALID"
+        }
+      }
+    ]);
+  }).then(finish, helpers.handleError);
+}
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
index dd49547179e5..8a31105d7d39 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-edit-cancel.js
@@ -2,57 +2,57 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Make sure that canceling a name change correctly unhides the separator and
- * value elements.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_watch-expressions.html";
-
-function test() {
-  Task.spawn(function* () {
+
+/**
+ * Make sure that canceling a name change correctly unhides the separator and
+ * value elements.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_watch-expressions.html";
+
+function test() {
+  Task.spawn(function* () {
     let options = {
       source: TAB_URL,
       line: 1
     };
-    let [tab,, panel] = yield initDebugger(TAB_URL, options);
-    let win = panel.panelWin;
-    let vars = win.DebuggerView.Variables;
-
-    win.DebuggerView.WatchExpressions.addExpression("this");
-
-    callInTab(tab, "ermahgerd");
-    yield waitForDebuggerEvents(panel, win.EVENTS.FETCHED_WATCH_EXPRESSIONS);
-
-    let exprScope = vars.getScopeAtIndex(0);
-    let {target} = exprScope.get("this");
-
-    let name = target.querySelector(".title > .name");
-    let separator = target.querySelector(".separator");
-    let value = target.querySelector(".value");
-
-    is(separator.hidden, false,
-      "The separator element should not be hidden.");
-    is(value.hidden, false,
-      "The value element should not be hidden.");
-
-    for (let key of ["ESCAPE", "RETURN"]) {
-      EventUtils.sendMouseEvent({ type: "dblclick" }, name, win);
-
-      is(separator.hidden, true,
-        "The separator element should be hidden.");
-      is(value.hidden, true,
-        "The value element should be hidden.");
-
-      EventUtils.sendKey(key, win);
-
-      is(separator.hidden, false,
-        "The separator element should not be hidden.");
-      is(value.hidden, false,
-        "The value element should not be hidden.");
-    }
-
-    yield resumeDebuggerThenCloseAndFinish(panel);
-  });
-}
+    let [tab,, panel] = yield initDebugger(TAB_URL, options);
+    let win = panel.panelWin;
+    let vars = win.DebuggerView.Variables;
+
+    win.DebuggerView.WatchExpressions.addExpression("this");
+
+    callInTab(tab, "ermahgerd");
+    yield waitForDebuggerEvents(panel, win.EVENTS.FETCHED_WATCH_EXPRESSIONS);
+
+    let exprScope = vars.getScopeAtIndex(0);
+    let {target} = exprScope.get("this");
+
+    let name = target.querySelector(".title > .name");
+    let separator = target.querySelector(".separator");
+    let value = target.querySelector(".value");
+
+    is(separator.hidden, false,
+      "The separator element should not be hidden.");
+    is(value.hidden, false,
+      "The value element should not be hidden.");
+
+    for (let key of ["ESCAPE", "RETURN"]) {
+      EventUtils.sendMouseEvent({ type: "dblclick" }, name, win);
+
+      is(separator.hidden, true,
+        "The separator element should be hidden.");
+      is(value.hidden, true,
+        "The value element should be hidden.");
+
+      EventUtils.sendKey(key, win);
+
+      is(separator.hidden, false,
+        "The separator element should not be hidden.");
+      is(value.hidden, false,
+        "The value element should not be hidden.");
+    }
+
+    yield resumeDebuggerThenCloseAndFinish(panel);
+  });
+}
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-17.js b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-17.js
index bdfe1a42b5b4..f11517b665d3 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-17.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_variables-view-popup-17.js
@@ -1,80 +1,80 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests opening the variable inspection popup while stopped at a debugger statement,
- * clicking "step in" and verifying that the popup is gone.
- */
-
-const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
-
-let gTab, gPanel, gDebugger;
-let actions, gSources, gVariables;
-
-function test() {
-  let options = {
-    source: TAB_URL,
-    line: 1
-  };
-  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
-    gTab = aTab;
-    gPanel = aPanel;
-    gDebugger = gPanel.panelWin;
-    actions = bindActionCreators(gPanel);
-    gSources = gDebugger.DebuggerView.Sources;
-    gVariables = gDebugger.DebuggerView.Variables;
-    let bubble = gDebugger.DebuggerView.VariableBubble;
-    let tooltip = bubble._tooltip.panel;
-    let testPopupHiding = Task.async(function* () {
-      yield addBreakpoint();
-      yield ensureThreadClientState(gPanel, "resumed");
-      yield pauseDebuggee();
-      yield openVarPopup(gPanel, { line: 20, ch: 17 });
-      is(tooltip.querySelectorAll(".devtools-tooltip-simple-text").length, 1,
-          "The popup should be open with a simple text entry");
-      // Now we're stopped at a breakpoint with an open popup
-      // we'll send a keypress and check if the popup closes
-      executeSoon(() => EventUtils.synthesizeKey("VK_F11", {}));
-      // The keypress should cause one resumed event and one paused event
-      yield waitForThreadEvents(gPanel, "resumed");
-      yield waitForThreadEvents(gPanel, "paused");
-      // Here's the state we're actually interested in checking..
-      checkVariablePopupClosed(bubble);
-      yield resumeDebuggerThenCloseAndFinish(gPanel);
-    });
-    testPopupHiding();
-  });
-}
-
-function addBreakpoint() {
-  return actions.addBreakpoint({ actor: gSources.selectedValue, line: 21 });
-}
-
-function pauseDebuggee() {
-  generateMouseClickInTab(gTab, "content.document.querySelector('button')");
-
-  // The first 'with' scope should be expanded by default, but the
-  // variables haven't been fetched yet. This is how 'with' scopes work.
-  return promise.all([
-    waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES),
-    waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_VARIABLES)
-  ]);
-}
-
-function checkVariablePopupClosed(bubble) {
-  ok(!bubble.contentsShown(),
-    "When stepping, popup should close and be hidden.");
-  ok(bubble._tooltip.isEmpty(),
-    "The variable inspection popup should now be empty.");
-  ok(!bubble._markedText,
-    "The marked text in the editor was removed.");
-}
-
-registerCleanupFunction(function () {
-  gTab = null;
-  gPanel = null;
-  gDebugger = null;
-  actions = null;
-  gSources = null;
-  gVariables = null;
-});
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests opening the variable inspection popup while stopped at a debugger statement,
+ * clicking "step in" and verifying that the popup is gone.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
+
+let gTab, gPanel, gDebugger;
+let actions, gSources, gVariables;
+
+function test() {
+  let options = {
+    source: TAB_URL,
+    line: 1
+  };
+  initDebugger(TAB_URL, options).then(([aTab,, aPanel]) => {
+    gTab = aTab;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    actions = bindActionCreators(gPanel);
+    gSources = gDebugger.DebuggerView.Sources;
+    gVariables = gDebugger.DebuggerView.Variables;
+    let bubble = gDebugger.DebuggerView.VariableBubble;
+    let tooltip = bubble._tooltip.panel;
+    let testPopupHiding = Task.async(function* () {
+      yield addBreakpoint();
+      yield ensureThreadClientState(gPanel, "resumed");
+      yield pauseDebuggee();
+      yield openVarPopup(gPanel, { line: 20, ch: 17 });
+      is(tooltip.querySelectorAll(".devtools-tooltip-simple-text").length, 1,
+          "The popup should be open with a simple text entry");
+      // Now we're stopped at a breakpoint with an open popup
+      // we'll send a keypress and check if the popup closes
+      executeSoon(() => EventUtils.synthesizeKey("VK_F11", {}));
+      // The keypress should cause one resumed event and one paused event
+      yield waitForThreadEvents(gPanel, "resumed");
+      yield waitForThreadEvents(gPanel, "paused");
+      // Here's the state we're actually interested in checking..
+      checkVariablePopupClosed(bubble);
+      yield resumeDebuggerThenCloseAndFinish(gPanel);
+    });
+    testPopupHiding();
+  });
+}
+
+function addBreakpoint() {
+  return actions.addBreakpoint({ actor: gSources.selectedValue, line: 21 });
+}
+
+function pauseDebuggee() {
+  generateMouseClickInTab(gTab, "content.document.querySelector('button')");
+
+  // The first 'with' scope should be expanded by default, but the
+  // variables haven't been fetched yet. This is how 'with' scopes work.
+  return promise.all([
+    waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES),
+    waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_VARIABLES)
+  ]);
+}
+
+function checkVariablePopupClosed(bubble) {
+  ok(!bubble.contentsShown(),
+    "When stepping, popup should close and be hidden.");
+  ok(bubble._tooltip.isEmpty(),
+    "The variable inspection popup should now be empty.");
+  ok(!bubble._markedText,
+    "The marked text in the editor was removed.");
+}
+
+registerCleanupFunction(function () {
+  gTab = null;
+  gPanel = null;
+  gDebugger = null;
+  actions = null;
+  gSources = null;
+  gVariables = null;
+});
diff --git a/devtools/client/locales/en-US/aboutdebugging.properties b/devtools/client/locales/en-US/aboutdebugging.properties
index f5449b3ec8b6..e84d32484f64 100644
--- a/devtools/client/locales/en-US/aboutdebugging.properties
+++ b/devtools/client/locales/en-US/aboutdebugging.properties
@@ -79,6 +79,10 @@ reload = Reload
 # disabled 'reload' button.
 reloadDisabledTooltip = Only temporarily installed add-ons can be reloaded
 
+# LOCALIZATION NOTE (location):
+# This string is displayed as a label for the filesystem location of an extension.
+location = Location
+
 # LOCALIZATION NOTE (workers):
 # This string is displayed as a header of the about:debugging#workers page.
 workers = Workers
diff --git a/devtools/client/netmonitor/src/assets/styles/netmonitor.css b/devtools/client/netmonitor/src/assets/styles/netmonitor.css
index 09be3fc93746..af11108757e7 100644
--- a/devtools/client/netmonitor/src/assets/styles/netmonitor.css
+++ b/devtools/client/netmonitor/src/assets/styles/netmonitor.css
@@ -50,6 +50,10 @@
 
 /* General */
 
+* {
+  box-sizing: border-box;
+}
+
 html,
 body,
 #mount,
@@ -63,26 +67,18 @@ body,
   overflow: hidden;
 }
 
-* {
-  box-sizing: border-box;
-}
-
 .split-box {
   overflow: hidden;
 }
 
-.toolbar-labels {
-  overflow: hidden;
-  display: flex;
-  flex: auto;
-}
+/* Toolbar */
 
 .devtools-toolbar {
   display: flex;
 }
 
-.devtools-toolbar-container.devtools-toolbar {
-  height: auto !important;
+.devtools-toolbar-container {
+  height: auto;
   flex-wrap: wrap;
   justify-content: space-between;
 }
@@ -94,13 +90,9 @@ body,
   align-items: center;
 }
 
-#response-content-image-box {
-  overflow: auto;
-}
-
-.cropped-textbox .textbox-input {
-  /* workaround for textbox not supporting the @crop attribute */
-  text-overflow: ellipsis;
+.requests-list-filter-buttons {
+  display: flex;
+  flex-wrap: nowrap;
 }
 
 .learn-more-link {
@@ -116,11 +108,13 @@ body,
 
 /* Status bar */
 
+.devtools-status-bar-label {
+  flex: 0;
+}
+
 .status-bar-label {
   display: inline-flex;
-  align-content: stretch;
   margin-inline-end: 10px;
-
   /* Status bar has just one line so, don't wrap labels */
   white-space: nowrap;
 }
@@ -143,15 +137,7 @@ body,
   color: red;
 }
 
-/* Request list */
-
-.request-list-container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
+/* Request list empty panel */
 
 .request-list-empty-notice {
   margin: 0;
@@ -184,75 +170,86 @@ body,
   margin: 0 5px;
 }
 
-/* Network requests table */
+/* Requests list table */
 
-.requests-list-toolbar {
+.request-list-container {
   display: flex;
-  padding: 0;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
 }
 
-.requests-list-filter-buttons {
-  display: flex;
-  flex-wrap: nowrap;
+.requests-list-wrapper {
+  width: 100%;
+  height: 100%;
 }
 
-.theme-firebug .requests-list-toolbar {
-  height: 19px !important;
+.requests-list-table {
+  display: table;
+  position: relative;
+  width: 100%;
+  height: 100%;
 }
 
 .requests-list-contents {
-  height: 100%;
+  display: table-row-group;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
   overflow-x: hidden;
   overflow-y: auto;
   --timings-scale: 1;
   --timings-rev-scale: 1;
 }
 
-.requests-list-subitem {
-  display: flex;
-  flex: none;
-  box-sizing: border-box;
-  align-items: center;
-  padding: 3px;
+.requests-list-column {
+  display: table-cell;
   cursor: default;
-}
-
-.subitem-label {
+  text-align: center;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  vertical-align: middle;
+  max-width: 50px;
+  min-width: 50px;
 }
 
-/* Requests list header */
+.requests-list-column > * {
+  display: inline-block;
+}
 
-.requests-list-header {
-  display: flex;
-  flex: none;
+.theme-firebug .requests-list-column {
+  padding: 1px;
+}
+
+/* Requests list headers */
+
+.requests-list-headers {
+  display: table-header-group;
+  height: 24px;
+  padding: 0;
+}
+
+.requests-list-headers .requests-list-column:first-child .requests-list-header-button {
+  border-width: 0;
 }
 
 .requests-list-header-button {
-  display: flex;
-  align-items: center;
-  flex: auto;
-  -moz-appearance: none; appearance: none;
   background-color: transparent;
   border-image: linear-gradient(transparent 15%,
                                 var(--theme-splitter-color) 15%,
                                 var(--theme-splitter-color) 85%,
                                 transparent 85%) 1 1;
-  border-style: solid;
   border-width: 0;
   border-inline-start-width: 1px;
-  min-width: 1px;
-  min-height: 24px;
-  margin: 0;
-  padding-top: 2px;
-  padding-bottom: 2px;
   padding-inline-start: 16px;
-  padding-inline-end: 0;
+  width: 100%;
+  min-height: 23px;
   text-align: center;
   color: inherit;
-  font-weight: inherit !important;
 }
 
 .requests-list-header-button::-moz-focus-inner {
@@ -260,27 +257,27 @@ body,
   padding: 0;
 }
 
-.requests-list-header:first-child .requests-list-header-button {
-  border-width: 0;
-}
-
 .requests-list-header-button:hover {
   background-color: rgba(0, 0, 0, 0.1);
 }
 
 .requests-list-header-button > .button-text {
-  flex: auto;
-  white-space: nowrap;
+  display: inline-block;
+  text-align: center;
+  vertical-align: middle;
+  /* Align button text to center */
+  width: calc(100% - 8px);
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 .requests-list-header-button > .button-icon {
-  flex: none;
+  display: inline-block;
+  width: 7px;
   height: 4px;
   margin-inline-start: 3px;
   margin-inline-end: 6px;
-  width: 7px;
+  vertical-align: middle;
 }
 
 .requests-list-header-button[data-sorted=ascending] > .button-icon {
@@ -291,10 +288,6 @@ body,
   background-image: var(--sort-descending-image);
 }
 
-.requests-list-waterfall-label-wrapper {
-  display: flex;
-}
-
 .requests-list-header-button[data-sorted],
 .requests-list-header-button[data-sorted]:hover {
   background-color: var(--theme-selection-background);
@@ -302,13 +295,11 @@ body,
 }
 
 .requests-list-header-button[data-sorted],
-.requests-list-header[data-active] + .requests-list-header .requests-list-header-button {
+.requests-list-column[data-active] + .requests-list-column .requests-list-header-button {
   border-image: linear-gradient(var(--theme-splitter-color), var(--theme-splitter-color)) 1 1;
 }
 
-/* Firebug theme support for Network panel header */
-
-.theme-firebug .requests-list-header {
+.theme-firebug .requests-list-headers {
   padding: 0 !important;
   font-weight: bold;
   background: linear-gradient(rgba(255, 255, 255, 0.05),
@@ -333,126 +324,26 @@ body,
   color: inherit !important;
 }
 
-.theme-firebug .requests-list-header:hover:active {
+.theme-firebug .requests-list-header-button:hover:active {
   background-image: linear-gradient(rgba(0, 0, 0, 0.1),
                                     transparent);
 }
 
+/* Requests list column */
 
-/* Network requests table: specific column dimensions */
+/* Status column */
 
 .requests-list-status {
-  max-width: 6em;
-  text-align: center;
-  width: 8vw;
+  width: 8%;
 }
 
-.requests-list-method,
-.requests-list-method-box {
-  max-width: 7em;
-  text-align: center;
-  width: 10vw;
-}
-
-.requests-list-icon-and-file {
-  width: 22vw;
-}
-
-.requests-list-icon {
-  background: transparent;
-  width: 15px;
-  height: 15px;
-  margin-inline-end: 4px;
-}
-
-.requests-list-icon {
-  outline: 1px solid var(--table-splitter-color);
-}
-
-.requests-list-security-and-domain {
-  width: 14vw;
-}
-
-.requests-list-remoteip {
-  width: 8vw;
-}
-
-.requests-list-protocol {
-  width: 7vw;
-}
-
-.requests-security-state-icon {
-  flex: none;
-  width: 16px;
-  height: 16px;
-  margin-inline-end: 4px;
-}
-
-.request-list-item.selected .requests-security-state-icon {
-  filter: brightness(1.3);
-}
-
-.security-state-insecure {
-  background-image: url(chrome://devtools/skin/images/security-state-insecure.svg);
-}
-
-.security-state-secure {
-  background-image: url(chrome://devtools/skin/images/security-state-secure.svg);
-}
-
-.security-state-weak {
-  background-image: url(chrome://devtools/skin/images/security-state-weak.svg);
-}
-
-.security-state-broken {
-  background-image: url(chrome://devtools/skin/images/security-state-broken.svg);
-}
-
-.security-state-local {
-  background-image: url(chrome://devtools/skin/images/globe.svg);
-}
-
-.requests-list-type,
-.requests-list-size {
-  max-width: 6em;
-  width: 8vw;
-  justify-content: center;
-}
-
-.requests-list-transferred {
-  max-width: 8em;
-  width: 8vw;
-  justify-content: center;
-}
-
-.requests-list-cause {
-  max-width: 8em;
-  width: 8vw;
-}
-
-.requests-list-cause-stack {
-  background-color: var(--theme-body-color-alt);
-  color: var(--theme-body-background);
-  font-size: 8px;
+.theme-firebug .requests-list-status {
   font-weight: bold;
-  line-height: 10px;
-  border-radius: 3px;
-  padding: 0 2px;
-  margin: 0;
-  margin-inline-end: 3px;
-  -moz-user-select: none;
 }
 
-.request-list-item.selected .requests-list-transferred.theme-comment {
-  color: var(--theme-selection-color);
-}
-
-/* Network requests table: status codes */
-
 .requests-list-status-code {
-  margin-inline-start: 3px !important;
+  margin-inline-start: 3px;
   width: 3em;
-  margin-inline-end: -3em !important;
 }
 
 .requests-list-status-icon {
@@ -463,7 +354,6 @@ body,
   margin-inline-end: 5px;
   border-radius: 10px;
   transition: box-shadow 0.5s ease-in-out;
-  box-sizing: border-box;
 }
 
 .request-list-item.selected .requests-list-status-icon {
@@ -500,7 +390,7 @@ body,
 
 /* 4xx and 5xx are squares - error codes */
 .requests-list-status-icon[data-code^="4"] {
- background-color: var(--theme-highlight-red);
+  background-color: var(--theme-highlight-red);
   border-radius: 0; /* squares */
 }
 
@@ -510,27 +400,171 @@ body,
   transform: rotate(45deg);
 }
 
-/* Network requests table: waterfall header */
+/* Method column */
+
+.requests-list-method {
+  width: 8%;
+}
+
+.theme-firebug .requests-list-method {
+  color: rgb(128, 128, 128);
+}
+
+/* File column */
+
+.requests-list-file {
+  width: 22%;
+}
+
+.requests-list-file.requests-list-column {
+  text-align: start;
+}
+
+.requests-list-icon {
+  background: transparent;
+  width: 15px;
+  height: 15px;
+  margin: 0 4px;
+  outline: 1px solid var(--table-splitter-color);
+  vertical-align: top;
+}
+
+/* Protocol column */
+
+.requests-list-protocol {
+  width: 8%;
+}
+
+/* Domain column */
+
+.requests-list-domain {
+  width: 13%;
+}
+
+.requests-list-domain.requests-list-column {
+  text-align: start;
+}
+
+.requests-security-state-icon {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  margin: 0 4px;
+  vertical-align: top;
+}
+
+.request-list-item.selected .requests-security-state-icon {
+  filter: brightness(1.3);
+}
+
+.security-state-insecure {
+  background-image: url(chrome://devtools/skin/images/security-state-insecure.svg);
+}
+
+.security-state-secure {
+  background-image: url(chrome://devtools/skin/images/security-state-secure.svg);
+}
+
+.security-state-weak {
+  background-image: url(chrome://devtools/skin/images/security-state-weak.svg);
+}
+
+.security-state-broken {
+  background-image: url(chrome://devtools/skin/images/security-state-broken.svg);
+}
+
+.security-state-local {
+  background-image: url(chrome://devtools/skin/images/globe.svg);
+}
+
+/* RemoteIP column */
+
+.requests-list-remoteip {
+  width: 9%;
+}
+
+/* Cause column */
+
+.requests-list-cause {
+  width: 9%;
+}
+
+.requests-list-cause-stack {
+  display: inline-block;
+  background-color: var(--theme-body-color-alt);
+  color: var(--theme-body-background);
+  font-size: 8px;
+  font-weight: bold;
+  line-height: 10px;
+  border-radius: 3px;
+  padding: 0 2px;
+  margin: 0;
+  margin-inline-end: 3px;
+}
+
+/* Type column */
+
+.requests-list-type {
+  width: 6%;
+}
+
+/* Transferred column */
+
+.requests-list-transferred {
+  width: 9%;
+}
+
+/* Size column */
+
+.requests-list-size {
+  width: 7%;
+}
+
+.theme-firebug .requests-list-size {
+  justify-content: end;
+  padding-inline-end: 4px;
+}
+
+/* Waterfall column */
 
 .requests-list-waterfall {
-  flex: auto;
+  width: 20vw;
+  max-width: 20vw;
+  min-width: 20vw;
+  background-repeat: repeat-y;
+  background-position: left center;
+  /* Background created on a <canvas> in js. */
+  /* @see devtools/client/netmonitor/src/waterfall-background.js */
+  background-image: -moz-element(#waterfall-background);
+}
+
+.requests-list-waterfall:dir(rtl) {
+  background-position: right center;
+}
+
+.requests-list-waterfall > .requests-list-header-button {
   padding-inline-start: 0;
 }
 
+.requests-list-waterfall > .requests-list-header-button > .button-text {
+  width: auto;
+}
+
 .requests-list-waterfall-label-wrapper:not(.requests-list-waterfall-visible) {
   padding-inline-start: 16px;
 }
 
 .requests-list-timings-division {
-  padding-top: 2px;
+  display: inline-block;
   padding-inline-start: 4px;
   font-size: 75%;
   pointer-events: none;
-  box-sizing: border-box;
   text-align: start;
-  /* Allow the timing label to shrink if the container gets too narrow.
-   * The container width then is not limited by the content. */
-  flex: initial;
+}
+
+:root[platform="win"] .requests-list-timings-division {
+  padding-top: 1px;
+  font-size: 90%;
 }
 
 .requests-list-timings-division:not(:first-child) {
@@ -558,22 +592,6 @@ body,
   font-weight: 600;
 }
 
-/* Network requests table: waterfall items */
-
-.requests-list-subitem.requests-list-waterfall {
-  padding-inline-start: 0;
-  padding-inline-end: 4px;
-  /* Background created on a <canvas> in js. */
-  /* @see devtools/client/netmonitor/netmonitor-view.js */
-  background-image: -moz-element(#waterfall-background);
-  background-repeat: repeat-y;
-  background-position: left center;
-}
-
-.requests-list-subitem.requests-list-waterfall:dir(rtl) {
-  background-position: right center;
-}
-
 .requests-list-timings {
   display: flex;
   flex: none;
@@ -589,24 +607,6 @@ body,
   transform-origin: right center;
 }
 
-.requests-list-timings-total:dir(ltr) {
-  transform-origin: left center;
-}
-
-.requests-list-timings-total:dir(rtl) {
-  transform-origin: right center;
-}
-
-.requests-list-timings-total {
-  display: inline-block;
-  padding-inline-start: 4px;
-  font-size: 85%;
-  font-weight: 600;
-  white-space: nowrap;
-  /* This node should not be scaled - apply a reversed transformation */
-  transform: scaleX(var(--timings-rev-scale));
-}
-
 .requests-list-timings-box {
   display: inline-block;
   height: 9px;
@@ -641,17 +641,29 @@ body,
   background-color: var(--timing-receive-color);
 }
 
-/* SideMenuWidget */
-#network-table .request-list-empty-notice,
-#network-table .request-list-container {
-  background-color: var(--theme-body-background);
+.requests-list-timings-total {
+  display: inline-block;
+  padding-inline-start: 4px;
+  font-size: 85%;
+  font-weight: 600;
+  white-space: nowrap;
+  /* This node should not be scaled - apply a reversed transformation */
+  transform: scaleX(var(--timings-rev-scale));
 }
 
+.requests-list-timings-total:dir(ltr) {
+  transform-origin: left center;
+}
+
+.requests-list-timings-total:dir(rtl) {
+  transform-origin: right center;
+}
+
+/* Request list item */
+
 .request-list-item {
-  display: flex;
-  border-top-color: transparent;
-  border-bottom-color: transparent;
-  padding: 0;
+  display: table-row;
+  height: 24px;
 }
 
 .request-list-item.selected {
@@ -667,40 +679,15 @@ body,
   background-color: var(--theme-selection-background-semitransparent);
 }
 
-.request-list-item.fromCache > .requests-list-subitem:not(.requests-list-waterfall) {
-    opacity: 0.6;
+.request-list-item.fromCache > .requests-list-column:not(.requests-list-waterfall) {
+  opacity: 0.6;
 }
 
 .theme-firebug .request-list-item:not(.selected):hover {
   background: #EFEFEF;
 }
 
-.theme-firebug .requests-list-subitem {
-  padding: 1px;
-}
-
-/* HTTP Status Column */
-.theme-firebug .requests-list-subitem.requests-list-status {
-  font-weight: bold;
-}
-
-/* Method Column */
-
-.theme-firebug .requests-list-subitem.requests-list-method-box {
-  color: rgb(128, 128, 128);
-}
-
-.request-list-item.selected .requests-list-method {
-  color: var(--theme-selection-color);
-}
-
-/* Size Column */
-.theme-firebug .requests-list-subitem.requests-list-size {
-  justify-content: end;
-  padding-inline-end: 4px;
-}
-
-/* Network details panel */
+/* Network details panel toggle */
 
 .network-details-panel-toggle[disabled] {
   display: none;
@@ -716,7 +703,7 @@ body,
   background-image: var(--theme-pane-expand-image);
 }
 
-/* Network request details tabpanels */
+/* Network details panel */
 
 .network-details-panel {
   width: 100%;
@@ -916,7 +903,6 @@ body,
   height: 50vh;
   font: message-box;
   resize: none;
-  box-sizing: border-box;
 }
 
 .headers-summary .raw-headers .tabpanel-summary-label {
@@ -1052,7 +1038,7 @@ body,
   }
 }
 
-/* Custom request view */
+/* Custom request panel */
 
 .custom-request-panel {
   height: 100%;
@@ -1101,22 +1087,23 @@ body,
   margin-inline-start: 6px;
 }
 
-/* Performance analysis buttons */
+/* Statistics panel buttons */
 
 .requests-list-network-summary-button {
-  display: flex;
-  flex-wrap: nowrap;
-  align-items: center;
+  display: inline-flex;
+  cursor: pointer;
+  height: 18px;
   background: none;
   box-shadow: none;
   border-color: transparent;
   padding-inline-end: 0;
-  cursor: pointer;
+  margin-top: 3px;
+  margin-bottom: 3px;
   margin-inline-end: 1em;
 }
 
 .requests-list-network-summary-button > .summary-info-icon {
-  background-image: url(chrome://devtools/skin/images/profiler-stopwatch.svg);
+  background: url(chrome://devtools/skin/images/profiler-stopwatch.svg) no-repeat;
   filter: var(--icon-filter);
   width: 16px;
   height: 16px;
@@ -1127,7 +1114,7 @@ body,
   opacity: 1;
 }
 
-/* Performance analysis view */
+/* Statistics panel */
 
 .statistics-panel {
   display: flex;
@@ -1263,7 +1250,7 @@ body,
   flex-direction: column;
 }
 
-/* Firebug theme support for network charts */
+/* Firebug theme support for statistics panel charts */
 
 .theme-firebug .chart-colored-blob[name=html] {
   fill: rgba(94, 136, 176, 0.8); /* Blue-Grey highlight */
@@ -1305,49 +1292,20 @@ body,
   background: rgba(84, 235, 159, 0.8);
 }
 
-/* Responsive sidebar */
+/* Responsive web design support */
+
 @media (max-width: 700px) {
-  .requests-list-toolbar {
-    height: 22px;
-  }
-
   .requests-list-header-button {
-    min-height: 22px;
-    padding-left: 8px;
-  }
-
-  .requests-list-status {
-    max-width: none;
+    padding-inline-start: 8px;
   }
 
   .requests-list-status-code {
     width: auto;
   }
 
-  .requests-list-method,
-  .requests-list-method-box {
-    max-width: none;
-    width: 12vw;
-  }
-
-  .requests-list-icon-and-file {
-    width: 22vw;
-  }
-
-  .requests-list-security-and-domain {
-    width: 16vw;
-  }
-
-  .requests-list-remoteip {
-    width: 8vw;
-  }
-
-  .requests-list-cause,
-  .requests-list-type,
-  .requests-list-transferred,
   .requests-list-size {
-    max-width: none;
-    width: 8vw;
+    /* Given a fix max-width to display all columns in RWD mode */
+    max-width: 7%;
   }
 
   .requests-list-waterfall {
@@ -1364,26 +1322,9 @@ body,
     width: 100%;
     height: 1px;
   }
-}
 
-/* Platform overrides (copied in from the old platform specific files) */
-
-:root[platform="win"] .requests-list-timings-division {
-  padding-top: 1px;
-  font-size: 90%;
-}
-
-:root[platform="linux"] #headers-summary-resend {
-  padding: 4px;
-}
-
-:root[platform="linux"] #toggle-raw-headers {
-  padding: 4px;
-}
-
-/* Responsive sidebar */
-@media (max-width: 700px) {
   :root[platform="linux"] .requests-list-header-button {
     font-size: 85%;
   }
 }
+
diff --git a/devtools/client/netmonitor/src/components/request-list-column-cause.js b/devtools/client/netmonitor/src/components/request-list-column-cause.js
index 06ccf406be8e..d57b50e49ca5 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-cause.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-cause.js
@@ -10,7 +10,7 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnCause = createClass({
   displayName: "RequestListColumnCause",
@@ -25,35 +25,27 @@ const RequestListColumnCause = createClass({
   },
 
   render() {
-    const {
-      item,
+    let {
+      item: { cause },
       onCauseBadgeClick,
     } = this.props;
 
-    const { cause } = item;
-
-    let causeType = "";
-    let causeUri = undefined;
+    let causeType = "unknown";
     let causeHasStack = false;
 
     if (cause) {
       // Legacy server might send a numeric value. Display it as "unknown"
       causeType = typeof cause.type === "string" ? cause.type : "unknown";
-      causeUri = cause.loadingDocumentUri;
       causeHasStack = cause.stacktrace && cause.stacktrace.length > 0;
     }
 
     return (
-      div({
-        className: "requests-list-subitem requests-list-cause",
-        title: causeUri,
-      },
-        span({
+      div({ className: "requests-list-column requests-list-cause", title: causeType },
+        causeHasStack && div({
           className: "requests-list-cause-stack",
-          hidden: !causeHasStack,
           onClick: onCauseBadgeClick,
         }, "JS"),
-        span({ className: "subitem-label" }, causeType),
+        causeType
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-content-size.js b/devtools/client/netmonitor/src/components/request-list-column-content-size.js
index b5da0525b1c3..a5fdaf506923 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-content-size.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-content-size.js
@@ -11,7 +11,7 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const { getFormattedSize } = require("../utils/format-utils");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnContentSize = createClass({
   displayName: "RequestListColumnContentSize",
@@ -25,20 +25,10 @@ const RequestListColumnContentSize = createClass({
   },
 
   render() {
-    const { contentSize } = this.props.item;
-
-    let text;
-    if (typeof contentSize == "number") {
-      text = getFormattedSize(contentSize);
-    }
-
+    let { contentSize } = this.props.item;
+    let size = typeof contentSize === "number" ? getFormattedSize(contentSize) : null;
     return (
-      div({
-        className: "requests-list-subitem subitem-label requests-list-size",
-        title: text,
-      },
-        span({ className: "subitem-label" }, text),
-      )
+      div({ className: "requests-list-column requests-list-size", title: size }, size)
     );
   }
 });
diff --git a/devtools/client/netmonitor/src/components/request-list-column-domain.js b/devtools/client/netmonitor/src/components/request-list-column-domain.js
index e2b6cbe18657..76a5c97b09b1 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-domain.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-domain.js
@@ -12,12 +12,12 @@ const {
 const { L10N } = require("../utils/l10n");
 const { propertiesEqual } = require("../utils/request-utils");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const UPDATED_DOMAIN_PROPS = [
-  "urlDetails",
   "remoteAddress",
   "securityState",
+  "urlDetails",
 ];
 
 const RequestListColumnDomain = createClass({
@@ -33,12 +33,13 @@ const RequestListColumnDomain = createClass({
   },
 
   render() {
-    const { item, onSecurityIconClick } = this.props;
-    const { urlDetails, remoteAddress, securityState } = item;
-
+    let { item, onSecurityIconClick } = this.props;
+    let { remoteAddress, securityState, urlDetails: { host, isLocal } } = item;
     let iconClassList = ["requests-security-state-icon"];
     let iconTitle;
-    if (urlDetails.isLocal) {
+    let title = host + (remoteAddress ? ` (${remoteAddress})` : "");
+
+    if (isLocal) {
       iconClassList.push("security-state-local");
       iconTitle = L10N.getStr("netmonitor.security.state.secure");
     } else if (securityState) {
@@ -46,16 +47,14 @@ const RequestListColumnDomain = createClass({
       iconTitle = L10N.getStr(`netmonitor.security.state.${securityState}`);
     }
 
-    let title = urlDetails.host + (remoteAddress ? ` (${remoteAddress})` : "");
-
     return (
-      div({ className: "requests-list-subitem requests-list-security-and-domain" },
+      div({ className: "requests-list-column requests-list-domain", title },
         div({
           className: iconClassList.join(" "),
+          onMouseDown: onSecurityIconClick,
           title: iconTitle,
-          onClick: onSecurityIconClick,
         }),
-        span({ className: "subitem-label requests-list-domain", title }, urlDetails.host),
+        host,
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-file.js b/devtools/client/netmonitor/src/components/request-list-column-file.js
index c97ebf897419..21034bbdc575 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-file.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-file.js
@@ -14,8 +14,8 @@ const { propertiesEqual } = require("../utils/request-utils");
 const { div, img } = DOM;
 
 const UPDATED_FILE_PROPS = [
-  "urlDetails",
   "responseContentDataUri",
+  "urlDetails",
 ];
 
 const RequestListColumnFile = createClass({
@@ -30,22 +30,18 @@ const RequestListColumnFile = createClass({
   },
 
   render() {
-    const { urlDetails, responseContentDataUri } = this.props.item;
+    let { responseContentDataUri, urlDetails } = this.props.item;
 
     return (
-      div({ className: "requests-list-subitem requests-list-icon-and-file" },
+      div({
+        className: "requests-list-column requests-list-file",
+        title: urlDetails.unicodeUrl,
+      },
         img({
           className: "requests-list-icon",
           src: responseContentDataUri,
-          hidden: !responseContentDataUri,
-          "data-type": responseContentDataUri ? "thumbnail" : undefined,
         }),
-        div({
-          className: "subitem-label requests-list-file",
-          title: urlDetails.unicodeUrl,
-        },
-          urlDetails.baseNameWithQuery,
-        ),
+        urlDetails.baseNameWithQuery
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-method.js b/devtools/client/netmonitor/src/components/request-list-column-method.js
index 8fa55db0035f..efdfb37d0792 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-method.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-method.js
@@ -10,7 +10,7 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnMethod = createClass({
   displayName: "RequestListColumnMethod",
@@ -24,12 +24,8 @@ const RequestListColumnMethod = createClass({
   },
 
   render() {
-    const { method } = this.props.item;
-    return (
-      div({ className: "requests-list-subitem requests-list-method-box" },
-        span({ className: "subitem-label requests-list-method" }, method)
-      )
-    );
+    let { method } = this.props.item;
+    return div({ className: "requests-list-column requests-list-method" }, method);
   }
 });
 
diff --git a/devtools/client/netmonitor/src/components/request-list-column-protocol.js b/devtools/client/netmonitor/src/components/request-list-column-protocol.js
index 4c1f5280f365..1cde21cc1699 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-protocol.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-protocol.js
@@ -10,7 +10,7 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnProtocol = createClass({
   displayName: "RequestListColumnProtocol",
@@ -24,10 +24,13 @@ const RequestListColumnProtocol = createClass({
   },
 
   render() {
-    const { httpVersion } = this.props.item;
+    let { httpVersion = "" } = this.props.item;
     return (
-      div({ className: "requests-list-subitem requests-list-protocol" },
-        span({ className: "subitem-label", title: httpVersion }, httpVersion),
+      div({
+        className: "requests-list-column requests-list-protocol",
+        title: httpVersion,
+      },
+        httpVersion
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js b/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js
index 13df90757f0e..453228fd80cd 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js
@@ -10,7 +10,7 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnRemoteIP = createClass({
   displayName: "RequestListColumnRemoteIP",
@@ -24,12 +24,12 @@ const RequestListColumnRemoteIP = createClass({
   },
 
   render() {
-    const { remoteAddress, remotePort } = this.props.item;
-    let remoteSummary = remoteAddress ? `${remoteAddress}:${remotePort}` : "";
+    let { remoteAddress, remotePort } = this.props.item;
+    let remoteIP = remoteAddress ? `${remoteAddress}:${remotePort}` : "unknown";
 
     return (
-      div({ className: "requests-list-subitem requests-list-remoteip" },
-        span({ className: "subitem-label", title: remoteSummary }, remoteSummary),
+      div({ className: "requests-list-column requests-list-remoteip", title: remoteIP },
+        remoteIP
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-status.js b/devtools/client/netmonitor/src/components/request-list-column-status.js
index 70a32b1b451b..e72065c87a42 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-status.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-status.js
@@ -12,7 +12,7 @@ const {
 const { L10N } = require("../utils/l10n");
 const { propertiesEqual } = require("../utils/request-utils");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const UPDATED_STATUS_PROPS = [
   "fromCache",
@@ -33,8 +33,7 @@ const RequestListColumnStatus = createClass({
   },
 
   render() {
-    const { status, statusText, fromCache, fromServiceWorker } = this.props.item;
-
+    let { fromCache, fromServiceWorker, status, statusText } = this.props.item;
     let code, title;
 
     if (status) {
@@ -64,9 +63,9 @@ const RequestListColumnStatus = createClass({
     }
 
     return (
-        div({ className: "requests-list-subitem requests-list-status", title },
+      div({ className: "requests-list-column requests-list-status", title },
         div({ className: "requests-list-status-icon", "data-code": code }),
-        span({ className: "subitem-label requests-list-status-code" }, status)
+        div({ className: "requests-list-status-code" }, status)
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-transferred-size.js b/devtools/client/netmonitor/src/components/request-list-column-transferred-size.js
index ea766197b076..2ba9237be240 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-transferred-size.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-transferred-size.js
@@ -13,7 +13,7 @@ const { getFormattedSize } = require("../utils/format-utils");
 const { L10N } = require("../utils/l10n");
 const { propertiesEqual } = require("../utils/request-utils");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const UPDATED_TRANSFERRED_PROPS = [
   "transferredSize",
@@ -33,16 +33,13 @@ const RequestListColumnTransferredSize = createClass({
   },
 
   render() {
-    const { transferredSize, fromCache, fromServiceWorker, status } = this.props.item;
-
+    let { fromCache, fromServiceWorker, status, transferredSize } = this.props.item;
     let text;
-    let className = "subitem-label";
+
     if (fromCache || status === "304") {
       text = L10N.getStr("networkMenu.sizeCached");
-      className += " theme-comment";
     } else if (fromServiceWorker) {
       text = L10N.getStr("networkMenu.sizeServiceWorker");
-      className += " theme-comment";
     } else if (typeof transferredSize == "number") {
       text = getFormattedSize(transferredSize);
     } else if (transferredSize === null) {
@@ -50,11 +47,8 @@ const RequestListColumnTransferredSize = createClass({
     }
 
     return (
-      div({
-        className: "requests-list-subitem requests-list-transferred",
-        title: text,
-      },
-        span({ className }, text),
+      div({ className: "requests-list-column requests-list-transferred", title: text },
+        text
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-type.js b/devtools/client/netmonitor/src/components/request-list-column-type.js
index 56f5c3bcd0ea..ed7567fc5407 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-type.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-type.js
@@ -11,7 +11,7 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const { getAbbreviatedMimeType } = require("../utils/request-utils");
 
-const { div, span } = DOM;
+const { div } = DOM;
 
 const RequestListColumnType = createClass({
   displayName: "RequestListColumnType",
@@ -25,18 +25,19 @@ const RequestListColumnType = createClass({
   },
 
   render() {
-    const { mimeType } = this.props.item;
+    let { mimeType } = this.props.item;
     let abbrevType;
+
     if (mimeType) {
       abbrevType = getAbbreviatedMimeType(mimeType);
     }
 
     return (
       div({
-        className: "requests-list-subitem requests-list-type",
+        className: "requests-list-column requests-list-type",
         title: mimeType,
       },
-        span({ className: "subitem-label" }, abbrevType),
+        abbrevType
       )
     );
   }
diff --git a/devtools/client/netmonitor/src/components/request-list-column-waterfall.js b/devtools/client/netmonitor/src/components/request-list-column-waterfall.js
index fa5149d641c4..be7090fc9b49 100644
--- a/devtools/client/netmonitor/src/components/request-list-column-waterfall.js
+++ b/devtools/client/netmonitor/src/components/request-list-column-waterfall.js
@@ -16,10 +16,12 @@ const { div } = DOM;
 
 const UPDATED_WATERFALL_PROPS = [
   "eventTimings",
-  "totalTime",
   "fromCache",
   "fromServiceWorker",
+  "totalTime",
 ];
+// List of properties of the timing info we want to create boxes for
+const TIMING_KEYS = ["blocked", "dns", "connect", "send", "wait", "receive"];
 
 const RequestListColumnWaterfall = createClass({
   displayName: "RequestListColumnWaterfall",
@@ -30,15 +32,15 @@ const RequestListColumnWaterfall = createClass({
   },
 
   shouldComponentUpdate(nextProps) {
-    return this.props.firstRequestStartedMillis !== nextProps.firstRequestStartedMillis ||
-      !propertiesEqual(UPDATED_WATERFALL_PROPS, this.props.item, nextProps.item);
+    return !propertiesEqual(UPDATED_WATERFALL_PROPS, this.props.item, nextProps.item) ||
+      this.props.firstRequestStartedMillis !== nextProps.firstRequestStartedMillis;
   },
 
   render() {
-    const { item, firstRequestStartedMillis } = this.props;
+    let { firstRequestStartedMillis, item } = this.props;
 
     return (
-      div({ className: "requests-list-subitem requests-list-waterfall" },
+      div({ className: "requests-list-column requests-list-waterfall" },
         div({
           className: "requests-list-timings",
           style: {
@@ -52,11 +54,8 @@ const RequestListColumnWaterfall = createClass({
   }
 });
 
-// List of properties of the timing info we want to create boxes for
-const TIMING_KEYS = ["blocked", "dns", "connect", "send", "wait", "receive"];
-
 function timingBoxes(item) {
-  const { eventTimings, totalTime, fromCache, fromServiceWorker } = item;
+  let { eventTimings, fromCache, fromServiceWorker, totalTime } = item;
   let boxes = [];
 
   if (fromCache || fromServiceWorker) {
@@ -71,22 +70,26 @@ function timingBoxes(item) {
       // Don't render anything if it surely won't be visible.
       // One millisecond == one unscaled pixel.
       if (width > 0) {
-        boxes.push(div({
-          key,
-          className: "requests-list-timings-box " + key,
-          style: { width }
-        }));
+        boxes.push(
+          div({
+            key,
+            className: `requests-list-timings-box ${key}`,
+            style: { width },
+          })
+        );
       }
     }
   }
 
   if (typeof totalTime === "number") {
-    let text = L10N.getFormatStr("networkMenu.totalMS", totalTime);
-    boxes.push(div({
-      key: "total",
-      className: "requests-list-timings-total",
-      title: text
-    }, text));
+    let title = L10N.getFormatStr("networkMenu.totalMS", totalTime);
+    boxes.push(
+      div({
+        key: "total",
+        className: "requests-list-timings-total",
+        title,
+      }, title)
+    );
   }
 
   return boxes;
diff --git a/devtools/client/netmonitor/src/components/request-list-content.js b/devtools/client/netmonitor/src/components/request-list-content.js
index 93d71efccf68..19311516a1fc 100644
--- a/devtools/client/netmonitor/src/components/request-list-content.js
+++ b/devtools/client/netmonitor/src/components/request-list-content.js
@@ -154,7 +154,7 @@ const RequestListContent = createClass({
       return false;
     }
 
-    if (requestItem.responseContent && target.closest(".requests-list-icon-and-file")) {
+    if (requestItem.responseContent && target.closest(".requests-list-icon")) {
       return setTooltipImageContent(tooltip, itemEl, requestItem);
     }
 
@@ -224,33 +224,37 @@ const RequestListContent = createClass({
       columns,
       displayedRequests,
       firstRequestStartedMillis,
-      selectedRequestId,
       onCauseBadgeClick,
       onItemMouseDown,
       onSecurityIconClick,
+      selectedRequestId,
     } = this.props;
 
     return (
-      div({
-        ref: "contentEl",
-        className: "requests-list-contents",
-        tabIndex: 0,
-        onKeyDown: this.onKeyDown,
-      },
-        displayedRequests.map((item, index) => RequestListItem({
-          firstRequestStartedMillis,
-          fromCache: item.status === "304" || item.fromCache,
-          columns,
-          item,
-          index,
-          isSelected: item.id === selectedRequestId,
-          key: item.id,
-          onContextMenu: this.onContextMenu,
-          onFocusedNodeChange: this.onFocusedNodeChange,
-          onMouseDown: () => onItemMouseDown(item.id),
-          onCauseBadgeClick: () => onCauseBadgeClick(item.cause),
-          onSecurityIconClick: () => onSecurityIconClick(item.securityState),
-        }))
+      div({ className: "requests-list-wrapper"},
+        div({ className: "requests-list-table"},
+          div({
+            ref: "contentEl",
+            className: "requests-list-contents",
+            tabIndex: 0,
+            onKeyDown: this.onKeyDown,
+          },
+            displayedRequests.map((item, index) => RequestListItem({
+              firstRequestStartedMillis,
+              fromCache: item.status === "304" || item.fromCache,
+              columns,
+              item,
+              index,
+              isSelected: item.id === selectedRequestId,
+              key: item.id,
+              onContextMenu: this.onContextMenu,
+              onFocusedNodeChange: this.onFocusedNodeChange,
+              onMouseDown: () => onItemMouseDown(item.id),
+              onCauseBadgeClick: () => onCauseBadgeClick(item.cause),
+              onSecurityIconClick: () => onSecurityIconClick(item.securityState),
+            }))
+          )
+        )
       )
     );
   },
diff --git a/devtools/client/netmonitor/src/components/request-list-header.js b/devtools/client/netmonitor/src/components/request-list-header.js
index 19ff0920bc64..16b1e4e7d140 100644
--- a/devtools/client/netmonitor/src/components/request-list-header.js
+++ b/devtools/client/netmonitor/src/components/request-list-header.js
@@ -11,18 +11,15 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 const Actions = require("../actions/index");
+const { HEADERS, REQUESTS_WATERFALL } = require("../constants");
 const { getWaterfallScale } = require("../selectors/index");
 const { getFormattedTime } = require("../utils/format-utils");
-const { HEADERS } = require("../constants");
 const { L10N } = require("../utils/l10n");
 const WaterfallBackground = require("../waterfall-background");
 const RequestListHeaderContextMenu = require("../request-list-header-context-menu");
 
 const { div, button } = DOM;
 
-const REQUESTS_WATERFALL_HEADER_TICKS_MULTIPLE = 5; // ms
-const REQUESTS_WATERFALL_HEADER_TICKS_SPACING_MIN = 60; // px
-
 /**
  * Render the request list header with sorting arrows for columns.
  * Displays tick marks in the waterfall column header.
@@ -33,19 +30,20 @@ const RequestListHeader = createClass({
 
   propTypes: {
     columns: PropTypes.object.isRequired,
-    dispatch: PropTypes.func.isRequired,
-    sort: PropTypes.object,
-    scale: PropTypes.number,
-    waterfallWidth: PropTypes.number,
-    onHeaderClick: PropTypes.func.isRequired,
+    resetColumns: PropTypes.func.isRequired,
     resizeWaterfall: PropTypes.func.isRequired,
+    scale: PropTypes.number,
+    sort: PropTypes.object,
+    sortBy: PropTypes.func.isRequired,
+    toggleColumn: PropTypes.func.isRequired,
+    waterfallWidth: PropTypes.number,
   },
 
   componentWillMount() {
-    const { dispatch } = this.props;
+    const { resetColumns, toggleColumn } = this.props;
     this.contextMenu = new RequestListHeaderContextMenu({
-      toggleColumn: (column) => dispatch(Actions.toggleColumn(column)),
-      resetColumns: () => dispatch(Actions.resetColumns()),
+      resetColumns,
+      toggleColumn,
     });
   },
 
@@ -73,27 +71,28 @@ const RequestListHeader = createClass({
   },
 
   resizeWaterfall() {
-    // Measure its width and update the 'waterfallWidth' property in the store.
-    // The 'waterfallWidth' will be further updated on every window resize.
-    setTimeout(() => {
-      let { width } = this.refs.header.getBoundingClientRect();
-      this.props.resizeWaterfall(width);
-    }, 50);
+    let waterfallHeader = this.refs.waterfallHeader;
+    if (waterfallHeader) {
+      // Measure its width and update the 'waterfallWidth' property in the store.
+      // The 'waterfallWidth' will be further updated on every window resize.
+      setTimeout(() => {
+        this.props.resizeWaterfall(waterfallHeader.getBoundingClientRect().width);
+      }, 500);
+    }
   },
 
   render() {
-    const { sort, scale, waterfallWidth, onHeaderClick, columns } = this.props;
-
-    return div(
-      { className: "devtools-toolbar requests-list-toolbar" },
-      div({ className: "toolbar-labels" },
-        HEADERS.filter(h => columns.get(h.name)).map(header => {
-          const name = header.name;
-          const boxName = header.boxName || name;
-          const label = L10N.getStr(`netmonitor.toolbar.${header.label || name}`);
+    let { columns, scale, sort, sortBy, waterfallWidth } = this.props;
 
+    return (
+      div({ className: "devtools-toolbar requests-list-headers" },
+        HEADERS.filter((header) => columns.get(header.name)).map((header) => {
+          let name = header.name;
+          let boxName = header.boxName || name;
+          let label = L10N.getStr(`netmonitor.toolbar.${header.label || name}`);
           let sorted, sortedTitle;
-          const active = sort.type == name ? true : undefined;
+          let active = sort.type == name ? true : undefined;
+
           if (active) {
             sorted = sort.ascending ? "ascending" : "descending";
             sortedTitle = L10N.getStr(sort.ascending
@@ -101,27 +100,28 @@ const RequestListHeader = createClass({
               : "networkMenu.sortedDesc");
           }
 
-          return div(
-            {
+          return (
+            div({
               id: `requests-list-${boxName}-header-box`,
-              className: `requests-list-header requests-list-${boxName}`,
+              className: `requests-list-column requests-list-${boxName}`,
               key: name,
-              ref: "header",
+              ref: `${name}Header`,
               // Used to style the next column.
               "data-active": active,
               onContextMenu: this.onContextMenu,
             },
-            button(
-              {
+              button({
                 id: `requests-list-${name}-button`,
-                className: `requests-list-header-button requests-list-${name}`,
+                className: `requests-list-header-button`,
                 "data-sorted": sorted,
                 title: sortedTitle,
-                onClick: () => onHeaderClick(name),
+                onClick: () => sortBy(name),
               },
-              name == "waterfall" ? WaterfallLabel(waterfallWidth, scale, label)
-                                  : div({ className: "button-text" }, label),
-              div({ className: "button-icon" })
+                name === "waterfall"
+                  ? WaterfallLabel(waterfallWidth, scale, label)
+                  : div({ className: "button-text" }, label),
+                div({ className: "button-icon" })
+              )
             )
           );
         })
@@ -137,11 +137,11 @@ function waterfallDivisionLabels(waterfallWidth, scale) {
   let labels = [];
 
   // Build new millisecond tick labels...
-  let timingStep = REQUESTS_WATERFALL_HEADER_TICKS_MULTIPLE;
+  let timingStep = REQUESTS_WATERFALL.HEADER_TICKS_MULTIPLE;
   let scaledStep = scale * timingStep;
 
   // Ignore any divisions that would end up being too close to each other.
-  while (scaledStep < REQUESTS_WATERFALL_HEADER_TICKS_SPACING_MIN) {
+  while (scaledStep < REQUESTS_WATERFALL.HEADER_TICKS_SPACING_MIN) {
     scaledStep *= 2;
   }
 
@@ -185,7 +185,7 @@ function waterfallDivisionLabels(waterfallWidth, scale) {
 function WaterfallLabel(waterfallWidth, scale, label) {
   let className = "button-text requests-list-waterfall-label-wrapper";
 
-  if (waterfallWidth != null && scale != null) {
+  if (waterfallWidth !== null && scale !== null) {
     label = waterfallDivisionLabels(waterfallWidth, scale);
     className += " requests-list-waterfall-visible";
   }
@@ -194,17 +194,18 @@ function WaterfallLabel(waterfallWidth, scale, label) {
 }
 
 module.exports = connect(
-  state => ({
+  (state) => ({
     columns: state.ui.columns,
-    sort: state.sort,
-    scale: getWaterfallScale(state),
-    waterfallWidth: state.ui.waterfallWidth,
     firstRequestStartedMillis: state.requests.firstStartedMillis,
+    scale: getWaterfallScale(state),
+    sort: state.sort,
     timingMarkers: state.timingMarkers,
+    waterfallWidth: state.ui.waterfallWidth,
   }),
-  dispatch => ({
-    dispatch,
-    onHeaderClick: type => dispatch(Actions.sortBy(type)),
-    resizeWaterfall: width => dispatch(Actions.resizeWaterfall(width)),
+  (dispatch) => ({
+    resetColumns: () => dispatch(Actions.resetColumns()),
+    resizeWaterfall: (width) => dispatch(Actions.resizeWaterfall(width)),
+    sortBy: (type) => dispatch(Actions.sortBy(type)),
+    toggleColumn: (column) => dispatch(Actions.toggleColumn(column)),
   })
 )(RequestListHeader);
diff --git a/devtools/client/netmonitor/src/components/request-list-item.js b/devtools/client/netmonitor/src/components/request-list-item.js
index d2b36ac3fb38..56c529663f4f 100644
--- a/devtools/client/netmonitor/src/components/request-list-item.js
+++ b/devtools/client/netmonitor/src/components/request-list-item.js
@@ -11,7 +11,6 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 const I = require("devtools/client/shared/vendor/immutable");
-
 const { propertiesEqual } = require("../utils/request-utils");
 
 // Components
@@ -55,9 +54,10 @@ const UPDATED_REQ_ITEM_PROPS = [
 ];
 
 const UPDATED_REQ_PROPS = [
+  "firstRequestStartedMillis",
   "index",
   "isSelected",
-  "firstRequestStartedMillis",
+  "waterfallWidth",
 ];
 
 /**
@@ -78,11 +78,12 @@ const RequestListItem = createClass({
     onFocusedNodeChange: PropTypes.func,
     onMouseDown: PropTypes.func.isRequired,
     onSecurityIconClick: PropTypes.func.isRequired,
+    waterfallWidth: PropTypes.number,
   },
 
   componentDidMount() {
     if (this.props.isSelected) {
-      this.refs.el.focus();
+      this.refs.listItem.focus();
     }
   },
 
@@ -94,7 +95,7 @@ const RequestListItem = createClass({
 
   componentDidUpdate(prevProps) {
     if (!prevProps.isSelected && this.props.isSelected) {
-      this.refs.el.focus();
+      this.refs.listItem.focus();
       if (this.props.onFocusedNodeChange) {
         this.props.onFocusedNodeChange();
       }
@@ -102,7 +103,7 @@ const RequestListItem = createClass({
   },
 
   render() {
-    const {
+    let {
       columns,
       item,
       index,
@@ -112,23 +113,16 @@ const RequestListItem = createClass({
       onContextMenu,
       onMouseDown,
       onCauseBadgeClick,
-      onSecurityIconClick
+      onSecurityIconClick,
     } = this.props;
 
-    let classList = ["request-list-item"];
-    if (isSelected) {
-      classList.push("selected");
-    }
-
-    if (fromCache) {
-      classList.push("fromCache");
-    }
-
-    classList.push(index % 2 ? "odd" : "even");
+    let classList = ["request-list-item", index % 2 ? "odd" : "even"];
+    isSelected && classList.push("selected");
+    fromCache && classList.push("fromCache");
 
     return (
       div({
-        ref: "el",
+        ref: "listItem",
         className: classList.join(" "),
         "data-id": item.id,
         tabIndex: 0,
diff --git a/devtools/client/netmonitor/src/components/source-editor.js b/devtools/client/netmonitor/src/components/source-editor.js
index 3119f0afeb03..6276506fbb4b 100644
--- a/devtools/client/netmonitor/src/components/source-editor.js
+++ b/devtools/client/netmonitor/src/components/source-editor.js
@@ -10,9 +10,9 @@ const {
   PropTypes,
 } = require("devtools/client/shared/vendor/react");
 const Editor = require("devtools/client/sourceeditor/editor");
+const { SOURCE_EDITOR_SYNTAX_HIGHLIGHT_MAX_SIZE } = require("../constants");
 
 const { div } = DOM;
-const SYNTAX_HIGHLIGHT_MAX_SIZE = 51200;
 
 /**
  * CodeMirror editor as a React component
@@ -33,7 +33,7 @@ const SourceEditor = createClass({
     this.editor = new Editor({
       lineNumbers: true,
       lineWrapping: false,
-      mode: text.length < SYNTAX_HIGHLIGHT_MAX_SIZE ? mode : null,
+      mode: text.length < SOURCE_EDITOR_SYNTAX_HIGHLIGHT_MAX_SIZE ? mode : null,
       readOnly: true,
       theme: "mozilla",
       value: text,
@@ -48,7 +48,8 @@ const SourceEditor = createClass({
   componentDidUpdate(prevProps) {
     const { mode, text } = this.props;
 
-    if (prevProps.mode !== mode && text.length < SYNTAX_HIGHLIGHT_MAX_SIZE) {
+    if (prevProps.mode !== mode &&
+        text.length < SOURCE_EDITOR_SYNTAX_HIGHLIGHT_MAX_SIZE) {
       this.editor.setMode(mode);
     }
 
diff --git a/devtools/client/netmonitor/src/components/status-bar.js b/devtools/client/netmonitor/src/components/status-bar.js
index a1408cef7674..b128de9aa91d 100644
--- a/devtools/client/netmonitor/src/components/status-bar.js
+++ b/devtools/client/netmonitor/src/components/status-bar.js
@@ -10,7 +10,6 @@ const {
 } = require("devtools/client/shared/vendor/react");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 const { PluralForm } = require("devtools/shared/plural-form");
-
 const Actions = require("../actions/index");
 const {
   getDisplayedRequestsSummary,
@@ -18,12 +17,11 @@ const {
 } = require("../selectors/index");
 const {
   getFormattedSize,
-  getFormattedTime
+  getFormattedTime,
 } = require("../utils/format-utils");
 const { L10N } = require("../utils/l10n");
 
-// Components
-const { div, button, span } = DOM;
+const { button, div } = DOM;
 
 function StatusBar({ summary, openStatistics, timingMarkers }) {
   let { count, contentSize, transferredSize, millis } = summary;
@@ -42,29 +40,32 @@ function StatusBar({ summary, openStatistics, timingMarkers }) {
     getFormattedTime(millis));
 
   return (
-    div({ className: "devtools-toolbar devtools-toolbar-bottom" },
+    div({ className: "devtools-toolbar devtools-status-bottom" },
       button({
         className: "devtools-button requests-list-network-summary-button",
         onClick: openStatistics,
       },
-        span({ className: "summary-info-icon" }),
+        div({ className: "summary-info-icon" }),
+      ),
+      div({ className: "status-bar-label requests-list-network-summary-count" },
+        countText
       ),
-      span({ className: "status-bar-label requests-list-network-summary-count" },
-        countText),
       count !== 0 &&
-        span({ className: "status-bar-label requests-list-network-summary-transfer" },
-          transferText),
+        div({ className: "status-bar-label requests-list-network-summary-transfer" },
+          transferText
+        ),
       count !== 0 &&
-        span({ className: "status-bar-label requests-list-network-summary-finish" },
-          finishText),
-
+        div({ className: "status-bar-label requests-list-network-summary-finish" },
+          finishText
+        ),
       DOMContentLoaded > -1 &&
-      span({ className: "status-bar-label dom-content-loaded" },
-        `DOMContentLoaded: ${getFormattedTime(DOMContentLoaded)}`),
-
+        div({ className: "status-bar-label dom-content-loaded" },
+          `DOMContentLoaded: ${getFormattedTime(DOMContentLoaded)}`
+        ),
       load > -1 &&
-      span({ className: "status-bar-label load" },
-        `load: ${getFormattedTime(load)}`),
+        div({ className: "status-bar-label load" },
+          `load: ${getFormattedTime(load)}`
+        ),
     )
   );
 }
diff --git a/devtools/client/netmonitor/src/constants.js b/devtools/client/netmonitor/src/constants.js
index d071aa5275f3..d9d706cb4047 100644
--- a/devtools/client/netmonitor/src/constants.js
+++ b/devtools/client/netmonitor/src/constants.js
@@ -93,18 +93,6 @@ const EVENTS = {
   UPDATING_RESPONSE_CONTENT: "NetMonitor:NetworkEventUpdating:ResponseContent",
   RECEIVED_RESPONSE_CONTENT: "NetMonitor:NetworkEventUpdated:ResponseContent",
 
-  // When the request post params are displayed in the UI.
-  REQUEST_POST_PARAMS_DISPLAYED: "NetMonitor:RequestPostParamsAvailable",
-
-  // When the image response thumbnail is displayed in the UI.
-  RESPONSE_IMAGE_THUMBNAIL_DISPLAYED:
-    "NetMonitor:ResponseImageThumbnailAvailable",
-
-  // Fired when charts have been displayed in the PerformanceStatisticsView.
-  PLACEHOLDER_CHARTS_DISPLAYED: "NetMonitor:PlaceholderChartsDisplayed",
-  PRIMED_CACHE_CHART_DISPLAYED: "NetMonitor:PrimedChartsDisplayed",
-  EMPTY_CACHE_CHART_DISPLAYED: "NetMonitor:EmptyChartsDisplayed",
-
   // Fired once the NetMonitorController establishes a connection to the debug
   // target.
   CONNECTED: "connected",
@@ -123,7 +111,6 @@ const HEADERS = [
   },
   {
     name: "file",
-    boxName: "icon-and-file",
     canFilter: false,
   },
   {
@@ -132,7 +119,6 @@ const HEADERS = [
   },
   {
     name: "domain",
-    boxName: "security-and-domain",
     canFilter: true,
   },
   {
@@ -164,13 +150,30 @@ const HEADERS = [
   }
 ];
 
+const REQUESTS_WATERFALL = {
+  BACKGROUND_TICKS_MULTIPLE: 5, // ms
+  BACKGROUND_TICKS_SCALES: 3,
+  BACKGROUND_TICKS_SPACING_MIN: 10, // px
+  BACKGROUND_TICKS_COLOR_RGB: [128, 136, 144],
+  // 8-bit value of the alpha component of the tick color
+  BACKGROUND_TICKS_OPACITY_MIN: 32,
+  BACKGROUND_TICKS_OPACITY_ADD: 32,
+  // RGBA colors for the timing markers
+  DOMCONTENTLOADED_TICKS_COLOR_RGBA: [0, 0, 255, 128],
+  HEADER_TICKS_MULTIPLE: 5, // ms
+  HEADER_TICKS_SPACING_MIN: 60, // px
+  LOAD_TICKS_COLOR_RGBA: [255, 0, 0, 128],
+  // Reserve extra space for rendering waterfall time label
+  LABEL_WIDTH: 50, // px
+};
+
 const general = {
   ACTIVITY_TYPE,
   EVENTS,
   FILTER_SEARCH_DELAY: 200,
   HEADERS,
-  // 100 KB in bytes
-  SOURCE_SYNTAX_HIGHLIGHT_MAX_FILE_SIZE: 102400,
+  SOURCE_EDITOR_SYNTAX_HIGHLIGHT_MAX_SIZE: 51200, // 50 KB in bytes
+  REQUESTS_WATERFALL,
 };
 
 // flatten constants
diff --git a/devtools/client/netmonitor/src/netmonitor-controller.js b/devtools/client/netmonitor/src/netmonitor-controller.js
index 1cb3f522d03b..727981be55a1 100644
--- a/devtools/client/netmonitor/src/netmonitor-controller.js
+++ b/devtools/client/netmonitor/src/netmonitor-controller.js
@@ -7,10 +7,7 @@
 const { TimelineFront } = require("devtools/shared/fronts/timeline");
 const { CurlUtils } = require("devtools/client/shared/curl");
 const { ACTIVITY_TYPE, EVENTS } = require("./constants");
-const {
-  getRequestById,
-  getDisplayedRequestById,
-} = require("./selectors/index");
+const { getDisplayedRequestById } = require("./selectors/index");
 const {
   fetchHeaders,
   formDataURI,
@@ -307,7 +304,6 @@ function NetworkEventsHandler() {
   this._onRequestPostData = this._onRequestPostData.bind(this);
   this._onResponseHeaders = this._onResponseHeaders.bind(this);
   this._onResponseCookies = this._onResponseCookies.bind(this);
-  this._onResponseContent = this._onResponseContent.bind(this);
   this._onSecurityInfo = this._onSecurityInfo.bind(this);
   this._onEventTimings = this._onEventTimings.bind(this);
 }
@@ -428,45 +424,11 @@ NetworkEventsHandler.prototype = {
     .then(() => window.emit(EVENTS.REQUEST_ADDED, id));
   },
 
-  async updateRequest(id, data) {
-    await this.actions.updateRequest(id, data, true);
-    let {
-      responseContent,
-      responseCookies,
-      responseHeaders,
-      requestCookies,
-      requestHeaders,
-      requestPostData,
-    } = data;
-    let request = getRequestById(window.gStore.getState(), id);
-
-    if (requestHeaders && requestHeaders.headers && requestHeaders.headers.length) {
-      let headers = await fetchHeaders(requestHeaders, getLongString);
-      if (headers) {
-        await this.actions.updateRequest(
-          id,
-          { requestHeaders: headers },
-          true,
-        );
-      }
-    }
-
-    if (responseHeaders && responseHeaders.headers && responseHeaders.headers.length) {
-      let headers = await fetchHeaders(responseHeaders, getLongString);
-      if (headers) {
-        await this.actions.updateRequest(
-          id,
-          { responseHeaders: headers },
-          true,
-        );
-      }
-    }
-
-    if (request && responseContent && responseContent.content) {
-      let { mimeType } = request;
-      let { text, encoding } = responseContent.content;
+  async fetchImage(mimeType, responseContent) {
+    let payload = {};
+    if (mimeType && responseContent && responseContent.content) {
+      let { encoding, text } = responseContent.content;
       let response = await getLongString(text);
-      let payload = {};
 
       if (mimeType.includes("image/")) {
         payload.responseContentDataUri = formDataURI(mimeType, encoding, response);
@@ -474,16 +436,36 @@ NetworkEventsHandler.prototype = {
 
       responseContent.content.text = response;
       payload.responseContent = responseContent;
+    }
+    return payload;
+  },
 
-      await this.actions.updateRequest(id, payload, true);
-
-      if (mimeType.includes("image/")) {
-        window.emit(EVENTS.RESPONSE_IMAGE_THUMBNAIL_DISPLAYED);
+  async fetchRequestHeaders(requestHeaders) {
+    let payload = {};
+    if (requestHeaders && requestHeaders.headers && requestHeaders.headers.length) {
+      let headers = await fetchHeaders(requestHeaders, getLongString);
+      if (headers) {
+        payload.requestHeaders = headers;
       }
     }
+    return payload;
+  },
 
-    // Search the POST data upload stream for request headers and add
-    // them as a separate property, different from the classic headers.
+  async fetchResponseHeaders(responseHeaders) {
+    let payload = {};
+    if (responseHeaders && responseHeaders.headers && responseHeaders.headers.length) {
+      let headers = await fetchHeaders(responseHeaders, getLongString);
+      if (headers) {
+        payload.responseHeaders = headers;
+      }
+    }
+    return payload;
+  },
+
+  // Search the POST data upload stream for request headers and add
+  // them as a separate property, different from the classic headers.
+  async fetchPostData(requestPostData) {
+    let payload = {};
     if (requestPostData && requestPostData.postData) {
       let { text } = requestPostData.postData;
       let postData = await getLongString(text);
@@ -491,35 +473,15 @@ NetworkEventsHandler.prototype = {
       const headersSize = headers.reduce((acc, { name, value }) => {
         return acc + name.length + value.length + 2;
       }, 0);
-      let payload = {};
       requestPostData.postData.text = postData;
       payload.requestPostData = Object.assign({}, requestPostData);
       payload.requestHeadersFromUploadStream = { headers, headersSize };
-
-      await this.actions.updateRequest(id, payload, true);
-    }
-
-    // Fetch request and response cookies long value.
-    // Actor does not provide full sized cookie value when the value is too long
-    // To display values correctly, we need fetch them in each request.
-    if (requestCookies) {
-      let reqCookies = [];
-      // request store cookies in requestCookies or requestCookies.cookies
-      let cookies = requestCookies.cookies ?
-        requestCookies.cookies : requestCookies;
-      // make sure cookies is iterable
-      if (typeof cookies[Symbol.iterator] === "function") {
-        for (let cookie of cookies) {
-          reqCookies.push(Object.assign({}, cookie, {
-            value: await getLongString(cookie.value),
-          }));
-        }
-        if (reqCookies.length) {
-          await this.actions.updateRequest(id, { requestCookies: reqCookies }, true);
-        }
-      }
     }
+    return payload;
+  },
 
+  async fetchResponseCookies(responseCookies) {
+    let payload = {};
     if (responseCookies) {
       let resCookies = [];
       // response store cookies in responseCookies or responseCookies.cookies
@@ -533,10 +495,70 @@ NetworkEventsHandler.prototype = {
           }));
         }
         if (resCookies.length) {
-          await this.actions.updateRequest(id, { responseCookies: resCookies }, true);
+          payload.responseCookies = resCookies;
         }
       }
     }
+    return payload;
+  },
+
+  // Fetch request and response cookies long value.
+  // Actor does not provide full sized cookie value when the value is too long
+  // To display values correctly, we need fetch them in each request.
+  async fetchRequestCookies(requestCookies) {
+    let payload = {};
+    if (requestCookies) {
+      let reqCookies = [];
+      // request store cookies in requestCookies or requestCookies.cookies
+      let cookies = requestCookies.cookies ?
+        requestCookies.cookies : requestCookies;
+      // make sure cookies is iterable
+      if (typeof cookies[Symbol.iterator] === "function") {
+        for (let cookie of cookies) {
+          reqCookies.push(Object.assign({}, cookie, {
+            value: await getLongString(cookie.value),
+          }));
+        }
+        if (reqCookies.length) {
+          payload.requestCookies = reqCookies;
+        }
+      }
+    }
+    return payload;
+  },
+
+  async updateRequest(id, data) {
+    let {
+      mimeType,
+      responseContent,
+      responseCookies,
+      responseHeaders,
+      requestCookies,
+      requestHeaders,
+      requestPostData,
+    } = data;
+
+    // fetch request detail contents in parallel
+    let [
+      imageObj,
+      requestHeadersObj,
+      responseHeadersObj,
+      postDataObj,
+      requestCookiesObj,
+      responseCookiesObj,
+    ] = await Promise.all([
+      this.fetchImage(mimeType, responseContent),
+      this.fetchRequestHeaders(requestHeaders),
+      this.fetchResponseHeaders(responseHeaders),
+      this.fetchPostData(requestPostData),
+      this.fetchRequestCookies(requestCookies),
+      this.fetchResponseCookies(responseCookies),
+    ]);
+
+    let payload = Object.assign({}, data,
+                                    imageObj, requestHeadersObj, responseHeadersObj,
+                                    postDataObj, requestCookiesObj, responseCookiesObj);
+    await this.actions.updateRequest(id, payload, true);
   },
 
   /**
@@ -568,9 +590,10 @@ NetworkEventsHandler.prototype = {
       case "securityInfo":
         this.updateRequest(actor, {
           securityState: networkInfo.securityInfo,
+        }).then(() => {
+          this.webConsoleClient.getSecurityInfo(actor, this._onSecurityInfo);
+          window.emit(EVENTS.UPDATING_SECURITY_INFO, actor);
         });
-        this.webConsoleClient.getSecurityInfo(actor, this._onSecurityInfo);
-        window.emit(EVENTS.UPDATING_SECURITY_INFO, actor);
         break;
       case "responseHeaders":
         this.webConsoleClient.getResponseHeaders(actor,
@@ -590,25 +613,26 @@ NetworkEventsHandler.prototype = {
           status: networkInfo.response.status,
           statusText: networkInfo.response.statusText,
           headersSize: networkInfo.response.headersSize
+        }).then(() => {
+          window.emit(EVENTS.STARTED_RECEIVING_RESPONSE, actor);
         });
-        window.emit(EVENTS.STARTED_RECEIVING_RESPONSE, actor);
         break;
       case "responseContent":
-        this.updateRequest(actor, {
-          contentSize: networkInfo.response.bodySize,
-          transferredSize: networkInfo.response.transferredSize,
-          mimeType: networkInfo.response.content.mimeType
-        });
         this.webConsoleClient.getResponseContent(actor,
-          this._onResponseContent);
+          this._onResponseContent.bind(this, {
+            contentSize: networkInfo.response.bodySize,
+            transferredSize: networkInfo.response.transferredSize,
+            mimeType: networkInfo.response.content.mimeType
+          }));
         window.emit(EVENTS.UPDATING_RESPONSE_CONTENT, actor);
         break;
       case "eventTimings":
         this.updateRequest(actor, {
           totalTime: networkInfo.totalTime
+        }).then(() => {
+          this.webConsoleClient.getEventTimings(actor, this._onEventTimings);
+          window.emit(EVENTS.UPDATING_EVENT_TIMINGS, actor);
         });
-        this.webConsoleClient.getEventTimings(actor, this._onEventTimings);
-        window.emit(EVENTS.UPDATING_EVENT_TIMINGS, actor);
         break;
     }
   },
@@ -700,13 +724,14 @@ NetworkEventsHandler.prototype = {
   /**
    * Handles additional information received for a "responseContent" packet.
    *
+   * @param object data
+   *        The message received from the server event.
    * @param object response
    *        The message received from the server.
    */
-  _onResponseContent: function (response) {
-    this.updateRequest(response.from, {
-      responseContent: response
-    }).then(() => {
+  _onResponseContent: function (data, response) {
+    let payload = Object.assign({ responseContent: response }, data);
+    this.updateRequest(response.from, payload).then(() => {
       window.emit(EVENTS.RECEIVED_RESPONSE_CONTENT, response.from);
     });
   },
diff --git a/devtools/client/netmonitor/src/reducers/ui.js b/devtools/client/netmonitor/src/reducers/ui.js
index 8f2738093a3b..8c82eba309cc 100644
--- a/devtools/client/netmonitor/src/reducers/ui.js
+++ b/devtools/client/netmonitor/src/reducers/ui.js
@@ -40,15 +40,12 @@ const UI = I.Record({
   waterfallWidth: null,
 });
 
-// Safe bounds for waterfall width (px)
-const REQUESTS_WATERFALL_SAFE_BOUNDS = 90;
-
 function resetColumns(state) {
   return state.set("columns", new Columns());
 }
 
 function resizeWaterfall(state, action) {
-  return state.set("waterfallWidth", action.width - REQUESTS_WATERFALL_SAFE_BOUNDS);
+  return state.set("waterfallWidth", action.width);
 }
 
 function openNetworkDetails(state, action) {
diff --git a/devtools/client/netmonitor/src/selectors/ui.js b/devtools/client/netmonitor/src/selectors/ui.js
index 51f351e98c8c..44aaf4504032 100644
--- a/devtools/client/netmonitor/src/selectors/ui.js
+++ b/devtools/client/netmonitor/src/selectors/ui.js
@@ -4,6 +4,7 @@
 
 "use strict";
 
+const { REQUESTS_WATERFALL } = require("../constants");
 const { getDisplayedRequests } = require("./requests");
 
 function isNetworkDetailsToggleButtonDisabled(state) {
@@ -15,11 +16,7 @@ const EPSILON = 0.001;
 function getWaterfallScale(state) {
   const { requests, timingMarkers, ui } = state;
 
-  if (requests.firstStartedMillis == +Infinity) {
-    return null;
-  }
-
-  if (ui.waterfallWidth == null) {
+  if (requests.firstStartedMillis === +Infinity || ui.waterfallWidth === null) {
     return null;
   }
 
@@ -27,7 +24,8 @@ function getWaterfallScale(state) {
                                    timingMarkers.firstDocumentDOMContentLoadedTimestamp,
                                    timingMarkers.firstDocumentLoadTimestamp);
   const longestWidth = lastEventMillis - requests.firstStartedMillis;
-  return Math.min(Math.max(ui.waterfallWidth / longestWidth, EPSILON), 1);
+  return Math.min(Math.max(
+    (ui.waterfallWidth - REQUESTS_WATERFALL.LABEL_WIDTH) / longestWidth, EPSILON), 1);
 }
 
 module.exports = {
diff --git a/devtools/client/netmonitor/src/waterfall-background.js b/devtools/client/netmonitor/src/waterfall-background.js
index 7d4ff5aafcb3..e7f3d088a5c3 100644
--- a/devtools/client/netmonitor/src/waterfall-background.js
+++ b/devtools/client/netmonitor/src/waterfall-background.js
@@ -4,23 +4,14 @@
 
 "use strict";
 
-const HTML_NS = "http://www.w3.org/1999/xhtml";
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_MULTIPLE = 5; // ms
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_SCALES = 3;
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_SPACING_MIN = 10; // px
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_COLOR_RGB = [128, 136, 144];
-// 8-bit value of the alpha component of the tick color
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_OPACITY_MIN = 32;
-const REQUESTS_WATERFALL_BACKGROUND_TICKS_OPACITY_ADD = 32;
-// RGBA colors for the timing markers
-const REQUESTS_WATERFALL_DOMCONTENTLOADED_TICKS_COLOR_RGBA = [0, 0, 255, 128];
-const REQUESTS_WATERFALL_LOAD_TICKS_COLOR_RGBA = [255, 0, 0, 128];
+const { REQUESTS_WATERFALL } = require("./constants");
 
+const HTML_NS = "http://www.w3.org/1999/xhtml";
 const STATE_KEYS = [
-  "scale",
-  "waterfallWidth",
   "firstRequestStartedMillis",
+  "scale",
   "timingMarkers",
+  "waterfallWidth",
 ];
 
 /**
@@ -62,7 +53,8 @@ WaterfallBackground.prototype = {
     }
 
     // Nuke the context.
-    let canvasWidth = this.canvas.width = state.waterfallWidth;
+    let canvasWidth = this.canvas.width =
+      state.waterfallWidth - REQUESTS_WATERFALL.LABEL_WIDTH;
     // Awww yeah, 1px, repeats on Y axis.
     let canvasHeight = this.canvas.height = 1;
 
@@ -75,14 +67,14 @@ WaterfallBackground.prototype = {
     let view32bit = new Uint32Array(buf);
 
     // Build new millisecond tick lines...
-    let timingStep = REQUESTS_WATERFALL_BACKGROUND_TICKS_MULTIPLE;
+    let timingStep = REQUESTS_WATERFALL.BACKGROUND_TICKS_MULTIPLE;
     let optimalTickIntervalFound = false;
     let scaledStep;
 
     while (!optimalTickIntervalFound) {
       // Ignore any divisions that would end up being too close to each other.
       scaledStep = state.scale * timingStep;
-      if (scaledStep < REQUESTS_WATERFALL_BACKGROUND_TICKS_SPACING_MIN) {
+      if (scaledStep < REQUESTS_WATERFALL.BACKGROUND_TICKS_SPACING_MIN) {
         timingStep <<= 1;
         continue;
       }
@@ -90,8 +82,8 @@ WaterfallBackground.prototype = {
     }
 
     const isRTL = isDocumentRTL(document);
-    const [r, g, b] = REQUESTS_WATERFALL_BACKGROUND_TICKS_COLOR_RGB;
-    let alphaComponent = REQUESTS_WATERFALL_BACKGROUND_TICKS_OPACITY_MIN;
+    const [r, g, b] = REQUESTS_WATERFALL.BACKGROUND_TICKS_COLOR_RGB;
+    let alphaComponent = REQUESTS_WATERFALL.BACKGROUND_TICKS_OPACITY_MIN;
 
     function drawPixelAt(offset, color) {
       let position = (isRTL ? canvasWidth - offset : offset - 1) | 0;
@@ -100,12 +92,12 @@ WaterfallBackground.prototype = {
     }
 
     // Insert one pixel for each division on each scale.
-    for (let i = 1; i <= REQUESTS_WATERFALL_BACKGROUND_TICKS_SCALES; i++) {
+    for (let i = 1; i <= REQUESTS_WATERFALL.BACKGROUND_TICKS_SCALES; i++) {
       let increment = scaledStep * Math.pow(2, i);
       for (let x = 0; x < canvasWidth; x += increment) {
         drawPixelAt(x, [r, g, b, alphaComponent]);
       }
-      alphaComponent += REQUESTS_WATERFALL_BACKGROUND_TICKS_OPACITY_ADD;
+      alphaComponent += REQUESTS_WATERFALL.BACKGROUND_TICKS_OPACITY_ADD;
     }
 
     function drawTimestamp(timestamp, color) {
@@ -118,10 +110,10 @@ WaterfallBackground.prototype = {
     }
 
     drawTimestamp(state.timingMarkers.firstDocumentDOMContentLoadedTimestamp,
-                  REQUESTS_WATERFALL_DOMCONTENTLOADED_TICKS_COLOR_RGBA);
+                  REQUESTS_WATERFALL.DOMCONTENTLOADED_TICKS_COLOR_RGBA);
 
     drawTimestamp(state.timingMarkers.firstDocumentLoadTimestamp,
-                  REQUESTS_WATERFALL_LOAD_TICKS_COLOR_RGBA);
+                  REQUESTS_WATERFALL.LOAD_TICKS_COLOR_RGBA);
 
     // Flush the image data and cache the waterfall background.
     pixelArray.set(view8bit);
diff --git a/devtools/client/netmonitor/test/browser_net_icon-preview.js b/devtools/client/netmonitor/test/browser_net_icon-preview.js
index a1d14d7e155a..3de8d6a7c139 100644
--- a/devtools/client/netmonitor/test/browser_net_icon-preview.js
+++ b/devtools/client/netmonitor/test/browser_net_icon-preview.js
@@ -9,22 +9,21 @@
 
 add_task(function* () {
   let { tab, monitor } = yield initNetMonitor(CONTENT_TYPE_WITHOUT_CACHE_URL);
+  const SELECTOR = ".requests-list-icon[src]";
   info("Starting test... ");
 
   let { document, gStore, windowRequire } = monitor.panelWin;
   let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
   let { NetMonitorController } =
     windowRequire("devtools/client/netmonitor/src/netmonitor-controller");
-  let {
-    ACTIVITY_TYPE,
-    EVENTS,
-  } = windowRequire("devtools/client/netmonitor/src/constants");
+  let { ACTIVITY_TYPE } = windowRequire("devtools/client/netmonitor/src/constants");
 
   gStore.dispatch(Actions.batchEnable(false));
 
-  let wait = waitForEvents();
+  let wait = waitForNetworkEvents(monitor, CONTENT_TYPE_WITHOUT_CACHE_REQUESTS);
   yield performRequests();
   yield wait;
+  yield waitUntil(() => !!document.querySelector(SELECTOR));
 
   info("Checking the image thumbnail when all items are shown.");
   checkImageThumbnail();
@@ -38,22 +37,16 @@ add_task(function* () {
   checkImageThumbnail();
 
   info("Reloading the debuggee and performing all requests again...");
-  wait = waitForEvents();
+  wait = waitForNetworkEvents(monitor, CONTENT_TYPE_WITHOUT_CACHE_REQUESTS);
   yield reloadAndPerformRequests();
   yield wait;
+  yield waitUntil(() => !!document.querySelector(SELECTOR));
 
   info("Checking the image thumbnail after a reload.");
   checkImageThumbnail();
 
   yield teardown(monitor);
 
-  function waitForEvents() {
-    return promise.all([
-      waitForNetworkEvents(monitor, CONTENT_TYPE_WITHOUT_CACHE_REQUESTS),
-      monitor.panelWin.once(EVENTS.RESPONSE_IMAGE_THUMBNAIL_DISPLAYED)
-    ]);
-  }
-
   function performRequests() {
     return ContentTask.spawn(tab.linkedBrowser, {}, function* () {
       content.wrappedJSObject.performRequests();
@@ -66,12 +59,11 @@ add_task(function* () {
   }
 
   function checkImageThumbnail() {
-    is(document.querySelectorAll(".requests-list-icon[data-type=thumbnail]").length, 1,
+    is(document.querySelectorAll(SELECTOR).length, 1,
       "There should be only one image request with a thumbnail displayed.");
-    is(document.querySelector(".requests-list-icon[data-type=thumbnail]").src,
-      TEST_IMAGE_DATA_URI,
+    is(document.querySelector(SELECTOR).src, TEST_IMAGE_DATA_URI,
       "The image requests-list-icon thumbnail is displayed correctly.");
-    is(document.querySelector(".requests-list-icon[data-type=thumbnail]").hidden, false,
+    is(document.querySelector(SELECTOR).hidden, false,
       "The image requests-list-icon thumbnail should not be hidden.");
   }
 });
diff --git a/devtools/client/netmonitor/test/browser_net_image-tooltip.js b/devtools/client/netmonitor/test/browser_net_image-tooltip.js
index 0cd45a85f6cc..4dbbd4127030 100644
--- a/devtools/client/netmonitor/test/browser_net_image-tooltip.js
+++ b/devtools/client/netmonitor/test/browser_net_image-tooltip.js
@@ -11,25 +11,22 @@ const IMAGE_TOOLTIP_REQUESTS = 1;
  */
 add_task(function* test() {
   let { tab, monitor } = yield initNetMonitor(IMAGE_TOOLTIP_URL);
+  const SELECTOR = ".requests-list-icon[src]";
   info("Starting test... ");
 
   let { document, gStore, windowRequire } = monitor.panelWin;
   let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
   let { NetMonitorController } =
     windowRequire("devtools/client/netmonitor/src/netmonitor-controller");
-  let {
-    ACTIVITY_TYPE,
-    EVENTS,
-  } = windowRequire("devtools/client/netmonitor/src/constants");
+  let { ACTIVITY_TYPE } = windowRequire("devtools/client/netmonitor/src/constants");
   let toolboxDoc = monitor.panelWin.parent.document;
 
   gStore.dispatch(Actions.batchEnable(false));
 
   let onEvents = waitForNetworkEvents(monitor, IMAGE_TOOLTIP_REQUESTS);
-  let onThumbnail = monitor.panelWin.once(EVENTS.RESPONSE_IMAGE_THUMBNAIL_DISPLAYED);
   yield performRequests();
   yield onEvents;
-  yield onThumbnail;
+  yield waitUntil(() => !!document.querySelector(SELECTOR));
 
   info("Checking the image thumbnail after a few requests were made...");
   yield showTooltipAndVerify(document.querySelectorAll(".request-list-item")[0]);
@@ -41,13 +38,12 @@ add_task(function* test() {
 
   // +1 extra document reload
   onEvents = waitForNetworkEvents(monitor, IMAGE_TOOLTIP_REQUESTS + 1);
-  onThumbnail = monitor.panelWin.once(EVENTS.RESPONSE_IMAGE_THUMBNAIL_DISPLAYED);
 
   info("Reloading the debuggee and performing all requests again...");
   yield NetMonitorController.triggerActivity(ACTIVITY_TYPE.RELOAD.WITH_CACHE_ENABLED);
   yield performRequests();
   yield onEvents;
-  yield onThumbnail;
+  yield waitUntil(() => !!document.querySelector(SELECTOR));
 
   info("Checking the image thumbnail after a reload.");
   yield showTooltipAndVerify(document.querySelectorAll(".request-list-item")[1]);
@@ -71,7 +67,7 @@ add_task(function* test() {
    * with the expected content.
    */
   function* showTooltipAndVerify(target) {
-    let anchor = target.querySelector(".requests-list-file");
+    let anchor = target.querySelector(".requests-list-icon");
     yield showTooltipOn(anchor);
 
     info("Tooltip was successfully opened for the image request.");
diff --git a/devtools/client/netmonitor/test/browser_net_security-state.js b/devtools/client/netmonitor/test/browser_net_security-state.js
index 440b769ef82a..d3092e9a3a4f 100644
--- a/devtools/client/netmonitor/test/browser_net_security-state.js
+++ b/devtools/client/netmonitor/test/browser_net_security-state.js
@@ -25,7 +25,7 @@ add_task(function* () {
   yield performRequests();
 
   for (let subitemNode of Array.from(document.querySelectorAll(
-    "requests-list-subitem.requests-list-security-and-domain"))) {
+    "requests-list-column.requests-list-security-and-domain"))) {
     let domain = subitemNode.querySelector(".requests-list-domain").textContent;
 
     info("Found a request to " + domain);
diff --git a/devtools/client/netmonitor/test/browser_net_simple-request-data.js b/devtools/client/netmonitor/test/browser_net_simple-request-data.js
index 2f71b45458e1..cbd5908f283f 100644
--- a/devtools/client/netmonitor/test/browser_net_simple-request-data.js
+++ b/devtools/client/netmonitor/test/browser_net_simple-request-data.js
@@ -193,7 +193,7 @@ function test() {
       );
     });
 
-    monitor.panelWin.once(EVENTS.UPDATING_RESPONSE_CONTENT, () => {
+    monitor.panelWin.once(EVENTS.RECEIVED_RESPONSE_CONTENT, () => {
       let requestItem = getSortedRequests(gStore.getState()).get(0);
 
       is(requestItem.transferredSize, "12",
@@ -203,24 +203,6 @@ function test() {
       is(requestItem.mimeType, "text/plain; charset=utf-8",
         "The mimeType data has an incorrect value.");
 
-      verifyRequestItemTarget(
-        document,
-        getDisplayedRequests(gStore.getState()),
-        requestItem,
-        "GET",
-        SIMPLE_SJS,
-        {
-          type: "plain",
-          fullMimeType: "text/plain; charset=utf-8",
-          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 12),
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 12),
-        }
-      );
-    });
-
-    monitor.panelWin.once(EVENTS.RECEIVED_RESPONSE_CONTENT, () => {
-      let requestItem = getSortedRequests(gStore.getState()).get(0);
-
       ok(requestItem.responseContent,
         "There should be a responseContent data available.");
       // eslint-disable-next-line mozilla/no-cpows-in-tests
diff --git a/devtools/client/netmonitor/test/browser_net_timing-division.js b/devtools/client/netmonitor/test/browser_net_timing-division.js
index 75e36f4739be..8305fbedce01 100644
--- a/devtools/client/netmonitor/test/browser_net_timing-division.js
+++ b/devtools/client/netmonitor/test/browser_net_timing-division.js
@@ -8,6 +8,13 @@
  */
 
 add_task(function* () {
+  // Hide file, protocol, remoteip columns to make sure timing division
+  // can render properly
+  Services.prefs.setCharPref(
+    "devtools.netmonitor.hiddenColumns",
+    "[\"file\",\"protocol\",\"remoteip\"]"
+  );
+
   let { tab, monitor } = yield initNetMonitor(CUSTOM_GET_URL);
   info("Starting test... ");
 
diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
index c2056bc93efa..c015ebb2ac47 100644
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -86,6 +86,9 @@ Services.prefs.setBoolPref("devtools.debugger.log", false);
 // Always reset some prefs to their original values after the test finishes.
 const gDefaultFilters = Services.prefs.getCharPref("devtools.netmonitor.filters");
 
+// Reveal all hidden columns for test
+Services.prefs.setCharPref("devtools.netmonitor.hiddenColumns", "[]");
+
 registerCleanupFunction(() => {
   info("finish() was called, cleaning up...");
 
@@ -374,7 +377,8 @@ function verifyRequestItemTarget(document, requestList, requestItem, method,
   let name = getUrlBaseName(url);
   let query = getUrlQuery(url);
   let hostPort = getUrlHost(url);
-  let remoteAddress = requestItem.remoteAddress;
+  let { httpVersion = "", remoteAddress, remotePort } = requestItem;
+  let remoteIP = remoteAddress ? `${remoteAddress}:${remotePort}` : "unknown";
 
   if (fuzzyUrl) {
     ok(requestItem.method.startsWith(method), "The attached method is correct.");
@@ -400,6 +404,12 @@ function verifyRequestItemTarget(document, requestList, requestItem, method,
       unicodeUrl, "The tooltip file is correct.");
   }
 
+  is(target.querySelector(".requests-list-protocol").textContent,
+    httpVersion, "The displayed protocol is correct.");
+
+  is(target.querySelector(".requests-list-protocol").getAttribute("title"),
+    httpVersion, "The tooltip protocol is correct.");
+
   is(target.querySelector(".requests-list-domain").textContent,
     hostPort, "The displayed domain is correct.");
 
@@ -407,6 +417,12 @@ function verifyRequestItemTarget(document, requestList, requestItem, method,
   is(target.querySelector(".requests-list-domain").getAttribute("title"),
     domainTooltip, "The tooltip domain is correct.");
 
+  is(target.querySelector(".requests-list-remoteip").textContent,
+    remoteIP, "The displayed remote IP is correct.");
+
+  is(target.querySelector(".requests-list-remoteip").getAttribute("title"),
+    remoteIP, "The tooltip remote IP is correct.");
+
   if (status !== undefined) {
     let value = target.querySelector(".requests-list-status-icon")
                       .getAttribute("data-code");
@@ -421,12 +437,13 @@ function verifyRequestItemTarget(document, requestList, requestItem, method,
     is(tooltip, status + " " + statusText, "The tooltip status is correct.");
   }
   if (cause !== undefined) {
-    let value = target.querySelector(".requests-list-cause > .subitem-label").textContent;
+    let value = Array.from(target.querySelector(".requests-list-cause").childNodes)
+      .filter((node) => node.nodeType === Node.TEXT_NODE)[0].textContent;
     let tooltip = target.querySelector(".requests-list-cause").getAttribute("title");
     info("Displayed cause: " + value);
     info("Tooltip cause: " + tooltip);
     is(value, cause.type, "The displayed cause is correct.");
-    is(tooltip, cause.loadingDocumentUri, "The tooltip cause is correct.");
+    is(tooltip, cause.type, "The tooltip cause is correct.");
   }
   if (type !== undefined) {
     let value = target.querySelector(".requests-list-type").textContent;
diff --git a/devtools/client/shared/components/notification-box.js b/devtools/client/shared/components/notification-box.js
index 87fc76cd6591..838d2ac297bf 100644
--- a/devtools/client/shared/components/notification-box.js
+++ b/devtools/client/shared/components/notification-box.js
@@ -29,7 +29,7 @@ const PriorityLevels = {
 
 /**
  * This component represents Notification Box - HTML alternative for
- * <xul:notifictionbox> binding.
+ * <xul:notificationbox> binding.
  *
  * See also MDN for more info about <xul:notificationbox>:
  * https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL/notificationbox
diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css
index 4bab805ff5ab..be5458e6b443 100644
--- a/devtools/client/themes/webconsole.css
+++ b/devtools/client/themes/webconsole.css
@@ -800,6 +800,17 @@ a.learn-more-link.webconsole-learn-more-link {
   display: none;
 }
 
+/*
+ * Open DOMNode in inspector button. Style need to be reset in the new
+ * console since its style is already defined in reps.css .
+ */
+.webconsole-output-wrapper .open-inspector {
+  background: unset;
+  padding-left: unset;
+  margin-left: unset;
+  cursor: unset;
+}
+
 /* console.table() */
 .new-consoletable {
   width: 100%;
diff --git a/devtools/client/webconsole/new-console-output/components/grip-message-body.js b/devtools/client/webconsole/new-console-output/components/grip-message-body.js
index 7fb15cee7ec0..41d7e794437c 100644
--- a/devtools/client/webconsole/new-console-output/components/grip-message-body.js
+++ b/devtools/client/webconsole/new-console-output/components/grip-message-body.js
@@ -61,9 +61,15 @@ function GripMessageBody(props) {
 
   let onDOMNodeMouseOver;
   let onDOMNodeMouseOut;
+  let onInspectIconClick;
   if (serviceContainer) {
-    onDOMNodeMouseOver = (object) => serviceContainer.highlightDomElement(object);
+    onDOMNodeMouseOver = serviceContainer.highlightDomElement
+      ? (object) => serviceContainer.highlightDomElement(object)
+      : null;
     onDOMNodeMouseOut = serviceContainer.unHighlightDomElement;
+    onInspectIconClick = serviceContainer.openNodeInInspector
+      ? (object) => serviceContainer.openNodeInInspector(object)
+      : null;
   }
 
   return (
@@ -81,6 +87,7 @@ function GripMessageBody(props) {
         objectLink: VariablesViewLink,
         onDOMNodeMouseOver,
         onDOMNodeMouseOut,
+        onInspectIconClick,
         defaultRep: Grip,
         mode: props.mode,
       })
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
index 0a1cdee28858..a411d4c8cfca 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
+++ b/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
@@ -57,9 +57,9 @@ function NetworkEventMessage({
     statusInfo = `[${httpVersion} ${status} ${statusText} ${totalTime}ms]`;
   }
 
-  function openNetworkMonitor() {
-    serviceContainer.openNetworkPanel(actor);
-  }
+  const openNetworkMonitor = serviceContainer.openNetworkPanel
+    ? () => serviceContainer.openNetworkPanel(actor)
+    : null;
 
   const method = dom.span({className: "method" }, request.method);
   const xhr = isXHR
diff --git a/devtools/client/webconsole/new-console-output/components/message.js b/devtools/client/webconsole/new-console-output/components/message.js
index 6cbe1cf2a226..f5d723e6fcaa 100644
--- a/devtools/client/webconsole/new-console-output/components/message.js
+++ b/devtools/client/webconsole/new-console-output/components/message.js
@@ -49,9 +49,9 @@ const Message = createClass({
     timeStamp: PropTypes.number,
     serviceContainer: PropTypes.shape({
       emitNewMessage: PropTypes.func.isRequired,
-      onViewSourceInDebugger: PropTypes.func.isRequired,
-      onViewSourceInScratchpad: PropTypes.func.isRequired,
-      onViewSourceInStyleEditor: PropTypes.func.isRequired,
+      onViewSourceInDebugger: PropTypes.func,
+      onViewSourceInScratchpad: PropTypes.func,
+      onViewSourceInStyleEditor: PropTypes.func,
       openContextMenu: PropTypes.func.isRequired,
       openLink: PropTypes.func.isRequired,
       sourceMapService: PropTypes.any,
diff --git a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
index 938985e49222..6529accb2561 100644
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
@@ -38,16 +38,42 @@ NewConsoleOutputWrapper.prototype = {
       this.jsterm.hud[id] = node;
     };
 
-    let childComponent = ConsoleOutput({
-      serviceContainer: {
-        attachRefToHud,
-        emitNewMessage: (node, messageId) => {
-          this.jsterm.hud.emit("new-messages", new Set([{
-            node,
-            messageId,
-          }]));
-        },
-        hudProxyClient: this.jsterm.hud.proxy.client,
+    const serviceContainer = {
+      attachRefToHud,
+      emitNewMessage: (node, messageId) => {
+        this.jsterm.hud.emit("new-messages", new Set([{
+          node,
+          messageId,
+        }]));
+      },
+      hudProxyClient: this.jsterm.hud.proxy.client,
+      openContextMenu: (e, message) => {
+        let { screenX, screenY, target } = e;
+
+        let messageEl = target.closest(".message");
+        let clipboardText = messageEl ? messageEl.textContent : null;
+
+        // Retrieve closes actor id from the DOM.
+        let actorEl = target.closest("[data-link-actor-id]");
+        let actor = actorEl ? actorEl.dataset.linkActorId : null;
+
+        let menu = createContextMenu(this.jsterm, this.parentNode,
+          { actor, clipboardText, message });
+
+        // Emit the "menu-open" event for testing.
+        menu.once("open", () => this.emit("menu-open"));
+        menu.popup(screenX, screenY, this.toolbox);
+
+        return menu;
+      },
+      openLink: url => this.jsterm.hud.owner.openLink(url),
+      createElement: nodename => {
+        return this.document.createElementNS("http://www.w3.org/1999/xhtml", nodename);
+      },
+    };
+
+    if (this.toolbox) {
+      Object.assign(serviceContainer, {
         onViewSourceInDebugger: frame => {
           this.toolbox.viewSourceInDebugger(frame.url, frame.line).then(() =>
             this.jsterm.hud.emit("source-in-debugger-opened")
@@ -61,25 +87,6 @@ NewConsoleOutputWrapper.prototype = {
           frame.url,
           frame.line
         ),
-        openContextMenu: (e, message) => {
-          let { screenX, screenY, target } = e;
-
-          let messageEl = target.closest(".message");
-          let clipboardText = messageEl ? messageEl.textContent : null;
-
-          // Retrieve closes actor id from the DOM.
-          let actorEl = target.closest("[data-link-actor-id]");
-          let actor = actorEl ? actorEl.dataset.linkActorId : null;
-
-          let menu = createContextMenu(this.jsterm, this.parentNode,
-            { actor, clipboardText, message });
-
-          // Emit the "menu-open" event for testing.
-          menu.once("open", () => this.emit("menu-open"));
-          menu.popup(screenX, screenY, this.toolbox);
-
-          return menu;
-        },
         openNetworkPanel: (requestId) => {
           return this.toolbox.selectTool("netmonitor").then(panel => {
             return panel.panelWin.NetMonitorController.inspectRequest(requestId);
@@ -87,22 +94,34 @@ NewConsoleOutputWrapper.prototype = {
         },
         sourceMapService:
           this.toolbox ? this.toolbox._deprecatedServerSourceMapService : null,
-        openLink: url => this.jsterm.hud.owner.openLink(url),
-        createElement: nodename => {
-          return this.document.createElementNS("http://www.w3.org/1999/xhtml", nodename);
-        },
         highlightDomElement: (grip, options = {}) => {
-          return this.toolbox && this.toolbox.highlighterUtils
+          return this.toolbox.highlighterUtils
             ? this.toolbox.highlighterUtils.highlightDomValueGrip(grip, options)
             : null;
         },
         unHighlightDomElement: (forceHide = false) => {
-          return this.toolbox && this.toolbox.highlighterUtils
+          return this.toolbox.highlighterUtils
             ? this.toolbox.highlighterUtils.unhighlight(forceHide)
             : null;
         },
-      }
-    });
+        openNodeInInspector: async (grip) => {
+          let onSelectInspector = this.toolbox.selectTool("inspector");
+          let onGripNodeToFront = this.toolbox.highlighterUtils.gripToNodeFront(grip);
+          let [
+            front,
+            inspector
+          ] = await Promise.all([onGripNodeToFront, onSelectInspector]);
+
+          let onInspectorUpdated = inspector.once("inspector-updated");
+          let onNodeFrontSet = this.toolbox.selection.setNodeFront(front, "console");
+
+          return Promise.all([onNodeFrontSet, onInspectorUpdated]);
+        }
+      });
+    }
+
+    let childComponent = ConsoleOutput({serviceContainer});
+
     let filterBar = FilterBar({
       serviceContainer: {
         attachRefToHud
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
index a8d5a49d7539..aa4181a12f61 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
@@ -38,6 +38,7 @@ skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32
 [browser_webconsole_location_scratchpad_link.js]
 [browser_webconsole_location_styleeditor_link.js]
 [browser_webconsole_nodes_highlight.js]
+[browser_webconsole_nodes_select.js]
 [browser_webconsole_observer_notifications.js]
 [browser_webconsole_stacktrace_location_debugger_link.js]
 [browser_webconsole_stacktrace_location_scratchpad_link.js]
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js
new file mode 100644
index 000000000000..00df54fb54d2
--- /dev/null
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js
@@ -0,0 +1,58 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+// Check clicking on open-in-inspector icon does select the node in the inspector.
+
+const HTML = `
+  <!DOCTYPE html>
+  <html>
+    <body>
+      <h1>Select node in inspector test</h1>
+    </body>
+    <script>
+      function logNode(selector) {
+        console.log(document.querySelector(selector));
+      }
+    </script>
+  </html>
+`;
+const TEST_URI = "data:text/html;charset=utf-8," + encodeURI(HTML);
+
+add_task(async function () {
+  const hud = await openNewTabAndConsole(TEST_URI);
+  const toolbox = gDevTools.getToolbox(hud.target);
+
+  // Loading the inspector panel at first, to make it possible to listen for
+  // new node selections
+  await toolbox.loadTool("inspector");
+  const inspector = toolbox.getPanel("inspector");
+
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, () => {
+    content.wrappedJSObject.logNode("h1");
+  });
+
+  let msg = await waitFor(() => findMessage(hud, "<h1>"));
+  let node = msg.querySelector(".objectBox-node");
+  ok(node !== null, "Node was logged as expected");
+
+  let openInInspectorIcon = node.querySelector(".open-inspector");
+  ok(openInInspectorIcon !== null, "The is an open in inspector icon");
+
+  info("Clicking on the inspector icon and waiting for the " +
+       "inspector to be selected");
+  let onInspectorSelected = toolbox.once("inspector-selected");
+  let onInspectorUpdated = inspector.once("inspector-updated");
+  let onNewNode = toolbox.selection.once("new-node-front");
+
+  openInInspectorIcon.click();
+
+  await onInspectorSelected;
+  await onInspectorUpdated;
+  let nodeFront = await onNewNode;
+
+  ok(true, "Inspector selected and new node got selected");
+  is(nodeFront.displayName, "h1", "The expected node was selected");
+});
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
index 6ddf07f14cd2..4ef934e1f043 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@@ -101,11 +101,9 @@ function waitForMessages({ hud, messages }) {
  * @return object
  *         A promise that is resolved with the result of the condition.
  */
-function* waitFor(condition, message = "waitFor", interval = 10, maxTries = 500) {
-  return new Promise(resolve => {
-    BrowserTestUtils.waitForCondition(condition, message, interval, maxTries)
-      .then(() => resolve(condition()));
-  });
+async function waitFor(condition, message = "waitFor", interval = 10, maxTries = 500) {
+  await BrowserTestUtils.waitForCondition(condition, message, interval, maxTries);
+  return condition();
 }
 
 /**
diff --git a/devtools/docs/SUMMARY.md b/devtools/docs/SUMMARY.md
index 59197d8c03cb..b5d76396e430 100644
--- a/devtools/docs/SUMMARY.md
+++ b/devtools/docs/SUMMARY.md
@@ -30,3 +30,9 @@
     * [Actor Best Practices](backend/actor-best-practices.md)
 * [Files and directories](files/README.md)
   * [Adding New Files](files/adding-files.md)
+* [Automated tests](tests/README.md)
+  * Running tests
+    * [`xpcshell`](tests/xpcshell.md)
+    * [Chrome mochitests](tests/mochitest-chrome.md)
+    * [DevTools mochitests](tests/mochitest-devtools.md)
+  * [Writing tests](tests/writing-tests.md)
diff --git a/devtools/docs/tests/README.md b/devtools/docs/tests/README.md
new file mode 100644
index 000000000000..2b15e87d2d97
--- /dev/null
+++ b/devtools/docs/tests/README.md
@@ -0,0 +1,23 @@
+# Automated tests
+
+When working on a patch for DevTools, there's almost never a reason not to add a new test. If you are fixing a bug, you probably should write a new test to prevent this bug from occurring again. If you're implementing a new feature, you should write new tests to cover the aspects of this new feature.
+
+Ask yourself:
+* Are there enough tests for my patch?
+* Are they the right types of tests?
+
+We use three suites of tests:
+
+* [`xpcshell`](xpcshell.md): Unit-test style of tests. No browser window, only a JavaScript shell. Mostly testing APIs directly.
+* [Chrome mochitests](mochitest-chrome.md): Unit-test style of tests, but with a browser window. Mostly testing APIs that interact with the DOM.
+* [DevTools mochitests](mochitest-devtools.md): Integration style of tests. Fires up a whole browser window with every test and you can test clicking on buttons, etc.
+
+More information about the different types of tests can be found on the [automated testing page](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Automated_testing) at MDN.
+
+To run all DevTools tests, regardless of suite type:
+
+```bash
+./mach test devtools/*
+```
+
+Have a look at the child pages for more specific commands for running only a single suite or single test in a suite.
diff --git a/devtools/docs/tests/mochitest-chrome.md b/devtools/docs/tests/mochitest-chrome.md
new file mode 100644
index 000000000000..13956ca7994d
--- /dev/null
+++ b/devtools/docs/tests/mochitest-chrome.md
@@ -0,0 +1,14 @@
+# Automated tests: chrome mochitests
+
+To run the whole suite of chrome mochitests:
+
+```bash
+./mach mochitest -f chrome --tag devtools
+```
+
+To run a specific chrome mochitest:
+
+```bash
+./mach mochitest devtools/path/to/the/test_you_want_to_run.html
+```
+
diff --git a/devtools/docs/tests/mochitest-devtools.md b/devtools/docs/tests/mochitest-devtools.md
new file mode 100644
index 000000000000..687432c001ea
--- /dev/null
+++ b/devtools/docs/tests/mochitest-devtools.md
@@ -0,0 +1,25 @@
+# Automated tests: DevTools mochitests
+
+To run the whole suite of browser mochitests for DevTools (sit back and relax):
+
+```bash
+./mach mochitest --subsuite devtools --tag devtools
+```
+To run a specific tool's suite of browser mochitests:
+
+```bash
+./mach mochitest devtools/client/<tool>
+```
+
+For example, run all of the debugger browser mochitests:
+
+```bash
+./mach mochitest devtools/client/debugger
+```
+To run a specific DevTools mochitest:
+
+```bash
+./mach mochitest devtools/client/path/to/the/test_you_want_to_run.js
+```
+Note that the mochitests *must* have focus while running.
+
diff --git a/devtools/docs/tests/writing-tests.md b/devtools/docs/tests/writing-tests.md
new file mode 100644
index 000000000000..7fc48592fc1a
--- /dev/null
+++ b/devtools/docs/tests/writing-tests.md
@@ -0,0 +1,255 @@
+# Automated tests: writing tests
+
+<!--TODO this file might benefit from being split in other various files. For now it's just taken from the wiki with some edits-->
+
+## Adding a new browser chrome test
+
+It's almost always a better idea to create a new test file rather than to add new test cases to an existing one.
+
+This prevents test files from growing up to the point where they timeout for running too long. Test systems may be under lots of stress at time and run a lot slower than your regular local environment.
+
+It also helps with making tests more maintainable: with many small files, it's easier to track a problem rather than in one huge file.
+
+### Creating the new file
+
+The first thing you need to do is create a file. This file should go next to the code it's testing, in the `tests` directory. For example, an inspector test would go into `devtools/inspector/test/`.
+
+### Naming the new file
+
+Naming your file is pretty important to help other people get a feeling of what it is supposed to test.
+Having said that, the name shouldn't be too long either.
+
+A good naming convention is `browser_<panel>_<short-description>[_N].js`
+
+where:
+
+* `<panel>` is one of `debugger`, `markupview`, `inspector`, `ruleview`, etc.
+* `<short-description>` should be about 3 to 4 words, separated by hyphens (-)
+* and optionally add a number at the end if you have several files testing the same thing
+
+For example: `browser_ruleview_completion-existing-property_01.js`
+
+Note that not all existing tests are consistently named. So the rule we try to follow is to **be consistent with how other tests in the same test folder are named**.
+
+### Basic structure of a test
+
+```javascript
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// A detailed description of what the test is supposed to test
+
+const TEST_URL = TEST_URL_ROOT + "doc_some_test_page.html";
+
+add_task(function*() {
+yield addTab(TEST_URL_ROOT);
+let {toolbox, inspector, view} = yield openRuleView();
+yield selectNode("#testNode", inspector);
+yield checkSomethingFirst(view);
+yield checkSomethingElse(view);
+});
+
+function* checkSomethingFirst(view) {
+/* ... do something ... this function can yield */
+}
+
+function* checkSomethingElse(view) {
+/* ... do something ... this function can yield */
+}
+```
+
+### Referencing the new file
+
+For your test to be run, it needs to be referenced in the `browser.ini` file that you'll find in the same directory. For example: `browser/devtools/debugger/test/browser.ini`
+
+Add a line with your file name between square brackets, and make sure that the list of files **is always sorted by alphabetical order** (some lists can be really long, so the alphabetical order helps in finding and reasoning about things).
+
+For example, if you were to add the test from the previous section, you'd add this to `browser.ini`:
+
+```ini
+[browser_ruleview_completion-existing-property_01.js]
+```
+
+### Adding support files
+
+Sometimes your test may need to open an HTML file in a tab, and it may also need to load CSS or JavaScript. For this to work, you'll need to...
+
+1. place these files in the same directory, and also 
+2. reference them in the `browser.ini` file.
+
+There's a naming convention for support files: `doc_<support-some-test>.html`
+
+But again, often names do not follow this convention, so try to follow the style of the other support files currently in the same test directory.
+
+To reference your new support file, add its filename in the `support-files` section of `browser.ini`, also making sure this section is in alphabetical order.
+
+Support files can be accessed via a local server that is started while tests are running. This server is accessible at [http://example.com/browser/](http://example.com/browser/). See the `head.js section` below for more information.
+
+## Leveraging helpers in `head.js`
+
+`head.js` is a special support file that is loaded in the scope the test runs in, before the test starts. It contains global helpers that are useful for most tests. Read through the head.js file in your test directory to see what functions are there and therefore avoid duplicating code.
+
+Each panel in DevTools has its own test directory with its own `head.js`, so you'll find different things in each panel's `head.js` file.
+
+For example, the head.js files in the `markupview` and `styleinspector` test folders contain these useful functions and constants:
+
+* Base URLs for support files: `TEST_URL_ROOT`. This avoids having to duplicate the http://example.com/browser/browser/devtools/styleinspector/ URL fragment in all tests,
+* `waitForExplicitFinish()` is called in `head.js` once and for all<!--TODO: what does this even mean?-->. All tests are asynchronous, so there's no need to call it again in each and every test,
+* `auto-cleanup`: the toolbox is closed automatically and all tabs are closed,
+* `tab addTab(url)`
+* `{toolbox, inspector} openInspector()`
+* `{toolbox, inspector, view} openRuleView()`
+* `selectNode(selectorOrNode, inspector)`
+* `node getNode(selectorOrNode)`
+* ...
+
+## Shared head.js file
+
+A [shared-head.js](https://dxr.mozilla.org/mozilla-central/source/devtools/client/framework/test/shared-head.js) file has been introduced to avoid duplicating code in various `head.js` files.
+
+It's important to know whether or not the `shared.js` in your test directory already imports `shared-head.js` (look for a <code>Services.scriptloader.loadSubScript</code> call), as common helpers in `shared-head.js` might be useful for your test.
+
+If you're planning to work on a lot of new tests, it might be worth the time actually importing `shared-head.js` in your `head.js` if it isn't here already.
+
+## E10S (Electrolysis)
+
+E10S is the codename for Firefox multi-process, and what that means for us is that the process in which the test runs isn't the same as the one in which the test content page runs.
+
+You can learn more about E10S [from this blog post](https://timtaubert.de/blog/2011/08/firefox-electrolysis-101/) and [the Electrolysis wiki page](https://wiki.mozilla.org/Electrolysis).
+
+One of the direct consequences of E10S on tests is that you cannot retrieve and manipulate objects from the content page as you'd do without E10S.
+
+Well this isn't entirely true, because with [cross-process object wrappers](https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Cross_Process_Object_Wrappers CPOWs) you can somehow access the page, get to DOM nodes, and read their attributes for instance, but a lot of other things you'd expect to work without E10S won't work exactly the same or at all.
+
+Using CPOWs is discouraged; they are only temporarily allowed in mochitests, and their use is forbidden in browser code.
+
+So when creating a new test, if this test needs to access the content page in any way, you can use [the message manager](https://developer.mozilla.org/en-US/docs/The_message_manager) to communicate with a script loaded in the content process to do things for you instead of accessing objects in the page directly.
+
+You can use the helper `ContentTask.spawn()` for this. See [this list of DevTools tests that use that helper for examples](https://dxr.mozilla.org/mozilla-central/search?q=ContentTask.spawn%28+path%3Adevtools%2Fclient&redirect=false&case=false).
+
+Note that a lot of tests only need to access the DevTools UI anyway, and don't need to interact with the content process at all. Since the UI lives in the same process as the test, you won't need to use the message manager to access it.
+
+## Asynchronous tests
+
+Most browser chrome DevTools tests are asynchronous. One of the reasons why they are asynchronous is that the code needs to register event handlers for various user interactions in the tools and then simulate these interactions. Another reason is that most DevTools operations are done asynchronously via the debugger protocol.
+
+Here are a few things to keep in mind with regards to asynchronous testing:
+
+* `head.js` already calls `waitForExplicitFinish()` so there's no need for your new test to do it too.
+* Using `add_task` with a generator function means that you can yield calls to functions that return promises. It also means your main test function can be written to almost look like synchronous code, by adding `yield` before calls to asynchronous functions. For example:
+
+```javascript
+for (let test of testData) {
+	yield testCompletion(test, editor, view);
+}
+```
+
+Each call to `testCompletion` is asynchronous, but the code doesn't need to rely on nested callbacks and maintain an index, a standard for loop can be used.
+
+<!--TODO: I think the following paragraph might be slightly outdated-->
+
+* Define your test functions as generators that yield, no need for them to be tasks since they are called from one already. In some cases you'll need to return promises anyway (if you're adding a new helper function to head.js for example). If this is the case, it sometimes is best to define your function like so:
+
+```javascript
+let myHelperFunction = Task.async(function*() {
+	...
+});
+```
+
+## Writing clean, maintainable test code
+
+Test code is as important as feature code itself, it helps avoiding regressions of course, but it also helps understanding complex parts of the code that would be otherwise hard to grasp.
+
+Since we find ourselves working with test code a large portion of our time, we should spend the time and energy it takes to make this time enjoyable.
+
+### Logs and comments
+
+Reading test output logs isn't exactly fun and it takes time but is needed at times. Make sure your test generates enough logs by using:
+
+```
+info("doing something now")
+```
+
+it helps a lot knowing around which lines the test fails, if it fails.
+
+One good rule of thumb is if you're about to add a JS line comment in your test to explain what the code below is about to test, write the same comment in an `info()` instead.
+
+Also add a description at the top of the file to help understand what this test is about. The file name is often not long enough to convey everything you need to know about the test. Understanding a test often teaches you about the feature itself.
+
+Not really a comment, but don't forget to "use strict";
+
+### Callbacks and promises
+
+Avoid multiple nested callbacks or chained promises. They make it hard to read the code.
+
+Thanks to `add_task`, it's easy to write asynchronous code that looks like flat, synchronous, code.
+
+### Clean up after yourself
+
+Do not expose global variables in your test file, they may end up causing bugs that are hard to track. Most functions in `head.js` return useful instances of the DevTools panels, and you can pass these as arguments to your sub functions, no need to store them in the global scope.
+This avoids having to remember nullifying them at the end.
+
+If your test needs to toggle user preferences, make sure you reset these preferences when the test ends. Do not reset them at the end of the test function though because if your test fails, the preferences will never be reset. Use the `registerCleanupFunction` helper instead.
+
+It may be a good idea to do the reset in `head.js`.
+
+### Write small, maintainable code
+
+Split your main test function into smaller test functions with self explanatory names.
+
+Make sure your test files are small. If you are working on a new feature, you can create a new test each time you add a new functionality, a new button to the UI for instance. This helps having small, incremental tests and can also help writing test while coding.
+
+If your test is just a sequence of functions being called to do the same thing over and over again, it may be better to describe the test steps in an array instead and just have one function that runs each item of the array. See the following example
+
+```javascript
+const TESTS = [
+	{desc: "add a class", cssSelector: "#id1", makeChanges: function*() {...}},
+	{desc: "change href", cssSelector: "a.the-link", makeChanges: function*() {...}},
+	...
+];
+
+add_task(function*() {
+	yield addTab("...");
+	let {toolbox, inspector} = yield openInspector();
+	for (let step of TESTS) {
+	  info("Testing step: " + step.desc);
+	  yield selectNode(step.cssSelector, inspector);
+	  yield step.makeChanges();
+	}
+});
+```
+
+As shown in this code example, you can add as many test cases as you want in the TESTS array and the actual test code will remain very short, and easy to understand and maintain (note that when looping through test arrays, it's always a good idea to add a "desc" property that will be used in an info() log output).
+
+### Avoid exceptions
+
+Even when they're not failing the test, exceptions are bad because they pollute the logs and make them harder to read.
+They're also bad because when your test is run as part of a test suite and if an other, unrelated, test fails then the exceptions may give wrong information to the person fixing the unrelated test.
+
+After your test has run locally, just make sure it doesn't output exceptions by scrolling through the logs.
+
+Often, non-blocking exceptions may be caused by hanging protocol requests that haven't been responded to yet when the tools get closed at the end of the test. Make sure you register to the right events and give time to the tools to update themselves before moving on.
+
+### Avoid test timeouts
+
+<!--TODO: this recommendation is conflicting with the above recommendation. What? -->
+When tests fail, it's far better to have them fail and end immediately with an exception that will help fix it rather than have them hang until they hit the timeout and get killed.
+
+## Adding new helpers
+
+In some cases, you may want to extract some common code from your test to use it another another test. 
+
+* If this is very common code that all tests could use, then add it to `devtools/client/framework/test/shared-head.js`.
+* If this is common code specific to a given tool, then add it to the corresponding `head.js` file.
+* If it isn't common enough to live in `head.js`, then it may be a good idea to create a helper file to avoid duplication anyway. Here's how to create a helper file:
+ * Create a new file in your test director. The naming convention should be `helper_<description_of_the_helper>.js`
+ * Add it to the browser.ini support-files section, making sure it is sorted alphabetically
+ * Load the helper file in the tests
+ * `browser/devtools/markupview/test/head.js` has a handy `loadHelperScript(fileName)` function that you can use.
+ * The file will be loaded in the test global scope, so any global function or variables it defines will be available (just like `head.js`).
+ * Use the special ESLint comment `/* import-globals-from helper_file.js */` to prevent ESLint errors for undefined variables.
+
+In all cases, new helper functions should be properly commented with an jsdoc comment block.
+
diff --git a/devtools/docs/tests/xpcshell.md b/devtools/docs/tests/xpcshell.md
new file mode 100644
index 000000000000..1e51714a4f0f
--- /dev/null
+++ b/devtools/docs/tests/xpcshell.md
@@ -0,0 +1,14 @@
+# Automated tests: `xpcshell` tests
+
+To run all of the xpcshell tests:
+
+```bash
+./mach xpcshell-test --tag devtools
+```
+
+To run a specific xpcshell test:
+
+```bash
+./mach xpcshell-test devtools/path/to/the/test_you_want_to_run.js
+```
+
diff --git a/devtools/server/tests/unit/test_frameactor_wasm-01.js b/devtools/server/tests/unit/test_frameactor_wasm-01.js
index 1e9f7b8326c8..8bb05452482d 100644
--- a/devtools/server/tests/unit/test_frameactor_wasm-01.js
+++ b/devtools/server/tests/unit/test_frameactor_wasm-01.js
@@ -47,7 +47,7 @@ function test_pause_frame() {
       let location = wasmFrame.where;
       do_check_eq(location.line > 0, true);
       do_check_eq(location.column > 0, true);
-      do_check_eq(location.source.url.endsWith(" > wasm"), true);
+      do_check_eq(/^wasm:(?:[^:]*:)*?[0-9a-f]{16}$/.test(location.source.url), true);
 
       finishClient(gClient);
     });
diff --git a/devtools/shared/acorn/tests/unit/test_import_acorn.js b/devtools/shared/acorn/tests/unit/test_import_acorn.js
index 49b2b50cb903..42a0edcea4bb 100644
--- a/devtools/shared/acorn/tests/unit/test_import_acorn.js
+++ b/devtools/shared/acorn/tests/unit/test_import_acorn.js
@@ -1,18 +1,18 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that we can require acorn.
- */
-
-function run_test() {
-  const acorn = require("acorn/acorn");
-  const acorn_loose = require("acorn/acorn_loose");
-  const walk = require("acorn/util/walk");
-  do_check_true(isObject(acorn));
-  do_check_true(isObject(acorn_loose));
-  do_check_true(isObject(walk));
-  do_check_eq(typeof acorn.parse, "function");
-  do_check_eq(typeof acorn_loose.parse_dammit, "function");
-  do_check_eq(typeof walk.simple, "function");
-}
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that we can require acorn.
+ */
+
+function run_test() {
+  const acorn = require("acorn/acorn");
+  const acorn_loose = require("acorn/acorn_loose");
+  const walk = require("acorn/util/walk");
+  do_check_true(isObject(acorn));
+  do_check_true(isObject(acorn_loose));
+  do_check_true(isObject(walk));
+  do_check_eq(typeof acorn.parse, "function");
+  do_check_eq(typeof acorn_loose.parse_dammit, "function");
+  do_check_eq(typeof walk.simple, "function");
+}
diff --git a/devtools/shared/acorn/tests/unit/test_lenient_parser.js b/devtools/shared/acorn/tests/unit/test_lenient_parser.js
index 7586eb8a3342..bc7a3d7c8c7c 100644
--- a/devtools/shared/acorn/tests/unit/test_lenient_parser.js
+++ b/devtools/shared/acorn/tests/unit/test_lenient_parser.js
@@ -1,62 +1,62 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that acorn's lenient parser gives something usable.
- */
-
-const acorn_loose = require("acorn/acorn_loose");
-
-function run_test() {
-  let actualAST = acorn_loose.parse_dammit("let x = 10", {});
-
-  do_print("Actual AST:");
-  do_print(JSON.stringify(actualAST, null, 2));
-  do_print("Expected AST:");
-  do_print(JSON.stringify(expectedAST, null, 2));
-
-  checkEquivalentASTs(expectedAST, actualAST);
-}
-
-const expectedAST = {
-  "type": "Program",
-  "start": 0,
-  "end": 10,
-  "body": [
-    {
-      "type": "ExpressionStatement",
-      "start": 0,
-      "end": 3,
-      "expression": {
-        "type": "Identifier",
-        "start": 0,
-        "end": 3,
-        "name": "let"
-      }
-    },
-    {
-      "type": "ExpressionStatement",
-      "start": 4,
-      "end": 10,
-      "expression": {
-        "type": "AssignmentExpression",
-        "start": 4,
-        "end": 10,
-        "operator": "=",
-        "left": {
-          "type": "Identifier",
-          "start": 4,
-          "end": 5,
-          "name": "x"
-        },
-        "right": {
-          "type": "Literal",
-          "start": 8,
-          "end": 10,
-          "value": 10,
-          "raw": "10"
-        }
-      }
-    }
-  ]
-};
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that acorn's lenient parser gives something usable.
+ */
+
+const acorn_loose = require("acorn/acorn_loose");
+
+function run_test() {
+  let actualAST = acorn_loose.parse_dammit("let x = 10", {});
+
+  do_print("Actual AST:");
+  do_print(JSON.stringify(actualAST, null, 2));
+  do_print("Expected AST:");
+  do_print(JSON.stringify(expectedAST, null, 2));
+
+  checkEquivalentASTs(expectedAST, actualAST);
+}
+
+const expectedAST = {
+  "type": "Program",
+  "start": 0,
+  "end": 10,
+  "body": [
+    {
+      "type": "ExpressionStatement",
+      "start": 0,
+      "end": 3,
+      "expression": {
+        "type": "Identifier",
+        "start": 0,
+        "end": 3,
+        "name": "let"
+      }
+    },
+    {
+      "type": "ExpressionStatement",
+      "start": 4,
+      "end": 10,
+      "expression": {
+        "type": "AssignmentExpression",
+        "start": 4,
+        "end": 10,
+        "operator": "=",
+        "left": {
+          "type": "Identifier",
+          "start": 4,
+          "end": 5,
+          "name": "x"
+        },
+        "right": {
+          "type": "Literal",
+          "start": 8,
+          "end": 10,
+          "value": 10,
+          "raw": "10"
+        }
+      }
+    }
+  ]
+};
diff --git a/devtools/shared/acorn/tests/unit/test_same_ast.js b/devtools/shared/acorn/tests/unit/test_same_ast.js
index d1d76bc500ff..ff4420d91d09 100644
--- a/devtools/shared/acorn/tests/unit/test_same_ast.js
+++ b/devtools/shared/acorn/tests/unit/test_same_ast.js
@@ -1,37 +1,37 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Test that Reflect and acorn create the same AST for ES5.
- */
-
-const acorn = require("acorn/acorn");
-const { Reflect } = require("resource://gre/modules/reflect.jsm");
-
-const testCode = "" + function main () {
-  function makeAcc(n) {
-    return function () {
-      return ++n;
-    };
-  }
-
-  var acc = makeAcc(10);
-
-  for (var i = 0; i < 10; i++) {
-    acc();
-  }
-
-  console.log(acc());
-};
-
-function run_test() {
-  const reflectAST = Reflect.parse(testCode);
-  const acornAST = acorn.parse(testCode);
-
-  do_print("Reflect AST:");
-  do_print(JSON.stringify(reflectAST, null, 2));
-  do_print("acorn AST:");
-  do_print(JSON.stringify(acornAST, null, 2));
-
-  checkEquivalentASTs(reflectAST, acornAST);
-}
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that Reflect and acorn create the same AST for ES5.
+ */
+
+const acorn = require("acorn/acorn");
+const { Reflect } = require("resource://gre/modules/reflect.jsm");
+
+const testCode = "" + function main () {
+  function makeAcc(n) {
+    return function () {
+      return ++n;
+    };
+  }
+
+  var acc = makeAcc(10);
+
+  for (var i = 0; i < 10; i++) {
+    acc();
+  }
+
+  console.log(acc());
+};
+
+function run_test() {
+  const reflectAST = Reflect.parse(testCode);
+  const acornAST = acorn.parse(testCode);
+
+  do_print("Reflect AST:");
+  do_print(JSON.stringify(reflectAST, null, 2));
+  do_print("acorn AST:");
+  do_print(JSON.stringify(acornAST, null, 2));
+
+  checkEquivalentASTs(reflectAST, acornAST);
+}
diff --git a/dom/base/domerr.msg b/dom/base/domerr.msg
index 5bc7b450143c..42ac0fb62117 100644
--- a/dom/base/domerr.msg
+++ b/dom/base/domerr.msg
@@ -145,6 +145,7 @@ DOM4_MSG_DEF(AbortError, "Error retrieving push subscription.", NS_ERROR_DOM_PUS
 DOM4_MSG_DEF(NetworkError, "Push service unreachable.", NS_ERROR_DOM_PUSH_SERVICE_UNREACHABLE)
 DOM4_MSG_DEF(InvalidAccessError, "Invalid raw ECDSA P-256 public key.", NS_ERROR_DOM_PUSH_INVALID_KEY_ERR)
 DOM4_MSG_DEF(InvalidStateError, "A subscription with a different application server key already exists.", NS_ERROR_DOM_PUSH_MISMATCHED_KEY_ERR)
+DOM4_MSG_DEF(InvalidStateError, "GCM service disabled.", NS_ERROR_DOM_PUSH_GCM_DISABLED)
 
 /* Media errors */
 DOM4_MSG_DEF(AbortError,        "The fetching process for the media resource was aborted by the user agent at the user's request.", NS_ERROR_DOM_MEDIA_ABORT_ERR)
diff --git a/dom/base/nsDOMTokenList.cpp b/dom/base/nsDOMTokenList.cpp
index 39ff60e123ce..649e2184364e 100644
--- a/dom/base/nsDOMTokenList.cpp
+++ b/dom/base/nsDOMTokenList.cpp
@@ -10,9 +10,13 @@
 
 #include "nsDOMTokenList.h"
 #include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
+#include "nsDataHashtable.h"
 #include "nsError.h"
+#include "nsHashKeys.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/DOMTokenListBinding.h"
+#include "mozilla/BloomFilter.h"
 #include "mozilla/ErrorResult.h"
 
 using namespace mozilla;
@@ -50,6 +54,45 @@ nsDOMTokenList::GetParsedAttr()
   return mElement->GetAttrInfo(kNameSpaceID_None, mAttrAtom).mValue;
 }
 
+void
+nsDOMTokenList::RemoveDuplicates(const nsAttrValue* aAttr)
+{
+  if (!aAttr || aAttr->Type() != nsAttrValue::eAtomArray) {
+    return;
+  }
+
+  BloomFilter<8, nsIAtom> filter;
+  nsAttrValue::AtomArray* array = aAttr->GetAtomArrayValue();
+  for (uint32_t i = 0; i < array->Length(); i++) {
+    nsIAtom* atom = array->ElementAt(i);
+    if (filter.mightContain(atom)) {
+      // Start again, with a hashtable
+      RemoveDuplicatesInternal(array, i);
+      return;
+    } else {
+      filter.add(atom);
+    }
+  }
+}
+
+void
+nsDOMTokenList::RemoveDuplicatesInternal(nsAttrValue::AtomArray* aArray,
+                                         uint32_t aStart)
+{
+  nsDataHashtable<nsPtrHashKey<nsIAtom>, bool> tokens;
+
+  for (uint32_t i = 0; i < aArray->Length(); i++) {
+    nsIAtom* atom = aArray->ElementAt(i);
+    // No need to check the hashtable below aStart
+    if (i >= aStart && tokens.Get(atom)) {
+      aArray->RemoveElementAt(i);
+      i--;
+    } else {
+      tokens.Put(atom, true);
+    }
+  }
+}
+
 uint32_t
 nsDOMTokenList::Length()
 {
@@ -58,6 +101,7 @@ nsDOMTokenList::Length()
     return 0;
   }
 
+  RemoveDuplicates(attr);
   return attr->GetAtomCount();
 }
 
@@ -66,6 +110,13 @@ nsDOMTokenList::IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aResult)
 {
   const nsAttrValue* attr = GetParsedAttr();
 
+  if (!attr || aIndex >= static_cast<uint32_t>(attr->GetAtomCount())) {
+    aFound = false;
+    return;
+  }
+
+  RemoveDuplicates(attr);
+
   if (attr && aIndex < static_cast<uint32_t>(attr->GetAtomCount())) {
     aFound = true;
     attr->AtomAt(aIndex)->ToString(aResult);
@@ -135,10 +186,15 @@ nsDOMTokenList::AddInternal(const nsAttrValue* aAttr,
   nsAutoString resultStr;
 
   if (aAttr) {
-    aAttr->ToString(resultStr);
+    RemoveDuplicates(aAttr);
+    for (uint32_t i = 0; i < aAttr->GetAtomCount(); i++) {
+      if (i != 0) {
+        resultStr.AppendLiteral(" ");
+      }
+      resultStr.Append(nsDependentAtomString(aAttr->AtomAt(i)));
+    }
   }
 
-  bool oneWasAdded = false;
   AutoTArray<nsString, 10> addedClasses;
 
   for (uint32_t i = 0, l = aTokens.Length(); i < l; ++i) {
@@ -149,16 +205,11 @@ nsDOMTokenList::AddInternal(const nsAttrValue* aAttr,
       continue;
     }
 
-    if (oneWasAdded ||
-        (!resultStr.IsEmpty() &&
-        !nsContentUtils::IsHTMLWhitespace(resultStr.Last()))) {
+    if (!resultStr.IsEmpty()) {
       resultStr.Append(' ');
-      resultStr.Append(aToken);
-    } else {
-      resultStr.Append(aToken);
     }
+    resultStr.Append(aToken);
 
-    oneWasAdded = true;
     addedClasses.AppendElement(aToken);
   }
 
@@ -191,23 +242,20 @@ nsDOMTokenList::RemoveInternal(const nsAttrValue* aAttr,
 {
   MOZ_ASSERT(aAttr, "Need an attribute");
 
-  nsAutoString input;
-  aAttr->ToString(input);
+  RemoveDuplicates(aAttr);
 
-  WhitespaceTokenizer tokenizer(input);
-  nsAutoString output;
-
-  while (tokenizer.hasMoreTokens()) {
-    auto& currentToken = tokenizer.nextToken();
-    if (!aTokens.Contains(currentToken)) {
-      if (!output.IsEmpty()) {
-        output.Append(char16_t(' '));
-      }
-      output.Append(currentToken);
+  nsAutoString resultStr;
+  for (uint32_t i = 0; i < aAttr->GetAtomCount(); i++) {
+    if (aTokens.Contains(nsDependentAtomString(aAttr->AtomAt(i)))) {
+      continue;
     }
+    if (!resultStr.IsEmpty()) {
+      resultStr.AppendLiteral(" ");
+    }
+    resultStr.Append(nsDependentAtomString(aAttr->AtomAt(i)));
   }
 
-  mElement->SetAttr(kNameSpaceID_None, mAttrAtom, output, true);
+  mElement->SetAttr(kNameSpaceID_None, mAttrAtom, resultStr, true);
 }
 
 void
@@ -303,33 +351,32 @@ nsDOMTokenList::ReplaceInternal(const nsAttrValue* aAttr,
                                 const nsAString& aToken,
                                 const nsAString& aNewToken)
 {
-  nsAutoString attribute;
-  aAttr->ToString(attribute);
-
-  nsAutoString result;
-  WhitespaceTokenizer tokenizer(attribute);
+  RemoveDuplicates(aAttr);
 
   bool sawIt = false;
-  while (tokenizer.hasMoreTokens()) {
-    auto currentToken = tokenizer.nextToken();
-    if (currentToken.Equals(aToken) || currentToken.Equals(aNewToken)) {
-      if (!sawIt) {
-        sawIt = true;
-        if (!result.IsEmpty()) {
-          result.Append(char16_t(' '));
-        }
-        result.Append(aNewToken);
+  nsAutoString resultStr;
+  for (uint32_t i = 0; i < aAttr->GetAtomCount(); i++) {
+    if (aAttr->AtomAt(i)->Equals(aToken) ||
+        aAttr->AtomAt(i)->Equals(aNewToken)) {
+      if (sawIt) {
+        // We keep only the first
+        continue;
       }
-    } else {
-      if (!result.IsEmpty()) {
-        result.Append(char16_t(' '));
+      sawIt = true;
+      if (!resultStr.IsEmpty()) {
+        resultStr.AppendLiteral(" ");
       }
-      result.Append(currentToken);
+      resultStr.Append(aNewToken);
+      continue;
     }
+    if (!resultStr.IsEmpty()) {
+      resultStr.AppendLiteral(" ");
+    }
+    resultStr.Append(nsDependentAtomString(aAttr->AtomAt(i)));
   }
 
   if (sawIt) {
-    mElement->SetAttr(kNameSpaceID_None, mAttrAtom, result, true);
+    mElement->SetAttr(kNameSpaceID_None, mAttrAtom, resultStr, true);
   }
 }
 
diff --git a/dom/base/nsDOMTokenList.h b/dom/base/nsDOMTokenList.h
index e44e042d5766..b4a3b2e68ce0 100644
--- a/dom/base/nsDOMTokenList.h
+++ b/dom/base/nsDOMTokenList.h
@@ -52,6 +52,7 @@ public:
     return mElement;
   }
 
+  void RemoveDuplicates(const nsAttrValue* aAttr);
   uint32_t Length();
   void Item(uint32_t aIndex, nsAString& aResult)
   {
@@ -87,6 +88,8 @@ protected:
 
   nsresult CheckToken(const nsAString& aStr);
   nsresult CheckTokens(const nsTArray<nsString>& aStr);
+  void RemoveDuplicatesInternal(nsTArray<nsCOMPtr<nsIAtom>>* aArray,
+                                uint32_t aStart);
   void AddInternal(const nsAttrValue* aAttr,
                    const nsTArray<nsString>& aTokens);
   void RemoveInternal(const nsAttrValue* aAttr,
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 90956702767d..4e193181f217 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -3049,13 +3049,20 @@ nsDOMWindowUtils::IsPartOfOpaqueLayer(nsIDOMElement* aElement, bool* aResult)
     return NS_ERROR_FAILURE;
   }
 
-  PaintedLayer* layer = FrameLayerBuilder::GetDebugSingleOldPaintedLayerForFrame(frame);
-  if (!layer) {
-    return NS_ERROR_FAILURE;
+  ColorLayer* colorLayer = FrameLayerBuilder::GetDebugSingleOldLayerForFrame<ColorLayer>(frame);
+  if (colorLayer) {
+    auto color = colorLayer->GetColor();
+    *aResult = color.a == 1.0f;
+    return NS_OK;
   }
 
-  *aResult = (layer->GetContentFlags() & Layer::CONTENT_OPAQUE);
-  return NS_OK;
+  PaintedLayer* paintedLayer = FrameLayerBuilder::GetDebugSingleOldLayerForFrame<PaintedLayer>(frame);
+  if (paintedLayer) {
+    *aResult = paintedLayer->IsOpaque();
+    return NS_OK;
+  }
+
+  return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
@@ -3078,7 +3085,7 @@ nsDOMWindowUtils::NumberOfAssignedPaintedLayers(nsIDOMElement** aElements,
       return NS_ERROR_FAILURE;
     }
 
-    PaintedLayer* layer = FrameLayerBuilder::GetDebugSingleOldPaintedLayerForFrame(frame);
+    PaintedLayer* layer = FrameLayerBuilder::GetDebugSingleOldLayerForFrame<PaintedLayer>(frame);
     if (!layer) {
       return NS_ERROR_FAILURE;
     }
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index 68f056496359..a9180d695540 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -2957,9 +2957,26 @@ nsFrameLoader::TryRemoteBrowser()
   nsresult rv = GetNewTabContext(&context);
   NS_ENSURE_SUCCESS(rv, false);
 
+  uint64_t nextTabParentId = 0;
+  if (mOwnerContent) {
+    nsAutoString nextTabParentIdAttr;
+    mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::nextTabParentId,
+                           nextTabParentIdAttr);
+    nextTabParentId = strtoull(NS_ConvertUTF16toUTF8(nextTabParentIdAttr).get(),
+                               nullptr, 10);
+
+    // We may be in a window that was just opened, so try the
+    // nsIBrowserDOMWindow API as a backup.
+    if (!nextTabParentId && window) {
+      Unused << window->GetNextTabParentId(&nextTabParentId);
+    }
+  }
+
   nsCOMPtr<Element> ownerElement = mOwnerContent;
   mRemoteBrowser = ContentParent::CreateBrowser(context, ownerElement,
-                                                openerContentParent, sameTabGroupAs);
+                                                openerContentParent,
+                                                sameTabGroupAs,
+                                                nextTabParentId);
   if (!mRemoteBrowser) {
     return false;
   }
diff --git a/dom/base/nsGkAtomList.h b/dom/base/nsGkAtomList.h
index 28aa72c83062..55fc009bc3cb 100644
--- a/dom/base/nsGkAtomList.h
+++ b/dom/base/nsGkAtomList.h
@@ -652,6 +652,7 @@ GK_ATOM(never, "never")
 GK_ATOM(_new, "new")
 GK_ATOM(newline, "newline")
 GK_ATOM(nextBidi, "NextBidi")
+GK_ATOM(nextTabParentId, "nextTabParentId")
 GK_ATOM(no, "no")
 GK_ATOM(noautofocus, "noautofocus")
 GK_ATOM(noautohide, "noautohide")
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 08096f35b801..d21312b962e7 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -11563,7 +11563,14 @@ nsGlobalWindow::ShowSlowScriptDialog()
   // Check if we should offer the option to debug
   JS::AutoFilename filename;
   unsigned lineno;
-  bool hasFrame = JS::DescribeScriptedCaller(cx, &filename, &lineno);
+  // Computing the line number can be very expensive (see bug 1330231 for
+  // example), and we don't use the line number anywhere except than in the
+  // parent process, so we avoid computing it elsewhere.  This gives us most of
+  // the wins we are interested in, since the source of the slowness here is
+  // minified scripts which is more common in Web content that is loaded in the
+  // content process.
+  unsigned* linenop = XRE_IsParentProcess() ? &lineno : nullptr;
+  bool hasFrame = JS::DescribeScriptedCaller(cx, &filename, linenop);
 
   // Record the slow script event if we haven't done so already for this inner window
   // (which represents a particular page to the user).
@@ -11579,8 +11586,7 @@ nsGlobalWindow::ShowSlowScriptDialog()
     nsIDocShell* docShell = GetDocShell();
     nsCOMPtr<nsITabChild> child = docShell ? docShell->GetTabChild() : nullptr;
     action = monitor->NotifySlowScript(child,
-                                       filename.get(),
-                                       lineno);
+                                       filename.get());
     if (action == ProcessHangMonitor::Terminate) {
       return KillSlowScript;
     }
diff --git a/dom/base/test/browser.ini b/dom/base/test/browser.ini
index 8b18cffbcd66..0602f629fdbb 100644
--- a/dom/base/test/browser.ini
+++ b/dom/base/test/browser.ini
@@ -34,7 +34,6 @@ skip-if = e10s # this tests non-e10s behavior. it's not expected to work in e10s
 [browser_state_notifications.js]
 skip-if = true # Bug 1271028
 [browser_use_counters.js]
-[browser_bug1307747.js]
 [browser_timeout_throttling_with_audio_playback.js]
 [browser_bug1303838.js]
 [browser_inputStream_structuredClone.js]
diff --git a/dom/base/test/browser_bug1307747.js b/dom/base/test/browser_bug1307747.js
deleted file mode 100644
index 8d1448cc2399..000000000000
--- a/dom/base/test/browser_bug1307747.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
-
-var {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-
-const BASE_URI = "http://mochi.test:8888/browser/dom/base/test/empty.html";
-
-add_task(function* test_initialize() {
-  let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
-  let browser = gBrowser.getBrowserForTab(tab);
-
-  let blob = yield ContentTask.spawn(browser, null, function() {
-    let blob = new Blob([new Array(1024*1024).join('123456789ABCDEF')]);
-    return blob;
-  });
-
-  ok(blob, "We have a blob!");
-  is(blob.size, new Array(1024*1024).join('123456789ABCDEF').length, "The size matches");
-
-  let status = yield ContentTask.spawn(browser, blob, function(blob) {
-    return new Promise(resolve => {
-      let fr = new content.FileReader();
-      fr.readAsText(blob);
-      fr.onloadend = function() {
-        resolve(fr.result == new Array(1024*1024).join('123456789ABCDEF'));
-      }
-    });
-  });
-
-  ok(status, "Data match!");
-
-  yield BrowserTestUtils.removeTab(tab);
-});
diff --git a/dom/base/test/file_domwindowutils_animation.html b/dom/base/test/file_domwindowutils_animation.html
new file mode 100644
index 000000000000..4d32474e32e1
--- /dev/null
+++ b/dom/base/test/file_domwindowutils_animation.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>DOMWindowUtils test with animation</title>
+</head>
+<body>
+<script type="application/javascript">
+
+const SimpleTest = window.opener.SimpleTest;
+const utils = SpecialPowers.getDOMWindowUtils(window);
+const next = window.opener.next;
+const is = window.opener.is;
+const ok = window.opener.ok;
+
+function addStyle(rules) {
+  const extraStyle = document.createElement("style");
+  document.head.appendChild(extraStyle);
+  rules.forEach(rule => {
+    extraStyle.sheet.insertRule(rule, extraStyle.sheet.cssRules.length);
+  });
+}
+
+function deleteStyle() {
+  document.head.querySelector("style").remove();
+}
+
+
+function test_getUnanimatedComputedStyle() {
+  [
+    {
+      property: "opacity",
+      keyframes: [1, 0],
+      expectedInitialStyle: "1",
+      expectedDuringTransitionStyle: "0",
+      isDiscrete: false,
+    },
+    {
+      property: "clear",
+      keyframes: ["left", "inline-end"],
+      expectedInitialStyle: "none",
+      expectedDuringTransitionStyle: "inline-end",
+      isDiscrete: true,
+    },
+  ].forEach(testcase => {
+    const { property, keyframes, expectedInitialStyle,
+            expectedDuringTransitionStyle, isDiscrete } = testcase;
+
+    [null, "unset", "initial", "inherit"].forEach(initialStyle => {
+      const scriptAnimation = target => {
+        return target.animate({ [property]: keyframes }, 1000);
+      }
+      checkUnanimatedComputedStyle(property, initialStyle, null,
+                                   expectedInitialStyle, expectedInitialStyle,
+                                   scriptAnimation, "script animation");
+
+      const cssAnimationStyle = `@keyframes cssanimation {`
+                                + ` from { ${property}: ${ keyframes[0] }; }`
+                                + ` to { ${property}: ${ keyframes[1] }; } }`;
+      addStyle([cssAnimationStyle]);
+      const cssAnimation = target => {
+        target.style.animation = "cssanimation 1s";
+        return target.getAnimations()[0];
+      }
+      checkUnanimatedComputedStyle(property, initialStyle, null,
+                                   expectedInitialStyle, expectedInitialStyle,
+                                   cssAnimation, "CSS Animations");
+      deleteStyle();
+
+      // We don't support discrete animations for CSS Transitions yet.
+      // (bug 1320854)
+      if (!isDiscrete) {
+        const cssTransition = target => {
+          target.style[property] = keyframes[0];
+          target.style.transition =
+            `${ property } 1s`;
+          window.getComputedStyle(target)[property];
+          target.style[property] = keyframes[1];
+          return target.getAnimations()[0];
+        }
+        checkUnanimatedComputedStyle(property, initialStyle, null,
+                                     expectedInitialStyle,
+                                     expectedDuringTransitionStyle,
+                                     cssTransition, "CSS Transitions");
+      }
+
+      addStyle([cssAnimationStyle,
+                ".pseudo::before { animation: cssanimation 1s; }"]);
+      const pseudoAnimation = target => {
+        target.classList.add("pseudo");
+        return target.getAnimations({ subtree: true })[0];
+      }
+      checkUnanimatedComputedStyle(property, initialStyle, "::before",
+                                   expectedInitialStyle, expectedInitialStyle,
+                                   pseudoAnimation, "Animation at pseudo");
+      deleteStyle();
+    });
+  });
+
+  SimpleTest.doesThrow(
+    () => utils.getUnanimatedComputedStyle(div, null, "background"),
+    "NS_ERROR_INVALID_ARG",
+    "Shorthand property should throw");
+
+  SimpleTest.doesThrow(
+    () => utils.getUnanimatedComputedStyle(div, null, "invalid"),
+    "NS_ERROR_INVALID_ARG",
+    "Invalid property should throw");
+
+  SimpleTest.doesThrow(
+    () => utils.getUnanimatedComputedStyle(null, null, "opacity"),
+    "NS_ERROR_INVALID_ARG",
+    "Null element should throw");
+
+  next();
+  window.close();
+}
+
+function checkUnanimatedComputedStyle(property, initialStyle, pseudoType,
+                                      expectedBeforeAnimation,
+                                      expectedDuringAnimation,
+                                      animate, animationType) {
+  const div = document.createElement("div");
+  document.body.appendChild(div);
+
+  if (initialStyle) {
+    div.style[property] = initialStyle;
+  }
+
+  is(utils.getUnanimatedComputedStyle(div, pseudoType, property),
+     expectedBeforeAnimation,
+     `'${ property }' property with '${ initialStyle }' style `
+     + `should be '${ expectedBeforeAnimation }' `
+     + `before animating by ${ animationType }`);
+
+  const animation = animate(div);
+  animation.currentTime = 500;
+  is(utils.getUnanimatedComputedStyle(div, pseudoType, property),
+     expectedDuringAnimation,
+     `'${ property }' property with '${ initialStyle }' style `
+     + `should be '${ expectedDuringAnimation }' `
+     + `even while animating by ${ animationType }`);
+
+  div.remove();
+}
+
+window.addEventListener("load", test_getUnanimatedComputedStyle);
+
+</script>
+</body>
+</html>
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 6d45965cffb3..347e7f0ca48a 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -126,6 +126,7 @@ support-files =
   file_bug907892.html
   file_bug945152.jar
   file_bug1274806.html
+  file_domwindowutils_animation.html
   file_general_document.html
   file_htmlserializer_1.html
   file_htmlserializer_1_bodyonly.html
diff --git a/dom/base/test/test_domwindowutils.html b/dom/base/test/test_domwindowutils.html
index 1e0d561834a9..daddb89371f2 100644
--- a/dom/base/test/test_domwindowutils.html
+++ b/dom/base/test/test_domwindowutils.html
@@ -152,122 +152,12 @@ function test_getAnimationType() {
 }
 
 function test_getUnanimatedComputedStyle() {
-  [
-    {
-      property: "opacity",
-      keyframes: [1, 0],
-      expectedInitialStyle: "1",
-      expectedDuringTransitionStyle: "0",
-      isDiscrete: false,
-    },
-    {
-      property: "clear",
-      keyframes: ["left", "inline-end"],
-      expectedInitialStyle: "none",
-      expectedDuringTransitionStyle: "inline-end",
-      isDiscrete: true,
-    },
-  ].forEach(testcase => {
-    const { property, keyframes, expectedInitialStyle,
-            expectedDuringTransitionStyle, isDiscrete } = testcase;
-
-    [null, "unset", "initial", "inherit"].forEach(initialStyle => {
-      const scriptAnimation = target => {
-        return target.animate({ [property]: keyframes }, 1000);
-      }
-      checkUnanimatedComputedStyle(property, initialStyle, null,
-                                   expectedInitialStyle, expectedInitialStyle,
-                                   scriptAnimation, "script animation");
-
-      const cssAnimationStyle = `@keyframes cssanimation {`
-                                + ` from { ${property}: ${ keyframes[0] }; }`
-                                + ` to { ${property}: ${ keyframes[1] }; } }`;
-      document.styleSheets[0].insertRule(cssAnimationStyle, 0);
-      const cssAnimation = target => {
-        target.style.animation = "cssanimation 1s";
-        return target.getAnimations()[0];
-      }
-      checkUnanimatedComputedStyle(property, initialStyle, null,
-                                   expectedInitialStyle, expectedInitialStyle,
-                                   cssAnimation, "CSS Animations");
-      document.styleSheets[0].deleteRule(0);
-
-      // We don't support discrete animations for CSS Transitions yet.
-      // (bug 1320854)
-      if (!isDiscrete) {
-        const cssTransition = target => {
-          target.style[property] = keyframes[0];
-          target.style.transition =
-            `${ property } 1s`;
-          window.getComputedStyle(target)[property];
-          target.style[property] = keyframes[1];
-          return target.getAnimations()[0];
-        }
-        checkUnanimatedComputedStyle(property, initialStyle, null,
-                                     expectedInitialStyle,
-                                     expectedDuringTransitionStyle,
-                                     cssTransition, "CSS Transitions");
-      }
-
-      document.styleSheets[0].insertRule(cssAnimationStyle, 0);
-      document.styleSheets[0].insertRule(
-        ".pseudo::before { animation: cssanimation 1s; }", 0);
-      const pseudoAnimation = target => {
-        target.classList.add("pseudo");
-        return target.getAnimations({ subtree: true })[0];
-      }
-      checkUnanimatedComputedStyle(property, initialStyle, "::before",
-                                   expectedInitialStyle, expectedInitialStyle,
-                                   pseudoAnimation, "Animation at pseudo");
-      document.styleSheets[0].deleteRule(0);
-      document.styleSheets[0].deleteRule(0);
-    });
-  });
-
-  SimpleTest.doesThrow(
-    () => utils.getUnanimatedComputedStyle(div, null, "background"),
-    "NS_ERROR_INVALID_ARG",
-    "Shorthand property should throw");
-
-  SimpleTest.doesThrow(
-    () => utils.getUnanimatedComputedStyle(div, null, "invalid"),
-    "NS_ERROR_INVALID_ARG",
-    "Invalid property should throw");
-
-  SimpleTest.doesThrow(
-    () => utils.getUnanimatedComputedStyle(null, null, "opacity"),
-    "NS_ERROR_INVALID_ARG",
-    "Null element should throw");
-
-  next();
-}
-
-function checkUnanimatedComputedStyle(property, initialStyle, pseudoType,
-                                      expectedBeforeAnimation,
-                                      expectedDuringAnimation,
-                                      animate, animationType) {
-  const div = document.createElement("div");
-  document.body.appendChild(div);
-
-  if (initialStyle) {
-    div.style[property] = initialStyle;
-  }
-
-  is(utils.getUnanimatedComputedStyle(div, pseudoType, property),
-     expectedBeforeAnimation,
-     `'${ property }' property with '${ initialStyle }' style `
-     + `should be '${ expectedBeforeAnimation }' `
-     + `before animating by ${ animationType }`);
-
-  const animation = animate(div);
-  animation.currentTime = 500;
-  is(utils.getUnanimatedComputedStyle(div, pseudoType, property),
-     expectedDuringAnimation,
-     `'${ property }' property with '${ initialStyle }' style `
-     + `should be '${ expectedDuringAnimation }' `
-     + `even while animating by ${ animationType }`);
-
-  div.remove();
+  SpecialPowers.pushPrefEnv(
+    { set: [["dom.animations-api.core.enabled", true]] },
+    () => {
+      window.open("file_domwindowutils_animation.html");
+    }
+  );
 }
 
 var tests = [
diff --git a/dom/broadcastchannel/BroadcastChannelParent.cpp b/dom/broadcastchannel/BroadcastChannelParent.cpp
index 833a3f8fba1f..5d70dd978b80 100644
--- a/dom/broadcastchannel/BroadcastChannelParent.cpp
+++ b/dom/broadcastchannel/BroadcastChannelParent.cpp
@@ -7,8 +7,9 @@
 #include "BroadcastChannelParent.h"
 #include "BroadcastChannelService.h"
 #include "mozilla/dom/File.h"
-#include "mozilla/dom/ipc/BlobParent.h"
+#include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/Unused.h"
 #include "nsIScriptSecurityManager.h"
 
@@ -73,30 +74,5 @@ BroadcastChannelParent::ActorDestroy(ActorDestroyReason aWhy)
   }
 }
 
-void
-BroadcastChannelParent::Deliver(const ClonedMessageData& aData)
-{
-  AssertIsOnBackgroundThread();
-
-  // Duplicate the data for this parent.
-  ClonedMessageData newData(aData);
-
-  // Create new BlobParent objects for this message.
-  for (uint32_t i = 0, len = newData.blobsParent().Length(); i < len; ++i) {
-    RefPtr<BlobImpl> impl =
-      static_cast<BlobParent*>(newData.blobsParent()[i])->GetBlobImpl();
-
-    PBlobParent* blobParent =
-      BackgroundParent::GetOrCreateActorForBlobImpl(Manager(), impl);
-    if (!blobParent) {
-      return;
-    }
-
-    newData.blobsParent()[i] = blobParent;
-  }
-
-  Unused << SendNotify(newData);
-}
-
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/broadcastchannel/BroadcastChannelParent.h b/dom/broadcastchannel/BroadcastChannelParent.h
index e7374a7f7a5f..c8d77b201164 100644
--- a/dom/broadcastchannel/BroadcastChannelParent.h
+++ b/dom/broadcastchannel/BroadcastChannelParent.h
@@ -26,9 +26,6 @@ class BroadcastChannelParent final : public PBroadcastChannelParent
 
   typedef mozilla::ipc::PrincipalInfo PrincipalInfo;
 
-public:
-  void Deliver(const ClonedMessageData& aData);
-
 private:
   explicit BroadcastChannelParent(const nsAString& aOriginChannelKey);
   ~BroadcastChannelParent();
diff --git a/dom/broadcastchannel/BroadcastChannelService.cpp b/dom/broadcastchannel/BroadcastChannelService.cpp
index f88108c3a3a6..c07babca9af1 100644
--- a/dom/broadcastchannel/BroadcastChannelService.cpp
+++ b/dom/broadcastchannel/BroadcastChannelService.cpp
@@ -7,7 +7,7 @@
 #include "BroadcastChannelService.h"
 #include "BroadcastChannelParent.h"
 #include "mozilla/dom/File.h"
-#include "mozilla/dom/ipc/BlobParent.h"
+#include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/ipc/BackgroundParent.h"
 
 #ifdef XP_WIN
@@ -106,25 +106,43 @@ BroadcastChannelService::PostMessage(BroadcastChannelParent* aParent,
   }
 
   // We need to keep the array alive for the life-time of this operation.
-  nsTArray<RefPtr<BlobImpl>> blobs;
-  if (!aData.blobsParent().IsEmpty()) {
-    blobs.SetCapacity(aData.blobsParent().Length());
+  nsTArray<RefPtr<BlobImpl>> blobImpls;
+  if (!aData.blobs().IsEmpty()) {
+    blobImpls.SetCapacity(aData.blobs().Length());
 
-    for (uint32_t i = 0, len = aData.blobsParent().Length(); i < len; ++i) {
-      RefPtr<BlobImpl> impl =
-        static_cast<BlobParent*>(aData.blobsParent()[i])->GetBlobImpl();
-     MOZ_ASSERT(impl);
-     blobs.AppendElement(impl);
+    for (uint32_t i = 0, len = aData.blobs().Length(); i < len; ++i) {
+      RefPtr<BlobImpl> impl = IPCBlobUtils::Deserialize(aData.blobs()[i]);
+
+      MOZ_ASSERT(impl);
+      blobImpls.AppendElement(impl);
     }
   }
 
+  // For each parent actor, we notify the message.
   for (uint32_t i = 0; i < parents->Length(); ++i) {
     BroadcastChannelParent* parent = parents->ElementAt(i);
     MOZ_ASSERT(parent);
 
-    if (parent != aParent) {
-      parent->Deliver(aData);
+    if (parent == aParent) {
+      continue;
     }
+
+    // We need to have a copy of the data for this parent.
+    ClonedMessageData newData(aData);
+    MOZ_ASSERT(blobImpls.Length() == newData.blobs().Length());
+
+    if (!blobImpls.IsEmpty()) {
+      // Serialize Blob objects for this message.
+      for (uint32_t i = 0, len = blobImpls.Length(); i < len; ++i) {
+        nsresult rv = IPCBlobUtils::Serialize(blobImpls[i], parent->Manager(),
+                                              newData.blobs()[i]);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return;
+        }
+      }
+    }
+
+    Unused << parent->SendNotify(newData);
   }
 }
 
diff --git a/dom/broadcastchannel/PBroadcastChannel.ipdl b/dom/broadcastchannel/PBroadcastChannel.ipdl
index f68a2b5e1155..95849c0755b5 100644
--- a/dom/broadcastchannel/PBroadcastChannel.ipdl
+++ b/dom/broadcastchannel/PBroadcastChannel.ipdl
@@ -6,6 +6,7 @@ include protocol PBackground;
 include protocol PBlob;
 include protocol PChildToParentStream;
 include protocol PFileDescriptorSet;
+include protocol PIPCBlobInputStream;
 include protocol PParentToChildStream;
 include DOMTypes;
 
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 748f3c9a7667..6befd23b7e82 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -5579,15 +5579,18 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindow& aWindow, double aX,
     return;
   }
 
+  // Flush layout updates
+  if (!(aFlags & nsIDOMCanvasRenderingContext2D::DRAWWINDOW_DO_NOT_FLUSH)) {
+    nsContentUtils::FlushLayoutForTree(aWindow.AsInner()->GetOuterWindow());
+  }
+
   CompositionOp op = UsedOperation();
   bool discardContent = GlobalAlpha() == 1.0f
     && (op == CompositionOp::OP_OVER || op == CompositionOp::OP_SOURCE);
   const gfx::Rect drawRect(aX, aY, aW, aH);
   EnsureTarget(discardContent ? &drawRect : nullptr);
-
-  // Flush layout updates
-  if (!(aFlags & nsIDOMCanvasRenderingContext2D::DRAWWINDOW_DO_NOT_FLUSH)) {
-    nsContentUtils::FlushLayoutForTree(aWindow.AsInner()->GetOuterWindow());
+  if (!IsTargetValid()) {
+    return;
   }
 
   RefPtr<nsPresContext> presContext;
diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp
index f9bd90046c98..e17ff3fb0120 100644
--- a/dom/events/TouchEvent.cpp
+++ b/dom/events/TouchEvent.cpp
@@ -223,8 +223,8 @@ TouchEvent::PrefEnabled(nsIDocShell* aDocShell)
       if (enabled && aDocShell) {
         // APZ might be disabled on this particular widget, in which case
         // TouchEvent support will also be disabled. Try to detect that.
-        nsPresContext* pc = nullptr;
-        aDocShell->GetPresContext(&pc);
+        RefPtr<nsPresContext> pc;
+        aDocShell->GetPresContext(getter_AddRefs(pc));
         if (pc && pc->GetRootWidget()) {
           enabled &= pc->GetRootWidget()->AsyncPanZoomEnabled();
         }
diff --git a/dom/events/test/pointerevents/test_trigger_fullscreen_by_pointer_events.html b/dom/events/test/pointerevents/test_trigger_fullscreen_by_pointer_events.html
index 13913cd35dca..19925d68af91 100644
--- a/dom/events/test/pointerevents/test_trigger_fullscreen_by_pointer_events.html
+++ b/dom/events/test/pointerevents/test_trigger_fullscreen_by_pointer_events.html
@@ -8,34 +8,38 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
-<div id="target" style="width: 50px; height: 50px; background: green"></div>
 <script>
-
 SimpleTest.waitForExplicitFinish();
 
-var target = document.getElementById("target");
-target.addEventListener("pointerdown", () => {
-  target.requestFullscreen();
-  target.addEventListener("pointerdown", () => {
-    document.exitFullscreen();
-  }, {once: true});
-}, {once: true});
-
-document.addEventListener("fullscreenchange", () => {
-  if (document.fullscreenElement) {
-    ok(document.fullscreenElement, target, "fullscreenElement should be the div element");
-    // synthesize mouse events to generate pointer events and leave full screen.
-    synthesizeMouseAtCenter(target, { type: "mousedown" });
-    synthesizeMouseAtCenter(target, { type: "mouseup" });
-  } else {
-    SimpleTest.finish();
-  }
-});
-
 function startTest() {
-  // synthesize mouse events to generate pointer events and enter full screen.
-  synthesizeMouseAtCenter(target, { type: "mousedown" });
-  synthesizeMouseAtCenter(target, { type: "mouseup" });
+  let win = window.open("data:text/html,<body><div id='target' style='width: 50px; height: 50px; background: green'></div></body>", "_blank");
+  win.addEventListener("load", () => {
+    let target = win.document.getElementById("target");
+    target.addEventListener("pointerdown", () => {
+      target.requestFullscreen();
+      target.addEventListener("pointerdown", () => {
+        win.document.exitFullscreen();
+      }, {once: true});
+    }, {once: true});
+
+    win.document.addEventListener("fullscreenchange", () => {
+      if (win.document.fullscreenElement) {
+        ok(win.document.fullscreenElement, target, "fullscreenElement should be the div element");
+        // synthesize mouse events to generate pointer events and leave full screen.
+        synthesizeMouseAtCenter(target, { type: "mousedown" }, win);
+        synthesizeMouseAtCenter(target, { type: "mouseup" }, win);
+      } else {
+        win.close();
+        SimpleTest.finish();
+      }
+    });
+    // Make sure our window is focused before starting the test
+    SimpleTest.waitForFocus(() => {
+      // synthesize mouse events to generate pointer events and enter full screen.
+      synthesizeMouseAtCenter(target, { type: "mousedown" }, win);
+      synthesizeMouseAtCenter(target, { type: "mouseup" }, win);
+    }, win);
+  });
 }
 
 SimpleTest.waitForFocus(() => {
@@ -47,7 +51,6 @@ SimpleTest.waitForFocus(() => {
     ]
   }, startTest);
 });
-
 </script>
 </body>
 </html>
diff --git a/dom/file/FileReader.cpp b/dom/file/FileReader.cpp
index 771d4bbcff2a..37bdbe7fbc5f 100644
--- a/dom/file/FileReader.cpp
+++ b/dom/file/FileReader.cpp
@@ -290,10 +290,20 @@ FileReader::DoReadData(uint64_t aCount)
     mResult.GetMutableData(&buf, oldLen + aCount, fallible);
     NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
 
+    nsresult rv;
+
+    // nsFileStreams do not implement ReadSegment. In case here we are dealing
+    // with a nsIAsyncInputStream, in content process, we need to wrap a
+    // nsIBufferedInputStream around it.
+    if (!mBufferedStream) {
+      rv = NS_NewBufferedInputStream(getter_AddRefs(mBufferedStream),
+                                     mAsyncStream, 8192);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
     uint32_t bytesRead = 0;
-    nsresult rv =
-      mAsyncStream->ReadSegments(ReadFuncBinaryString, buf + oldLen, aCount,
-                                 &bytesRead);
+    rv = mBufferedStream->ReadSegments(ReadFuncBinaryString, buf + oldLen,
+                                       aCount, &bytesRead);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -350,6 +360,7 @@ FileReader::ReadFileContent(Blob& aBlob,
   mResultArrayBuffer = nullptr;
 
   mAsyncStream = nullptr;
+  mBufferedStream = nullptr;
 
   mTransferred = 0;
   mTotal = 0;
@@ -374,27 +385,30 @@ FileReader::ReadFileContent(Blob& aBlob,
     return;
   }
 
-  nsCOMPtr<nsITransport> transport;
-  aRv = sts->CreateInputTransport(stream,
-                                  /* aStartOffset */ 0,
-                                  /* aReadLimit */ -1,
-                                  /* aCloseWhenDone */ true,
-                                  getter_AddRefs(transport));
-  if (NS_WARN_IF(aRv.Failed())) {
-    return;
+  mAsyncStream = do_QueryInterface(stream);
+  if (!mAsyncStream) {
+    nsCOMPtr<nsITransport> transport;
+    aRv = sts->CreateInputTransport(stream,
+                                    /* aStartOffset */ 0,
+                                    /* aReadLimit */ -1,
+                                    /* aCloseWhenDone */ true,
+                                    getter_AddRefs(transport));
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
+
+    nsCOMPtr<nsIInputStream> wrapper;
+    aRv = transport->OpenInputStream(/* aFlags */ 0,
+                                     /* aSegmentSize */ 0,
+                                     /* aSegmentCount */ 0,
+                                     getter_AddRefs(wrapper));
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
+
+    mAsyncStream = do_QueryInterface(wrapper);
   }
 
-  nsCOMPtr<nsIInputStream> wrapper;
-  aRv = transport->OpenInputStream(/* aFlags */ 0,
-                                   /* aSegmentSize */ 0,
-                                   /* aSegmentCount */ 0,
-                                   getter_AddRefs(wrapper));
-  if (NS_WARN_IF(aRv.Failed())) {
-    return;
-  }
-
-  MOZ_ASSERT(!mAsyncStream);
-  mAsyncStream = do_QueryInterface(wrapper);
   MOZ_ASSERT(mAsyncStream);
 
   mTotal = mBlob->GetSize(aRv);
@@ -529,6 +543,7 @@ FileReader::FreeDataAndDispatchSuccess()
   FreeFileData();
   mResult.SetIsVoid(false);
   mAsyncStream = nullptr;
+  mBufferedStream = nullptr;
   mBlob = nullptr;
 
   // Dispatch event to signify end of a successful operation
@@ -544,6 +559,7 @@ FileReader::FreeDataAndDispatchError()
   FreeFileData();
   mResult.SetIsVoid(true);
   mAsyncStream = nullptr;
+  mBufferedStream = nullptr;
   mBlob = nullptr;
 
   // Dispatch error event to signify load failure
@@ -729,6 +745,7 @@ FileReader::Abort()
   mResultArrayBuffer = nullptr;
 
   mAsyncStream = nullptr;
+  mBufferedStream = nullptr;
   mBlob = nullptr;
 
   //Clean up memory buffer
@@ -782,6 +799,11 @@ FileReader::Shutdown()
     mAsyncStream = nullptr;
   }
 
+  if (mBufferedStream) {
+    mBufferedStream->Close();
+    mBufferedStream = nullptr;
+  }
+
   FreeFileData();
   mResultArrayBuffer = nullptr;
 
diff --git a/dom/file/FileReader.h b/dom/file/FileReader.h
index b8461399041a..a0e297a9b671 100644
--- a/dom/file/FileReader.h
+++ b/dom/file/FileReader.h
@@ -180,6 +180,7 @@ private:
   bool mTimerIsActive;
 
   nsCOMPtr<nsIAsyncInputStream> mAsyncStream;
+  nsCOMPtr<nsIInputStream> mBufferedStream;
 
   RefPtr<DOMError> mError;
 
diff --git a/dom/file/ipc/Blob.cpp b/dom/file/ipc/Blob.cpp
index 7fbda72b8bf1..ee70bad132a6 100644
--- a/dom/file/ipc/Blob.cpp
+++ b/dom/file/ipc/Blob.cpp
@@ -671,9 +671,12 @@ SerializeInputStreamInChunks(nsIInputStream* aInputStream, uint64_t aLength,
 void
 DeleteStreamMemoryFromBlobDataStream(BlobDataStream& aStream)
 {
-  PMemoryStreamChild* actor = aStream.streamChild();
-  if (actor) {
-    actor->Send__delete__(actor);
+  if (aStream.type() == BlobDataStream::TMemoryBlobDataStream) {
+    PMemoryStreamChild* actor =
+      aStream.get_MemoryBlobDataStream().streamChild();
+    if (actor) {
+      actor->Send__delete__(actor);
+    }
   }
 }
 
@@ -753,17 +756,36 @@ CreateBlobImpl(const BlobDataStream& aStream,
 {
   MOZ_ASSERT(gProcessType == GeckoProcessType_Default);
 
-  MemoryStreamParent* actor =
-    static_cast<MemoryStreamParent*>(aStream.streamParent());
-
   nsCOMPtr<nsIInputStream> inputStream;
-  actor->GetStream(getter_AddRefs(inputStream));
-  if (!inputStream) {
-    ASSERT_UNLESS_FUZZING();
-    return nullptr;
-  }
+  uint64_t length;
 
-  uint64_t length = aStream.length();
+  if (aStream.type() == BlobDataStream::TMemoryBlobDataStream) {
+    const MemoryBlobDataStream& memoryBlobDataStream =
+      aStream.get_MemoryBlobDataStream();
+
+    MemoryStreamParent* actor =
+      static_cast<MemoryStreamParent*>(memoryBlobDataStream.streamParent());
+
+    actor->GetStream(getter_AddRefs(inputStream));
+    if (!inputStream) {
+      ASSERT_UNLESS_FUZZING();
+      return nullptr;
+    }
+
+    length = memoryBlobDataStream.length();
+  } else {
+    MOZ_ASSERT(aStream.type() == BlobDataStream::TIPCStream);
+    inputStream = DeserializeIPCStream(aStream.get_IPCStream());
+    if (!inputStream) {
+      ASSERT_UNLESS_FUZZING();
+      return nullptr;
+    }
+
+    nsresult rv = inputStream->Available(&length);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return nullptr;
+    }
+  }
 
   RefPtr<BlobImpl> blobImpl;
   if (!aMetadata.mHasRecursed && aMetadata.IsFile()) {
@@ -951,7 +973,8 @@ CreateBlobImpl(const ParentBlobConstructorParams& aParams,
 template <class ChildManagerType>
 bool
 BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
-                     BlobData& aBlobData)
+                     BlobData& aBlobData,
+                     nsTArray<UniquePtr<AutoIPCStream>>& aIPCStreams)
 {
   MOZ_ASSERT(gProcessType != GeckoProcessType_Default);
   MOZ_ASSERT(aBlobImpl);
@@ -970,7 +993,7 @@ BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
          index < count;
          index++) {
       if (!BlobDataFromBlobImpl(aManager, subBlobs->ElementAt(index),
-                                subBlobDatas[index])) {
+                                subBlobDatas[index], aIPCStreams)) {
         return false;
       }
     }
@@ -995,13 +1018,33 @@ BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
   aBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
   MOZ_ALWAYS_TRUE(!rv.Failed());
 
+  nsCOMPtr<nsIIPCSerializableInputStream> serializable =
+    do_QueryInterface(inputStream);
+
+  // ExpectedSerializedLength() returns the length of the stream if serialized.
+  // This is useful to decide if we want to continue using the serialization
+  // directly, or if it's better to use IPCStream.
+  uint64_t expectedLength =
+    serializable ? serializable->ExpectedSerializedLength().valueOr(0) : 0;
+
+  // If a stream is known to be larger than 1MB, prefer sending it in chunks.
+  const uint64_t kTooLargeStream = 1024 * 1024;
+  if (serializable && expectedLength < kTooLargeStream) {
+    UniquePtr<AutoIPCStream> autoStream(new AutoIPCStream());
+    autoStream->Serialize(inputStream, aManager);
+    aBlobData = autoStream->TakeValue();
+
+    aIPCStreams.AppendElement(Move(autoStream));
+    return true;
+  }
+
   PMemoryStreamChild* streamActor =
     SerializeInputStreamInChunks(inputStream, length, aManager);
   if (!streamActor) {
     return false;
   }
 
-  aBlobData = BlobDataStream(nullptr, streamActor, length);
+  aBlobData = MemoryBlobDataStream(nullptr, streamActor, length);
   return true;
 }
 
@@ -3597,6 +3640,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
   MOZ_ASSERT(!aBlobImpl->IsDateUnknown());
 
   AnyBlobConstructorParams blobParams;
+  nsTArray<UniquePtr<AutoIPCStream>> autoIPCStreams;
 
   if (gProcessType == GeckoProcessType_Default) {
     RefPtr<BlobImpl> sameProcessImpl = aBlobImpl;
@@ -3608,7 +3652,8 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
     // BlobData is going to be populate here and it _must_ be send via IPC in
     // order to avoid leaks.
     BlobData blobData;
-    if (NS_WARN_IF(!BlobDataFromBlobImpl(aManager, aBlobImpl, blobData))) {
+    if (NS_WARN_IF(!BlobDataFromBlobImpl(aManager, aBlobImpl, blobData,
+                                         autoIPCStreams))) {
       return nullptr;
     }
 
@@ -3647,6 +3692,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
 
   DeleteStreamMemory(params.blobParams());
 
+  autoIPCStreams.Clear();
   return actor;
 }
 
diff --git a/dom/file/ipc/IPCBlob.ipdlh b/dom/file/ipc/IPCBlob.ipdlh
new file mode 100644
index 000000000000..7bb237353196
--- /dev/null
+++ b/dom/file/ipc/IPCBlob.ipdlh
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include protocol PChildToParentStream;
+include protocol PParentToChildStream;
+include protocol PIPCBlobInputStream;
+
+include IPCStream;
+include ProtocolTypes;
+
+using struct mozilla::void_t
+  from "ipc/IPCMessageUtils.h";
+
+namespace mozilla {
+namespace dom {
+
+// This contains any extra bit for making a File out of a Blob.
+// For more information about Blobs and IPC, please read the comments in
+// IPCBlobUtils.h
+
+struct IPCFile
+{
+  nsString name;
+  int64_t lastModified;
+  nsString DOMPath;
+};
+
+// Union for blob vs file.
+union IPCFileUnion
+{
+  // For Blob.
+  void_t;
+
+  // For File.
+  IPCFile;
+};
+
+union IPCBlobStream
+{
+  // Parent to Child: The child will receive a IPCBlobInputStream. Nothing
+  // can be done with it except retrieving the size.
+  PIPCBlobInputStream;
+
+  // Child to Parent: Normal serialization.
+  IPCStream;
+};
+
+struct IPCBlob
+{
+  nsString type;
+  uint64_t size;
+
+  IPCBlobStream inputStream;
+
+  IPCFileUnion file;
+};
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/file/ipc/IPCBlobInputStream.cpp b/dom/file/ipc/IPCBlobInputStream.cpp
new file mode 100644
index 000000000000..3fac06e19435
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStream.cpp
@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "IPCBlobInputStream.h"
+#include "IPCBlobInputStreamChild.h"
+#include "nsIAsyncInputStream.h"
+#include "mozilla/SystemGroup.h"
+
+namespace mozilla {
+namespace dom {
+
+namespace {
+
+class CallbackRunnable final : public CancelableRunnable
+{
+public:
+  static void
+  Execute(nsIInputStreamCallback* aCallback,
+          nsIEventTarget* aEventTarget,
+          IPCBlobInputStream* aStream)
+  {
+    RefPtr<CallbackRunnable> runnable =
+      new CallbackRunnable(aCallback, aStream);
+
+    nsCOMPtr<nsIEventTarget> target = aEventTarget;
+    if (!target) {
+      target = SystemGroup::EventTargetFor(TaskCategory::Other);
+    }
+
+    target->Dispatch(runnable, NS_DISPATCH_NORMAL);
+  }
+
+  NS_IMETHOD
+  Run() override
+  {
+    mCallback->OnInputStreamReady(mStream);
+    mCallback = nullptr;
+    mStream = nullptr;
+    return NS_OK;
+  }
+
+private:
+  CallbackRunnable(nsIInputStreamCallback* aCallback,
+                   IPCBlobInputStream* aStream)
+    : mCallback(aCallback)
+    , mStream(aStream)
+  {
+    MOZ_ASSERT(mCallback);
+    MOZ_ASSERT(mStream);
+  }
+
+  nsCOMPtr<nsIInputStreamCallback> mCallback;
+  RefPtr<IPCBlobInputStream> mStream;
+};
+
+} // anonymous
+
+NS_IMPL_ADDREF(IPCBlobInputStream);
+NS_IMPL_RELEASE(IPCBlobInputStream);
+
+NS_INTERFACE_MAP_BEGIN(IPCBlobInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIAsyncInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIInputStreamCallback)
+  NS_INTERFACE_MAP_ENTRY(nsICloneableInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIIPCSerializableInputStream)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIInputStream)
+NS_INTERFACE_MAP_END
+
+IPCBlobInputStream::IPCBlobInputStream(IPCBlobInputStreamChild* aActor)
+  : mActor(aActor)
+  , mState(eInit)
+{
+  MOZ_ASSERT(aActor);
+}
+
+IPCBlobInputStream::~IPCBlobInputStream()
+{
+  Close();
+}
+
+// nsIInputStream interface
+
+NS_IMETHODIMP
+IPCBlobInputStream::Available(uint64_t* aLength)
+{
+  // We don't have a remoteStream yet. Let's return the full known size.
+  if (mState == eInit || mState == ePending) {
+    *aLength = mActor->Size();
+    return NS_OK;
+  }
+
+  if (mState == eRunning) {
+    MOZ_ASSERT(mRemoteStream);
+    return mRemoteStream->Available(aLength);
+  }
+
+  MOZ_ASSERT(mState == eClosed);
+  return NS_BASE_STREAM_CLOSED;
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::Read(char* aBuffer, uint32_t aCount, uint32_t* aReadCount)
+{
+  // Read is not available is we don't have a remoteStream.
+  if (mState == eInit || mState == ePending) {
+    return NS_BASE_STREAM_WOULD_BLOCK;
+  }
+
+  if (mState == eRunning) {
+    return mRemoteStream->Read(aBuffer, aCount, aReadCount);
+  }
+
+  MOZ_ASSERT(mState == eClosed);
+  return NS_BASE_STREAM_CLOSED;
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
+                                 uint32_t aCount, uint32_t *aResult)
+{
+  // ReadSegments is not available is we don't have a remoteStream.
+  if (mState == eInit || mState == ePending) {
+    return NS_BASE_STREAM_WOULD_BLOCK;
+  }
+
+  if (mState == eRunning) {
+    return mRemoteStream->ReadSegments(aWriter, aClosure, aCount, aResult);
+  }
+
+  MOZ_ASSERT(mState == eClosed);
+  return NS_BASE_STREAM_CLOSED;
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::IsNonBlocking(bool* aNonBlocking)
+{
+  *aNonBlocking = true;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::Close()
+{
+  if (mActor) {
+    mActor->ForgetStream(this);
+    mActor = nullptr;
+  }
+
+  if (mRemoteStream) {
+    mRemoteStream->Close();
+    mRemoteStream = nullptr;
+  }
+
+  mCallback = nullptr;
+
+  mState = eClosed;
+  return NS_OK;
+}
+
+// nsICloneableInputStream interface
+
+NS_IMETHODIMP
+IPCBlobInputStream::GetCloneable(bool* aCloneable)
+{
+  *aCloneable = mState != eClosed;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::Clone(nsIInputStream** aResult)
+{
+  if (mState == eClosed) {
+    return NS_BASE_STREAM_CLOSED;
+  }
+
+  MOZ_ASSERT(mActor);
+
+  nsCOMPtr<nsIInputStream> stream = mActor->CreateStream();
+  stream.forget(aResult);
+  return NS_OK;
+}
+
+// nsIAsyncInputStream interface
+
+NS_IMETHODIMP
+IPCBlobInputStream::CloseWithStatus(nsresult aStatus)
+{
+  return Close();
+}
+
+NS_IMETHODIMP
+IPCBlobInputStream::AsyncWait(nsIInputStreamCallback* aCallback,
+                              uint32_t aFlags, uint32_t aRequestedCount,
+                              nsIEventTarget* aEventTarget)
+{
+  // See IPCBlobInputStream.h for more information about this state machine.
+
+  switch (mState) {
+  // First call, we need to retrieve the stream from the parent actor.
+  case eInit:
+    MOZ_ASSERT(mActor);
+
+    mCallback = aCallback;
+    mCallbackEventTarget = aEventTarget;
+    mState = ePending;
+
+    mActor->StreamNeeded(this);
+    return NS_OK;
+
+  // We are still waiting for the remote inputStream
+  case ePending:
+    if (mCallback && aCallback) {
+      return NS_ERROR_FAILURE;
+    }
+
+    mCallback = aCallback;
+    mCallbackEventTarget = aEventTarget;
+    return NS_OK;
+
+  // We have the remote inputStream, let's check if we can execute the callback.
+  case eRunning:
+    return MaybeExecuteCallback(aCallback, aEventTarget);
+
+  // Stream is closed.
+  default:
+    MOZ_ASSERT(mState == eClosed);
+    return NS_BASE_STREAM_CLOSED;
+  }
+}
+
+void
+IPCBlobInputStream::StreamReady(nsIInputStream* aInputStream)
+{
+  // We have been closed in the meantime.
+  if (mState == eClosed) {
+    if (aInputStream) {
+      aInputStream->Close();
+    }
+    return;
+  }
+
+  // If aInputStream is null, it means that the serialization went wrong or the
+  // stream is not available anymore. We keep the state as pending just to block
+  // any additional operation.
+
+  nsCOMPtr<nsIInputStreamCallback> callback;
+  callback.swap(mCallback);
+
+  nsCOMPtr<nsIEventTarget> callbackEventTarget;
+  callbackEventTarget.swap(mCallbackEventTarget);
+
+  if (aInputStream && callback) {
+    MOZ_ASSERT(mState == ePending);
+
+    mRemoteStream = aInputStream;
+    mState = eRunning;
+
+    MaybeExecuteCallback(callback, callbackEventTarget);
+  }
+}
+
+nsresult
+IPCBlobInputStream::MaybeExecuteCallback(nsIInputStreamCallback* aCallback,
+                                         nsIEventTarget* aCallbackEventTarget)
+{
+  MOZ_ASSERT(mState == eRunning);
+  MOZ_ASSERT(mRemoteStream);
+
+  // If the stream supports nsIAsyncInputStream, we need to call its AsyncWait
+  // and wait for OnInputStreamReady.
+  nsCOMPtr<nsIAsyncInputStream> asyncStream = do_QueryInterface(mRemoteStream);
+  if (asyncStream) {
+    // If the callback has been already set, we return an error.
+    if (mCallback && aCallback) {
+      return NS_ERROR_FAILURE;
+    }
+
+    mCallback = aCallback;
+    mCallbackEventTarget = aCallbackEventTarget;
+
+    if (!mCallback) {
+      return NS_OK;
+    }
+
+    nsCOMPtr<nsIEventTarget> target = NS_GetCurrentThread();
+    return asyncStream->AsyncWait(this, 0, 0, target);
+  }
+
+  MOZ_ASSERT(!mCallback);
+  MOZ_ASSERT(!mCallbackEventTarget);
+
+  if (!aCallback) {
+    return NS_OK;
+  }
+
+  CallbackRunnable::Execute(aCallback, aCallbackEventTarget, this);
+  return NS_OK;
+}
+
+// nsIInputStreamCallback
+
+NS_IMETHODIMP
+IPCBlobInputStream::OnInputStreamReady(nsIAsyncInputStream* aStream)
+{
+  // We have been closed in the meantime.
+  if (mState == eClosed) {
+    return NS_OK;
+  }
+
+  MOZ_ASSERT(mState == eRunning);
+  MOZ_ASSERT(mRemoteStream == aStream);
+
+  // The callback has been canceled in the meantime.
+  if (!mCallback) {
+    return NS_OK;
+  }
+
+  CallbackRunnable::Execute(mCallback, mCallbackEventTarget, this);
+
+  mCallback = nullptr;
+  mCallbackEventTarget = nullptr;
+
+  return NS_OK;
+}
+
+// nsIIPCSerializableInputStream
+
+void
+IPCBlobInputStream::Serialize(mozilla::ipc::InputStreamParams& aParams,
+                              FileDescriptorArray& aFileDescriptors)
+{
+  IPCBlobInputStreamParams params;
+  params.id() = mActor->ID();
+
+  aParams = params;
+}
+
+bool
+IPCBlobInputStream::Deserialize(const mozilla::ipc::InputStreamParams& aParams,
+                                const FileDescriptorArray& aFileDescriptors)
+{
+  MOZ_CRASH("This should never be called.");
+  return false;
+}
+
+mozilla::Maybe<uint64_t>
+IPCBlobInputStream::ExpectedSerializedLength()
+{
+  return mozilla::Nothing();
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/file/ipc/IPCBlobInputStream.h b/dom/file/ipc/IPCBlobInputStream.h
new file mode 100644
index 000000000000..e63be5d04408
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStream.h
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_ipc_IPCBlobInputStream_h
+#define mozilla_dom_ipc_IPCBlobInputStream_h
+
+#include "nsIAsyncInputStream.h"
+#include "nsICloneableInputStream.h"
+#include "nsIIPCSerializableInputStream.h"
+
+namespace mozilla {
+namespace dom {
+
+class IPCBlobInputStreamChild;
+
+class IPCBlobInputStream final : public nsIAsyncInputStream
+                               , public nsIInputStreamCallback
+                               , public nsICloneableInputStream
+                               , public nsIIPCSerializableInputStream
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIINPUTSTREAM
+  NS_DECL_NSIASYNCINPUTSTREAM
+  NS_DECL_NSIINPUTSTREAMCALLBACK
+  NS_DECL_NSICLONEABLEINPUTSTREAM
+  NS_DECL_NSIIPCSERIALIZABLEINPUTSTREAM
+
+  explicit IPCBlobInputStream(IPCBlobInputStreamChild* aActor);
+
+  void
+  StreamReady(nsIInputStream* aInputStream);
+
+private:
+  ~IPCBlobInputStream();
+
+  nsresult
+  MaybeExecuteCallback(nsIInputStreamCallback* aCallback,
+                       nsIEventTarget* aEventTarget);
+
+  RefPtr<IPCBlobInputStreamChild> mActor;
+
+  // This is the list of possible states.
+  enum {
+    // The initial state. Only ::Available() can be used without receiving an
+    // error. The available size is known by the actor.
+    eInit,
+
+    // AsyncWait() has been called for the first time. SendStreamNeeded() has
+    // been called and we are waiting for the 'real' inputStream.
+    ePending,
+
+    // When the child receives the stream from the parent, we move to this
+    // state. The received stream is stored in mRemoteStream. From now on, any
+    // method call will be forwared to mRemoteStream.
+    eRunning,
+
+    // If Close() or CloseWithStatus() is called, we move to this state.
+    // mRemoveStream is released and any method will return
+    // NS_BASE_STREAM_CLOSED.
+    eClosed,
+  } mState;
+
+  nsCOMPtr<nsIInputStream> mRemoteStream;
+
+  // These 2 values are set only if mState is ePending.
+  nsCOMPtr<nsIInputStreamCallback> mCallback;
+  nsCOMPtr<nsIEventTarget> mCallbackEventTarget;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ipc_IPCBlobInputStream_h
diff --git a/dom/file/ipc/IPCBlobInputStreamChild.cpp b/dom/file/ipc/IPCBlobInputStreamChild.cpp
new file mode 100644
index 000000000000..f3ecac28e8d1
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamChild.cpp
@@ -0,0 +1,183 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "IPCBlobInputStreamChild.h"
+
+namespace mozilla {
+namespace dom {
+
+namespace {
+
+// This runnable is used in case the last stream is forgotten on the 'wrong'
+// thread.
+class DeleteRunnable final : public Runnable
+{
+public:
+  explicit DeleteRunnable(IPCBlobInputStreamChild* aActor)
+    : mActor(aActor)
+  {}
+
+  NS_IMETHOD
+  Run() override
+  {
+    if (mActor->IsAlive()) {
+      mActor->Send__delete__(mActor);
+    }
+    return NS_OK;
+  }
+
+private:
+  RefPtr<IPCBlobInputStreamChild> mActor;
+};
+
+// This runnable is used in case StreamNeeded() has been called on a non-owning
+// thread.
+class StreamNeededRunnable final : public Runnable
+{
+public:
+  explicit StreamNeededRunnable(IPCBlobInputStreamChild* aActor)
+    : mActor(aActor)
+  {}
+
+  NS_IMETHOD
+  Run() override
+  {
+    if (mActor->IsAlive()) {
+      mActor->SendStreamNeeded();
+    }
+    return NS_OK;
+  }
+
+private:
+  RefPtr<IPCBlobInputStreamChild> mActor;
+};
+
+// When the stream has been received from the parent, we inform the
+// IPCBlobInputStream.
+class StreamReadyRunnable final : public CancelableRunnable
+{
+public:
+  StreamReadyRunnable(IPCBlobInputStream* aDestinationStream,
+                      nsIInputStream* aCreatedStream)
+    : mDestinationStream(aDestinationStream)
+    , mCreatedStream(aCreatedStream)
+  {
+    MOZ_ASSERT(mDestinationStream);
+    // mCreatedStream can be null.
+  }
+
+  NS_IMETHOD
+  Run() override
+  {
+    mDestinationStream->StreamReady(mCreatedStream);
+    return NS_OK;
+  }
+
+private:
+  RefPtr<IPCBlobInputStream> mDestinationStream;
+  nsCOMPtr<nsIInputStream> mCreatedStream;
+};
+
+} // anonymous
+
+IPCBlobInputStreamChild::IPCBlobInputStreamChild(const nsID& aID,
+                                                 uint64_t aSize)
+  : mMutex("IPCBlobInputStreamChild::mMutex")
+  , mID(aID)
+  , mSize(aSize)
+  , mActorAlive(true)
+  , mOwningThread(NS_GetCurrentThread())
+{}
+
+IPCBlobInputStreamChild::~IPCBlobInputStreamChild()
+{}
+
+void
+IPCBlobInputStreamChild::ActorDestroy(IProtocol::ActorDestroyReason aReason)
+{
+  MutexAutoLock lock(mMutex);
+  mActorAlive = false;
+}
+
+bool
+IPCBlobInputStreamChild::IsAlive()
+{
+  MutexAutoLock lock(mMutex);
+  return mActorAlive;
+}
+
+already_AddRefed<nsIInputStream>
+IPCBlobInputStreamChild::CreateStream()
+{
+  MutexAutoLock lock(mMutex);
+
+  RefPtr<IPCBlobInputStream> stream = new IPCBlobInputStream(this);
+  mStreams.AppendElement(stream);
+  return stream.forget();
+}
+
+void
+IPCBlobInputStreamChild::ForgetStream(IPCBlobInputStream* aStream)
+{
+  MOZ_ASSERT(aStream);
+
+  RefPtr<IPCBlobInputStreamChild> kungFoDeathGrip = this;
+
+  {
+    MutexAutoLock lock(mMutex);
+    mStreams.RemoveElement(aStream);
+
+    if (!mStreams.IsEmpty() || !mActorAlive) {
+      return;
+    }
+  }
+
+  if (mOwningThread == NS_GetCurrentThread()) {
+    Send__delete__(this);
+    return;
+  }
+
+  RefPtr<DeleteRunnable> runnable = new DeleteRunnable(this);
+  mOwningThread->Dispatch(runnable, NS_DISPATCH_NORMAL);
+}
+
+void
+IPCBlobInputStreamChild::StreamNeeded(IPCBlobInputStream* aStream)
+{
+  MutexAutoLock lock(mMutex);
+  MOZ_ASSERT(mStreams.Contains(aStream));
+
+  PendingOperation* opt = mPendingOperations.AppendElement();
+  opt->mStream = aStream;
+  opt->mThread = NS_GetCurrentThread();
+
+  if (mOwningThread == NS_GetCurrentThread()) {
+    SendStreamNeeded();
+    return;
+  }
+
+  RefPtr<StreamNeededRunnable> runnable = new StreamNeededRunnable(this);
+  mOwningThread->Dispatch(runnable, NS_DISPATCH_NORMAL);
+}
+
+mozilla::ipc::IPCResult
+IPCBlobInputStreamChild::RecvStreamReady(const OptionalIPCStream& aStream)
+{
+  MOZ_ASSERT(!mPendingOperations.IsEmpty());
+
+  nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
+
+  RefPtr<StreamReadyRunnable> runnable =
+    new StreamReadyRunnable(mPendingOperations[0].mStream, stream);
+  mPendingOperations[0].mThread->Dispatch(runnable, NS_DISPATCH_NORMAL);
+
+  mPendingOperations.RemoveElementAt(0);
+
+  return IPC_OK();
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/file/ipc/IPCBlobInputStreamChild.h b/dom/file/ipc/IPCBlobInputStreamChild.h
new file mode 100644
index 000000000000..7616c8c9844c
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamChild.h
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_ipc_IPCBlobInputStreamChild_h
+#define mozilla_dom_ipc_IPCBlobInputStreamChild_h
+
+#include "mozilla/ipc/PIPCBlobInputStreamChild.h"
+#include "mozilla/Mutex.h"
+#include "nsIThread.h"
+#include "nsTArray.h"
+
+namespace mozilla {
+namespace dom {
+
+class IPCBlobInputStream;
+
+class IPCBlobInputStreamChild final
+  : public mozilla::ipc::PIPCBlobInputStreamChild
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(IPCBlobInputStreamChild)
+
+  IPCBlobInputStreamChild(const nsID& aID, uint64_t aSize);
+
+  void
+  ActorDestroy(IProtocol::ActorDestroyReason aReason) override;
+
+  bool
+  IsAlive();
+
+  already_AddRefed<nsIInputStream>
+  CreateStream();
+
+  void
+  ForgetStream(IPCBlobInputStream* aStream);
+
+  const nsID&
+  ID() const
+  {
+    return mID;
+  }
+
+  uint64_t
+  Size() const
+  {
+    return mSize;
+  }
+
+  void
+  StreamNeeded(IPCBlobInputStream* aStream);
+
+  mozilla::ipc::IPCResult
+  RecvStreamReady(const OptionalIPCStream& aStream) override;
+
+private:
+  ~IPCBlobInputStreamChild();
+
+  // Raw pointers because these streams keep this actor alive. When the last
+  // stream is unregister, the actor will be deleted. This list is protected by
+  // mutex.
+  nsTArray<IPCBlobInputStream*> mStreams;
+
+  // This mutex protects mStreams because that can be touched in any thread.
+  Mutex mMutex;
+
+  const nsID mID;
+  const uint64_t mSize;
+
+  // false when ActorDestroy() is called.
+  bool mActorAlive;
+
+  // This struct and the array are used for creating streams when needed.
+  struct PendingOperation
+  {
+    RefPtr<IPCBlobInputStream> mStream;
+    nsCOMPtr<nsIThread> mThread;
+  };
+  nsTArray<PendingOperation> mPendingOperations;
+
+  nsCOMPtr<nsIThread> mOwningThread;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ipc_IPCBlobInputStreamChild_h
diff --git a/dom/file/ipc/IPCBlobInputStreamParent.cpp b/dom/file/ipc/IPCBlobInputStreamParent.cpp
new file mode 100644
index 000000000000..5415d0259b1e
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamParent.cpp
@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "IPCBlobInputStreamParent.h"
+#include "IPCBlobInputStreamStorage.h"
+#include "nsContentUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+template<typename M>
+/* static */ IPCBlobInputStreamParent*
+IPCBlobInputStreamParent::Create(nsIInputStream* aInputStream, uint64_t aSize,
+                                 nsresult* aRv, M* aManager)
+{
+  MOZ_ASSERT(aInputStream);
+  MOZ_ASSERT(aRv);
+
+  nsID id;
+  *aRv = nsContentUtils::GenerateUUIDInPlace(id);
+  if (NS_WARN_IF(NS_FAILED(*aRv))) {
+    return nullptr;
+  }
+
+  IPCBlobInputStreamStorage::Get()->AddStream(aInputStream, id);
+
+  return new IPCBlobInputStreamParent(id, aSize, aManager);
+}
+
+IPCBlobInputStreamParent::IPCBlobInputStreamParent(const nsID& aID,
+                                                   uint64_t aSize,
+                                                   nsIContentParent* aManager)
+  : mID(aID)
+  , mSize(aSize)
+  , mContentManager(aManager)
+  , mPBackgroundManager(nullptr)
+{}
+
+IPCBlobInputStreamParent::IPCBlobInputStreamParent(const nsID& aID,
+                                                   uint64_t aSize,
+                                                   PBackgroundParent* aManager)
+  : mID(aID)
+  , mSize(aSize)
+  , mContentManager(nullptr)
+  , mPBackgroundManager(aManager)
+{}
+
+void
+IPCBlobInputStreamParent::ActorDestroy(IProtocol::ActorDestroyReason aReason)
+{
+  MOZ_ASSERT(mContentManager || mPBackgroundManager);
+
+  mContentManager = nullptr;
+  mPBackgroundManager = nullptr;
+
+  IPCBlobInputStreamStorage::Get()->ForgetStream(mID);
+}
+
+mozilla::ipc::IPCResult
+IPCBlobInputStreamParent::RecvStreamNeeded()
+{
+  MOZ_ASSERT(mContentManager || mPBackgroundManager);
+
+  nsCOMPtr<nsIInputStream> stream;
+  IPCBlobInputStreamStorage::Get()->GetStream(mID, getter_AddRefs(stream));
+  if (!stream) {
+    if (!SendStreamReady(void_t())) {
+      return IPC_FAIL(this, "SendStreamReady failed");
+    }
+
+    return IPC_OK();
+  }
+
+  AutoIPCStream ipcStream;
+  bool ok = false;
+
+  if (mContentManager) {
+    MOZ_ASSERT(NS_IsMainThread());
+    ok = ipcStream.Serialize(stream, mContentManager);
+  } else {
+    MOZ_ASSERT(mPBackgroundManager);
+    ok = ipcStream.Serialize(stream, mPBackgroundManager);
+  }
+
+  if (NS_WARN_IF(!ok)) {
+    return IPC_FAIL(this, "SendStreamReady failed");
+  }
+
+  if (!SendStreamReady(ipcStream.TakeValue())) {
+    return IPC_FAIL(this, "SendStreamReady failed");
+  }
+
+  return IPC_OK();
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/file/ipc/IPCBlobInputStreamParent.h b/dom/file/ipc/IPCBlobInputStreamParent.h
new file mode 100644
index 000000000000..f1cd9dbc75a6
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamParent.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_ipc_IPCBlobInputStreamParent_h
+#define mozilla_dom_ipc_IPCBlobInputStreamParent_h
+
+#include "mozilla/ipc/PIPCBlobInputStreamParent.h"
+
+class nsIInputStream;
+
+namespace mozilla {
+namespace dom {
+
+class IPCBlobInputStreamParent final
+  : public mozilla::ipc::PIPCBlobInputStreamParent
+{
+public:
+  // The size of the inputStream must be passed as argument in order to avoid
+  // the use of nsIInputStream::Available() which could open a fileDescriptor in
+  // case the stream is a nsFileStream.
+  template<typename M>
+  static IPCBlobInputStreamParent*
+  Create(nsIInputStream* aInputStream, uint64_t aSize, nsresult* aRv,
+         M* aManager);
+
+  void
+  ActorDestroy(IProtocol::ActorDestroyReason aReason) override;
+
+  const nsID&
+  ID() const
+  {
+    return mID;
+  }
+
+  uint64_t
+  Size() const
+  {
+    return mSize;
+  }
+
+  mozilla::ipc::IPCResult
+  RecvStreamNeeded() override;
+
+private:
+  IPCBlobInputStreamParent(const nsID& aID, uint64_t aSize,
+                           nsIContentParent* aManager);
+
+  IPCBlobInputStreamParent(const nsID& aID, uint64_t aSize,
+                           mozilla::ipc::PBackgroundParent* aManager);
+
+  const nsID mID;
+  const uint64_t mSize;
+
+  // Only 1 of these 2 is set. Raw pointer because these 2 managers are keeping
+  // the parent actor alive. The pointers will be nullified in ActorDestroyed.
+  nsIContentParent* mContentManager;
+  mozilla::ipc::PBackgroundParent* mPBackgroundManager;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ipc_IPCBlobInputStreamParent_h
diff --git a/dom/file/ipc/IPCBlobInputStreamStorage.cpp b/dom/file/ipc/IPCBlobInputStreamStorage.cpp
new file mode 100644
index 000000000000..07f058e6df18
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamStorage.cpp
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "IPCBlobInputStreamStorage.h"
+
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPtr.h"
+#include "nsStreamUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+namespace {
+StaticMutex gMutex;
+StaticRefPtr<IPCBlobInputStreamStorage> gStorage;
+}
+
+IPCBlobInputStreamStorage::~IPCBlobInputStreamStorage()
+{}
+
+/* static */ IPCBlobInputStreamStorage*
+IPCBlobInputStreamStorage::Get()
+{
+  return gStorage;
+}
+
+/* static */ void
+IPCBlobInputStreamStorage::Initialize()
+{
+  MOZ_ASSERT(!gStorage);
+
+  gStorage = new IPCBlobInputStreamStorage();
+  ClearOnShutdown(&gStorage);
+}
+
+void
+IPCBlobInputStreamStorage::AddStream(nsIInputStream* aInputStream,
+                                     const nsID& aID)
+{
+  MOZ_ASSERT(aInputStream);
+
+  mozilla::StaticMutexAutoLock lock(gMutex);
+  mStorage.Put(aID, aInputStream);
+}
+
+void
+IPCBlobInputStreamStorage::ForgetStream(const nsID& aID)
+{
+  mozilla::StaticMutexAutoLock lock(gMutex);
+  mStorage.Remove(aID);
+}
+
+void
+IPCBlobInputStreamStorage::GetStream(const nsID& aID,
+                                     nsIInputStream** aInputStream)
+{
+  mozilla::StaticMutexAutoLock lock(gMutex);
+  nsCOMPtr<nsIInputStream> stream = mStorage.Get(aID);
+  if (!stream) {
+    *aInputStream = nullptr;
+    return;
+  }
+
+  // We cannot return always the same inputStream because not all of them are
+  // able to be reused. Better to clone them.
+
+  nsCOMPtr<nsIInputStream> clonedStream;
+  nsCOMPtr<nsIInputStream> replacementStream;
+
+  nsresult rv =
+    NS_CloneInputStream(stream, getter_AddRefs(clonedStream),
+                        getter_AddRefs(replacementStream));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  if (replacementStream) {
+    mStorage.Put(aID, replacementStream);
+  }
+
+  clonedStream.forget(aInputStream);
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/file/ipc/IPCBlobInputStreamStorage.h b/dom/file/ipc/IPCBlobInputStreamStorage.h
new file mode 100644
index 000000000000..41a7ae1a56a6
--- /dev/null
+++ b/dom/file/ipc/IPCBlobInputStreamStorage.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_ipc_IPCBlobInputStreamStorage_h
+#define mozilla_dom_ipc_IPCBlobInputStreamStorage_h
+
+#include "mozilla/RefPtr.h"
+#include "nsInterfaceHashtable.h"
+#include "nsISupportsImpl.h"
+
+class nsIInputStream;
+struct nsID;
+
+namespace mozilla {
+namespace dom {
+
+class IPCBlobInputStreamStorage final
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(IPCBlobInputStreamStorage);
+
+  // This initializes the singleton and it must be called on the main-thread.
+  static void
+  Initialize();
+
+  static IPCBlobInputStreamStorage*
+  Get();
+
+  void
+  AddStream(nsIInputStream* aInputStream, const nsID& aID);
+
+  void
+  ForgetStream(const nsID& aID);
+
+  void
+  GetStream(const nsID& aID, nsIInputStream** aInputStream);
+
+private:
+  ~IPCBlobInputStreamStorage();
+
+  nsInterfaceHashtable<nsIDHashKey, nsIInputStream> mStorage;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ipc_IPCBlobInputStreamStorage_h
diff --git a/dom/file/ipc/IPCBlobUtils.cpp b/dom/file/ipc/IPCBlobUtils.cpp
new file mode 100644
index 000000000000..8b64affe6d89
--- /dev/null
+++ b/dom/file/ipc/IPCBlobUtils.cpp
@@ -0,0 +1,211 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "IPCBlobUtils.h"
+#include "IPCBlobInputStream.h"
+#include "IPCBlobInputStreamChild.h"
+#include "IPCBlobInputStreamParent.h"
+#include "IPCBlobInputStreamStorage.h"
+#include "mozilla/dom/IPCBlob.h"
+#include "prtime.h"
+
+namespace mozilla {
+namespace dom {
+namespace IPCBlobUtils {
+
+already_AddRefed<BlobImpl>
+Deserialize(const IPCBlob& aIPCBlob)
+{
+  nsCOMPtr<nsIInputStream> inputStream;
+
+  const IPCBlobStream& stream = aIPCBlob.inputStream();
+  switch (stream.type()) {
+
+  // Parent to child: when an nsIInputStream is sent from parent to child, the
+  // child receives a IPCBlobInputStream actor.
+  case IPCBlobStream::TPIPCBlobInputStreamChild: {
+    IPCBlobInputStreamChild* actor =
+      static_cast<IPCBlobInputStreamChild*>(stream.get_PIPCBlobInputStreamChild());
+    inputStream = actor->CreateStream();
+    break;
+  }
+
+  // Child to Parent: when a blob is created on the content process send it's
+  // sent to the parent, we have an IPCStream object.
+  case IPCBlobStream::TIPCStream:
+    MOZ_ASSERT(XRE_IsParentProcess());
+    inputStream = DeserializeIPCStream(stream.get_IPCStream());
+    break;
+
+  default:
+    MOZ_CRASH("Unknown type.");
+    break;
+  }
+
+  MOZ_ASSERT(inputStream);
+
+  RefPtr<BlobImpl> blobImpl;
+
+  if (aIPCBlob.file().type() == IPCFileUnion::Tvoid_t) {
+    blobImpl = StreamBlobImpl::Create(inputStream,
+                                      aIPCBlob.type(),
+                                      aIPCBlob.size());
+  } else {
+    const IPCFile& file = aIPCBlob.file().get_IPCFile();
+    blobImpl = StreamBlobImpl::Create(inputStream,
+                                      file.name(),
+                                      aIPCBlob.type(),
+                                      file.lastModified(),
+                                      aIPCBlob.size());
+    blobImpl->SetDOMPath(file.DOMPath());
+  }
+
+  return blobImpl.forget();
+}
+
+template<typename M>
+nsresult
+SerializeInputStreamParent(nsIInputStream* aInputStream, uint64_t aSize,
+                           IPCBlob& aIPCBlob, M* aManager)
+{
+  // Parent to Child we always send a IPCBlobInputStream.
+  MOZ_ASSERT(XRE_IsParentProcess());
+
+  nsresult rv;
+  IPCBlobInputStreamParent* parentActor =
+    IPCBlobInputStreamParent::Create(aInputStream, aSize, &rv, aManager);
+  if (!parentActor) {
+    return rv;
+  }
+
+  if (!aManager->SendPIPCBlobInputStreamConstructor(parentActor,
+                                                    parentActor->ID(),
+                                                    parentActor->Size())) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aIPCBlob.inputStream() = parentActor;
+  return NS_OK;
+}
+
+template<typename M>
+nsresult
+SerializeInputStreamChild(nsIInputStream* aInputStream, IPCBlob& aIPCBlob,
+                          M* aManager)
+{
+  AutoIPCStream ipcStream(true /* delayed start */);
+  if (!ipcStream.Serialize(aInputStream, aManager)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aIPCBlob.inputStream() = ipcStream.TakeValue();
+  return NS_OK;
+}
+
+nsresult
+SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,
+                     IPCBlob& aIPCBlob, nsIContentParent* aManager)
+{
+  return SerializeInputStreamParent(aInputStream, aSize, aIPCBlob, aManager);
+}
+
+nsresult
+SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,
+                     IPCBlob& aIPCBlob, PBackgroundParent* aManager)
+{
+  return SerializeInputStreamParent(aInputStream, aSize, aIPCBlob, aManager);
+}
+
+nsresult
+SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,
+                     IPCBlob& aIPCBlob, nsIContentChild* aManager)
+{
+  return SerializeInputStreamChild(aInputStream, aIPCBlob, aManager);
+}
+
+nsresult
+SerializeInputStream(nsIInputStream* aInputStream, uint64_t aSize,
+                     IPCBlob& aIPCBlob, PBackgroundChild* aManager)
+{
+  return SerializeInputStreamChild(aInputStream, aIPCBlob, aManager);
+}
+
+template<typename M>
+nsresult
+SerializeInternal(BlobImpl* aBlobImpl, M* aManager, IPCBlob& aIPCBlob)
+{
+  MOZ_ASSERT(aBlobImpl);
+
+  nsAutoString value;
+  aBlobImpl->GetType(value);
+  aIPCBlob.type() = value;
+
+  ErrorResult rv;
+  aIPCBlob.size() = aBlobImpl->GetSize(rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
+  if (!aBlobImpl->IsFile()) {
+    aIPCBlob.file() = void_t();
+  } else {
+    IPCFile file;
+
+    aBlobImpl->GetName(value);
+    file.name() = value;
+
+    file.lastModified() = aBlobImpl->GetLastModified(rv) * PR_USEC_PER_MSEC;
+    if (NS_WARN_IF(rv.Failed())) {
+      return rv.StealNSResult();
+    }
+
+    aBlobImpl->GetDOMPath(value);
+    file.DOMPath() = value;
+
+    aIPCBlob.file() = file;
+  }
+
+  nsCOMPtr<nsIInputStream> inputStream;
+  aBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
+  rv = SerializeInputStream(inputStream, aIPCBlob.size(), aIPCBlob, aManager);
+  if (NS_WARN_IF(rv.Failed())) {
+    return rv.StealNSResult();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, nsIContentChild* aManager, IPCBlob& aIPCBlob)
+{
+  return SerializeInternal(aBlobImpl, aManager, aIPCBlob);
+}
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, PBackgroundChild* aManager, IPCBlob& aIPCBlob)
+{
+  return SerializeInternal(aBlobImpl, aManager, aIPCBlob);
+}
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, nsIContentParent* aManager, IPCBlob& aIPCBlob)
+{
+  return SerializeInternal(aBlobImpl, aManager, aIPCBlob);
+}
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, PBackgroundParent* aManager, IPCBlob& aIPCBlob)
+{
+  return SerializeInternal(aBlobImpl, aManager, aIPCBlob);
+}
+
+} // IPCBlobUtils namespace
+} // dom namespace
+} // mozilla namespace
diff --git a/dom/file/ipc/IPCBlobUtils.h b/dom/file/ipc/IPCBlobUtils.h
new file mode 100644
index 000000000000..e4b13ecfd782
--- /dev/null
+++ b/dom/file/ipc/IPCBlobUtils.h
@@ -0,0 +1,169 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_IPCBlobUtils_h
+#define mozilla_dom_IPCBlobUtils_h
+
+#include "mozilla/dom/File.h"
+
+/*
+ * Blobs and IPC
+ * ~~~~~~~~~~~~~
+ * 
+ * Simplifying, DOM Blob objects are chunks of data with a content type and a
+ * size. DOM Files are Blobs with a name. They are are used in many APIs and
+ * they can be cloned and sent cross threads and cross processes.
+ * 
+ * If we see Blobs from a platform point of view, the main (and often, the only)
+ * interesting part is how to retrieve data from it. This is done via
+ * nsIInputStream and, except for a couple of important details, this stream is
+ * used in the parent process.
+ * 
+ * For this reason, when we consider the serialization of a blob via IPC
+ * messages, the biggest effort is put in how to manage the nsInputStream
+ * correctly. To serialize, we use the IPCBlob data struct: basically, the blob
+ * properties (size, type, name if it's a file) and the nsIInputStream.
+ * 
+ * Before talking about the nsIInputStream it's important to say that we have
+ * different kinds of Blobs, based on the different kinds of sources. A non
+ * exaustive list is:
+ * - a memory buffer: MemoryBlobImpl
+ * - a string: StringBlobImpl
+ * - a real OS file: FileBlobImpl
+ * - a temporary OS file: TemporaryBlobImpl
+ * - a generic nsIInputStream: StreamBlobImpl
+ * - an empty blob: EmptyBlobImpl
+ * - more blobs combined together: MultipartBlobImpl
+ * Each one of these implementations has a custom ::GetInternalStream method.
+ * So, basically, each one has a different kind of nsIInputStream (nsFileStream,
+ * nsIStringInputStream, SlicedInputStream, and so on).
+ * 
+ * Another important point to keep in mind is that a Blob can be created on the
+ * content process (for example: |new Blob([123])|) or it can be created on the
+ * parent process and sent to content (a FilePicker creates Blobs and it runs on
+ * the parent process).
+ * 
+ * Child to Parent Blob Serialization
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * 
+ * When a document creates a blob, this can be sent, for different reasons to
+ * the parent process. For instance it can be sent as part of a FormData, or it
+ * can be converted to a BlobURL and broadcasted to any other existing
+ * processes.
+ * 
+ * When this happens, we use the IPCStream data struct for the serialization
+ * of the nsIInputStream. This means that, if the stream is fully serializable
+ * and its size is lower than 1Mb, we are able to recreate the stream completely
+ * on the parent side. This happens, basically with any kind of child-to-parent
+ * stream except for huge memory streams. In this case we end up using
+ * PChildToParentStream. See more information in IPCStreamUtils.h.
+ *
+ * In order to populate IPCStream correctly, we use AutoIPCStream as documented
+ * in IPCStreamUtils.h. Note that we use the 'delayed start' feature because,
+ * often, the stream doesn't need to be read on the parent side.
+ * 
+ * Parent to Child Blob Serialization
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * 
+ * This scenario is common when we talk about Blobs pointing to real files:
+ * HTMLInputElement (type=file), or Entries API, DataTransfer and so on. But we
+ * also have this scenario when a content process creates a Blob and it
+ * broadcasts it because of a BlobURL or because BroadcastChannel API is used.
+ * 
+ * The approach here is this: normally, the content process doesn't really read
+ * data from the blob nsIInputStream. The content process needs to have the
+ * nsIInputStream and be able to send it back to the parent process when the
+ * "real" work needs to be done. This is true except for 2 usecases: FileReader
+ * API and BlobURL usage. So, if we ignore these 2, normally, the parent sends a
+ * blob nsIInputStream to a content process, and then, it will receive it back
+ * in order to do some networking, or whatever.
+ * 
+ * For this reason, IPCBlobUtils uses a particular protocol for serializing
+ * nsIInputStream parent to child: PIPCBlobInputStream. This protocol keeps the
+ * original nsIInputStream alive on the parent side, and gives its size and a
+ * UUID to the child side. The child side creates a IPCBlobInputStream and that
+ * is incapsulated into a StreamBlobImpl.
+ * 
+ * The UUID is useful when the content process sends the same nsIInputStream
+ * back to the parent process because, the only information it has to share is
+ * the UUID. Each nsIInputStream sent via PIPCBlobInputStream, is registered
+ * into the IPCBlobInputStreamStorage.
+ * 
+ * On the content process side, IPCBlobInputStream is a special inputStream:
+ * the only reliable methods are:
+ * - nsIInputStream.available() - the size is shared by PIPCBlobInputStream
+ *   actor.
+ * - nsIIPCSerializableInputStream.serialize() - we can give back this stream to
+ *   the parent because we know its UUID.
+ * - nsICloneableInputStream.cloneable() and nsICloneableInputStream.clone() -
+ *   this stream can be cloned. We just need to have a reference of the
+ *   PIPCBlobInputStream actor and its UUID.
+ * - nsIAsyncInputStream.asyncWait() - see next section.
+ * 
+ * Any other method (read, readSegment and so on) will fail if asyncWait() is
+ * not previously called (see the next section). Basically, this inputStream
+ * cannot be used synchronously for any 'real' reading operation.
+ * 
+ * When the parent receives the serialization of a IPCBlobInputStream, it is
+ * able to retrieve the correct nsIInputStream using the UUID and
+ * IPCBlobInputStreamStorage.
+ * 
+ * Parent to Child Streams, FileReader and BlobURL
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * 
+ * The FileReader and BlobURL scenarios are described here.
+ *
+ * When content process needs to read data from a Blob sent from the parent
+ * process, it must do it asynchronously using IPCBlobInputStream as a
+ * nsIAsyncInputStream stream. This happens calling
+ * IPCBlobInputStream.asyncWait(). At that point, the child actor will send a
+ * StreamNeeded() IPC message to the parent side. When this is received, the
+ * parent retrieves the 'real' stream from IPCBlobInputStreamStorage using the
+ * UUID, it will serialize the 'real' stream, and it will send it to the child
+ * side.
+ * 
+ * When the 'real' stream is received (RecvStreamReady()), the asyncWait
+ * callback will be executed and, from that moment, any IPCBlobInputStream
+ * method will be forwarded to the 'real' stream ones. This means that the
+ * reading will be available.
+ */ 
+
+namespace mozilla {
+
+namespace ipc {
+class PBackgroundChild;
+class PBackgroundParent;
+}
+
+namespace dom {
+
+class nsIContentChild;
+class nsIContentParent;
+
+namespace IPCBlobUtils {
+
+already_AddRefed<BlobImpl>
+Deserialize(const IPCBlob& aIPCBlob);
+
+// These 4 methods serialize aBlobImpl into aIPCBlob using the right manager.
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, nsIContentChild* aManager, IPCBlob& aIPCBlob);
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, PBackgroundChild* aManager, IPCBlob& aIPCBlob);
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, nsIContentParent* aManager, IPCBlob& aIPCBlob);
+
+nsresult
+Serialize(BlobImpl* aBlobImpl, PBackgroundParent* aManager, IPCBlob& aIPCBlob);
+
+} // IPCBlobUtils
+} // dom namespace
+} // mozilla namespace
+
+#endif // mozilla_dom_IPCBlobUtils_h
diff --git a/dom/file/ipc/PIPCBlobInputStream.ipdl b/dom/file/ipc/PIPCBlobInputStream.ipdl
new file mode 100644
index 000000000000..7fa48f2f6e81
--- /dev/null
+++ b/dom/file/ipc/PIPCBlobInputStream.ipdl
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include protocol PBackground;
+include protocol PChildToParentStream;
+include protocol PContent;
+include protocol PContentBridge;
+include protocol PFileDescriptorSet;
+include protocol PParentToChildStream;
+
+include IPCStream;
+
+namespace mozilla {
+namespace ipc {
+
+protocol PIPCBlobInputStream
+{
+  manager PBackground or PContent or PContentBridge;
+
+parent:
+  async StreamNeeded();
+
+  async __delete__();
+
+child:
+  async StreamReady(OptionalIPCStream aStream);
+};
+
+} // namespace dom
+} // namespace mozilla
+
diff --git a/dom/file/ipc/moz.build b/dom/file/ipc/moz.build
index 1857261726ec..cdccf1e177d9 100644
--- a/dom/file/ipc/moz.build
+++ b/dom/file/ipc/moz.build
@@ -7,20 +7,35 @@
 EXPORTS.mozilla.dom.ipc += [
     'BlobChild.h',
     'BlobParent.h',
+    'IPCBlobInputStream.h',
+    'IPCBlobInputStreamChild.h',
+    'IPCBlobInputStreamParent.h',
+    'IPCBlobInputStreamStorage.h',
     'MemoryStreamChild.h',
     'MemoryStreamParent.h',
     'nsIRemoteBlob.h',
 ]
 
+EXPORTS.mozilla.dom += [
+    'IPCBlobUtils.h',
+]
+
 UNIFIED_SOURCES += [
     'Blob.cpp',
+    'IPCBlobInputStream.cpp',
+    'IPCBlobInputStreamChild.cpp',
+    'IPCBlobInputStreamParent.cpp',
+    'IPCBlobInputStreamStorage.cpp',
+    'IPCBlobUtils.cpp',
     'MemoryStreamParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'BlobTypes.ipdlh',
+    'IPCBlob.ipdlh',
     'PBlob.ipdl',
     'PBlobStream.ipdl',
+    'PIPCBlobInputStream.ipdl',
     'PMemoryStream.ipdl',
 ]
 
@@ -38,3 +53,5 @@ CXXFLAGS += CONFIG['TK_CFLAGS']
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
diff --git a/dom/file/ipc/tests/browser.ini b/dom/file/ipc/tests/browser.ini
new file mode 100644
index 000000000000..6fe13d1a6d3c
--- /dev/null
+++ b/dom/file/ipc/tests/browser.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+support-files =
+  empty.html
+
+[browser_ipcBlob.js]
diff --git a/dom/file/ipc/tests/browser_ipcBlob.js b/dom/file/ipc/tests/browser_ipcBlob.js
new file mode 100644
index 000000000000..5ca04b1dbe45
--- /dev/null
+++ b/dom/file/ipc/tests/browser_ipcBlob.js
@@ -0,0 +1,173 @@
+/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
+
+requestLongerTimeout(3);
+
+var {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+
+const BASE_URI = "http://mochi.test:8888/browser/dom/file/ipc/tests/empty.html";
+
+// More than 1mb memory blob childA-parent-childB.
+add_task(function* test_CtoPtoC_big() {
+  let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser1 = gBrowser.getBrowserForTab(tab1);
+
+  let blob = yield ContentTask.spawn(browser1, null, function() {
+    let blob = new Blob([new Array(1024*1024).join('123456789ABCDEF')]);
+    return blob;
+  });
+
+  ok(blob, "CtoPtoC-big: We have a blob!");
+  is(blob.size, new Array(1024*1024).join('123456789ABCDEF').length, "CtoPtoC-big: The size matches");
+
+  let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser2 = gBrowser.getBrowserForTab(tab2);
+
+  let status = yield ContentTask.spawn(browser2, blob, function(blob) {
+    return new Promise(resolve => {
+      let fr = new content.FileReader();
+      fr.readAsText(blob);
+      fr.onloadend = function() {
+        resolve(fr.result == new Array(1024*1024).join('123456789ABCDEF'));
+      }
+    });
+  });
+
+  ok(status, "CtoPtoC-big: Data match!");
+
+  yield BrowserTestUtils.removeTab(tab1);
+  yield BrowserTestUtils.removeTab(tab2);
+});
+
+// Less than 1mb memory blob childA-parent-childB.
+add_task(function* test_CtoPtoC_small() {
+  let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser1 = gBrowser.getBrowserForTab(tab1);
+
+  let blob = yield ContentTask.spawn(browser1, null, function() {
+    let blob = new Blob(["hello world!"]);
+    return blob;
+  });
+
+  ok(blob, "CtoPtoC-small: We have a blob!");
+  is(blob.size, "hello world!".length, "CtoPtoC-small: The size matches");
+
+  let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser2 = gBrowser.getBrowserForTab(tab2);
+
+  let status = yield ContentTask.spawn(browser2, blob, function(blob) {
+    return new Promise(resolve => {
+      let fr = new content.FileReader();
+      fr.readAsText(blob);
+      fr.onloadend = function() {
+        resolve(fr.result == "hello world!");
+      }
+    });
+  });
+
+  ok(status, "CtoPtoC-small: Data match!");
+
+  yield BrowserTestUtils.removeTab(tab1);
+  yield BrowserTestUtils.removeTab(tab2);
+});
+
+// More than 1mb memory blob childA-parent-childB: BroadcastChannel
+add_task(function* test_CtoPtoC_bc_big() {
+  let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser1 = gBrowser.getBrowserForTab(tab1);
+
+  yield ContentTask.spawn(browser1, null, function() {
+    var bc = new content.BroadcastChannel('test');
+    bc.onmessage = function() {
+      bc.postMessage(new Blob([new Array(1024*1024).join('123456789ABCDEF')]));
+    }
+  });
+
+  let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser2 = gBrowser.getBrowserForTab(tab2);
+
+  let status = yield ContentTask.spawn(browser2, null, function() {
+    return new Promise(resolve => {
+      var bc = new content.BroadcastChannel('test');
+      bc.onmessage = function(e) {
+        let fr = new content.FileReader();
+        fr.readAsText(e.data);
+        fr.onloadend = function() {
+          resolve(fr.result == new Array(1024*1024).join('123456789ABCDEF'));
+        }
+      }
+
+      bc.postMessage("GO!");
+    });
+  });
+
+  ok(status, "CtoPtoC-broadcastChannel-big: Data match!");
+
+  yield BrowserTestUtils.removeTab(tab1);
+  yield BrowserTestUtils.removeTab(tab2);
+});
+
+// Less than 1mb memory blob childA-parent-childB: BroadcastChannel
+add_task(function* test_CtoPtoC_bc_small() {
+  let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser1 = gBrowser.getBrowserForTab(tab1);
+
+  yield ContentTask.spawn(browser1, null, function() {
+    var bc = new content.BroadcastChannel('test');
+    bc.onmessage = function() {
+      bc.postMessage(new Blob(["hello world!"]));
+    }
+  });
+
+  let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser2 = gBrowser.getBrowserForTab(tab2);
+
+  let status = yield ContentTask.spawn(browser2, null, function() {
+    return new Promise(resolve => {
+      var bc = new content.BroadcastChannel('test');
+      bc.onmessage = function(e) {
+        let fr = new content.FileReader();
+        fr.readAsText(e.data);
+        fr.onloadend = function() {
+          resolve(fr.result == "hello world!");
+        }
+      }
+
+      bc.postMessage("GO!");
+    });
+  });
+
+  ok(status, "CtoPtoC-broadcastChannel-small: Data match!");
+
+  yield BrowserTestUtils.removeTab(tab1);
+  yield BrowserTestUtils.removeTab(tab2);
+});
+
+// blob URL childA-parent-childB
+add_task(function* test_CtoPtoC_bc_small() {
+  let tab1 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser1 = gBrowser.getBrowserForTab(tab1);
+
+  let blobURL = yield ContentTask.spawn(browser1, null, function() {
+    return content.URL.createObjectURL(new content.Blob(["hello world!"]));
+  });
+
+  let tab2 = yield BrowserTestUtils.openNewForegroundTab(gBrowser, BASE_URI);
+  let browser2 = gBrowser.getBrowserForTab(tab2);
+
+  let status = yield ContentTask.spawn(browser2, blobURL, function(blobURL) {
+    return new Promise(resolve => {
+      var xhr = new content.XMLHttpRequest();
+      xhr.open("GET", blobURL);
+      xhr.onloadend = function() {
+        resolve(xhr.response == "hello world!");
+      }
+
+      xhr.send();
+    });
+  });
+
+  ok(status, "CtoPtoC-blobURL: Data match!");
+
+  yield BrowserTestUtils.removeTab(tab1);
+  yield BrowserTestUtils.removeTab(tab2);
+});
diff --git a/dom/file/ipc/tests/empty.html b/dom/file/ipc/tests/empty.html
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dom/interfaces/base/nsIBrowserDOMWindow.idl b/dom/interfaces/base/nsIBrowserDOMWindow.idl
index bc64bf783e64..f566df630577 100644
--- a/dom/interfaces/base/nsIBrowserDOMWindow.idl
+++ b/dom/interfaces/base/nsIBrowserDOMWindow.idl
@@ -109,7 +109,8 @@ interface nsIBrowserDOMWindow : nsISupports
    // See bug 537428
    */
   nsIFrameLoaderOwner openURIInFrame(in nsIURI aURI, in nsIOpenURIInFrameParams params,
-                                     in short aWhere, in long aFlags);
+                                     in short aWhere, in long aFlags,
+                                     in unsigned long long aNextTabParentId);
 
   /**
    * @param  aWindow the window to test.
diff --git a/dom/ipc/ContentBridgeChild.cpp b/dom/ipc/ContentBridgeChild.cpp
index c6972b3d7e00..b22795bc6259 100644
--- a/dom/ipc/ContentBridgeChild.cpp
+++ b/dom/ipc/ContentBridgeChild.cpp
@@ -192,6 +192,19 @@ ContentBridgeChild::DeallocPMemoryStreamChild(PMemoryStreamChild* aActor)
   return nsIContentChild::DeallocPMemoryStreamChild(aActor);
 }
 
+PIPCBlobInputStreamChild*
+ContentBridgeChild::AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                                  const uint64_t& aSize)
+{
+  return nsIContentChild::AllocPIPCBlobInputStreamChild(aID, aSize);
+}
+
+bool
+ContentBridgeChild::DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor)
+{
+  return nsIContentChild::DeallocPIPCBlobInputStreamChild(aActor);
+}
+
 PChildToParentStreamChild*
 ContentBridgeChild::AllocPChildToParentStreamChild()
 {
diff --git a/dom/ipc/ContentBridgeChild.h b/dom/ipc/ContentBridgeChild.h
index a2954d1a2d17..21c5e3277b60 100644
--- a/dom/ipc/ContentBridgeChild.h
+++ b/dom/ipc/ContentBridgeChild.h
@@ -92,6 +92,13 @@ protected:
   AllocPMemoryStreamChild(const uint64_t& aSize) override;
   virtual bool DeallocPMemoryStreamChild(PMemoryStreamChild*) override;
 
+  virtual PIPCBlobInputStreamChild*
+  AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild*) override;
+
   virtual mozilla::ipc::PChildToParentStreamChild*
   AllocPChildToParentStreamChild() override;
 
diff --git a/dom/ipc/ContentBridgeParent.cpp b/dom/ipc/ContentBridgeParent.cpp
index 3a4168cd8d1a..95436c3b2e7e 100644
--- a/dom/ipc/ContentBridgeParent.cpp
+++ b/dom/ipc/ContentBridgeParent.cpp
@@ -131,6 +131,15 @@ ContentBridgeParent::DeallocPBlobParent(PBlobParent* aActor)
   return nsIContentParent::DeallocPBlobParent(aActor);
 }
 
+PIPCBlobInputStreamParent*
+ContentBridgeParent::SendPIPCBlobInputStreamConstructor(PIPCBlobInputStreamParent* aActor,
+                                                        const nsID& aID,
+                                                        const uint64_t& aSize)
+{
+  return
+    PContentBridgeParent::SendPIPCBlobInputStreamConstructor(aActor, aID, aSize);
+}
+
 PMemoryStreamParent*
 ContentBridgeParent::AllocPMemoryStreamParent(const uint64_t& aSize)
 {
@@ -143,6 +152,19 @@ ContentBridgeParent::DeallocPMemoryStreamParent(PMemoryStreamParent* aActor)
   return nsIContentParent::DeallocPMemoryStreamParent(aActor);
 }
 
+PIPCBlobInputStreamParent*
+ContentBridgeParent::AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                                    const uint64_t& aSize)
+{
+  return nsIContentParent::AllocPIPCBlobInputStreamParent(aID, aSize);
+}
+
+bool
+ContentBridgeParent::DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor)
+{
+  return nsIContentParent::DeallocPIPCBlobInputStreamParent(aActor);
+}
+
 mozilla::jsipc::PJavaScriptParent *
 ContentBridgeParent::AllocPJavaScriptParent()
 {
diff --git a/dom/ipc/ContentBridgeParent.h b/dom/ipc/ContentBridgeParent.h
index 48d0b3fb3573..0ec2b5f7d5db 100644
--- a/dom/ipc/ContentBridgeParent.h
+++ b/dom/ipc/ContentBridgeParent.h
@@ -143,6 +143,18 @@ protected:
 
   virtual bool DeallocPMemoryStreamParent(PMemoryStreamParent*) override;
 
+  virtual PIPCBlobInputStreamParent*
+  SendPIPCBlobInputStreamConstructor(PIPCBlobInputStreamParent* aActor,
+                                     const nsID& aID,
+                                     const uint64_t& aSize) override;
+
+  virtual PIPCBlobInputStreamParent*
+  AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                 const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent*) override;
+
   virtual PChildToParentStreamParent* AllocPChildToParentStreamParent() override;
 
   virtual bool
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index dc5c22c2d158..75bf0b810493 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1584,6 +1584,19 @@ ContentChild::DeallocPMemoryStreamChild(PMemoryStreamChild* aActor)
   return nsIContentChild::DeallocPMemoryStreamChild(aActor);
 }
 
+PIPCBlobInputStreamChild*
+ContentChild::AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                            const uint64_t& aSize)
+{
+  return nsIContentChild::AllocPIPCBlobInputStreamChild(aID, aSize);
+}
+
+bool
+ContentChild::DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor)
+{
+  return nsIContentChild::DeallocPIPCBlobInputStreamChild(aActor);
+}
+
 PBlobChild*
 ContentChild::AllocPBlobChild(const BlobConstructorParams& aParams)
 {
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index bb5d0789ab38..09591a5c1f2f 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -191,6 +191,13 @@ public:
   virtual bool
   DeallocPMemoryStreamChild(PMemoryStreamChild* aActor) override;
 
+  virtual PIPCBlobInputStreamChild*
+  AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor) override;
+
   virtual PHalChild* AllocPHalChild() override;
   virtual bool DeallocPHalChild(PHalChild*) override;
 
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 54ade58dbb4c..d892f9e90db3 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -535,6 +535,8 @@ StaticAutoPtr<LinkedList<ContentParent> > ContentParent::sContentParents;
 #if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)
 UniquePtr<SandboxBrokerPolicyFactory> ContentParent::sSandboxBrokerPolicyFactory;
 #endif
+uint64_t ContentParent::sNextTabParentId = 0;
+nsDataHashtable<nsUint64HashKey, TabParent*> ContentParent::sNextTabParents;
 
 // This is true when subprocess launching is enabled.  This is the
 // case between StartUp() and ShutDown() or JoinAllSubprocesses().
@@ -1152,7 +1154,8 @@ ContentParent::RecvFindPlugins(const uint32_t& aPluginEpoch,
 ContentParent::CreateBrowser(const TabContext& aContext,
                              Element* aFrameElement,
                              ContentParent* aOpenerContentParent,
-                             TabParent* aSameTabGroupAs)
+                             TabParent* aSameTabGroupAs,
+                             uint64_t aNextTabParentId)
 {
   PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
 
@@ -1160,9 +1163,14 @@ ContentParent::CreateBrowser(const TabContext& aContext,
     return nullptr;
   }
 
-  if (TabParent* parent = TabParent::GetNextTabParent()) {
-    parent->SetOwnerElement(aFrameElement);
-    return parent;
+  if (aNextTabParentId) {
+    if (TabParent* parent =
+          sNextTabParents.GetAndRemove(aNextTabParentId).valueOr(nullptr)) {
+      MOZ_ASSERT(!parent->GetOwnerElement(),
+                 "Shouldn't have an owner elemnt before");
+      parent->SetOwnerElement(aFrameElement);
+      return parent;
+    }
   }
 
   ProcessPriority initialPriority = GetInitialProcessPriority(aFrameElement);
@@ -2838,6 +2846,19 @@ ContentParent::DeallocPMemoryStreamParent(PMemoryStreamParent* aActor)
   return nsIContentParent::DeallocPMemoryStreamParent(aActor);
 }
 
+PIPCBlobInputStreamParent*
+ContentParent::AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                              const uint64_t& aSize)
+{
+  return nsIContentParent::AllocPIPCBlobInputStreamParent(aID, aSize);
+}
+
+bool
+ContentParent::DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor)
+{
+  return nsIContentParent::DeallocPIPCBlobInputStreamParent(aActor);
+}
+
 mozilla::ipc::IPCResult
 ContentParent::RecvPBlobConstructor(PBlobParent* aActor,
                                     const BlobConstructorParams& aParams)
@@ -3835,6 +3856,14 @@ ContentParent::SendPBlobConstructor(PBlobParent* aActor,
   return PContentParent::SendPBlobConstructor(aActor, aParams);
 }
 
+PIPCBlobInputStreamParent*
+ContentParent::SendPIPCBlobInputStreamConstructor(PIPCBlobInputStreamParent* aActor,
+                                                  const nsID& aID,
+                                                  const uint64_t& aSize)
+{
+  return PContentParent::SendPIPCBlobInputStreamConstructor(aActor, aID, aSize);
+}
+
 PBrowserParent*
 ContentParent::SendPBrowserConstructor(PBrowserParent* aActor,
                                        const TabId& aTabId,
@@ -4441,6 +4470,7 @@ ContentParent::CommonCreateWindow(PBrowserParent* aThisTab,
                                   const nsCString& aBaseURI,
                                   const OriginAttributes& aOpenerOriginAttributes,
                                   const float& aFullZoom,
+                                  uint64_t aNextTabParentId,
                                   nsresult& aResult,
                                   nsCOMPtr<nsITabParent>& aNewTabParent,
                                   bool* aWindowIsNew)
@@ -4523,6 +4553,7 @@ ContentParent::CommonCreateWindow(PBrowserParent* aThisTab,
     nsCOMPtr<nsIFrameLoaderOwner> frameLoaderOwner;
     aResult = browserDOMWin->OpenURIInFrame(aURIToLoad, params, openLocation,
                                             nsIBrowserDOMWindow::OPEN_NEW,
+                                            aNextTabParentId,
                                             getter_AddRefs(frameLoaderOwner));
     if (NS_SUCCEEDED(aResult) && frameLoaderOwner) {
       RefPtr<nsFrameLoader> frameLoader = frameLoaderOwner->GetFrameLoader();
@@ -4544,6 +4575,7 @@ ContentParent::CommonCreateWindow(PBrowserParent* aThisTab,
 
   aResult = pwwatch->OpenWindowWithTabParent(aSetOpener ? thisTabParent : nullptr,
                                              aFeatures, aCalledFromJS, aFullZoom,
+                                             aNextTabParentId,
                                              getter_AddRefs(aNewTabParent));
   if (NS_WARN_IF(NS_FAILED(aResult))) {
     return IPC_OK();
@@ -4609,14 +4641,17 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
   // we must have an opener.
   newTab->SetHasContentOpener(true);
 
-  TabParent::AutoUseNewTab aunt(newTab, aWindowIsNew, aURLToLoad);
+  TabParent::AutoUseNewTab aunt(newTab, aURLToLoad);
+  const uint64_t nextTabParentId = ++sNextTabParentId;
+  sNextTabParents.Put(nextTabParentId, newTab);
 
   nsCOMPtr<nsITabParent> newRemoteTab;
   mozilla::ipc::IPCResult ipcResult =
     CommonCreateWindow(aThisTab, /* aSetOpener = */ true, aChromeFlags,
                        aCalledFromJS, aPositionSpecified, aSizeSpecified,
                        nullptr, aFeatures, aBaseURI, aOpenerOriginAttributes,
-                       aFullZoom, *aResult, newRemoteTab, aWindowIsNew);
+                       aFullZoom, nextTabParentId, *aResult,
+                       newRemoteTab, aWindowIsNew);
   if (!ipcResult) {
     return ipcResult;
   }
@@ -4625,6 +4660,9 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
     return IPC_OK();
   }
 
+  if (sNextTabParents.GetAndRemove(nextTabParentId).valueOr(nullptr)) {
+    *aWindowIsNew = false;
+  }
   MOZ_ASSERT(TabParent::GetFrom(newRemoteTab) == newTab);
 
   newTab->SwapFrameScriptsFrom(*aFrameScripts);
@@ -4660,7 +4698,8 @@ ContentParent::RecvCreateWindowInDifferentProcess(
     CommonCreateWindow(aThisTab, /* aSetOpener = */ false, aChromeFlags,
                        aCalledFromJS, aPositionSpecified, aSizeSpecified,
                        uriToLoad, aFeatures, aBaseURI, aOpenerOriginAttributes,
-                       aFullZoom, rv, newRemoteTab, &windowIsNew);
+                       aFullZoom, /* aNextTabParentId = */ 0, rv,
+                       newRemoteTab, &windowIsNew);
   if (!ipcResult) {
     return ipcResult;
   }
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index f9c630a16818..3a27d616ad32 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -189,7 +189,8 @@ public:
   CreateBrowser(const TabContext& aContext,
                 Element* aFrameElement,
                 ContentParent* aOpenerContentParent,
-                TabParent* aSameTabGroupAs);
+                TabParent* aSameTabGroupAs,
+                uint64_t aNextTabParentId);
 
   static void GetAll(nsTArray<ContentParent*>& aArray);
 
@@ -719,6 +720,7 @@ private:
                      const nsCString& aBaseURI,
                      const OriginAttributes& aOpenerOriginAttributes,
                      const float& aFullZoom,
+                     uint64_t aNextTabParentId,
                      nsresult& aResult,
                      nsCOMPtr<nsITabParent>& aNewTabParent,
                      bool* aWindowIsNew);
@@ -851,6 +853,18 @@ private:
 
   virtual bool DeallocPMemoryStreamParent(PMemoryStreamParent* aActor) override;
 
+  virtual PIPCBlobInputStreamParent*
+  SendPIPCBlobInputStreamConstructor(PIPCBlobInputStreamParent* aActor,
+                                     const nsID& aID,
+                                     const uint64_t& aSize) override;
+
+  virtual PIPCBlobInputStreamParent*
+  AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                 const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor) override;
+
   virtual mozilla::ipc::IPCResult
   RecvPBlobConstructor(PBlobParent* aActor,
                        const BlobConstructorParams& params) override;
@@ -1262,6 +1276,9 @@ private:
 #ifdef MOZ_CRASHREPORTER
   UniquePtr<mozilla::ipc::CrashReporterHost> mCrashReporter;
 #endif
+
+  static uint64_t sNextTabParentId;
+  static nsDataHashtable<nsUint64HashKey, TabParent*> sNextTabParents;
 };
 
 } // namespace dom
diff --git a/dom/ipc/DOMTypes.ipdlh b/dom/ipc/DOMTypes.ipdlh
index 41e8624c2820..f6e2c100121e 100644
--- a/dom/ipc/DOMTypes.ipdlh
+++ b/dom/ipc/DOMTypes.ipdlh
@@ -7,6 +7,7 @@
 include protocol PBlob;
 include protocol PMemoryStream;
 
+include IPCBlob;
 include IPCStream;
 include ProtocolTypes;
 
@@ -41,17 +42,26 @@ struct MessagePortIdentifier
 struct ClonedMessageData
 {
   SerializedStructuredCloneBuffer data;
-  PBlob[] blobs;
+  IPCBlob[] blobs;
   IPCStream[] inputStreams;
   MessagePortIdentifier[] identfiers;
 };
 
-struct BlobDataStream
+struct MemoryBlobDataStream
 {
   PMemoryStream stream;
   uint64_t length;
 };
 
+union BlobDataStream
+{
+  MemoryBlobDataStream;
+
+  // InputStreamParams is used only when we are _sure_ that the serialized size
+  // is lower than 1 Mb. Otherwise we use MemoryBlobDataStream.
+  IPCStream;
+};
+
 union BlobData
 {
   // For remote blobs.
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
index 6c2512f183b3..a7b096d16b8d 100644
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@@ -19,7 +19,11 @@ include protocol PRemotePrintJob;
 include protocol PChildToParentStream;
 include protocol PParentToChildStream;
 include protocol PFileDescriptorSet;
+include protocol PIPCBlobInputStream;
+
 include DOMTypes;
+include IPCBlob;
+include IPCStream;
 include JavaScriptTypes;
 include URIParams;
 include PPrintingTypes;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index c8739eea8a62..045694b7f7cd 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -19,6 +19,7 @@ include protocol PHal;
 include protocol PHeapSnapshotTempFileHelper;
 include protocol PProcessHangMonitor;
 include protocol PImageBridge;
+include protocol PIPCBlobInputStream;
 include protocol PMedia;
 include protocol PMemoryStream;
 include protocol PNecko;
@@ -287,6 +288,7 @@ nested(upto inside_cpow) sync protocol PContent
     manages PHal;
     manages PHandlerService;
     manages PHeapSnapshotTempFileHelper;
+    manages PIPCBlobInputStream;
     manages PMedia;
     manages PMemoryStream;
     manages PNecko;
@@ -609,6 +611,8 @@ child:
 
     async RefreshScreens(ScreenDetails[] aScreens);
 
+    async PIPCBlobInputStream(nsID aID, uint64_t aSize);
+
 parent:
     async InitBackground(Endpoint<PBackgroundParent> aEndpoint);
 
diff --git a/dom/ipc/PContentBridge.ipdl b/dom/ipc/PContentBridge.ipdl
index d23132f4538d..ac88b7a053c0 100644
--- a/dom/ipc/PContentBridge.ipdl
+++ b/dom/ipc/PContentBridge.ipdl
@@ -12,9 +12,11 @@ include protocol PFileDescriptorSet;
 include protocol PChildToParentStream;
 include protocol PMemoryStream;
 include protocol PParentToChildStream;
+include protocol PIPCBlobInputStream;
 
 include DOMTypes;
 include JavaScriptTypes;
+include ProtocolTypes;
 include PTabContext;
 
 using class IPC::Principal from "mozilla/dom/PermissionMessageUtils.h";
@@ -43,6 +45,7 @@ nested(upto inside_cpow) sync protocol PContentBridge
     manages PChildToParentStream;
     manages PMemoryStream;
     manages PParentToChildStream;
+    manages PIPCBlobInputStream;
 
 child:
     async PParentToChildStream();
@@ -57,6 +60,8 @@ child:
 
     async ParentActivated(PBrowser aTab, bool aActivated);
 
+    async PIPCBlobInputStream(nsID aID, uint64_t aSize);
+
 parent:
     sync SyncMessage(nsString aMessage, ClonedMessageData aData,
                      CpowEntry[] aCpows, Principal aPrincipal)
diff --git a/dom/ipc/PProcessHangMonitor.ipdl b/dom/ipc/PProcessHangMonitor.ipdl
index 0ad30fe4e8ec..d158b9ef9e94 100644
--- a/dom/ipc/PProcessHangMonitor.ipdl
+++ b/dom/ipc/PProcessHangMonitor.ipdl
@@ -14,7 +14,6 @@ struct SlowScriptData
 {
   TabId tabId;
   nsCString filename;
-  uint32_t lineno;
 };
 
 struct PluginHangData
diff --git a/dom/ipc/ProcessHangMonitor.cpp b/dom/ipc/ProcessHangMonitor.cpp
index db8176b2e91d..9e4058bfdb67 100644
--- a/dom/ipc/ProcessHangMonitor.cpp
+++ b/dom/ipc/ProcessHangMonitor.cpp
@@ -85,11 +85,9 @@ class HangMonitorChild
 
   typedef ProcessHangMonitor::SlowScriptAction SlowScriptAction;
   SlowScriptAction NotifySlowScript(nsITabChild* aTabChild,
-                                    const char* aFileName,
-                                    unsigned aLineNo);
+                                    const char* aFileName);
   void NotifySlowScriptAsync(TabId aTabId,
-                             const nsCString& aFileName,
-                             unsigned aLineNo);
+                             const nsCString& aFileName);
 
   bool IsDebuggerStartupComplete();
 
@@ -160,7 +158,6 @@ public:
   NS_IMETHOD GetHangType(uint32_t* aHangType) override;
   NS_IMETHOD GetScriptBrowser(nsIDOMElement** aBrowser) override;
   NS_IMETHOD GetScriptFileName(nsACString& aFileName) override;
-  NS_IMETHOD GetScriptLineNo(uint32_t* aLineNo) override;
 
   NS_IMETHOD GetPluginName(nsACString& aPluginName) override;
 
@@ -458,18 +455,16 @@ HangMonitorChild::Bind(Endpoint<PProcessHangMonitorChild>&& aEndpoint)
 
 void
 HangMonitorChild::NotifySlowScriptAsync(TabId aTabId,
-                                        const nsCString& aFileName,
-                                        unsigned aLineNo)
+                                        const nsCString& aFileName)
 {
   if (mIPCOpen) {
-    Unused << SendHangEvidence(SlowScriptData(aTabId, aFileName, aLineNo));
+    Unused << SendHangEvidence(SlowScriptData(aTabId, aFileName));
   }
 }
 
 HangMonitorChild::SlowScriptAction
 HangMonitorChild::NotifySlowScript(nsITabChild* aTabChild,
-                                   const char* aFileName,
-                                   unsigned aLineNo)
+                                   const char* aFileName)
 {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
 
@@ -497,9 +492,9 @@ HangMonitorChild::NotifySlowScript(nsITabChild* aTabChild,
   nsAutoCString filename(aFileName);
 
   MonitorLoop()->PostTask(NewNonOwningRunnableMethod
-                          <TabId, nsCString, unsigned>(this,
-                                                       &HangMonitorChild::NotifySlowScriptAsync,
-                                                       id, filename, aLineNo));
+                          <TabId, nsCString>(this,
+                                             &HangMonitorChild::NotifySlowScriptAsync,
+                                             id, filename));
   return SlowScriptAction::Continue;
 }
 
@@ -962,18 +957,6 @@ HangMonitoredProcess::GetScriptFileName(nsACString& aFileName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-HangMonitoredProcess::GetScriptLineNo(uint32_t* aLineNo)
-{
-  MOZ_RELEASE_ASSERT(NS_IsMainThread());
-  if (mHangData.type() != HangData::TSlowScriptData) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  *aLineNo = mHangData.get_SlowScriptData().lineno();
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 HangMonitoredProcess::GetPluginName(nsACString& aPluginName)
 {
@@ -1182,11 +1165,10 @@ ProcessHangMonitor::Observe(nsISupports* aSubject, const char* aTopic, const cha
 
 ProcessHangMonitor::SlowScriptAction
 ProcessHangMonitor::NotifySlowScript(nsITabChild* aTabChild,
-                                     const char* aFileName,
-                                     unsigned aLineNo)
+                                     const char* aFileName)
 {
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
-  return HangMonitorChild::Get()->NotifySlowScript(aTabChild, aFileName, aLineNo);
+  return HangMonitorChild::Get()->NotifySlowScript(aTabChild, aFileName);
 }
 
 bool
diff --git a/dom/ipc/ProcessHangMonitor.h b/dom/ipc/ProcessHangMonitor.h
index e846d02e899a..1c0a1f76760b 100644
--- a/dom/ipc/ProcessHangMonitor.h
+++ b/dom/ipc/ProcessHangMonitor.h
@@ -57,8 +57,7 @@ class ProcessHangMonitor final
     StartDebugger
   };
   SlowScriptAction NotifySlowScript(nsITabChild* aTabChild,
-                                    const char* aFileName,
-                                    unsigned aLineNo);
+                                    const char* aFileName);
 
   void NotifyPluginHang(uint32_t aPluginId);
 
diff --git a/dom/ipc/StructuredCloneData.cpp b/dom/ipc/StructuredCloneData.cpp
index 3bbad9a40f65..e0fb5c17fbfd 100644
--- a/dom/ipc/StructuredCloneData.cpp
+++ b/dom/ipc/StructuredCloneData.cpp
@@ -13,6 +13,7 @@
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "nsContentUtils.h"
@@ -142,92 +143,9 @@ enum ManagerFlavorEnum {
   BackgroundProtocol
 };
 
-template <ActorFlavorEnum>
-struct BlobTraits
-{ };
-
-template <>
-struct BlobTraits<Parent>
-{
-  typedef mozilla::dom::BlobParent BlobType;
-  typedef mozilla::dom::PBlobParent ProtocolType;
-};
-
-template <>
-struct BlobTraits<Child>
-{
-  typedef mozilla::dom::BlobChild BlobType;
-  typedef mozilla::dom::PBlobChild ProtocolType;
-};
-
-template <ActorFlavorEnum, ManagerFlavorEnum>
-struct ParentManagerTraits
-{ };
-
-template<>
-struct ParentManagerTraits<Parent, ContentProtocol>
-{
-  typedef mozilla::dom::nsIContentParent ConcreteContentManagerType;
-};
-
-template<>
-struct ParentManagerTraits<Child, ContentProtocol>
-{
-  typedef mozilla::dom::nsIContentChild ConcreteContentManagerType;
-};
-
-template<>
-struct ParentManagerTraits<Parent, BackgroundProtocol>
-{
-  typedef mozilla::ipc::PBackgroundParent ConcreteContentManagerType;
-};
-
-template<>
-struct ParentManagerTraits<Child, BackgroundProtocol>
-{
-  typedef mozilla::ipc::PBackgroundChild ConcreteContentManagerType;
-};
-
-template<ActorFlavorEnum>
-struct DataBlobs
-{ };
-
-template<>
-struct DataBlobs<Parent>
-{
-  typedef BlobTraits<Parent>::ProtocolType ProtocolType;
-
-  static InfallibleTArray<ProtocolType*>& Blobs(ClonedMessageData& aData)
-  {
-    return aData.blobsParent();
-  }
-
-  static const InfallibleTArray<ProtocolType*>& Blobs(const ClonedMessageData& aData)
-  {
-    return aData.blobsParent();
-  }
-};
-
-template<>
-struct DataBlobs<Child>
-{
-  typedef BlobTraits<Child>::ProtocolType ProtocolType;
-
-  static InfallibleTArray<ProtocolType*>& Blobs(ClonedMessageData& aData)
-  {
-    return aData.blobsChild();
-  }
-
-  static const InfallibleTArray<ProtocolType*>& Blobs(const ClonedMessageData& aData)
-  {
-    return aData.blobsChild();
-  }
-};
-
-template<ActorFlavorEnum Flavor, ManagerFlavorEnum ManagerFlavor>
-static bool
-BuildClonedMessageData(typename ParentManagerTraits<Flavor, ManagerFlavor>::ConcreteContentManagerType* aManager,
-                       StructuredCloneData& aData,
+template<typename M>
+bool
+BuildClonedMessageData(M* aManager, StructuredCloneData& aData,
                        ClonedMessageData& aClonedData)
 {
   SerializedStructuredCloneBuffer& buffer = aClonedData.data();
@@ -245,23 +163,26 @@ BuildClonedMessageData(typename ParentManagerTraits<Flavor, ManagerFlavor>::Conc
   const nsTArray<RefPtr<BlobImpl>>& blobImpls = aData.BlobImpls();
 
   if (!blobImpls.IsEmpty()) {
-    typedef typename BlobTraits<Flavor>::BlobType BlobType;
-    typedef typename BlobTraits<Flavor>::ProtocolType ProtocolType;
-    InfallibleTArray<ProtocolType*>& blobList = DataBlobs<Flavor>::Blobs(aClonedData);
-    uint32_t length = blobImpls.Length();
-    blobList.SetCapacity(length);
-    for (uint32_t i = 0; i < length; ++i) {
-      BlobType* protocolActor = BlobType::GetOrCreate(aManager, blobImpls[i]);
-      if (!protocolActor) {
+    if (NS_WARN_IF(!aClonedData.blobs().SetLength(blobImpls.Length(), fallible))) {
+      return false;
+    }
+
+    for (uint32_t i = 0; i < blobImpls.Length(); ++i) {
+      nsresult rv = IPCBlobUtils::Serialize(blobImpls[i], aManager,
+                                            aClonedData.blobs()[i]);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
         return false;
       }
-      blobList.AppendElement(protocolActor);
     }
   }
 
   const nsTArray<nsCOMPtr<nsIInputStream>>& inputStreams = aData.InputStreams();
-
   if (!inputStreams.IsEmpty()) {
+    if (NS_WARN_IF(!aData.IPCStreams().SetCapacity(inputStreams.Length(),
+                                                   fallible))) {
+      return false;
+    }
+
     InfallibleTArray<IPCStream>& streams = aClonedData.inputStreams();
     uint32_t length = inputStreams.Length();
     streams.SetCapacity(length);
@@ -286,7 +207,7 @@ StructuredCloneData::BuildClonedMessageDataForParent(
   nsIContentParent* aParent,
   ClonedMessageData& aClonedData)
 {
-  return BuildClonedMessageData<Parent, ContentProtocol>(aParent, *this, aClonedData);
+  return BuildClonedMessageData(aParent, *this, aClonedData);
 }
 
 bool
@@ -294,7 +215,7 @@ StructuredCloneData::BuildClonedMessageDataForChild(
   nsIContentChild* aChild,
   ClonedMessageData& aClonedData)
 {
-  return BuildClonedMessageData<Child, ContentProtocol>(aChild, *this, aClonedData);
+  return BuildClonedMessageData(aChild, *this, aClonedData);
 }
 
 bool
@@ -302,7 +223,7 @@ StructuredCloneData::BuildClonedMessageDataForBackgroundParent(
   PBackgroundParent* aParent,
   ClonedMessageData& aClonedData)
 {
-  return BuildClonedMessageData<Parent, BackgroundProtocol>(aParent, *this, aClonedData);
+  return BuildClonedMessageData(aParent, *this, aClonedData);
 }
 
 bool
@@ -310,7 +231,7 @@ StructuredCloneData::BuildClonedMessageDataForBackgroundChild(
   PBackgroundChild* aChild,
   ClonedMessageData& aClonedData)
 {
-  return BuildClonedMessageData<Child, BackgroundProtocol>(aChild, *this, aClonedData);
+  return BuildClonedMessageData(aChild, *this, aClonedData);
 }
 
 // See the StructuredCloneData class block comment for the meanings of each val.
@@ -373,8 +294,6 @@ static void
 UnpackClonedMessageData(typename MemoryTraits<MemoryFlavor>::ClonedMessageType& aClonedData,
                         StructuredCloneData& aData)
 {
-  typedef typename BlobTraits<Flavor>::ProtocolType ProtocolType;
-  const InfallibleTArray<ProtocolType*>& blobs = DataBlobs<Flavor>::Blobs(aClonedData);
   const InfallibleTArray<MessagePortIdentifier>& identifiers = aClonedData.identfiers();
 
   MemoryTraits<MemoryFlavor>::ProvideBuffer(aClonedData, aData);
@@ -383,15 +302,12 @@ UnpackClonedMessageData(typename MemoryTraits<MemoryFlavor>::ClonedMessageType&
     aData.PortIdentifiers().AppendElements(identifiers);
   }
 
+  const nsTArray<IPCBlob>& blobs = aClonedData.blobs();
   if (!blobs.IsEmpty()) {
     uint32_t length = blobs.Length();
     aData.BlobImpls().SetCapacity(length);
     for (uint32_t i = 0; i < length; ++i) {
-      auto* blob =
-        static_cast<typename BlobTraits<Flavor>::BlobType*>(blobs[i]);
-      MOZ_ASSERT(blob);
-
-      RefPtr<BlobImpl> blobImpl = blob->GetBlobImpl();
+      RefPtr<BlobImpl> blobImpl = IPCBlobUtils::Deserialize(blobs[i]);
       MOZ_ASSERT(blobImpl);
 
       aData.BlobImpls().AppendElement(blobImpl);
diff --git a/dom/ipc/StructuredCloneData.h b/dom/ipc/StructuredCloneData.h
index 06a8af23ee35..008db3a57fba 100644
--- a/dom/ipc/StructuredCloneData.h
+++ b/dom/ipc/StructuredCloneData.h
@@ -203,8 +203,8 @@ public:
 
   // Actor-varying methods to convert the structured clone stored in this holder
   // by a previous call to Write() into ClonedMessageData IPC representation.
-  // (Blobs are represented in IPC by PBlob actors, so we need the parent to be
-  // able to create them.)
+  // (Blobs are represented in IPC by IPCBlob actors, so we need the parent to
+  // be able to create them.)
   bool BuildClonedMessageDataForParent(nsIContentParent* aParent,
                                        ClonedMessageData& aClonedData);
   bool BuildClonedMessageDataForChild(nsIContentChild* aChild,
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index 1416a7165d4a..b439f0265a52 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -565,16 +565,6 @@ TabParent::RecvEvent(const RemoteDOMEvent& aEvent)
   return IPC_OK();
 }
 
-TabParent* TabParent::sNextTabParent;
-
-/* static */ TabParent*
-TabParent::GetNextTabParent()
-{
-  TabParent* result = sNextTabParent;
-  sNextTabParent = nullptr;
-  return result;
-}
-
 bool
 TabParent::SendLoadRemoteScript(const nsString& aURL,
                                 const bool& aRunInGlobalScope)
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 9130327f2703..c3b82953e38a 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -553,8 +553,6 @@ public:
 
   bool IsInitedByParent() const { return mInitedByParent; }
 
-  static TabParent* GetNextTabParent();
-
   bool SendLoadRemoteScript(const nsString& aURL,
                             const bool& aRunInGlobalScope);
 
@@ -698,13 +696,6 @@ private:
 
   TabId mTabId;
 
-  // When loading a new tab or window via window.open, the child process sends
-  // a new PBrowser to use. We store that tab in sNextTabParent and then
-  // proceed through the browser's normal paths to create a new
-  // window/tab. When it comes time to create a new TabParent, we instead use
-  // sNextTabParent.
-  static TabParent* sNextTabParent;
-
   // When loading a new tab or window via window.open, the child is
   // responsible for loading the URL it wants into the new TabChild. When the
   // parent receives the CreateWindow message, though, it sends a LoadURL
@@ -778,13 +769,11 @@ public:
 struct MOZ_STACK_CLASS TabParent::AutoUseNewTab final
 {
 public:
-  AutoUseNewTab(TabParent* aNewTab, bool* aWindowIsNew, nsCString* aURLToLoad)
-   : mNewTab(aNewTab), mWindowIsNew(aWindowIsNew), mURLToLoad(aURLToLoad)
+  AutoUseNewTab(TabParent* aNewTab, nsCString* aURLToLoad)
+   : mNewTab(aNewTab), mURLToLoad(aURLToLoad)
   {
-    MOZ_ASSERT(!TabParent::sNextTabParent);
     MOZ_ASSERT(!aNewTab->mCreatingWindow);
 
-    TabParent::sNextTabParent = aNewTab;
     aNewTab->mCreatingWindow = true;
     aNewTab->mDelayedURL.Truncate();
   }
@@ -793,17 +782,10 @@ public:
   {
     mNewTab->mCreatingWindow = false;
     *mURLToLoad = mNewTab->mDelayedURL;
-
-    if (TabParent::sNextTabParent) {
-      MOZ_ASSERT(TabParent::sNextTabParent == mNewTab);
-      TabParent::sNextTabParent = nullptr;
-      *mWindowIsNew = false;
-    }
   }
 
 private:
   TabParent* mNewTab;
-  bool* mWindowIsNew;
   nsCString* mURLToLoad;
 };
 
diff --git a/dom/ipc/nsIContentChild.cpp b/dom/ipc/nsIContentChild.cpp
index d00d7feac62a..c9787279e643 100644
--- a/dom/ipc/nsIContentChild.cpp
+++ b/dom/ipc/nsIContentChild.cpp
@@ -21,6 +21,7 @@
 #include "mozilla/ipc/PChildToParentStreamChild.h"
 #include "mozilla/ipc/PParentToChildStreamChild.h"
 #include "mozilla/dom/ipc/MemoryStreamChild.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamChild.h"
 
 #include "nsPrintfCString.h"
 #include "xpcpublic.h"
@@ -119,6 +120,26 @@ nsIContentChild::DeallocPMemoryStreamChild(PMemoryStreamChild* aActor)
   return true;
 }
 
+PIPCBlobInputStreamChild*
+nsIContentChild::AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                               const uint64_t& aSize)
+{
+  // IPCBlobInputStreamChild is refcounted. Here it's created and in
+  // DeallocPIPCBlobInputStreamChild is released.
+
+  RefPtr<IPCBlobInputStreamChild> actor =
+    new IPCBlobInputStreamChild(aID, aSize);
+  return actor.forget().take();
+}
+
+bool
+nsIContentChild::DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor)
+{
+  RefPtr<IPCBlobInputStreamChild> actor =
+    dont_AddRef(static_cast<IPCBlobInputStreamChild*>(aActor));
+  return true;
+}
+
 PBlobChild*
 nsIContentChild::AllocPBlobChild(const BlobConstructorParams& aParams)
 {
diff --git a/dom/ipc/nsIContentChild.h b/dom/ipc/nsIContentChild.h
index 3208538d42b7..960931cdc15c 100644
--- a/dom/ipc/nsIContentChild.h
+++ b/dom/ipc/nsIContentChild.h
@@ -111,6 +111,12 @@ protected:
 
   virtual bool DeallocPMemoryStreamChild(mozilla::ipc::PMemoryStreamChild* aActor);
 
+  virtual mozilla::ipc::PIPCBlobInputStreamChild*
+  AllocPIPCBlobInputStreamChild(const nsID& aID, const uint64_t& aSize);
+
+  virtual bool
+  DeallocPIPCBlobInputStreamChild(mozilla::ipc::PIPCBlobInputStreamChild* aActor);
+
   virtual mozilla::ipc::PChildToParentStreamChild* AllocPChildToParentStreamChild();
 
   virtual bool
diff --git a/dom/ipc/nsIContentParent.cpp b/dom/ipc/nsIContentParent.cpp
index ab0a25579ae7..9ef39d6f02a3 100644
--- a/dom/ipc/nsIContentParent.cpp
+++ b/dom/ipc/nsIContentParent.cpp
@@ -14,6 +14,7 @@
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/dom/ipc/BlobParent.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamParent.h"
 #include "mozilla/dom/ipc/MemoryStreamParent.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
@@ -204,6 +205,21 @@ nsIContentParent::DeallocPMemoryStreamParent(PMemoryStreamParent* aActor)
   return true;
 }
 
+PIPCBlobInputStreamParent*
+nsIContentParent::AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                                 const uint64_t& aSize)
+{
+  MOZ_CRASH("PIPCBlobInputStreamParent actors should be manually constructed!");
+  return nullptr;
+}
+
+bool
+nsIContentParent::DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor)
+{
+  delete aActor;
+  return true;
+}
+
 BlobParent*
 nsIContentParent::GetOrCreateActorForBlob(Blob* aBlob)
 {
diff --git a/dom/ipc/nsIContentParent.h b/dom/ipc/nsIContentParent.h
index 6147dad1b1b3..19aeb40a76f3 100644
--- a/dom/ipc/nsIContentParent.h
+++ b/dom/ipc/nsIContentParent.h
@@ -37,6 +37,7 @@ class PFileDescriptorSetParent;
 class PChildToParentStreamParent;
 class PParentToChildStreamParent;
 class PMemoryStreamParent;
+class PIPCBlobInputStreamParent;
 }
 
 namespace dom {
@@ -71,6 +72,11 @@ public:
   SendPBlobConstructor(PBlobParent* aActor,
                        const BlobConstructorParams& aParams) = 0;
 
+  virtual mozilla::ipc::PIPCBlobInputStreamParent*
+  SendPIPCBlobInputStreamConstructor(mozilla::ipc::PIPCBlobInputStreamParent* aActor,
+                                     const nsID& aID,
+                                     const uint64_t& aSize) = 0;
+
   MOZ_MUST_USE virtual PBrowserParent*
   SendPBrowserConstructor(PBrowserParent* actor,
                           const TabId& aTabId,
@@ -129,6 +135,12 @@ protected: // IPDL methods
 
   virtual bool DeallocPMemoryStreamParent(mozilla::ipc::PMemoryStreamParent* aActor);
 
+  virtual mozilla::ipc::PIPCBlobInputStreamParent*
+  AllocPIPCBlobInputStreamParent(const nsID& aID, const uint64_t& aSize);
+
+  virtual bool
+  DeallocPIPCBlobInputStreamParent(mozilla::ipc::PIPCBlobInputStreamParent* aActor);
+
   virtual mozilla::ipc::PFileDescriptorSetParent*
   AllocPFileDescriptorSetParent(const mozilla::ipc::FileDescriptor& aFD);
 
diff --git a/dom/ipc/nsIHangReport.idl b/dom/ipc/nsIHangReport.idl
index 9ccbbbbad1ba..d762e1e6255f 100644
--- a/dom/ipc/nsIHangReport.idl
+++ b/dom/ipc/nsIHangReport.idl
@@ -32,7 +32,6 @@ interface nsIHangReport : nsISupports
   // Only valid for SLOW_SCRIPT reports.
   readonly attribute nsIDOMElement scriptBrowser;
   readonly attribute ACString scriptFileName;
-  readonly attribute unsigned long scriptLineNo;
 
   // For PLUGIN_HANGs, this field contains information about the plugin.
   // Only valid for PLUGIN_HANG reports.
diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp
index 0bd9b8d4e087..4786741360b5 100644
--- a/dom/media/MediaCache.cpp
+++ b/dom/media/MediaCache.cpp
@@ -1530,6 +1530,12 @@ MediaCache::AllocateAndWriteBlock(
       bo->mStream = stream;
     }
 
+    if (block->mOwners.IsEmpty()) {
+      // This happens when all streams with the resource id are closed. We can
+      // just return here now and discard the data.
+      return;
+    }
+
     // Tell each stream using this resource about the new block.
     for (auto& bo : block->mOwners) {
       bo.mStreamBlock = streamBlockIndex;
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index f15a1341bc35..9e969d639929 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -129,6 +129,8 @@ StaticRefPtr<MediaMemoryTracker> MediaMemoryTracker::sUniqueInstance;
 
 LazyLogModule gMediaTimerLog("MediaTimer");
 
+constexpr TimeUnit MediaDecoder::DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED;
+
 void
 MediaDecoder::InitStatics()
 {
@@ -1773,8 +1775,7 @@ MediaDecoder::NextFrameBufferedStatus()
   TimeUnit currentPosition = TimeUnit::FromMicroseconds(CurrentPosition());
   media::TimeInterval interval(
     currentPosition,
-    currentPosition
-    + TimeUnit::FromMicroseconds(DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED));
+    currentPosition + DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED);
   return GetBuffered().Contains(interval)
          ? MediaDecoderOwner::NEXT_FRAME_AVAILABLE
          : MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index 950fc4ff09e8..5869408d7b10 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -586,7 +586,8 @@ protected:
   // Amount of buffered data ahead of current time required to consider that
   // the next frame is available.
   // An arbitrary value of 250ms is used.
-  static const int DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED = 250000;
+  static constexpr auto DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED =
+    media::TimeUnit::FromMicroseconds(250000);
 
 private:
   nsCString GetDebugInfo();
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index 9b1fbb92e52a..8a9c3bdffc07 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -825,11 +825,6 @@ private:
       }
       mInputStream = nullptr;
     }
-    for (RefPtr<MediaInputPort>& inputPort : mInputPorts) {
-      MOZ_ASSERT(inputPort);
-      inputPort->Destroy();
-    }
-    mInputPorts.Clear();
 
     if (mTrackUnionStream) {
       if (mEncoder) {
@@ -855,6 +850,12 @@ private:
       mTrackUnionStream = nullptr;
     }
 
+    for (RefPtr<MediaInputPort>& inputPort : mInputPorts) {
+      MOZ_ASSERT(inputPort);
+      inputPort->Destroy();
+    }
+    mInputPorts.Clear();
+
     if (mMediaStream) {
       mMediaStream->UnregisterTrackListener(this);
       mMediaStream = nullptr;
diff --git a/dom/media/MediaResource.cpp b/dom/media/MediaResource.cpp
index 81fafb41d274..678f8ecb4c8e 100644
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -1518,14 +1518,35 @@ MediaResource::Create(MediaResourceCallback* aCallback,
     return nullptr;
   }
 
-  nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(aChannel);
   RefPtr<MediaResource> resource;
-  if (fc || IsBlobURI(uri)) {
+
+  // Let's try to create a FileMediaResource in case the channel is a nsIFile
+  nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(aChannel);
+  if (fc) {
     resource = new FileMediaResource(aCallback, aChannel, uri, *containerType);
-  } else {
-    resource = new ChannelMediaResource(
-      aCallback, aChannel, uri, *containerType, aIsPrivateBrowsing);
   }
+
+  // If the URL is blobURL with a seekable inputStream, we can still use a
+  // FileMediaResource. This basically means that the blobURL and its Blob have
+  // been created in the current process.
+
+  if (!resource) {
+    nsCOMPtr<nsIInputStream> stream;
+    nsCOMPtr<nsISeekableStream> seekableStream;
+    if (IsBlobURI(uri) &&
+        NS_SUCCEEDED(NS_GetStreamForBlobURI(uri, getter_AddRefs(stream))) &&
+        (seekableStream = do_QueryInterface(stream))) {
+      resource =
+        new FileMediaResource(aCallback, aChannel, uri, *containerType);
+    }
+  }
+
+  if (!resource) {
+    resource =
+      new ChannelMediaResource(aCallback, aChannel, uri, *containerType,
+                               aIsPrivateBrowsing);
+  }
+
   return resource.forget();
 }
 
diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp
index 58aa24d663de..f0ed4493e5ac 100644
--- a/dom/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -57,13 +57,13 @@ TrackUnionStream::TrackUnionStream(AbstractThread* aMainThread) :
     for (int32_t i = mTrackMap.Length() - 1; i >= 0; --i) {
       if (mTrackMap[i].mInputPort == aPort) {
         STREAM_LOG(LogLevel::Debug, ("TrackUnionStream %p removing trackmap entry %d", this, i));
-        EndTrack(i);
         nsTArray<RefPtr<DirectMediaStreamTrackListener>> listeners(
           mTrackMap[i].mOwnedDirectListeners);
         for (auto listener : listeners) {
           // Remove listeners while the entry still exists.
           RemoveDirectTrackListenerImpl(listener, mTrackMap[i].mOutputTrackID);
         }
+        EndTrack(i);
         mTrackMap.RemoveElementAt(i);
       }
     }
diff --git a/dom/media/mediasource/MediaSourceDecoder.cpp b/dom/media/mediasource/MediaSourceDecoder.cpp
index e23f8609adbe..82d6f71c18e1 100644
--- a/dom/media/mediasource/MediaSourceDecoder.cpp
+++ b/dom/media/mediasource/MediaSourceDecoder.cpp
@@ -286,8 +286,7 @@ MediaSourceDecoder::NextFrameBufferedStatus()
   buffered.SetFuzz(MediaSourceDemuxer::EOS_FUZZ / 2);
   TimeInterval interval(
     currentPosition,
-    currentPosition
-    + TimeUnit::FromMicroseconds(DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED));
+    currentPosition + DEFAULT_NEXT_FRAME_AVAILABLE_BUFFERED);
   return buffered.ContainsStrict(ClampIntervalToEnd(interval))
          ? MediaDecoderOwner::NEXT_FRAME_AVAILABLE
          : MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE;
diff --git a/dom/media/mediasource/test/mochitest.ini b/dom/media/mediasource/test/mochitest.ini
index 182472e063d5..fd06acf52fa4 100644
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@@ -53,6 +53,7 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 [test_AutoRevocation.html]
 tags = firstpartyisolation
 [test_BufferedSeek.html]
+skip-if = android_version == '22' # bug 1329532 bug 1066090
 [test_BufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_BufferingWait.html]
@@ -68,15 +69,18 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 [test_DurationUpdated_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_EndedEvent.html]
+skip-if = android_version == '22' # bug 1358640
 [test_EndOfStream.html]
 [test_EndOfStream_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_Eviction_mp4.html]
 skip-if = (os == "win" && os_version == "5.1") || (android_version == '15') # Not supported on xp. Android(Bug 1358271)
 [test_FrameSelection.html]
+skip-if = android_version == '22' # bug 1341519
 [test_FrameSelection_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_HaveMetadataUnbufferedSeek.html]
+skip-if = android_version == '22' # bug 1342247
 [test_HaveMetadataUnbufferedSeek_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_LiveSeekable.html]
@@ -86,7 +90,9 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 [test_LoadedMetadataFired_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_MediaSource.html]
+skip-if = android_version == '22' # bug 1341146
 [test_MediaSource_memory_reporting.html]
+skip-if = android_version == '22' # bug 1225758
 [test_MediaSource_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_MediaSource_flac_mp4.html]
@@ -96,6 +102,7 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 [test_MultipleInitSegments_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_OnEvents.html]
+skip-if = android_version == '22' # bug 1359010
 [test_PlayEvents.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_ResumeAfterClearing_mp4.html]
@@ -126,9 +133,11 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_SetModeThrows.html]
 [test_SplitAppendDelay.html]
+skip-if = android_version == '22' # bug 1293896 bug 1342683
 [test_SplitAppendDelay_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_SplitAppend.html]
+skip-if = android_version == '22' # bug 1211999
 [test_SplitAppend_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_Threshold_mp4.html]
@@ -136,6 +145,7 @@ skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not
 [test_TimestampOffset_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_TruncatedDuration.html]
+skip-if = android_version == '22' # bug 1359012
 [test_TruncatedDuration_mp4.html]
 skip-if = ((os == "win" && os_version == "5.1") || (toolkit == 'android')) # Not supported on xp and android 2.3
 [test_WaitingOnMissingData.html]
diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index 2e9d362f712b..25df24406d7e 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -11,7 +11,7 @@ load 495794-1.html
 load 576612-1.html
 load 752784-1.html
 load 789075-1.html
-HTTP load 795892-1.html
+skip-if(Android&&AndroidVersion=='22') HTTP load 795892-1.html # bug 1358718
 load 844563.html
 load 846612.html
 load 852838.html
diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index 9bf1e7968943..abcf3dad9d8f 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -120,6 +120,8 @@ skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulato
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicVideo.html]
 skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
+[test_peerConnection_basicVideoRemoteHwEncoder.html]
+skip-if = os == 'linux' || os == 'mac' || os == 'win' || (android_version == '18' && debug) # android-specific feature. android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_basicScreenshare.html]
 # frequent timeouts/crashes on e10s (bug 1048455)
 skip-if = toolkit == 'android' # no screenshare on android
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicVideoRemoteHwEncoder.html b/dom/media/tests/mochitest/test_peerConnection_basicVideoRemoteHwEncoder.html
new file mode 100644
index 000000000000..22a37f51cd8d
--- /dev/null
+++ b/dom/media/tests/mochitest/test_peerConnection_basicVideoRemoteHwEncoder.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+  createHTML({
+    bug: "1265755",
+    title: "Basic video peer connection with android oop hw encoder"
+  });
+
+  runNetworkTest(options => {
+    SpecialPowers.pushPrefEnv(
+      {
+        set: [
+          ['media.navigator.hardware.vp8_encode.acceleration_enabled', true],
+          ['media.navigator.hardware.vp8_encode.acceleration_remote_enabled', true]
+        ]
+      }, function (options = {}) {
+        var test = new PeerConnectionTest(options);
+        test.setMediaConstraints([{video: true}],
+                                 [{video: true}]);
+        test.run();
+      })
+  });
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/media/webvtt/vtt.jsm b/dom/media/webvtt/vtt.jsm
index 1a6ecb1d7d66..467717e405dc 100644
--- a/dom/media/webvtt/vtt.jsm
+++ b/dom/media/webvtt/vtt.jsm
@@ -522,6 +522,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
     styles = {
       position: "absolute",
       textAlign: cue.align,
+      font: styleOptions.font,
     };
 
     this.div = window.document.createElement("div");
@@ -532,17 +533,24 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
     // Calculate the distance from the reference edge of the viewport to the text
     // position of the cue box. The reference edge will be resolved later when
     // the box orientation styles are applied.
+    function convertCuePostionToPercentage(cuePosition) {
+      if (cuePosition === "auto") {
+        return 50;
+      }
+      return cuePosition;
+    }
     var textPos = 0;
+    let postionPercentage = convertCuePostionToPercentage(cue.position);
     switch (cue.computedPositionAlign) {
       // TODO : modify these fomula to follow the spec, see bug 1277437.
       case "line-left":
-        textPos = cue.position;
+        textPos = postionPercentage;
         break;
       case "center":
-        textPos = cue.position - (cue.size / 2);
+        textPos = postionPercentage - (cue.size / 2);
         break;
       case "line-right":
-        textPos = cue.position - cue.size;
+        textPos = postionPercentage - cue.size;
         break;
     }
 
@@ -893,7 +901,6 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 
   var FONT_SIZE_PERCENT = 0.05;
   var FONT_STYLE = "sans-serif";
-  var CUE_BACKGROUND_PADDING = "1.5%";
 
   // Runs the processing model over the cues and regions passed to it.
   // @param overlay A block level element (usually a div) that the computed cues
@@ -919,14 +926,13 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
       controlBarShown = controlBar ? !!controlBar.clientHeight : false;
     }
 
-    var paddedOverlay = window.document.createElement("div");
-    paddedOverlay.style.position = "absolute";
-    paddedOverlay.style.left = "0";
-    paddedOverlay.style.right = "0";
-    paddedOverlay.style.top = "0";
-    paddedOverlay.style.bottom = "0";
-    paddedOverlay.style.margin = CUE_BACKGROUND_PADDING;
-    overlay.appendChild(paddedOverlay);
+    var rootOfCues = window.document.createElement("div");
+    rootOfCues.style.position = "absolute";
+    rootOfCues.style.left = "0";
+    rootOfCues.style.right = "0";
+    rootOfCues.style.top = "0";
+    rootOfCues.style.bottom = "0";
+    overlay.appendChild(rootOfCues);
 
     // Determine if we need to compute the display states of the cues. This could
     // be the case if a cue's state has been changed since the last computation or
@@ -947,13 +953,13 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
     // We don't need to recompute the cues' display states. Just reuse them.
     if (!shouldCompute(cues)) {
       for (var i = 0; i < cues.length; i++) {
-        paddedOverlay.appendChild(cues[i].displayState);
+        rootOfCues.appendChild(cues[i].displayState);
       }
       return;
     }
 
     var boxPositions = [],
-        containerBox = BoxPosition.getSimpleBoxPosition(paddedOverlay),
+        containerBox = BoxPosition.getSimpleBoxPosition(rootOfCues),
         fontSize = Math.round(containerBox.height * FONT_SIZE_PERCENT * 100) / 100;
     var styleOptions = {
       font: fontSize + "px " + FONT_STYLE
@@ -973,7 +979,7 @@ const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
         // Compute the intial position and styles of the cue div.
         styleBox = new CueStyleBox(window, cue, styleOptions);
         styleBox.cueDiv.style.setProperty("--cue-font-size", fontSize + "px");
-        paddedOverlay.appendChild(styleBox.div);
+        rootOfCues.appendChild(styleBox.div);
 
         // Move the cue div to it's correct line position.
         moveBoxToLinePosition(window, styleBox, containerBox, boxPositions);
diff --git a/dom/messagechannel/PMessagePort.ipdl b/dom/messagechannel/PMessagePort.ipdl
index 09f56ed76b9a..2026938136df 100644
--- a/dom/messagechannel/PMessagePort.ipdl
+++ b/dom/messagechannel/PMessagePort.ipdl
@@ -5,6 +5,7 @@
 include protocol PBackground;
 include protocol PChildToParentStream;
 include protocol PFileDescriptorSet;
+include protocol PIPCBlobInputStream;
 include protocol PParentToChildStream;
 include protocol PBlob;
 
diff --git a/dom/quota/StorageManager.cpp b/dom/quota/StorageManager.cpp
index 561dcba6399d..271488f5c351 100644
--- a/dom/quota/StorageManager.cpp
+++ b/dom/quota/StorageManager.cpp
@@ -193,8 +193,9 @@ public:
   nsresult
   Start();
 
-  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSICONTENTPERMISSIONREQUEST
+  NS_DECL_CYCLE_COLLECTION_CLASS(PersistentStoragePermissionRequest)
 
 private:
   ~PersistentStoragePermissionRequest()
@@ -698,8 +699,15 @@ PersistentStoragePermissionRequest::Start()
   return nsContentPermissionUtils::AskPermission(this, mWindow);
 }
 
-NS_IMPL_ISUPPORTS(PersistentStoragePermissionRequest,
-                  nsIContentPermissionRequest)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(PersistentStoragePermissionRequest)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(PersistentStoragePermissionRequest)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PersistentStoragePermissionRequest)
+  NS_INTERFACE_MAP_ENTRY(nsIContentPermissionRequest)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION(PersistentStoragePermissionRequest, mWindow, mPromise)
 
 NS_IMETHODIMP
 PersistentStoragePermissionRequest::GetPrincipal(nsIPrincipal** aPrincipal)
diff --git a/dom/svg/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp
index cd7ba4b98473..d7b53660c764 100644
--- a/dom/svg/SVGSVGElement.cpp
+++ b/dom/svg/SVGSVGElement.cpp
@@ -183,7 +183,6 @@ SVGSVGElement::SVGSVGElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo
                                 aFromParser == FROM_PARSER_FRAGMENT ||
                                 aFromParser == FROM_PARSER_XSLT),
     mImageNeedsTransformInvalidation(false),
-    mIsPaintingSVGImageElement(false),
     mHasChildrenOnlyTransform(false)
 {
 }
@@ -1061,14 +1060,9 @@ SVGSVGElement::HasViewBoxRect() const
 bool
 SVGSVGElement::ShouldSynthesizeViewBox() const
 {
-  MOZ_ASSERT(!HasViewBoxRect(),
-             "Should only be called if we lack a viewBox");
+  MOZ_ASSERT(!HasViewBoxRect(), "Should only be called if we lack a viewBox");
 
-  nsIDocument* doc = GetUncomposedDoc();
-  return doc &&
-    doc->IsBeingUsedAsImage() &&
-    !mIsPaintingSVGImageElement &&
-    !GetParent();
+  return IsRoot() && OwnerDoc()->IsBeingUsedAsImage();
 }
 
 bool
@@ -1108,12 +1102,6 @@ SVGSVGElement::ClearPreserveAspectRatioProperty()
   return valPtr;
 }
 
-void
-SVGSVGElement::SetIsPaintingForSVGImageElement(bool aIsPaintingSVGImageElement)
-{
-  mIsPaintingSVGImageElement = aIsPaintingSVGImageElement;
-}
-
 void
 SVGSVGElement::
   SetImageOverridePreserveAspectRatio(const SVGPreserveAspectRatio& aPAR)
diff --git a/dom/svg/SVGSVGElement.h b/dom/svg/SVGSVGElement.h
index d8aa70aa506e..95f12fb6b2f0 100644
--- a/dom/svg/SVGSVGElement.h
+++ b/dom/svg/SVGSVGElement.h
@@ -317,8 +317,6 @@ private:
   const SVGPreserveAspectRatio* GetPreserveAspectRatioProperty() const;
   bool ClearPreserveAspectRatioProperty();
 
-  void SetIsPaintingForSVGImageElement(bool aIsPaintingSVGImageElement);
-
   bool IsRoot() const {
     NS_ASSERTION((IsInUncomposedDoc() && !GetParent()) ==
                  (OwnerDoc() && (OwnerDoc()->GetRootElement() == this)),
@@ -420,7 +418,6 @@ private:
   // to manually kick off animation when they are bound to the tree.
   bool     mStartAnimationOnBindToTree;
   bool     mImageNeedsTransformInvalidation;
-  bool     mIsPaintingSVGImageElement;
   bool     mHasChildrenOnlyTransform;
 };
 
@@ -447,8 +444,6 @@ public:
       // and overflow properties here, too. See bug 272288 comment 36.
       mRootElem->SetImageOverridePreserveAspectRatio(
           *aSVGContext->GetPreserveAspectRatio());
-      mRootElem->SetIsPaintingForSVGImageElement(
-          aSVGContext->IsPaintingForSVGImageElement());
     }
 
     mOriginalTime = mRootElem->GetCurrentTime();
@@ -460,7 +455,6 @@ public:
     mRootElem->SetCurrentTime(mOriginalTime);
     if (mHaveOverrides) {
       mRootElem->ClearImageOverridePreserveAspectRatio();
-      mRootElem->SetIsPaintingForSVGImageElement(false);
     }
   }
 
diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp
index 5582874085b6..a845b69aabd2 100644
--- a/editor/libeditor/EditorBase.cpp
+++ b/editor/libeditor/EditorBase.cpp
@@ -3491,63 +3491,6 @@ EditorBase::IsContainer(nsIDOMNode* aNode)
   return aNode ? true : false;
 }
 
-static inline bool
-IsElementVisible(Element* aElement)
-{
-  if (aElement->GetPrimaryFrame()) {
-    // It's visible, for our purposes
-    return true;
-  }
-
-  nsIContent *cur = aElement;
-  for (;;) {
-    // Walk up the tree looking for the nearest ancestor with a frame.
-    // The state of the child right below it will determine whether
-    // we might possibly have a frame or not.
-    bool haveLazyBitOnChild = cur->HasFlag(NODE_NEEDS_FRAME);
-    cur = cur->GetFlattenedTreeParent();
-    if (!cur) {
-      if (!haveLazyBitOnChild) {
-        // None of our ancestors have lazy bits set, so we shouldn't
-        // have a frame
-        return false;
-      }
-
-      // The root has a lazy frame construction bit.  We need to check
-      // our style.
-      break;
-    }
-
-    if (cur->GetPrimaryFrame()) {
-      if (!haveLazyBitOnChild) {
-        // Our ancestor directly under |cur| doesn't have lazy bits;
-        // that means we won't get a frame
-        return false;
-      }
-
-      if (cur->GetPrimaryFrame()->IsLeaf()) {
-        // Nothing under here will ever get frames
-        return false;
-      }
-
-      // Otherwise, we might end up with a frame when that lazy bit is
-      // processed.  Figure out our actual style.
-      break;
-    }
-  }
-
-  // Now it might be that we have no frame because we're in a
-  // display:none subtree, or it might be that we're just dealing with
-  // lazy frame construction and it hasn't happened yet.  Check which
-  // one it is.
-  RefPtr<nsStyleContext> styleContext =
-    nsComputedDOMStyle::GetStyleContextNoFlush(aElement, nullptr, nullptr);
-  if (styleContext) {
-    return styleContext->StyleDisplay()->mDisplay != StyleDisplay::None;
-  }
-  return false;
-}
-
 bool
 EditorBase::IsEditable(nsIDOMNode* aNode)
 {
@@ -3565,18 +3508,10 @@ EditorBase::IsEditable(nsINode* aNode)
     return false;
   }
 
-  // see if it has a frame.  If so, we'll edit it.
-  // special case for textnodes: frame must have width.
-  if (aNode->IsElement() && !IsElementVisible(aNode->AsElement())) {
-    // If the element has no frame, it's not editable.  Note that we
-    // need to check IsElement() here, because some of our tests
-    // rely on frameless textnodes being visible.
-    return false;
-  }
   switch (aNode->NodeType()) {
     case nsIDOMNode::ELEMENT_NODE:
     case nsIDOMNode::TEXT_NODE:
-      return true; // element or text node; not invisible
+      return true;
     default:
       return false;
   }
diff --git a/editor/libeditor/EditorBase.h b/editor/libeditor/EditorBase.h
index ce0f0909695c..aabf83b123a6 100644
--- a/editor/libeditor/EditorBase.h
+++ b/editor/libeditor/EditorBase.h
@@ -7,7 +7,6 @@
 #define mozilla_EditorBase_h
 
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc.
-#include "mozilla/FlushType.h"          // for FlushType enum
 #include "mozilla/OwningNonNull.h"      // for OwningNonNull
 #include "mozilla/SelectionState.h"     // for RangeUpdater, etc.
 #include "mozilla/StyleSheet.h"   // for StyleSheet
@@ -984,14 +983,6 @@ public:
    */
   void HideCaret(bool aHide);
 
-  void FlushFrames()
-  {
-    nsCOMPtr<nsIDocument> doc = GetDocument();
-    if (doc) {
-      doc->FlushPendingNotifications(FlushType::Frames);
-    }
-  }
-
 protected:
   enum Tristate
   {
diff --git a/editor/libeditor/HTMLEditorDataTransfer.cpp b/editor/libeditor/HTMLEditorDataTransfer.cpp
index ebd7783c01a5..1664cde6ecdf 100644
--- a/editor/libeditor/HTMLEditorDataTransfer.cpp
+++ b/editor/libeditor/HTMLEditorDataTransfer.cpp
@@ -1668,9 +1668,6 @@ HTMLEditor::PasteAsCitedQuotation(const nsAString& aCitation,
   rv = selection->Collapse(newNode, 0);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Ensure that the inserted <blockquote> has a frame to make it IsEditable.
-  FlushFrames();
-
   return Paste(aSelectionType);
 }
 
@@ -1727,7 +1724,6 @@ HTMLEditor::PasteAsPlaintextQuotation(int32_t aSelectionType)
 NS_IMETHODIMP
 HTMLEditor::InsertTextWithQuotations(const nsAString& aStringToInsert)
 {
-  AutoEditBatch beginBatching(this);
   // The whole operation should be undoable in one transaction:
   BeginTransaction();
 
@@ -1891,9 +1887,6 @@ HTMLEditor::InsertAsPlaintextQuotation(const nsAString& aQuotedText,
     selection->Collapse(newNode, 0);
   }
 
-  // Ensure that the inserted <span> has a frame to make it IsEditable.
-  FlushFrames();
-
   if (aAddCites) {
     rv = TextEditor::InsertAsQuotation(aQuotedText, aNodeInserted);
   } else {
@@ -1977,9 +1970,6 @@ HTMLEditor::InsertAsCitedQuotation(const nsAString& aQuotedText,
   // Set the selection inside the blockquote so aQuotedText will go there:
   selection->Collapse(newNode, 0);
 
-  // Ensure that the inserted <blockquote> has a frame to make it IsEditable.
-  FlushFrames();
-
   if (aInsertHTML) {
     rv = LoadHTML(aQuotedText);
   } else {
diff --git a/editor/libeditor/TextEditRules.cpp b/editor/libeditor/TextEditRules.cpp
index afff387109f9..014ec7e217d7 100644
--- a/editor/libeditor/TextEditRules.cpp
+++ b/editor/libeditor/TextEditRules.cpp
@@ -26,10 +26,8 @@
 #include "nsGkAtoms.h"
 #include "nsIContent.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMElement.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMNodeFilter.h"
-#include "nsIDOMNodeIterator.h"
 #include "nsIDOMText.h"
 #include "nsNameSpaceManager.h"
 #include "nsINode.h"
@@ -191,7 +189,7 @@ TextEditRules::BeforeEdit(EditAction action,
   RefPtr<Selection> selection = mTextEditor->GetSelection();
   NS_ENSURE_STATE(selection);
 
-  selection->GetAnchorNode(getter_AddRefs(mCachedSelectionNode));
+  mCachedSelectionNode = selection->GetAnchorNode();
   selection->GetAnchorOffset(&mCachedSelectionOffset);
 
   return NS_OK;
@@ -216,7 +214,7 @@ TextEditRules::AfterEdit(EditAction action,
     NS_ENSURE_STATE(mTextEditor);
     nsresult rv =
       mTextEditor->HandleInlineSpellCheck(action, selection,
-                                          mCachedSelectionNode,
+                                          GetAsDOMNode(mCachedSelectionNode),
                                           mCachedSelectionOffset,
                                           nullptr, 0, nullptr, 0);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -995,7 +993,7 @@ TextEditRules::DidUndo(Selection* aSelection,
   NS_ENSURE_TRUE(theRoot, NS_ERROR_FAILURE);
   nsIContent* node = mTextEditor->GetLeftmostChild(theRoot);
   if (node && mTextEditor->IsMozEditorBogusNode(node)) {
-    mBogusNode = do_QueryInterface(node);
+    mBogusNode = node;
   } else {
     mBogusNode = nullptr;
   }
@@ -1045,7 +1043,7 @@ TextEditRules::DidRedo(Selection* aSelection,
 
   RefPtr<Element> node = nodeList->Item(0);
   if (mTextEditor->IsMozEditorBogusNode(node)) {
-    mBogusNode = do_QueryInterface(node);
+    mBogusNode = node;
   } else {
     mBogusNode = nullptr;
   }
@@ -1131,7 +1129,7 @@ TextEditRules::RemoveRedundantTrailingBR()
   elem->UnsetAttr(kNameSpaceID_None, nsGkAtoms::type, true);
 
   // set mBogusNode to be this <br>
-  mBogusNode = do_QueryInterface(elem);
+  mBogusNode = elem;
 
   // give it the bogus node attribute
   elem->SetAttr(kNameSpaceID_None, kMOZEditorBogusNodeAttrAtom,
@@ -1220,16 +1218,14 @@ TextEditRules::CreateBogusNodeIfNeeded(Selection* aSelection)
   NS_ENSURE_STATE(newContent);
 
   // set mBogusNode to be the newly created <br>
-  mBogusNode = do_QueryInterface(newContent);
-  NS_ENSURE_TRUE(mBogusNode, NS_ERROR_NULL_POINTER);
+  mBogusNode = newContent;
 
   // Give it a special attribute.
   newContent->SetAttr(kNameSpaceID_None, kMOZEditorBogusNodeAttrAtom,
                       kMOZEditorBogusNodeValue, false);
 
   // Put the node in the document.
-  nsCOMPtr<nsIDOMNode> bodyNode = do_QueryInterface(body);
-  nsresult rv = mTextEditor->InsertNode(mBogusNode, bodyNode, 0);
+  nsresult rv = mTextEditor->InsertNode(*mBogusNode, *body, 0);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Set selection.
diff --git a/editor/libeditor/TextEditRules.h b/editor/libeditor/TextEditRules.h
index 602e703bd313..d1bb0bee160a 100644
--- a/editor/libeditor/TextEditRules.h
+++ b/editor/libeditor/TextEditRules.h
@@ -16,7 +16,6 @@
 #include "nsString.h"
 #include "nscore.h"
 
-class nsIDOMElement;
 class nsIDOMNode;
 
 namespace mozilla {
@@ -124,7 +123,6 @@ protected:
                           nsAString* outString,
                           int32_t aMaxLength);
   nsresult DidInsertText(Selection* aSelection, nsresult aResult);
-  nsresult GetTopEnclosingPre(nsIDOMNode* aNode, nsIDOMNode** aOutPreNode);
 
   nsresult WillInsertBreak(Selection* aSelection, bool* aCancel,
                            bool* aHandled, int32_t aMaxLength);
@@ -235,9 +233,9 @@ protected:
   nsString mPasswordIMEText;
   uint32_t mPasswordIMEIndex;
   // Magic node acts as placeholder in empty doc.
-  nsCOMPtr<nsIDOMNode> mBogusNode;
+  nsCOMPtr<nsIContent> mBogusNode;
   // Cached selected node.
-  nsCOMPtr<nsIDOMNode> mCachedSelectionNode;
+  nsCOMPtr<nsINode> mCachedSelectionNode;
   // Cached selected offset.
   int32_t mCachedSelectionOffset;
   uint32_t mActionNesting;
diff --git a/editor/libeditor/tests/mochitest.ini b/editor/libeditor/tests/mochitest.ini
index fdd874301101..236fd02f307e 100644
--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -232,6 +232,7 @@ skip-if = toolkit == 'android' # bug 1315898
 [test_bug1328023.html]
 [test_bug1330796.html]
 [test_bug1332876.html]
+[test_bug1355792.html]
 
 [test_CF_HTML_clipboard.html]
 subsuite = clipboard
diff --git a/editor/libeditor/tests/test_bug1355792.html b/editor/libeditor/tests/test_bug1355792.html
new file mode 100644
index 000000000000..c8231ebec404
--- /dev/null
+++ b/editor/libeditor/tests/test_bug1355792.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Test for Bug 1355792</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<div contenteditable><div><font><table><td>a</table><br><br><table><td>b</table></font></div></div>
+<script>
+var font = document.querySelector("font");
+getSelection().collapse(font, 1);
+document.execCommand("forwarddelete");
+is(document.body.firstChild.innerHTML,
+   "<div><font><table><tbody><tr><td>a</td></tr></tbody></table><br>"
+   + "<table><tbody><tr><td>b</td></tr></tbody></table></font></div>",
+   "No creating an extra <br>");
+is(getSelection().focusNode, font, "Selection node should not change");
+is(getSelection().focusOffset, 1, "Selection offset should not move");
+ok(getSelection().isCollapsed, "Selection should be collapsed");
+</script>
diff --git a/gfx/ipc/GPUProcessHost.cpp b/gfx/ipc/GPUProcessHost.cpp
index b2ff27e2bdfb..041d19920619 100644
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -9,6 +9,7 @@
 #include "gfxPrefs.h"
 #include "mozilla/gfx/Logging.h"
 #include "nsITimer.h"
+#include "mozilla/Preferences.h"
 
 namespace mozilla {
 namespace gfx {
@@ -38,6 +39,10 @@ GPUProcessHost::Launch()
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mGPUChild);
 
+#if defined(XP_WIN) && defined(MOZ_SANDBOX)
+  mSandboxLevel = Preferences::GetInt("security.sandbox.gpu.level");
+#endif
+
   mLaunchPhase = LaunchPhase::Waiting;
   mLaunchTime = TimeStamp::Now();
 
diff --git a/gfx/ipc/GPUProcessImpl.cpp b/gfx/ipc/GPUProcessImpl.cpp
index f7c4c80daafe..2ed07b66bacd 100644
--- a/gfx/ipc/GPUProcessImpl.cpp
+++ b/gfx/ipc/GPUProcessImpl.cpp
@@ -7,6 +7,11 @@
 #include "mozilla/ipc/IOThreadChild.h"
 #include "nsXPCOM.h"
 
+#if defined(OS_WIN) && defined(MOZ_SANDBOX)
+#define TARGET_SANDBOX_EXPORTS
+#include "mozilla/sandboxTarget.h"
+#endif
+
 namespace mozilla {
 namespace gfx {
 
@@ -24,6 +29,10 @@ GPUProcessImpl::~GPUProcessImpl()
 bool
 GPUProcessImpl::Init(int aArgc, char* aArgv[])
 {
+#if defined(MOZ_SANDBOX) && defined(OS_WIN)
+  mozilla::SandboxTarget::Instance()->StartSandbox();
+#endif
+
   return mGPU.Init(ParentPid(),
                    IOThreadChild::message_loop(),
                    IOThreadChild::channel());
diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h
index babbe161649b..9d7f40033e81 100644
--- a/gfx/ipc/GfxMessageUtils.h
+++ b/gfx/ipc/GfxMessageUtils.h
@@ -1306,6 +1306,7 @@ struct ParamTraits<mozilla::layers::AsyncDragMetrics>
     WriteParam(aMsg, aParam.mDragStartSequenceNumber);
     WriteParam(aMsg, aParam.mScrollbarDragOffset);
     WriteParam(aMsg, aParam.mScrollTrack);
+    WriteParam(aMsg, aParam.mScrollThumbLength);
     WriteParam(aMsg, aParam.mDirection);
   }
 
@@ -1316,6 +1317,7 @@ struct ParamTraits<mozilla::layers::AsyncDragMetrics>
             ReadParam(aMsg, aIter, &aResult->mDragStartSequenceNumber) &&
             ReadParam(aMsg, aIter, &aResult->mScrollbarDragOffset) &&
             ReadParam(aMsg, aIter, &aResult->mScrollTrack) &&
+            ReadParam(aMsg, aIter, &aResult->mScrollThumbLength) &&
             ReadParam(aMsg, aIter, &aResult->mDirection));
   }
 };
diff --git a/gfx/layers/LayerMetricsWrapper.h b/gfx/layers/LayerMetricsWrapper.h
index f714cda24bfe..67f99221d2de 100644
--- a/gfx/layers/LayerMetricsWrapper.h
+++ b/gfx/layers/LayerMetricsWrapper.h
@@ -423,15 +423,6 @@ public:
     return mLayer->GetScrollbarTargetContainerId();
   }
 
-  int32_t GetScrollThumbLength() const
-  {
-    if (GetScrollbarDirection() == ScrollDirection::VERTICAL) {
-      return mLayer->GetVisibleRegion().GetBounds().height;
-    } else {
-      return mLayer->GetVisibleRegion().GetBounds().width;
-    }
-  }
-
   bool IsScrollbarContainer() const
   {
     MOZ_ASSERT(IsValid());
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index 25a4a9ded1e8..74a5f7c77070 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -116,7 +116,8 @@ class LayersPacket;
 
 #define MOZ_LAYER_DECL_NAME(n, e)                              \
   virtual const char* Name() const override { return n; }  \
-  virtual LayerType GetType() const override { return e; }
+  virtual LayerType GetType() const override { return e; } \
+  static LayerType Type() { return e; }
 
 // Defined in LayerUserData.h; please include that file instead.
 class LayerUserData;
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index cdee22ee8951..af27107439a4 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -519,7 +519,6 @@ APZCTreeManager::PrepareNodeForLayer(const ScrollNode& aLayer,
         GetEventRegionsOverride(aParent, aLayer));
     node->SetScrollbarData(aLayer.GetScrollbarTargetContainerId(),
                            aLayer.GetScrollbarDirection(),
-                           aLayer.GetScrollThumbLength(),
                            aLayer.IsScrollbarContainer());
     node->SetFixedPosData(aLayer.GetFixedPositionScrollContainerId());
     return node;
@@ -709,7 +708,6 @@ APZCTreeManager::PrepareNodeForLayer(const ScrollNode& aLayer,
   // when those properties change.
   node->SetScrollbarData(aLayer.GetScrollbarTargetContainerId(),
                          aLayer.GetScrollbarDirection(),
-                         aLayer.GetScrollThumbLength(),
                          aLayer.IsScrollbarContainer());
   node->SetFixedPosData(aLayer.GetFixedPositionScrollContainerId());
   return node;
diff --git a/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp b/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp
index 3fe6e73d6264..041b90e45e7b 100644
--- a/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp
+++ b/gfx/layers/apz/src/AndroidDynamicToolbarAnimator.cpp
@@ -287,7 +287,7 @@ bool
 AndroidDynamicToolbarAnimator::UpdateAnimation(const TimeStamp& aCurrentFrame)
 {
   MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
-  if (mToolbarState != eToolbarAnimating) {
+  if ((mToolbarState != eToolbarAnimating) || mCompositorShutdown) {
     return false;
   }
 
@@ -330,6 +330,8 @@ AndroidDynamicToolbarAnimator::UpdateAnimation(const TimeStamp& aCurrentFrame)
 
   if (!continueAnimating) {
     NotifyControllerAnimationStopped(mCompositorToolbarHeight);
+  } else {
+    UpdateControllerToolbarHeight(mCompositorToolbarHeight);
   }
 
   return continueAnimating;
@@ -579,7 +581,10 @@ AndroidDynamicToolbarAnimator::HandleTouchEnd(StaticToolbarState aCurrentToolbar
 void
 AndroidDynamicToolbarAnimator::PostMessage(int32_t aMessage) {
   RefPtr<UiCompositorControllerParent> uiController = UiCompositorControllerParent::GetFromRootLayerTreeId(mRootLayerTreeId);
-  MOZ_ASSERT(uiController);
+  if (!uiController) {
+    // Looks like IPC may be shutdown.
+    return;
+  }
   // ToolbarAnimatorMessageFromCompositor may be called from any thread.
   uiController->ToolbarAnimatorMessageFromCompositor(aMessage);
 }
@@ -637,6 +642,9 @@ void
 AndroidDynamicToolbarAnimator::UpdateFixedLayerMargins()
 {
   MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
+  if (mCompositorShutdown) {
+    return;
+  }
   CompositorBridgeParent* parent = CompositorBridgeParent::GetCompositorBridgeParentFromLayersId(mRootLayerTreeId);
   if (parent) {
     ScreenIntCoord surfaceHeight = parent->GetEGLSurfaceSize().height;
@@ -736,7 +744,10 @@ AndroidDynamicToolbarAnimator::StopCompositorAnimation()
     return;
   }
 
-  mToolbarState = eToolbarUnlocked;
+  if (mToolbarState == eToolbarAnimating) {
+    mToolbarState = eToolbarUnlocked;
+  }
+
   NotifyControllerAnimationStopped(mCompositorToolbarHeight);
 }
 
@@ -763,6 +774,10 @@ AndroidDynamicToolbarAnimator::RequestComposite()
     return;
   }
 
+  if (mCompositorShutdown) {
+    return;
+  }
+
   CompositorBridgeParent* parent = CompositorBridgeParent::GetCompositorBridgeParentFromLayersId(mRootLayerTreeId);
   if (parent) {
     AsyncCompositionManager* manager = parent->GetCompositionManager(nullptr);
diff --git a/gfx/layers/apz/src/AsyncDragMetrics.h b/gfx/layers/apz/src/AsyncDragMetrics.h
index cd763a243e55..1ebfb5947742 100644
--- a/gfx/layers/apz/src/AsyncDragMetrics.h
+++ b/gfx/layers/apz/src/AsyncDragMetrics.h
@@ -34,6 +34,7 @@ public:
     , mPresShellId(0)
     , mDragStartSequenceNumber(0)
     , mScrollbarDragOffset(0)
+    , mScrollThumbLength(0)
     , mDirection(NONE)
   {}
 
@@ -42,12 +43,14 @@ public:
                    uint64_t aDragStartSequenceNumber,
                    CSSCoord aScrollbarDragOffset,
                    const CSSRect& aScrollTrack,
+                   CSSCoord aScrollThumbLength,
                    DragDirection aDirection)
     : mViewId(aViewId)
     , mPresShellId(aPresShellId)
     , mDragStartSequenceNumber(aDragStartSequenceNumber)
     , mScrollbarDragOffset(aScrollbarDragOffset)
     , mScrollTrack(aScrollTrack)
+    , mScrollThumbLength(aScrollThumbLength)
     , mDirection(aDirection)
   {}
 
@@ -56,6 +59,7 @@ public:
   uint64_t mDragStartSequenceNumber;
   CSSCoord mScrollbarDragOffset;
   CSSRect mScrollTrack;
+  CSSCoord mScrollThumbLength;
   DragDirection mDirection;
 };
 
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 6290bf51dab7..da35760ef1cf 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -927,9 +927,7 @@ nsEventStatus AsyncPanZoomController::HandleDragEvent(const MouseInput& aEvent,
                         GetAxisStart(aDragMetrics.mDirection, aDragMetrics.mScrollTrack);
 
   CSSCoord scrollMax = GetAxisLength(aDragMetrics.mDirection, aDragMetrics.mScrollTrack);
-  scrollMax -= node->GetScrollThumbLength() /
-               GetAxisScale(aDragMetrics.mDirection, mFrameMetrics.GetZoom()) *
-               mFrameMetrics.GetPresShellResolution();
+  scrollMax -= aDragMetrics.mScrollThumbLength;
 
   float scrollPercent = mousePosition / scrollMax;
 
diff --git a/gfx/layers/apz/src/HitTestingTreeNode.cpp b/gfx/layers/apz/src/HitTestingTreeNode.cpp
index 0fe7ffa1d334..77be356af5c0 100644
--- a/gfx/layers/apz/src/HitTestingTreeNode.cpp
+++ b/gfx/layers/apz/src/HitTestingTreeNode.cpp
@@ -28,7 +28,6 @@ HitTestingTreeNode::HitTestingTreeNode(AsyncPanZoomController* aApzc,
   , mLayersId(aLayersId)
   , mScrollViewId(FrameMetrics::NULL_SCROLL_ID)
   , mScrollDir(ScrollDirection::NONE)
-  , mScrollThumbLength(0)
   , mIsScrollbarContainer(false)
   , mFixedPosTarget(FrameMetrics::NULL_SCROLL_ID)
   , mOverride(EventRegionsOverride::NoOverride)
@@ -97,12 +96,10 @@ HitTestingTreeNode::SetLastChild(HitTestingTreeNode* aChild)
 void
 HitTestingTreeNode::SetScrollbarData(FrameMetrics::ViewID aScrollViewId,
                                      ScrollDirection aDir,
-                                     int32_t aScrollThumbLength,
                                      bool aIsScrollContainer)
 {
   mScrollViewId = aScrollViewId;
   mScrollDir = aDir;
-  mScrollThumbLength = aScrollThumbLength;
   mIsScrollbarContainer = aIsScrollContainer;
 }
 
@@ -116,12 +113,6 @@ HitTestingTreeNode::MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetric
          mScrollViewId == aDragMetrics.mViewId;
 }
 
-LayerIntCoord
-HitTestingTreeNode::GetScrollThumbLength() const
-{
-  return mScrollThumbLength;
-}
-
 bool
 HitTestingTreeNode::IsScrollbarNode() const
 {
diff --git a/gfx/layers/apz/src/HitTestingTreeNode.h b/gfx/layers/apz/src/HitTestingTreeNode.h
index 628259524620..606b758ff631 100644
--- a/gfx/layers/apz/src/HitTestingTreeNode.h
+++ b/gfx/layers/apz/src/HitTestingTreeNode.h
@@ -93,7 +93,6 @@ public:
 
   void SetScrollbarData(FrameMetrics::ViewID aScrollViewId,
                         ScrollDirection aDir,
-                        int32_t aScrollThumbLength,
                         bool aIsScrollContainer);
   bool MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetrics) const;
   LayerIntCoord GetScrollThumbLength() const;
@@ -135,7 +134,6 @@ private:
 
   // This is set for scroll thumb Container layers only.
   ScrollDirection mScrollDir;
-  int32_t mScrollThumbLength;
 
   // This is set for scroll track Container layers only.
   bool mIsScrollbarContainer;
diff --git a/gfx/thebes/PrintTarget.cpp b/gfx/thebes/PrintTarget.cpp
index a5ad5574aa1e..c686e8e49789 100644
--- a/gfx/thebes/PrintTarget.cpp
+++ b/gfx/thebes/PrintTarget.cpp
@@ -25,6 +25,7 @@ PrintTarget::PrintTarget(cairo_surface_t* aCairoSurface, const IntSize& aSize)
   , mIsFinished(false)
 #ifdef DEBUG
   , mHasActivePage(false)
+  , mRecorder(nullptr)
 #endif
 
 {
@@ -132,20 +133,34 @@ PrintTarget::GetReferenceDrawTarget(DrawEventRecorder* aRecorder)
     if (!dt || !dt->IsValid()) {
       return nullptr;
     }
+    mRefDT = dt.forget();
+  }
 
-    if (aRecorder) {
-      dt = CreateRecordingDrawTarget(aRecorder, dt);
+  if (aRecorder) {
+    if (!mRecordingRefDT) {
+      RefPtr<DrawTarget> dt = CreateRecordingDrawTarget(aRecorder, mRefDT);
       if (!dt || !dt->IsValid()) {
         return nullptr;
       }
+      mRecordingRefDT = dt.forget();
+#ifdef DEBUG
+      mRecorder = aRecorder;
+#endif
     }
+#ifdef DEBUG
+    else {
+      MOZ_ASSERT(aRecorder == mRecorder,
+                 "Caching mRecordingRefDT assumes the aRecorder is an invariant");
+    }
+#endif
 
-    mRefDT = dt.forget();
+    return do_AddRef(mRecordingRefDT);
   }
+
   return do_AddRef(mRefDT);
 }
 
-already_AddRefed<DrawTarget>
+/* static */ already_AddRefed<DrawTarget>
 PrintTarget::CreateRecordingDrawTarget(DrawEventRecorder* aRecorder,
                                        DrawTarget* aDrawTarget)
 {
diff --git a/gfx/thebes/PrintTarget.h b/gfx/thebes/PrintTarget.h
index f28518059121..5dadf73ae858 100644
--- a/gfx/thebes/PrintTarget.h
+++ b/gfx/thebes/PrintTarget.h
@@ -143,16 +143,25 @@ protected:
   // Protected because we're refcounted
   virtual ~PrintTarget();
 
-  already_AddRefed<DrawTarget>
+  static already_AddRefed<DrawTarget>
   CreateRecordingDrawTarget(DrawEventRecorder* aRecorder,
                             DrawTarget* aDrawTarget);
 
   cairo_surface_t* mCairoSurface;
   RefPtr<DrawTarget> mRefDT; // reference DT
+
+  // Early on during printing we expect to be called without a recorder in
+  // order to gather metrics for reflow.  However, in a content process, once
+  // we go on to paint we then expect to be called with a recorder.  Hence why
+  // we have this separate recording reference DrawTarget (which wraps mRefDT).
+  RefPtr<DrawTarget> mRecordingRefDT;
+
   IntSize mSize;
   bool mIsFinished;
 #ifdef DEBUG
   bool mHasActivePage;
+  // owned by mRecordingRefDT, so kept alive for our entire lifetime if set:
+  DrawEventRecorder* mRecorder;
 #endif
 };
 
diff --git a/gfx/thebes/PrintTargetCG.mm b/gfx/thebes/PrintTargetCG.mm
index 130ac6828310..66474db3ce66 100644
--- a/gfx/thebes/PrintTargetCG.mm
+++ b/gfx/thebes/PrintTargetCG.mm
@@ -94,16 +94,30 @@ PrintTargetCG::GetReferenceDrawTarget(DrawEventRecorder* aRecorder)
     if (!dt || !dt->IsValid()) {
       return nullptr;
     }
+    mRefDT = dt.forget();
+  }
 
-    if (aRecorder) {
-      dt = CreateRecordingDrawTarget(aRecorder, dt);
+  if (aRecorder) {
+    if (!mRecordingRefDT) {
+      RefPtr<DrawTarget> dt = CreateRecordingDrawTarget(aRecorder, mRefDT);
       if (!dt || !dt->IsValid()) {
         return nullptr;
       }
+      mRecordingRefDT = dt.forget();
+#ifdef DEBUG
+      mRecorder = aRecorder;
+#endif
     }
+#ifdef DEBUG
+    else {
+      MOZ_ASSERT(aRecorder == mRecorder,
+                 "Caching mRecordingRefDT assumes the aRecorder is an invariant");
+    }
+#endif
 
-    mRefDT = dt.forget();
+    return do_AddRef(mRecordingRefDT);
   }
+
   return do_AddRef(mRefDT);
 }
 
diff --git a/gfx/thebes/PrintTargetSkPDF.cpp b/gfx/thebes/PrintTargetSkPDF.cpp
index 0412a7c476e1..5e68c4f64b16 100644
--- a/gfx/thebes/PrintTargetSkPDF.cpp
+++ b/gfx/thebes/PrintTargetSkPDF.cpp
@@ -142,16 +142,30 @@ PrintTargetSkPDF::GetReferenceDrawTarget(DrawEventRecorder* aRecorder)
     if (!dt) {
       return nullptr;
     }
+    mRefDT = dt.forget();
+  }
 
-    if (aRecorder) {
-      dt = CreateRecordingDrawTarget(aRecorder, dt);
+  if (aRecorder) {
+    if (!mRecordingRefDT) {
+      RefPtr<DrawTarget> dt = CreateRecordingDrawTarget(aRecorder, mRefDT);
       if (!dt || !dt->IsValid()) {
         return nullptr;
       }
+      mRecordingRefDT = dt.forget();
+#ifdef DEBUG
+      mRecorder = aRecorder;
+#endif
     }
+#ifdef DEBUG
+    else {
+      MOZ_ASSERT(aRecorder == mRecorder,
+                 "Caching mRecordingRefDT assumes the aRecorder is an invariant");
+    }
+#endif
 
-    mRefDT = dt.forget();
+    return do_AddRef(mRecordingRefDT);
   }
+
   return do_AddRef(mRefDT);
 }
 
diff --git a/gfx/thebes/PrintTargetSkPDF.h b/gfx/thebes/PrintTargetSkPDF.h
index 4c729b3aa62f..3a742b992d3c 100644
--- a/gfx/thebes/PrintTargetSkPDF.h
+++ b/gfx/thebes/PrintTargetSkPDF.h
@@ -66,7 +66,6 @@ private:
   sk_sp<SkDocument> mRefPDFDoc;
   sk_sp<SkCanvas> mRefCanvas;
   SkDynamicMemoryWStream mRefOStream;
-  RefPtr<DrawTarget> mRefDT;
 };
 
 } // namespace gfx
diff --git a/gfx/thebes/PrintTargetThebes.cpp b/gfx/thebes/PrintTargetThebes.cpp
index 99fe470e6f94..fb82a8db0a1e 100644
--- a/gfx/thebes/PrintTargetThebes.cpp
+++ b/gfx/thebes/PrintTargetThebes.cpp
@@ -65,14 +65,30 @@ PrintTargetThebes::GetReferenceDrawTarget(DrawEventRecorder* aRecorder)
     if (!dt || !dt->IsValid()) {
       return nullptr;
     }
-    if (aRecorder) {
-      dt = CreateRecordingDrawTarget(aRecorder, dt);
+    mRefDT = dt->CreateSimilarDrawTarget(IntSize(1,1), dt->GetFormat());
+  }
+
+  if (aRecorder) {
+    if (!mRecordingRefDT) {
+      RefPtr<DrawTarget> dt = CreateRecordingDrawTarget(aRecorder, mRefDT);
       if (!dt || !dt->IsValid()) {
         return nullptr;
       }
+      mRecordingRefDT = dt.forget();
+#ifdef DEBUG
+      mRecorder = aRecorder;
+#endif
     }
-    mRefDT = dt->CreateSimilarDrawTarget(IntSize(1,1), dt->GetFormat());
+#ifdef DEBUG
+    else {
+      MOZ_ASSERT(aRecorder == mRecorder,
+                 "Caching mRecordingRefDT assumes the aRecorder is an invariant");
+    }
+#endif
+
+    return do_AddRef(mRecordingRefDT);
   }
+
   return do_AddRef(mRefDT);
 }
 
diff --git a/image/DynamicImage.cpp b/image/DynamicImage.cpp
index 47c920944c3e..9dda6c9c44ef 100644
--- a/image/DynamicImage.cpp
+++ b/image/DynamicImage.cpp
@@ -7,6 +7,7 @@
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "ImageRegion.h"
 #include "Orientation.h"
diff --git a/image/VectorImage.cpp b/image/VectorImage.cpp
index ea003d28d7d3..20f601c47c19 100644
--- a/image/VectorImage.cpp
+++ b/image/VectorImage.cpp
@@ -841,25 +841,22 @@ VectorImage::Draw(gfxContext* aContext,
     return DrawResult::NOT_READY;
   }
 
-  if (mIsDrawing) {
-    NS_WARNING("Refusing to make re-entrant call to VectorImage::Draw");
-    return DrawResult::TEMPORARY_ERROR;
-  }
-
   if (mAnimationConsumers == 0) {
     SendOnUnlockedDraw(aFlags);
   }
 
-  AutoRestore<bool> autoRestoreIsDrawing(mIsDrawing);
-  mIsDrawing = true;
+  MOZ_ASSERT(!(aFlags & FLAG_FORCE_PRESERVEASPECTRATIO_NONE) ||
+             (aSVGContext && aSVGContext->GetViewportSize()),
+             "Viewport size is required when using "
+             "FLAG_FORCE_PRESERVEASPECTRATIO_NONE");
 
-  // If FLAG_FORCE_PRESERVEASPECTRATIO_NONE bit is set, that means we should
-  // overwrite SVG preserveAspectRatio attibute of this image with none, and
-  // always stretch this image to viewport non-uniformly.
-  // And we can do this only if the caller pass in the the SVG viewport, via
-  // aSVGContext.
   Maybe<SVGImageContext> newSVGContext;
   if ((aFlags & FLAG_FORCE_PRESERVEASPECTRATIO_NONE) && aSVGContext) {
+    // Create an SVGImageContext with the appropriate 'preserveAspectRatio'
+    // value so that LookupCachedSurface() below uses the appropriate key:
+    MOZ_ASSERT(!aSVGContext->GetPreserveAspectRatio(),
+               "FLAG_FORCE_PRESERVEASPECTRATIO_NONE is not expected if a "
+               "preserveAspectRatio override is supplied");
     Maybe<SVGPreserveAspectRatio> aspectRatio =
       Some(SVGPreserveAspectRatio(SVG_PRESERVEASPECTRATIO_NONE,
                                   SVG_MEETORSLICE_UNKNOWN));
@@ -867,13 +864,8 @@ VectorImage::Draw(gfxContext* aContext,
     newSVGContext->SetPreserveAspectRatio(aspectRatio);
   }
 
-  float animTime =
-    (aWhichFrame == FRAME_FIRST) ? 0.0f
-                                 : mSVGDocumentWrapper->GetCurrentTime();
-  AutoSVGRenderingState autoSVGState(newSVGContext ? newSVGContext : aSVGContext,
-                                     animTime,
-                                     mSVGDocumentWrapper->GetRootSVGElem());
-
+  float animTime = (aWhichFrame == FRAME_FIRST)
+                     ? 0.0f : mSVGDocumentWrapper->GetCurrentTime();
 
   SVGDrawingParameters params(aContext, aSize, aRegion, aSamplingFilter,
                               newSVGContext ? newSVGContext : aSVGContext,
@@ -887,6 +879,22 @@ VectorImage::Draw(gfxContext* aContext,
     return DrawResult::SUCCESS;
   }
 
+  // else, we need to paint the image:
+
+  if (mIsDrawing) {
+    NS_WARNING("Refusing to make re-entrant call to VectorImage::Draw");
+    return DrawResult::TEMPORARY_ERROR;
+  }
+  AutoRestore<bool> autoRestoreIsDrawing(mIsDrawing);
+  mIsDrawing = true;
+
+  // Apply any 'preserveAspectRatio' override (if specified) to the root
+  // element, and set the animation time:
+  AutoSVGRenderingState autoSVGState(newSVGContext ? newSVGContext : aSVGContext,
+                                     animTime,
+                                     mSVGDocumentWrapper->GetRootSVGElem());
+
+  // Set context paint (if specified) on the document:
   Maybe<AutoSetRestoreSVGContextPaint> autoContextPaint;
   if (aSVGContext &&
       aSVGContext->GetContextPaint()) {
diff --git a/image/imgTools.cpp b/image/imgTools.cpp
index 29905c1ab36c..b20553fb6c83 100644
--- a/image/imgTools.cpp
+++ b/image/imgTools.cpp
@@ -8,6 +8,7 @@
 
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
diff --git a/ipc/glue/BackgroundChildImpl.cpp b/ipc/glue/BackgroundChildImpl.cpp
index 201742d06f50..6904e91b3de6 100644
--- a/ipc/glue/BackgroundChildImpl.cpp
+++ b/ipc/glue/BackgroundChildImpl.cpp
@@ -23,6 +23,7 @@
 #include "mozilla/dom/indexedDB/PBackgroundIDBFactoryChild.h"
 #include "mozilla/dom/indexedDB/PBackgroundIndexedDBUtilsChild.h"
 #include "mozilla/dom/ipc/BlobChild.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamChild.h"
 #include "mozilla/dom/ipc/MemoryStreamChild.h"
 #include "mozilla/dom/quota/PQuotaChild.h"
 #include "mozilla/dom/GamepadEventChannelChild.h"
@@ -229,6 +230,26 @@ BackgroundChildImpl::DeallocPMemoryStreamChild(PMemoryStreamChild* aActor)
   return true;
 }
 
+PIPCBlobInputStreamChild*
+BackgroundChildImpl::AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                                   const uint64_t& aSize)
+{
+  // IPCBlobInputStreamChild is refcounted. Here it's created and in
+  // DeallocPIPCBlobInputStreamChild is released.
+
+  RefPtr<mozilla::dom::IPCBlobInputStreamChild> actor =
+    new mozilla::dom::IPCBlobInputStreamChild(aID, aSize);
+  return actor.forget().take();
+}
+
+bool
+BackgroundChildImpl::DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor)
+{
+  RefPtr<mozilla::dom::IPCBlobInputStreamChild> actor =
+    dont_AddRef(static_cast<mozilla::dom::IPCBlobInputStreamChild*>(aActor));
+  return true;
+}
+
 PFileDescriptorSetChild*
 BackgroundChildImpl::AllocPFileDescriptorSetChild(
                                           const FileDescriptor& aFileDescriptor)
diff --git a/ipc/glue/BackgroundChildImpl.h b/ipc/glue/BackgroundChildImpl.h
index 40b77edb3025..20ca291274e6 100644
--- a/ipc/glue/BackgroundChildImpl.h
+++ b/ipc/glue/BackgroundChildImpl.h
@@ -82,6 +82,13 @@ protected:
   virtual bool
   DeallocPMemoryStreamChild(PMemoryStreamChild* aActor) override;
 
+  virtual PIPCBlobInputStreamChild*
+  AllocPIPCBlobInputStreamChild(const nsID& aID,
+                                const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamChild(PIPCBlobInputStreamChild* aActor) override;
+
   virtual PFileDescriptorSetChild*
   AllocPFileDescriptorSetChild(const FileDescriptor& aFileDescriptor)
                                override;
diff --git a/ipc/glue/BackgroundParentImpl.cpp b/ipc/glue/BackgroundParentImpl.cpp
index 8fd05795df1d..652eb0a117b2 100644
--- a/ipc/glue/BackgroundParentImpl.cpp
+++ b/ipc/glue/BackgroundParentImpl.cpp
@@ -28,6 +28,7 @@
 #include "mozilla/dom/cache/ActorUtils.h"
 #include "mozilla/dom/indexedDB/ActorsParent.h"
 #include "mozilla/dom/ipc/BlobParent.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamParent.h"
 #include "mozilla/dom/ipc/MemoryStreamParent.h"
 #include "mozilla/dom/quota/ActorsParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
@@ -287,6 +288,24 @@ BackgroundParentImpl::DeallocPMemoryStreamParent(PMemoryStreamParent* aActor)
   return true;
 }
 
+PIPCBlobInputStreamParent*
+BackgroundParentImpl::AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                                     const uint64_t& aSize)
+{
+  MOZ_CRASH("PIPCBlobInputStreamParent actors should be manually constructed!");
+}
+
+bool
+BackgroundParentImpl::DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor)
+{
+  AssertIsInMainProcess();
+  AssertIsOnBackgroundThread();
+  MOZ_ASSERT(aActor);
+
+  delete aActor;
+  return true;
+}
+
 mozilla::ipc::IPCResult
 BackgroundParentImpl::RecvPBlobConstructor(PBlobParent* aActor,
                                            const BlobConstructorParams& aParams)
diff --git a/ipc/glue/BackgroundParentImpl.h b/ipc/glue/BackgroundParentImpl.h
index bbc0aad419b3..9a3b5dc81c51 100644
--- a/ipc/glue/BackgroundParentImpl.h
+++ b/ipc/glue/BackgroundParentImpl.h
@@ -75,6 +75,13 @@ protected:
   virtual bool
   DeallocPMemoryStreamParent(PMemoryStreamParent* aActor) override;
 
+  virtual PIPCBlobInputStreamParent*
+  AllocPIPCBlobInputStreamParent(const nsID& aID,
+                                 const uint64_t& aSize) override;
+
+  virtual bool
+  DeallocPIPCBlobInputStreamParent(PIPCBlobInputStreamParent* aActor) override;
+
   virtual mozilla::ipc::IPCResult
   RecvPBlobConstructor(PBlobParent* aActor,
                        const BlobConstructorParams& params) override;
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index 29dd53bb30fa..7c8446f0c537 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -1077,6 +1077,13 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
       }
       break;
     case GeckoProcessType_GPU:
+      if (mSandboxLevel > 0 && !PR_GetEnv("MOZ_DISABLE_GPU_SANDBOX")) {
+        // For now we treat every failure as fatal in SetSecurityLevelForGPUProcess
+        // and just crash there right away. Should this change in the future then we
+        // should also handle the error here.
+        mSandboxBroker.SetSecurityLevelForGPUProcess(mSandboxLevel);
+        shouldSandboxCurrentProcess = true;
+      }
       break;
     case GeckoProcessType_Default:
     default:
diff --git a/ipc/glue/IPCStream.ipdlh b/ipc/glue/IPCStream.ipdlh
index df9cd9af4a89..68751ce46978 100644
--- a/ipc/glue/IPCStream.ipdlh
+++ b/ipc/glue/IPCStream.ipdlh
@@ -4,8 +4,10 @@
 
 include protocol PChildToParentStream;
 include protocol PParentToChildStream;
+
 include BlobTypes;
 include InputStreamParams;
+include ProtocolTypes;
 
 namespace mozilla {
 namespace ipc {
@@ -17,14 +19,30 @@ struct InputStreamParamsWithFds
   OptionalFileDescriptorSet optionalFds;
 };
 
+union IPCRemoteStreamType
+{
+  PChildToParentStream;
+  PParentToChildStream;
+};
+
+struct IPCRemoteStream
+{
+  // If this is true, the stream will send data only when the first operation
+  // is done on the destination side. The benefit of this is that we do not
+  // send data if not needed. On the other hand, it could have a performance
+  // issue.
+  bool delayedStart;
+
+  IPCRemoteStreamType stream;
+};
+
 // Use IPCStream or OptionalIPCStream in your ipdl to represent serialized
 // nsIInputStreams.  Then use AutoIPCStream from IPCStreamUtils.h to perform
 // the serialization.
 union IPCStream
 {
   InputStreamParamsWithFds;
-  PChildToParentStream;
-  PParentToChildStream;
+  IPCRemoteStream;
 };
 
 union OptionalIPCStream
diff --git a/ipc/glue/IPCStreamChild.cpp b/ipc/glue/IPCStreamChild.cpp
index 155a47b54307..76294312978e 100644
--- a/ipc/glue/IPCStreamChild.cpp
+++ b/ipc/glue/IPCStreamChild.cpp
@@ -47,6 +47,13 @@ public:
     ActorDestroyed();
   }
 
+  IPCResult
+  RecvStartReading() override
+  {
+    Start();
+    return IPC_OK();
+  }
+
   IPCResult
   RecvRequestClose(const nsresult& aRv) override
   {
@@ -167,6 +174,13 @@ private:
 
   // IPCStreamDestination methods
 
+  void
+  StartReading() override
+  {
+    MOZ_ASSERT(HasDelayedStart());
+    Unused << SendStartReading();
+  }
+
   void
   RequestClose(nsresult aRv) override
   {
diff --git a/ipc/glue/IPCStreamDestination.cpp b/ipc/glue/IPCStreamDestination.cpp
index 2d2ee8d80cde..1d3a76b1956a 100644
--- a/ipc/glue/IPCStreamDestination.cpp
+++ b/ipc/glue/IPCStreamDestination.cpp
@@ -5,14 +5,256 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IPCStreamDestination.h"
+#include "mozilla/Mutex.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIAsyncOutputStream.h"
+#include "nsIBufferedStreams.h"
+#include "nsICloneableInputStream.h"
 #include "nsIPipe.h"
 
 namespace mozilla {
 namespace ipc {
 
+// ----------------------------------------------------------------------------
+// IPCStreamDestination::DelayedStartInputStream
+//
+// When AutoIPCStream is used with delayedStart, we need to ask for data at the
+// first real use of the nsIInputStream. In order to do so, we wrap the
+// nsIInputStream, created by the nsIPipe, with this wrapper.
+
+class IPCStreamDestination::DelayedStartInputStream final
+  : public nsIAsyncInputStream
+  , public nsISearchableInputStream
+  , public nsICloneableInputStream
+  , public nsIBufferedInputStream
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+
+  DelayedStartInputStream(IPCStreamDestination* aDestination,
+                          already_AddRefed<nsIAsyncInputStream>&& aStream)
+    : mDestination(aDestination)
+    , mStream(aStream)
+    , mMutex("IPCStreamDestination::DelayedStartInputStream::mMutex")
+  {
+    MOZ_ASSERT(mDestination);
+    MOZ_ASSERT(mStream);
+  }
+
+  void
+  DestinationShutdown()
+  {
+    MutexAutoLock lock(mMutex);
+    mDestination = nullptr;
+  }
+
+  // nsIInputStream interface
+
+  NS_IMETHOD
+  Close() override
+  {
+    MaybeCloseDestination();
+    return mStream->Close();
+  }
+
+  NS_IMETHOD
+  Available(uint64_t* aLength) override
+  {
+    MaybeStartReading();
+    return mStream->Available(aLength);
+  }
+
+  NS_IMETHOD
+  Read(char* aBuffer, uint32_t aCount, uint32_t* aReadCount) override
+  {
+    MaybeStartReading();
+    return mStream->Read(aBuffer, aCount, aReadCount);
+  }
+
+  NS_IMETHOD
+  ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, uint32_t aCount,
+               uint32_t *aResult) override
+  {
+    MaybeStartReading();
+    return mStream->ReadSegments(aWriter, aClosure, aCount, aResult);
+  }
+
+  NS_IMETHOD
+  IsNonBlocking(bool* aNonBlocking) override
+  {
+    MaybeStartReading();
+    return mStream->IsNonBlocking(aNonBlocking);
+  }
+
+  // nsIAsyncInputStream interface
+
+  NS_IMETHOD
+  CloseWithStatus(nsresult aReason) override
+  {
+    MaybeCloseDestination();
+    return mStream->CloseWithStatus(aReason);
+  }
+
+  NS_IMETHOD
+  AsyncWait(nsIInputStreamCallback* aCallback, uint32_t aFlags,
+            uint32_t aRequestedCount, nsIEventTarget* aTarget) override
+  {
+    MaybeStartReading();
+    return mStream->AsyncWait(aCallback, aFlags, aRequestedCount, aTarget);
+  }
+
+  NS_IMETHOD
+  Search(const char* aForString, bool aIgnoreCase, bool* aFound,
+         uint32_t* aOffsetSearchedTo) override
+  {
+    MaybeStartReading();
+    nsCOMPtr<nsISearchableInputStream> searchable = do_QueryInterface(mStream);
+    MOZ_ASSERT(searchable);
+    return searchable->Search(aForString, aIgnoreCase, aFound, aOffsetSearchedTo);
+  }
+
+  // nsICloneableInputStream interface
+
+  NS_IMETHOD
+  GetCloneable(bool* aCloneable) override
+  {
+    MaybeStartReading();
+    nsCOMPtr<nsICloneableInputStream> cloneable = do_QueryInterface(mStream);
+    MOZ_ASSERT(cloneable);
+    return cloneable->GetCloneable(aCloneable);
+  }
+
+  NS_IMETHOD
+  Clone(nsIInputStream** aResult) override
+  {
+    MaybeStartReading();
+    nsCOMPtr<nsICloneableInputStream> cloneable = do_QueryInterface(mStream);
+    MOZ_ASSERT(cloneable);
+    return cloneable->Clone(aResult);
+  }
+
+  // nsIBufferedInputStream
+
+  NS_IMETHOD
+  Init(nsIInputStream* aStream, uint32_t aBufferSize) override
+  {
+    MaybeStartReading();
+    nsCOMPtr<nsIBufferedInputStream> stream = do_QueryInterface(mStream);
+    MOZ_ASSERT(stream);
+    return stream->Init(aStream, aBufferSize);
+  }
+
+  void
+  MaybeStartReading();
+
+  void
+  MaybeCloseDestination();
+
+private:
+  ~DelayedStartInputStream() = default;
+
+  IPCStreamDestination* mDestination;
+  nsCOMPtr<nsIAsyncInputStream> mStream;
+
+  // This protects mDestination: any method can be called by any thread.
+  Mutex mMutex;
+
+  class HelperRunnable;
+};
+
+class IPCStreamDestination::DelayedStartInputStream::HelperRunnable final
+  : public Runnable
+{
+public:
+  enum Op {
+    eStartReading,
+    eCloseDestination,
+  };
+
+  HelperRunnable(IPCStreamDestination::DelayedStartInputStream* aDelayedStartInputStream,
+                 Op aOp)
+    : mDelayedStartInputStream(aDelayedStartInputStream)
+    , mOp(aOp)
+  {
+    MOZ_ASSERT(aDelayedStartInputStream);
+  }
+
+  NS_IMETHOD
+  Run() override
+  {
+    switch (mOp) {
+    case eStartReading:
+      mDelayedStartInputStream->MaybeStartReading();
+      break;
+    case eCloseDestination:
+      mDelayedStartInputStream->MaybeCloseDestination();
+      break;
+    }
+
+    return NS_OK;
+  }
+
+private:
+  RefPtr<IPCStreamDestination::DelayedStartInputStream> mDelayedStartInputStream;
+  Op mOp;
+};
+
+void
+IPCStreamDestination::DelayedStartInputStream::MaybeStartReading()
+{
+  MutexAutoLock lock(mMutex);
+  if (!mDestination) {
+    return;
+  }
+
+  if (mDestination->IsOnOwningThread()) {
+    mDestination->StartReading();
+    mDestination = nullptr;
+    return;
+  }
+
+  RefPtr<Runnable> runnable =
+    new HelperRunnable(this, HelperRunnable::eStartReading);
+  mDestination->DispatchRunnable(runnable.forget());
+}
+
+void
+IPCStreamDestination::DelayedStartInputStream::MaybeCloseDestination()
+{
+  MutexAutoLock lock(mMutex);
+  if (!mDestination) {
+    return;
+  }
+
+  if (mDestination->IsOnOwningThread()) {
+    mDestination->RequestClose(NS_ERROR_ABORT);
+    mDestination = nullptr;
+    return;
+  }
+
+  RefPtr<Runnable> runnable =
+    new HelperRunnable(this, HelperRunnable::eCloseDestination);
+  mDestination->DispatchRunnable(runnable.forget());
+}
+
+NS_IMPL_ADDREF(IPCStreamDestination::DelayedStartInputStream);
+NS_IMPL_RELEASE(IPCStreamDestination::DelayedStartInputStream);
+
+NS_INTERFACE_MAP_BEGIN(IPCStreamDestination::DelayedStartInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIAsyncInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsISearchableInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsICloneableInputStream)
+  NS_INTERFACE_MAP_ENTRY(nsIBufferedInputStream)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIInputStream, nsIAsyncInputStream)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAsyncInputStream)
+NS_INTERFACE_MAP_END
+
+// ----------------------------------------------------------------------------
+// IPCStreamDestination
+
 IPCStreamDestination::IPCStreamDestination()
+  : mOwningThread(NS_GetCurrentThread())
+  , mDelayedStart(false)
 {
 }
 
@@ -45,13 +287,41 @@ IPCStreamDestination::Initialize()
   return NS_OK;
 }
 
+void
+IPCStreamDestination::SetDelayedStart(bool aDelayedStart)
+{
+  mDelayedStart = aDelayedStart;
+}
+
 already_AddRefed<nsIInputStream>
 IPCStreamDestination::TakeReader()
 {
   MOZ_ASSERT(mReader);
+  MOZ_ASSERT(!mDelayedStartInputStream);
+
+  if (mDelayedStart) {
+    mDelayedStartInputStream =
+      new DelayedStartInputStream(this, mReader.forget());
+    RefPtr<nsIAsyncInputStream> inputStream = mDelayedStartInputStream;
+    return inputStream.forget();
+  }
+
   return mReader.forget();
 }
 
+bool
+IPCStreamDestination::IsOnOwningThread() const
+{
+  return mOwningThread == NS_GetCurrentThread();
+}
+
+void
+IPCStreamDestination::DispatchRunnable(already_AddRefed<nsIRunnable>&& aRunnable)
+{
+  nsCOMPtr<nsIRunnable> runnable = aRunnable;
+  mOwningThread->Dispatch(runnable.forget(), NS_DISPATCH_NORMAL);
+}
+
 void
 IPCStreamDestination::ActorDestroyed()
 {
@@ -62,6 +332,11 @@ IPCStreamDestination::ActorDestroyed()
   // effect.  This just aborts the writer in the case where the child process
   // crashes.
   mWriter->CloseWithStatus(NS_ERROR_ABORT);
+
+  if (mDelayedStartInputStream) {
+    mDelayedStartInputStream->DestinationShutdown();
+    mDelayedStartInputStream = nullptr;
+  }
 }
 
 void
diff --git a/ipc/glue/IPCStreamDestination.h b/ipc/glue/IPCStreamDestination.h
index 20c44f359d77..97c165f44f56 100644
--- a/ipc/glue/IPCStreamDestination.h
+++ b/ipc/glue/IPCStreamDestination.h
@@ -31,9 +31,18 @@ public:
   static IPCStreamDestination*
   Cast(PParentToChildStreamChild* aActor);
 
-  virtual already_AddRefed<nsIInputStream>
+  void
+  SetDelayedStart(bool aDelayedStart);
+
+  already_AddRefed<nsIInputStream>
   TakeReader();
 
+  bool
+  IsOnOwningThread() const;
+
+  void
+  DispatchRunnable(already_AddRefed<nsIRunnable>&& aRunnable);
+
 protected:
   IPCStreamDestination();
   virtual ~IPCStreamDestination();
@@ -51,16 +60,37 @@ protected:
   void
   CloseReceived(nsresult aRv);
 
+#ifdef DEBUG
+  bool
+  HasDelayedStart() const
+  {
+    return mDelayedStart;
+  }
+#endif
+
   // These methods will be implemented by the actor.
 
+  virtual void
+  StartReading() = 0;
+
   virtual void
   RequestClose(nsresult aRv) = 0;
 
   virtual void
   TerminateDestination() = 0;
 
+private:
   nsCOMPtr<nsIAsyncInputStream> mReader;
   nsCOMPtr<nsIAsyncOutputStream> mWriter;
+
+  // This is created by TakeReader() if we need to delay the reading of data.
+  // We keep a reference to the stream in order to inform it when the actor goes
+  // away. If that happens, the reading of data will not be possible anymore.
+  class DelayedStartInputStream;
+  RefPtr<DelayedStartInputStream> mDelayedStartInputStream;
+
+  nsCOMPtr<nsIThread> mOwningThread;
+  bool mDelayedStart;
 };
 
 } // namespace ipc
diff --git a/ipc/glue/IPCStreamParent.cpp b/ipc/glue/IPCStreamParent.cpp
index ec7e8e8e3717..99aa6ea50ac6 100644
--- a/ipc/glue/IPCStreamParent.cpp
+++ b/ipc/glue/IPCStreamParent.cpp
@@ -45,6 +45,13 @@ public:
     ActorDestroyed();
   }
 
+  IPCResult
+  RecvStartReading() override
+  {
+    Start();
+    return IPC_OK();
+  }
+
   IPCResult
   RecvRequestClose(const nsresult& aRv) override
   {
@@ -167,6 +174,13 @@ private:
 
   // IPCStreamDestination methods
 
+  void
+  StartReading() override
+  {
+    MOZ_ASSERT(HasDelayedStart());
+    Unused << SendStartReading();
+  }
+
   void
   RequestClose(nsresult aRv) override
   {
diff --git a/ipc/glue/IPCStreamSource.cpp b/ipc/glue/IPCStreamSource.cpp
index c54c8392a8fa..60aa8da0b81c 100644
--- a/ipc/glue/IPCStreamSource.cpp
+++ b/ipc/glue/IPCStreamSource.cpp
@@ -128,21 +128,24 @@ IPCStreamSource::Initialize()
   }
 
   // A source can be used on any thread, but we only support IPCStream on
-  // main thread and Worker threads right now.  This is due to the requirement
-  // that the thread be guaranteed to live long enough to receive messages.
-  // We can enforce this guarantee with a feature on worker threads, but not
-  // other threads.
+  // main thread, Workers and PBackground thread right now.  This is due
+  // to the requirement  that the thread be guaranteed to live long enough to
+  // receive messages. We can enforce this guarantee with a WorkerHolder on
+  // worker threads, but not other threads. Main-thread and PBackground thread
+  // do not need anything special in order to be kept alive.
   WorkerPrivate* workerPrivate = nullptr;
   if (!NS_IsMainThread()) {
     workerPrivate = GetCurrentThreadWorkerPrivate();
-    MOZ_RELEASE_ASSERT(workerPrivate);
+    if (workerPrivate) {
+      bool result = HoldWorker(workerPrivate, Canceling);
+      if (!result) {
+        return false;
+      }
 
-    bool result = HoldWorker(workerPrivate, Canceling);
-    if (!result) {
-      return false;
+      mWorkerPrivate = workerPrivate;
+    } else {
+      AssertIsOnBackgroundThread();
     }
-
-    mWorkerPrivate = workerPrivate;
   }
 
   return true;
@@ -186,7 +189,6 @@ void
 IPCStreamSource::Start()
 {
   NS_ASSERT_OWNINGTHREAD(IPCStreamSource);
-  MOZ_ASSERT_IF(!NS_IsMainThread(), mWorkerPrivate);
   DoRead();
 }
 
diff --git a/ipc/glue/IPCStreamUtils.cpp b/ipc/glue/IPCStreamUtils.cpp
index 909a7d274d66..7518e3812edd 100644
--- a/ipc/glue/IPCStreamUtils.cpp
+++ b/ipc/glue/IPCStreamUtils.cpp
@@ -36,8 +36,7 @@ namespace {
 void
 AssertValidValueToTake(const IPCStream& aVal)
 {
-  MOZ_ASSERT(aVal.type() == IPCStream::TPChildToParentStreamChild ||
-             aVal.type() == IPCStream::TPParentToChildStreamParent ||
+  MOZ_ASSERT(aVal.type() == IPCStream::TIPCRemoteStream ||
              aVal.type() == IPCStream::TInputStreamParamsWithFds);
 }
 
@@ -132,7 +131,8 @@ SerializeInputStreamWithFdsParent(nsIIPCSerializableInputStream* aStream,
 
 template<typename M>
 bool
-SerializeInputStream(nsIInputStream* aStream, IPCStream& aValue, M* aManager)
+SerializeInputStream(nsIInputStream* aStream, IPCStream& aValue, M* aManager,
+                     bool aDelayedStart)
 {
   MOZ_ASSERT(aStream);
   MOZ_ASSERT(aManager);
@@ -164,7 +164,12 @@ SerializeInputStream(nsIInputStream* aStream, IPCStream& aValue, M* aManager)
   }
 
   MOZ_ASSERT(asyncStream);
-  aValue = IPCStreamSource::Create(asyncStream, aManager);
+
+  IPCRemoteStream remoteStream;
+  remoteStream.delayedStart() = aDelayedStart;
+  remoteStream.stream() = IPCStreamSource::Create(asyncStream, aManager);
+  aValue = remoteStream;
+
   return true;
 }
 
@@ -172,7 +177,8 @@ template<typename M>
 bool
 SerializeInputStreamChild(nsIInputStream* aStream, M* aManager,
                           IPCStream* aValue,
-                          OptionalIPCStream* aOptionalValue)
+                          OptionalIPCStream* aOptionalValue,
+                          bool aDelayedStart)
 {
   MOZ_ASSERT(aStream);
   MOZ_ASSERT(aManager);
@@ -199,17 +205,18 @@ SerializeInputStreamChild(nsIInputStream* aStream, M* aManager,
   }
 
   if (aValue) {
-    return SerializeInputStream(aStream, *aValue, aManager);
+    return SerializeInputStream(aStream, *aValue, aManager, aDelayedStart);
   }
 
-  return SerializeInputStream(aStream, *aOptionalValue, aManager);
+  return SerializeInputStream(aStream, *aOptionalValue, aManager, aDelayedStart);
 }
 
 template<typename M>
 bool
 SerializeInputStreamParent(nsIInputStream* aStream, M* aManager,
                            IPCStream* aValue,
-                           OptionalIPCStream* aOptionalValue)
+                           OptionalIPCStream* aOptionalValue,
+                           bool aDelayedStart)
 {
   MOZ_ASSERT(aStream);
   MOZ_ASSERT(aManager);
@@ -233,14 +240,14 @@ SerializeInputStreamParent(nsIInputStream* aStream, M* aManager,
   }
 
   if (aValue) {
-    return SerializeInputStream(aStream, *aValue, aManager);
+    return SerializeInputStream(aStream, *aValue, aManager, aDelayedStart);
   }
 
-  return SerializeInputStream(aStream, *aOptionalValue, aManager);
+  return SerializeInputStream(aStream, *aOptionalValue, aManager, aDelayedStart);
 }
 
 void
-CleanupIPCStream(IPCStream& aValue, bool aConsumedByIPC)
+CleanupIPCStream(IPCStream& aValue, bool aConsumedByIPC, bool aDelayedStart)
 {
   if (aValue.type() == IPCStream::T__None) {
     return;
@@ -292,34 +299,43 @@ CleanupIPCStream(IPCStream& aValue, bool aConsumedByIPC)
     return;
   }
 
+  MOZ_ASSERT(aValue.type() == IPCStream::TIPCRemoteStream);
+  IPCRemoteStreamType& remoteInputStream =
+    aValue.get_IPCRemoteStream().stream();
+
   IPCStreamSource* source = nullptr;
-  if (aValue.type() == IPCStream::TPChildToParentStreamChild) {
-    source = IPCStreamSource::Cast(aValue.get_PChildToParentStreamChild());
+  if (remoteInputStream.type() == IPCRemoteStreamType::TPChildToParentStreamChild) {
+    source = IPCStreamSource::Cast(remoteInputStream.get_PChildToParentStreamChild());
   } else {
-    MOZ_ASSERT(aValue.type() == IPCStream::TPParentToChildStreamParent);
-    source = IPCStreamSource::Cast(aValue.get_PParentToChildStreamParent());
+    MOZ_ASSERT(remoteInputStream.type() == IPCRemoteStreamType::TPParentToChildStreamParent);
+    source = IPCStreamSource::Cast(remoteInputStream.get_PParentToChildStreamParent());
   }
 
   MOZ_ASSERT(source);
 
+  // If the source stream has not been taken to be sent to the other side, we
+  // can destroy it.
   if (!aConsumedByIPC) {
     source->StartDestroy();
     return;
   }
 
-  // If the source stream was taken to be sent to the other side, then we need
-  // to start it before forgetting about it.
-  source->Start();
+  if (!aDelayedStart) {
+    // If we don't need to do a delayedStart, we start it now. Otherwise, the
+    // Start() will be called at the first use by the
+    // IPCStreamDestination::DelayedStartInputStream.
+    source->Start();
+  }
 }
 
 void
-CleanupIPCStream(OptionalIPCStream& aValue, bool aConsumedByIPC)
+CleanupIPCStream(OptionalIPCStream& aValue, bool aConsumedByIPC, bool aDelayedStart)
 {
   if (aValue.type() == OptionalIPCStream::Tvoid_t) {
     return;
   }
 
-  CleanupIPCStream(aValue.get_IPCStream(), aConsumedByIPC);
+  CleanupIPCStream(aValue.get_IPCStream(), aConsumedByIPC, aDelayedStart);
 }
 
 // Returns false if the serialization should not proceed. This means that the
@@ -348,16 +364,22 @@ NormalizeOptionalValue(nsIInputStream* aStream,
 already_AddRefed<nsIInputStream>
 DeserializeIPCStream(const IPCStream& aValue)
 {
-  if (aValue.type() == IPCStream::TPChildToParentStreamParent) {
-    auto sendStream =
-      IPCStreamDestination::Cast(aValue.get_PChildToParentStreamParent());
-    return sendStream->TakeReader();
-  }
+  if (aValue.type() == IPCStream::TIPCRemoteStream) {
+    const IPCRemoteStream& remoteStream = aValue.get_IPCRemoteStream();
+    const IPCRemoteStreamType& remoteStreamType = remoteStream.stream();
+    IPCStreamDestination* destinationStream;
 
-  if (aValue.type() == IPCStream::TPParentToChildStreamChild) {
-    auto sendStream =
-      IPCStreamDestination::Cast(aValue.get_PParentToChildStreamChild());
-    return sendStream->TakeReader();
+    if (remoteStreamType.type() == IPCRemoteStreamType::TPChildToParentStreamParent) {
+      destinationStream =
+        IPCStreamDestination::Cast(remoteStreamType.get_PChildToParentStreamParent());
+    } else {
+      MOZ_ASSERT(remoteStreamType.type() == IPCRemoteStreamType::TPParentToChildStreamChild);
+      destinationStream =
+        IPCStreamDestination::Cast(remoteStreamType.get_PParentToChildStreamChild());
+    }
+
+    destinationStream->SetDelayedStart(remoteStream.delayedStart());
+    return destinationStream->TakeReader();
   }
 
   // Note, we explicitly do not support deserializing the PChildToParentStream actor on
@@ -408,27 +430,30 @@ DeserializeIPCStream(const OptionalIPCStream& aValue)
   return DeserializeIPCStream(aValue.get_IPCStream());
 }
 
-AutoIPCStream::AutoIPCStream()
+AutoIPCStream::AutoIPCStream(bool aDelayedStart)
   : mInlineValue(void_t())
   , mValue(nullptr)
   , mOptionalValue(&mInlineValue)
   , mTaken(false)
+  , mDelayedStart(aDelayedStart)
 {
 }
 
-AutoIPCStream::AutoIPCStream(IPCStream& aTarget)
+AutoIPCStream::AutoIPCStream(IPCStream& aTarget, bool aDelayedStart)
   : mInlineValue(void_t())
   , mValue(&aTarget)
   , mOptionalValue(nullptr)
   , mTaken(false)
+  , mDelayedStart(aDelayedStart)
 {
 }
 
-AutoIPCStream::AutoIPCStream(OptionalIPCStream& aTarget)
+AutoIPCStream::AutoIPCStream(OptionalIPCStream& aTarget, bool aDelayedStart)
   : mInlineValue(void_t())
   , mValue(nullptr)
   , mOptionalValue(&aTarget)
   , mTaken(false)
+  , mDelayedStart(aDelayedStart)
 {
   *mOptionalValue = void_t();
 }
@@ -437,9 +462,9 @@ AutoIPCStream::~AutoIPCStream()
 {
   MOZ_ASSERT(mValue || mOptionalValue);
   if (mValue && IsSet()) {
-    CleanupIPCStream(*mValue, mTaken);
+    CleanupIPCStream(*mValue, mTaken, mDelayedStart);
   } else {
-    CleanupIPCStream(*mOptionalValue, mTaken);
+    CleanupIPCStream(*mOptionalValue, mTaken, mDelayedStart);
   }
 }
 
@@ -457,7 +482,8 @@ AutoIPCStream::Serialize(nsIInputStream* aStream, dom::nsIContentChild* aManager
     return true;
   }
 
-  if (!SerializeInputStreamChild(aStream, aManager, mValue, mOptionalValue)) {
+  if (!SerializeInputStreamChild(aStream, aManager, mValue, mOptionalValue,
+                                 mDelayedStart)) {
     MOZ_CRASH("IPCStream creation failed!");
   }
 
@@ -484,7 +510,8 @@ AutoIPCStream::Serialize(nsIInputStream* aStream, PBackgroundChild* aManager)
     return true;
   }
 
-  if (!SerializeInputStreamChild(aStream, aManager, mValue, mOptionalValue)) {
+  if (!SerializeInputStreamChild(aStream, aManager, mValue, mOptionalValue,
+                                 mDelayedStart)) {
     MOZ_CRASH("IPCStream creation failed!");
   }
 
@@ -512,7 +539,8 @@ AutoIPCStream::Serialize(nsIInputStream* aStream,
     return true;
   }
 
-  if (!SerializeInputStreamParent(aStream, aManager, mValue, mOptionalValue)) {
+  if (!SerializeInputStreamParent(aStream, aManager, mValue, mOptionalValue,
+                                  mDelayedStart)) {
     return false;
   }
 
@@ -539,7 +567,8 @@ AutoIPCStream::Serialize(nsIInputStream* aStream, PBackgroundParent* aManager)
     return true;
   }
 
-  if (!SerializeInputStreamParent(aStream, aManager, mValue, mOptionalValue)) {
+  if (!SerializeInputStreamParent(aStream, aManager, mValue, mOptionalValue,
+                                  mDelayedStart)) {
     return false;
   }
 
diff --git a/ipc/glue/IPCStreamUtils.h b/ipc/glue/IPCStreamUtils.h
index 054f7c02b7c8..936b8b23ce03 100644
--- a/ipc/glue/IPCStreamUtils.h
+++ b/ipc/glue/IPCStreamUtils.h
@@ -126,6 +126,7 @@ class AutoIPCStream final
   IPCStream* mValue;
   OptionalIPCStream* mOptionalValue;
   bool mTaken;
+  bool mDelayedStart;
 
   bool
   IsSet() const;
@@ -133,16 +134,17 @@ class AutoIPCStream final
 public:
   // Implicitly create an OptionalIPCStream value.  Either
   // TakeValue() or TakeOptionalValue() can be used.
-  AutoIPCStream();
+  explicit AutoIPCStream(bool aDelayedStart = false);
 
   // Wrap an existing IPCStream.  Only TakeValue() may be
   // used.  If a nullptr nsIInputStream is passed to SerializeOrSend() then
   // a crash will be forced.
-  explicit AutoIPCStream(IPCStream& aTarget);
+  explicit AutoIPCStream(IPCStream& aTarget, bool aDelayedStart = false);
 
   // Wrap an existing OptionalIPCStream.  Either TakeValue()
   // or TakeOptionalValue can be used.
-  explicit AutoIPCStream(OptionalIPCStream& aTarget);
+  explicit AutoIPCStream(OptionalIPCStream& aTarget,
+                         bool aDelayedStart = false);
 
   ~AutoIPCStream();
 
@@ -178,6 +180,11 @@ public:
   // is being, or has already been, sent to the other side.
   OptionalIPCStream&
   TakeOptionalValue();
+
+private:
+  AutoIPCStream(const AutoIPCStream& aOther) = delete;
+  AutoIPCStream& operator=(const AutoIPCStream& aOther) = delete;
+  AutoIPCStream& operator=(const AutoIPCStream&& aOther) = delete;
 };
 
 } // namespace ipc
diff --git a/ipc/glue/InputStreamParams.ipdlh b/ipc/glue/InputStreamParams.ipdlh
index 50ecb758099d..1f4253a1d689 100644
--- a/ipc/glue/InputStreamParams.ipdlh
+++ b/ipc/glue/InputStreamParams.ipdlh
@@ -66,6 +66,11 @@ struct SlicedInputStreamParams
   bool closed;
 };
 
+struct IPCBlobInputStreamParams
+{
+  nsID id;
+};
+
 union InputStreamParams
 {
   StringInputStreamParams;
@@ -77,6 +82,7 @@ union InputStreamParams
   RemoteInputStreamParams;
   SameProcessInputStreamParams;
   SlicedInputStreamParams;
+  IPCBlobInputStreamParams;
 };
 
 union OptionalInputStreamParams
diff --git a/ipc/glue/InputStreamUtils.cpp b/ipc/glue/InputStreamUtils.cpp
index 883738859b11..84aaa51d3851 100644
--- a/ipc/glue/InputStreamUtils.cpp
+++ b/ipc/glue/InputStreamUtils.cpp
@@ -12,6 +12,8 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/ipc/BlobChild.h"
 #include "mozilla/dom/ipc/BlobParent.h"
+#include "mozilla/dom/ipc/IPCBlobInputStream.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h"
 #include "nsComponentManagerUtils.h"
 #include "nsDebug.h"
 #include "nsID.h"
@@ -66,6 +68,14 @@ InputStreamHelper::DeserializeInputStream(const InputStreamParams& aParams,
   nsCOMPtr<nsIInputStream> stream;
   nsCOMPtr<nsIIPCSerializableInputStream> serializable;
 
+  // IPCBlobInputStreams are not deserializable on the parent side.
+  if (aParams.type() == InputStreamParams::TIPCBlobInputStreamParams) {
+    MOZ_ASSERT(XRE_IsParentProcess());
+    IPCBlobInputStreamStorage::Get()->GetStream(aParams.get_IPCBlobInputStreamParams().id(),
+                                                getter_AddRefs(stream));
+    return stream.forget();
+  }
+
   switch (aParams.type()) {
     case InputStreamParams::TStringInputStreamParams:
       serializable = do_CreateInstance(kStringInputStreamCID);
diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index bd7fb8181230..f4f6ba4be3f3 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -717,7 +717,7 @@ MessageChannel::Clear()
 
     gUnresolvedPromises -= mPendingPromises.size();
     for (auto& pair : mPendingPromises) {
-        pair.second.mRejectFunction(__func__);
+        pair.second.mRejectFunction(pair.second.mPromise, __func__);
     }
     mPendingPromises.clear();
 
diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h
index 69d3225efebc..fd74ec7a3370 100644
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -98,7 +98,7 @@ class MessageChannel : HasResultCodes, MessageLoop::DestructionObserver
     struct PromiseHolder
     {
         RefPtr<MozPromiseRefcountable> mPromise;
-        std::function<void(const char*)> mRejectFunction;
+        std::function<void(MozPromiseRefcountable*, const char*)> mRejectFunction;
     };
     static Atomic<size_t> gUnresolvedPromises;
     friend class PromiseReporter;
@@ -186,8 +186,10 @@ class MessageChannel : HasResultCodes, MessageLoop::DestructionObserver
         }
         PromiseHolder holder;
         holder.mPromise = aPromise;
-        holder.mRejectFunction = [aPromise](const char* aRejectSite) {
-            aPromise->Reject(PromiseRejectReason::ChannelClosed, aRejectSite);
+        holder.mRejectFunction = [](MozPromiseRefcountable* aRejectPromise,
+                                    const char* aRejectSite) {
+            static_cast<Promise*>(aRejectPromise)->Reject(
+                PromiseRejectReason::ChannelClosed, aRejectSite);
         };
         mPendingPromises.insert(std::make_pair(seqno, Move(holder)));
         gUnresolvedPromises++;
diff --git a/ipc/glue/PBackground.ipdl b/ipc/glue/PBackground.ipdl
index f5303ef9197a..6e472b311c5b 100644
--- a/ipc/glue/PBackground.ipdl
+++ b/ipc/glue/PBackground.ipdl
@@ -15,6 +15,7 @@ include protocol PFileDescriptorSet;
 include protocol PFileSystemRequest;
 include protocol PGamepadEventChannel;
 include protocol PGamepadTestChannel;
+include protocol PIPCBlobInputStream;
 include protocol PMemoryStream;
 include protocol PMessagePort;
 include protocol PCameras;
@@ -60,6 +61,7 @@ sync protocol PBackground
   manages PFileSystemRequest;
   manages PGamepadEventChannel;
   manages PGamepadTestChannel;
+  manages PIPCBlobInputStream;
   manages PMemoryStream;
   manages PMessagePort;
   manages PCameras;
@@ -120,6 +122,8 @@ child:
 
   async PParentToChildStream();
 
+  async PIPCBlobInputStream(nsID aID, uint64_t aSize);
+
 both:
   async PBlob(BlobConstructorParams params);
 
diff --git a/ipc/glue/PChildToParentStream.ipdl b/ipc/glue/PChildToParentStream.ipdl
index bc789a73dfe3..ee81822371d6 100644
--- a/ipc/glue/PChildToParentStream.ipdl
+++ b/ipc/glue/PChildToParentStream.ipdl
@@ -20,6 +20,14 @@ parent:
   async Close(nsresult aRv);
 
 child:
+  // The remote stream can be used in 2 ways: it can start receiving data
+  // immediately after the creation of the child actor, or it can wait until
+  // the child stream is actually used. This second configuration is enabled by
+  // passing 'true' to delayedStart in AutoIPCStream CTOR.
+  // If we are delaying the reading, at the first use of the remote stream, we
+  // must activate the sending of data. This happens by calling this method.
+  async StartReading();
+
   // The parent side has hit an error condition and has requested the child
   // actor issue a Close() message.  The close must be initiated by the child
   // to avoid racing with an in-flight Buffer() message.
diff --git a/ipc/glue/PParentToChildStream.ipdl b/ipc/glue/PParentToChildStream.ipdl
index c5e81e279477..dae753bcbdc1 100644
--- a/ipc/glue/PParentToChildStream.ipdl
+++ b/ipc/glue/PParentToChildStream.ipdl
@@ -20,6 +20,14 @@ child:
   async Close(nsresult aRv);
 
 parent:
+  // The remote stream can be used in 2 ways: it can start receiving data
+  // immediately after the creation of the child actor, or it can wait until
+  // the child stream is actually used. This second configuration is enabled by
+  // passing 'true' to delayedStart in AutoIPCStream CTOR.
+  // If we are delaying the reading, at the first use of the remote stream, we
+  // must activate the sending of data. This happens by calling this method.
+  async StartReading();
+
   // The parent side has hit an error condition and has requested the child
   // actor issue a Close() message.  The close must be initiated by the child
   // to avoid racing with an in-flight Buffer() message.
diff --git a/ipc/ipdl/test/cxx/TestAsyncReturns.cpp b/ipc/ipdl/test/cxx/TestAsyncReturns.cpp
index 12c6c4a7a37e..f34b46a9b269 100644
--- a/ipc/ipdl/test/cxx/TestAsyncReturns.cpp
+++ b/ipc/ipdl/test/cxx/TestAsyncReturns.cpp
@@ -2,6 +2,8 @@
 
 #include "IPDLUnitTests.h"      // fail etc.
 
+#include "mozilla/Unused.h"
+
 namespace mozilla {
 namespace _ipdltest {
 
@@ -79,7 +81,7 @@ mozilla::ipc::IPCResult
 TestAsyncReturnsChild::RecvNoReturn(RefPtr<NoReturnPromise>&& aPromise)
 {
   // Leak the promise intentionally
-  aPromise->AddRef();
+  Unused << do_AddRef(aPromise);
   return IPC_OK();
 }
 
diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h
index 881570754ee4..a28c44eb65b0 100644
--- a/js/public/MemoryMetrics.h
+++ b/js/public/MemoryMetrics.h
@@ -649,6 +649,7 @@ struct ZoneStats
     macro(Other,   GCHeapUsed,  regExpSharedsGCHeap) \
     macro(Other,   MallocHeap,  regExpSharedsMallocHeap) \
     macro(Other,   MallocHeap,  typePool) \
+    macro(Other,   MallocHeap,  jitZone) \
     macro(Other,   MallocHeap,  baselineStubsOptimized) \
     macro(Other,   MallocHeap,  cachedCFG) \
     macro(Other,   MallocHeap,  uniqueIdMap) \
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index db55a8acb19f..619c45818d2a 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1441,6 +1441,16 @@ ResetOOMFailure(JSContext* cx, unsigned argc, Value* vp)
     return true;
 }
 
+static size_t
+CountCompartments(JSContext* cx)
+{
+    size_t count = 0;
+    ZoneGroup* group = cx->compartment()->zone()->group();
+    for (auto zone : group->zones())
+        count += zone->compartments().length();
+    return count;
+}
+
 static bool
 OOMTest(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -1503,6 +1513,8 @@ OOMTest(JSContext* cx, unsigned argc, Value* vp)
     MOZ_ASSERT(!cx->isExceptionPending());
     cx->runtime()->hadOutOfMemory = false;
 
+    size_t compartmentCount = CountCompartments(cx);
+
     JS_SetGCZeal(cx, 0, JS_DEFAULT_ZEAL_FREQ);
 
     for (unsigned thread = threadStart; thread < threadEnd; thread++) {
@@ -1550,6 +1562,16 @@ OOMTest(JSContext* cx, unsigned argc, Value* vp)
             cx->clearPendingException();
             cx->runtime()->hadOutOfMemory = false;
 
+            // Some tests create a new compartment or zone on every
+            // iteration. Our GC is triggered by GC allocations and not by
+            // number of copmartments or zones, so these won't normally get
+            // cleaned up. The check here stops some tests running out of
+            // memory.
+            if (CountCompartments(cx) > compartmentCount + 100) {
+                JS_GC(cx);
+                compartmentCount = CountCompartments(cx);
+            }
+
 #ifdef JS_TRACE_LOGGING
             // Reset the TraceLogger state if enabled.
             TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index ae9e96e323f1..1eae752e8f1c 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -865,6 +865,10 @@ class FullParseHandlerBase
         return node->isKind(PNK_NAME);
     }
 
+    bool isArgumentsAnyParentheses(ParseNode* node, JSContext* cx) {
+        return node->isKind(PNK_NAME) && node->pn_atom == cx->names().arguments;
+    }
+
     bool isEvalAnyParentheses(ParseNode* node, JSContext* cx) {
         return node->isKind(PNK_NAME) && node->pn_atom == cx->names().eval;
     }
@@ -875,7 +879,7 @@ class FullParseHandlerBase
 
         if (isEvalAnyParentheses(node, cx))
             return js_eval_str;
-        if (node->pn_atom == cx->names().arguments)
+        if (isArgumentsAnyParentheses(node, cx))
             return js_arguments_str;
         return nullptr;
     }
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index b00b4cde61e7..dbb1290b2378 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -699,6 +699,19 @@ ParserBase::extraWarning(unsigned errorNumber, ...)
     return result;
 }
 
+bool
+ParserBase::extraWarningAt(uint32_t offset, unsigned errorNumber, ...)
+{
+    va_list args;
+    va_start(args, errorNumber);
+
+    bool result =
+        tokenStream.reportExtraWarningErrorNumberVA(nullptr, offset, errorNumber, args);
+
+    va_end(args);
+    return result;
+}
+
 bool
 ParserBase::strictModeError(unsigned errorNumber, ...)
 {
@@ -3705,6 +3718,7 @@ Parser<ParseHandler, CharT>::functionFormalParametersAndBody(InHandling inHandli
     // Whereas the |yield| in the function body is always parsed as a name.
     // The same goes when parsing |await| in arrow functions.
     YieldHandling bodyYieldHandling = GetYieldHandling(pc->generatorKind());
+    bool inheritedStrict = pc->sc()->strict();
     Node body;
     {
         AutoAwaitIsKeyword<Parser> awaitIsKeyword(this, funbox->isAsync());
@@ -3713,8 +3727,14 @@ Parser<ParseHandler, CharT>::functionFormalParametersAndBody(InHandling inHandli
             return false;
     }
 
-    if ((kind == Statement || kind == Expression) && fun->explicitName()) {
-        RootedPropertyName propertyName(context, fun->explicitName()->asPropertyName());
+    // Revalidate the function name when we transitioned to strict mode.
+    if ((kind == Statement || kind == Expression) && fun->explicitName()
+        && !inheritedStrict && pc->sc()->strict())
+    {
+        MOZ_ASSERT(pc->sc()->hasExplicitUseStrict(),
+                   "strict mode should only change when a 'use strict' directive is present");
+
+        PropertyName* propertyName = fun->explicitName()->asPropertyName();
         YieldHandling nameYieldHandling;
         if (kind == Expression) {
             // Named lambda has binding inside it.
@@ -4164,8 +4184,10 @@ Parser<ParseHandler, CharT>::PossibleError::error(ErrorKind kind)
 {
     if (kind == ErrorKind::Expression)
         return exprError_;
-    MOZ_ASSERT(kind == ErrorKind::Destructuring);
-    return destructuringError_;
+    if (kind == ErrorKind::Destructuring)
+        return destructuringError_;
+    MOZ_ASSERT(kind == ErrorKind::DestructuringWarning);
+    return destructuringWarning_;
 }
 
 template <template <typename CharT> class ParseHandler, typename CharT>
@@ -4182,6 +4204,13 @@ Parser<ParseHandler, CharT>::PossibleError::hasError(ErrorKind kind)
     return error(kind).state_ == ErrorState::Pending;
 }
 
+template <template <typename CharT> class ParseHandler, typename CharT>
+bool
+Parser<ParseHandler, CharT>::PossibleError::hasPendingDestructuringError()
+{
+    return hasError(ErrorKind::Destructuring);
+}
+
 template <template <typename CharT> class ParseHandler, typename CharT>
 void
 Parser<ParseHandler, CharT>::PossibleError::setPending(ErrorKind kind, const TokenPos& pos,
@@ -4207,6 +4236,14 @@ Parser<ParseHandler, CharT>::PossibleError::setPendingDestructuringErrorAt(const
     setPending(ErrorKind::Destructuring, pos, errorNumber);
 }
 
+template <template <typename CharT> class ParseHandler, typename CharT>
+void
+Parser<ParseHandler, CharT>::PossibleError::setPendingDestructuringWarningAt(const TokenPos& pos,
+                                                                             unsigned errorNumber)
+{
+    setPending(ErrorKind::DestructuringWarning, pos, errorNumber);
+}
+
 template <template <typename CharT> class ParseHandler, typename CharT>
 void
 Parser<ParseHandler, CharT>::PossibleError::setPendingExpressionErrorAt(const TokenPos& pos,
@@ -4229,23 +4266,36 @@ Parser<ParseHandler, CharT>::PossibleError::checkForError(ErrorKind kind)
 
 template <template <typename CharT> class ParseHandler, typename CharT>
 bool
-Parser<ParseHandler, CharT>::PossibleError::checkForDestructuringError()
+Parser<ParseHandler, CharT>::PossibleError::checkForWarning(ErrorKind kind)
+{
+    if (!hasError(kind))
+        return true;
+
+    Error& err = error(kind);
+    return parser_.extraWarningAt(err.offset_, err.errorNumber_);
+}
+
+template <template <typename CharT> class ParseHandler, typename CharT>
+bool
+Parser<ParseHandler, CharT>::PossibleError::checkForDestructuringErrorOrWarning()
 {
     // Clear pending expression error, because we're definitely not in an
     // expression context.
     setResolved(ErrorKind::Expression);
 
-    // Report any pending destructuring error.
-    return checkForError(ErrorKind::Destructuring);
+    // Report any pending destructuring error or warning.
+    return checkForError(ErrorKind::Destructuring) &&
+           checkForWarning(ErrorKind::DestructuringWarning);
 }
 
 template <template <typename CharT> class ParseHandler, typename CharT>
 bool
 Parser<ParseHandler, CharT>::PossibleError::checkForExpressionError()
 {
-    // Clear pending destructuring error, because we're definitely not in a
-    // destructuring context.
+    // Clear pending destructuring error or warning, because we're definitely
+    // not in a destructuring context.
     setResolved(ErrorKind::Destructuring);
+    setResolved(ErrorKind::DestructuringWarning);
 
     // Report any pending expression error.
     return checkForError(ErrorKind::Expression);
@@ -4277,195 +4327,255 @@ Parser<ParseHandler, CharT>::PossibleError::transferErrorsTo(PossibleError* othe
     transferErrorTo(ErrorKind::Expression, other);
 }
 
-template <>
-bool
-Parser<FullParseHandler, char16_t>::checkDestructuringName(ParseNode* expr,
-                                                           const Maybe<DeclarationKind>& maybeDecl)
+template <template <typename CharT> class ParseHandler, typename CharT>
+typename ParseHandler<CharT>::Node
+Parser<ParseHandler, CharT>::bindingInitializer(Node lhs, DeclarationKind kind,
+                                                YieldHandling yieldHandling)
 {
-    MOZ_ASSERT(!handler.isUnparenthesizedDestructuringPattern(expr));
+    MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_ASSIGN));
 
-    // Parentheses are forbidden around destructuring *patterns* (but allowed
-    // around names).  Use our nicer error message for parenthesized, nested
-    // patterns.
-    if (handler.isParenthesizedDestructuringPattern(expr)) {
-        errorAt(expr->pn_pos.begin, JSMSG_BAD_DESTRUCT_PARENS);
-        return false;
-    }
+    if (kind == DeclarationKind::FormalParameter)
+        pc->functionBox()->hasParameterExprs = true;
 
-    // This expression might be in a variable-binding pattern where only plain,
-    // unparenthesized names are permitted.
-    if (maybeDecl) {
-        // Destructuring patterns in declarations must only contain
-        // unparenthesized names.
-        if (!handler.isUnparenthesizedName(expr)) {
-            errorAt(expr->pn_pos.begin, JSMSG_NO_VARIABLE_NAME);
-            return false;
-        }
+    Node rhs = assignExpr(InAllowed, yieldHandling, TripledotProhibited);
+    if (!rhs)
+        return null();
 
-        RootedPropertyName name(context, expr->name());
-        // `yield` is already checked, so pass YieldIsName to skip that check.
-        if (!checkBindingIdentifier(name, expr->pn_pos.begin, YieldIsName))
-            return false;
-        return noteDeclaredName(name, *maybeDecl, expr->pn_pos);
-    }
+    handler.checkAndSetIsDirectRHSAnonFunction(rhs);
 
-    // Otherwise this is an expression in destructuring outside a declaration.
-    if (handler.isNameAnyParentheses(expr)) {
-        if (const char* chars = handler.nameIsArgumentsEvalAnyParentheses(expr, context)) {
-            if (!strictModeErrorAt(expr->pn_pos.begin, JSMSG_BAD_STRICT_ASSIGN, chars))
-                return false;
-        }
+    Node assign = handler.newAssignment(PNK_ASSIGN, lhs, rhs, JSOP_NOP);
+    if (!assign)
+        return null();
 
-        return true;
-    }
+    if (foldConstants && !FoldConstants(context, &assign, this))
+        return null();
 
-    if (handler.isPropertyAccess(expr))
-        return true;
-
-    errorAt(expr->pn_pos.begin, JSMSG_BAD_DESTRUCT_TARGET);
-    return false;
+    return assign;
 }
 
-template <>
-bool
-Parser<FullParseHandler, char16_t>::checkDestructuringPattern(ParseNode* pattern,
-                                                              const Maybe<DeclarationKind>& maybeDecl,
-                                                              PossibleError* possibleError /* = nullptr */);
-
-template <>
-bool
-Parser<SyntaxParseHandler, char16_t>::checkDestructuringPattern(Node pattern,
-                                                                const Maybe<DeclarationKind>& maybeDecl,
-                                                                PossibleError* possibleError /* = nullptr */)
+template <template <typename CharT> class ParseHandler, typename CharT>
+typename ParseHandler<CharT>::Node
+Parser<ParseHandler, CharT>::bindingIdentifier(DeclarationKind kind, YieldHandling yieldHandling)
 {
-    return abortIfSyntaxParser();
+    RootedPropertyName name(context, bindingIdentifier(yieldHandling));
+    if (!name)
+        return null();
+
+    Node binding = newName(name);
+    if (!binding || !noteDeclaredName(name, kind, pos()))
+        return null();
+
+    return binding;
 }
 
-template <>
-bool
-Parser<FullParseHandler, char16_t>::checkDestructuringObject(ParseNode* objectPattern,
-                                                             const Maybe<DeclarationKind>& maybeDecl)
+template <template <typename CharT> class ParseHandler, typename CharT>
+typename ParseHandler<CharT>::Node
+Parser<ParseHandler, CharT>::bindingIdentifierOrPattern(DeclarationKind kind,
+                                                        YieldHandling yieldHandling, TokenKind tt)
 {
-    MOZ_ASSERT(objectPattern->isKind(PNK_OBJECT));
+    if (tt == TOK_LB)
+        return arrayBindingPattern(kind, yieldHandling);
 
-    for (ParseNode* member = objectPattern->pn_head; member; member = member->pn_next) {
-        ParseNode* target;
-        if (member->isKind(PNK_MUTATEPROTO)) {
-            target = member->pn_kid;
+    if (tt == TOK_LC)
+        return objectBindingPattern(kind, yieldHandling);
+
+    if (!TokenKindIsPossibleIdentifierName(tt)) {
+        error(JSMSG_NO_VARIABLE_NAME);
+        return null();
+    }
+
+    return bindingIdentifier(kind, yieldHandling);
+}
+
+template <template <typename CharT> class ParseHandler, typename CharT>
+typename ParseHandler<CharT>::Node
+Parser<ParseHandler, CharT>::objectBindingPattern(DeclarationKind kind,
+                                                  YieldHandling yieldHandling)
+{
+    MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_LC));
+
+    if (!CheckRecursionLimit(context))
+        return null();
+
+    uint32_t begin = pos().begin;
+    Node literal = handler.newObjectLiteral(begin);
+    if (!literal)
+        return null();
+
+    Maybe<DeclarationKind> declKind = Some(kind);
+    RootedAtom propAtom(context);
+    for (;;) {
+        TokenKind tt;
+        if (!tokenStream.getToken(&tt))
+            return null();
+        if (tt == TOK_RC)
+            break;
+
+        TokenPos namePos = pos();
+
+        tokenStream.ungetToken();
+
+        PropertyType propType;
+        Node propName = propertyName(yieldHandling, declKind, literal, &propType, &propAtom);
+        if (!propName)
+            return null();
+
+        if (propType == PropertyType::Normal) {
+            // Handle e.g., |var {p: x} = o| and |var {p: x=0} = o|.
+
+            if (!tokenStream.getToken(&tt, TokenStream::Operand))
+                return null();
+
+            Node binding = bindingIdentifierOrPattern(kind, yieldHandling, tt);
+            if (!binding)
+                return null();
+
+            bool hasInitializer;
+            if (!tokenStream.matchToken(&hasInitializer, TOK_ASSIGN))
+                return null();
+
+            Node bindingExpr = hasInitializer
+                               ? bindingInitializer(binding, kind, yieldHandling)
+                               : binding;
+            if (!bindingExpr)
+                return null();
+
+            if (!handler.addPropertyDefinition(literal, propName, bindingExpr))
+                return null();
+        } else if (propType == PropertyType::Shorthand) {
+            // Handle e.g., |var {x, y} = o| as destructuring shorthand
+            // for |var {x: x, y: y} = o|.
+            MOZ_ASSERT(TokenKindIsPossibleIdentifierName(tt));
+
+            Node binding = bindingIdentifier(kind, yieldHandling);
+            if (!binding)
+                return null();
+
+            if (!handler.addShorthand(literal, propName, binding))
+                return null();
+        } else if (propType == PropertyType::CoverInitializedName) {
+            // Handle e.g., |var {x=1, y=2} = o| as destructuring shorthand
+            // with default values.
+            MOZ_ASSERT(TokenKindIsPossibleIdentifierName(tt));
+
+            Node binding = bindingIdentifier(kind, yieldHandling);
+            if (!binding)
+                return null();
+
+            tokenStream.consumeKnownToken(TOK_ASSIGN);
+
+            Node bindingExpr = bindingInitializer(binding, kind, yieldHandling);
+            if (!bindingExpr)
+                return null();
+
+            if (!handler.addPropertyDefinition(literal, propName, bindingExpr))
+                return null();
         } else {
-            MOZ_ASSERT(member->isKind(PNK_COLON) || member->isKind(PNK_SHORTHAND));
-            MOZ_ASSERT_IF(member->isKind(PNK_SHORTHAND),
-                          member->pn_left->isKind(PNK_OBJECT_PROPERTY_NAME) &&
-                          member->pn_right->isKind(PNK_NAME) &&
-                          member->pn_left->pn_atom == member->pn_right->pn_atom);
-
-            target = member->pn_right;
+            errorAt(namePos.begin, JSMSG_NO_VARIABLE_NAME);
+            return null();
         }
-        if (handler.isUnparenthesizedAssignment(target))
-            target = target->pn_left;
 
-        if (handler.isUnparenthesizedDestructuringPattern(target)) {
-            if (!checkDestructuringPattern(target, maybeDecl))
-                return false;
-        } else {
-            if (!checkDestructuringName(target, maybeDecl))
-                return false;
+        if (!tokenStream.getToken(&tt))
+            return null();
+        if (tt == TOK_RC)
+            break;
+        if (tt != TOK_COMMA) {
+            reportMissingClosing(JSMSG_CURLY_AFTER_LIST, JSMSG_CURLY_OPENED, begin);
+            return null();
         }
     }
 
-    return true;
+    handler.setEndPosition(literal, pos().end);
+    return literal;
 }
 
-template <>
-bool
-Parser<FullParseHandler, char16_t>::checkDestructuringArray(ParseNode* arrayPattern,
-                                                            const Maybe<DeclarationKind>& maybeDecl)
+template <template <typename CharT> class ParseHandler, typename CharT>
+typename ParseHandler<CharT>::Node
+Parser<ParseHandler, CharT>::arrayBindingPattern(DeclarationKind kind, YieldHandling yieldHandling)
 {
-    MOZ_ASSERT(arrayPattern->isKind(PNK_ARRAY));
+    MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_LB));
 
-    for (ParseNode* element = arrayPattern->pn_head; element; element = element->pn_next) {
-        if (element->isKind(PNK_ELISION))
-            continue;
+    if (!CheckRecursionLimit(context))
+        return null();
 
-        ParseNode* target;
-        if (element->isKind(PNK_SPREAD)) {
-            if (element->pn_next) {
-                errorAt(element->pn_next->pn_pos.begin, JSMSG_PARAMETER_AFTER_REST);
-                return false;
-            }
-            target = element->pn_kid;
-        } else if (handler.isUnparenthesizedAssignment(element)) {
-            target = element->pn_left;
-        } else {
-            target = element;
-        }
+    uint32_t begin = pos().begin;
+    Node literal = handler.newArrayLiteral(begin);
+    if (!literal)
+        return null();
 
-        if (handler.isUnparenthesizedDestructuringPattern(target)) {
-            if (!this->checkDestructuringPattern(target, maybeDecl))
-                return false;
-        } else {
-            if (!checkDestructuringName(target, maybeDecl))
-                return false;
-        }
-    }
+     uint32_t index = 0;
+     TokenStream::Modifier modifier = TokenStream::Operand;
+     for (; ; index++) {
+         if (index >= NativeObject::MAX_DENSE_ELEMENTS_COUNT) {
+             error(JSMSG_ARRAY_INIT_TOO_BIG);
+             return null();
+         }
 
-    return true;
-}
+         TokenKind tt;
+         if (!tokenStream.getToken(&tt, TokenStream::Operand))
+             return null();
 
-/*
- * Destructuring patterns can appear in two kinds of contexts:
- *
- * - assignment-like: assignment expressions and |for| loop heads.  In
- *   these cases, the patterns' property value positions can be
- *   arbitrary lvalue expressions; the destructuring is just a fancy
- *   assignment.
- *
- * - binding-like: |var| and |let| declarations, functions' formal
- *   parameter lists, |catch| clauses, and comprehension tails.  In
- *   these cases, the patterns' property value positions must be
- *   simple names; the destructuring defines them as new variables.
- *
- * In both cases, other code parses the pattern as an arbitrary
- * primaryExpr, and then, here in checkDestructuringPattern, verify
- * that the tree is a valid AssignmentPattern or BindingPattern.
- *
- * In assignment-like contexts, we parse the pattern with
- * pc->inDestructuringDecl clear, so the lvalue expressions in the
- * pattern are parsed normally.  primaryExpr links variable references
- * into the appropriate use chains; creates placeholder definitions;
- * and so on.  checkDestructuringPattern won't bind any new names and
- * we specialize lvalues as appropriate.
- *
- * In declaration-like contexts, the normal variable reference
- * processing would just be an obstruction, because we're going to
- * define the names that appear in the property value positions as new
- * variables anyway.  In this case, we parse the pattern with
- * pc->inDestructuringDecl set, which directs primaryExpr to leave
- * whatever name nodes it creates unconnected.  Then, here in
- * checkDestructuringPattern, we require the pattern's property value
- * positions to be simple names, and define them as appropriate to the
- * context.
- */
-template <>
-bool
-Parser<FullParseHandler, char16_t>::checkDestructuringPattern(ParseNode* pattern,
-                                                              const Maybe<DeclarationKind>& maybeDecl,
-                                                              PossibleError* possibleError /* = nullptr */)
-{
-    if (pattern->isKind(PNK_ARRAYCOMP)) {
-        errorAt(pattern->pn_pos.begin, JSMSG_ARRAY_COMP_LEFTSIDE);
-        return false;
-    }
+         if (tt == TOK_RB) {
+             tokenStream.ungetToken();
+             break;
+         }
 
-    bool isDestructuring = pattern->isKind(PNK_ARRAY)
-                           ? checkDestructuringArray(pattern, maybeDecl)
-                           : checkDestructuringObject(pattern, maybeDecl);
+         if (tt == TOK_COMMA) {
+             if (!handler.addElision(literal, pos()))
+                 return null();
+         } else if (tt == TOK_TRIPLEDOT) {
+             uint32_t begin = pos().begin;
 
-    // Report any pending destructuring error.
-    if (isDestructuring && possibleError && !possibleError->checkForDestructuringError())
-        return false;
+             TokenKind tt;
+             if (!tokenStream.getToken(&tt, TokenStream::Operand))
+                 return null();
 
-    return isDestructuring;
+             Node inner = bindingIdentifierOrPattern(kind, yieldHandling, tt);
+             if (!inner)
+                 return null();
+
+             if (!handler.addSpreadElement(literal, begin, inner))
+                 return null();
+         } else {
+             Node binding = bindingIdentifierOrPattern(kind, yieldHandling, tt);
+             if (!binding)
+                 return null();
+
+             bool hasInitializer;
+             if (!tokenStream.matchToken(&hasInitializer, TOK_ASSIGN))
+                 return null();
+
+             Node element = hasInitializer
+                            ? bindingInitializer(binding, kind, yieldHandling)
+                            : binding;
+             if (!element)
+                 return null();
+
+             handler.addArrayElement(literal, element);
+         }
+
+         if (tt != TOK_COMMA) {
+             // If we didn't already match TOK_COMMA in above case.
+             bool matched;
+             if (!tokenStream.matchToken(&matched, TOK_COMMA))
+                 return null();
+             if (!matched) {
+                 modifier = TokenStream::None;
+                 break;
+             }
+             if (tt == TOK_TRIPLEDOT) {
+                 error(JSMSG_REST_WITH_COMMA);
+                 return null();
+             }
+         }
+     }
+
+     MUST_MATCH_TOKEN_MOD_WITH_REPORT(TOK_RB, modifier,
+                                      reportMissingClosing(JSMSG_BRACKET_AFTER_LIST,
+                                                           JSMSG_BRACKET_OPENED, begin));
+
+    handler.setEndPosition(literal, pos().end);
+    return literal;
 }
 
 template <template <typename CharT> class ParseHandler, typename CharT>
@@ -4477,18 +4587,9 @@ Parser<ParseHandler, CharT>::destructuringDeclaration(DeclarationKind kind,
     MOZ_ASSERT(tokenStream.isCurrentTokenType(tt));
     MOZ_ASSERT(tt == TOK_LB || tt == TOK_LC);
 
-    PossibleError possibleError(*this);
-    Node pattern;
-    {
-        pc->inDestructuringDecl = Some(kind);
-        pattern = primaryExpr(yieldHandling, TripledotProhibited, tt, &possibleError);
-        pc->inDestructuringDecl = Nothing();
-    }
-
-    if (!pattern || !checkDestructuringPattern(pattern, Some(kind), &possibleError))
-        return null();
-
-    return pattern;
+    return tt == TOK_LB
+           ? arrayBindingPattern(kind, yieldHandling)
+           : objectBindingPattern(kind, yieldHandling);
 }
 
 template <template <typename CharT> class ParseHandler, typename CharT>
@@ -4604,6 +4705,12 @@ Parser<ParseHandler, CharT>::declarationPattern(Node decl, DeclarationKind declK
         // binary operator (examined with modifier None) terminated |init|.
         // For all other declarations, through ASI's infinite majesty, a next
         // token on a new line would begin an expression.
+        // Similar to the case in initializerInNameDeclaration(), we need to
+        // peek at the next token when assignExpr() is a lazily parsed arrow
+        // function.
+        TokenKind ignored;
+        if (!tokenStream.peekToken(&ignored))
+            return null();
         tokenStream.addModifierException(TokenStream::OperandIsNone);
     }
 
@@ -6034,7 +6141,7 @@ Parser<ParseHandler, CharT>::forHeadStart(YieldHandling yieldHandling,
 
     // Verify the left-hand side expression doesn't have a forbidden form.
     if (handler.isUnparenthesizedDestructuringPattern(*forInitialPart)) {
-        if (!checkDestructuringPattern(*forInitialPart, Nothing(), &possibleError))
+        if (!possibleError.checkForDestructuringErrorOrWarning())
             return false;
     } else if (handler.isNameAnyParentheses(*forInitialPart)) {
         const char* chars = handler.nameIsArgumentsEvalAnyParentheses(*forInitialPart, context);
@@ -6873,14 +6980,10 @@ Parser<ParseHandler, CharT>::tryStatement(YieldHandling yieldHandling)
                     return null();
                 }
 
-                RootedPropertyName param(context, bindingIdentifier(yieldHandling));
-                if (!param)
-                    return null();
-                catchName = newName(param);
+                catchName = bindingIdentifier(DeclarationKind::SimpleCatchParameter,
+                                              yieldHandling);
                 if (!catchName)
                     return null();
-                if (!noteDeclaredName(param, DeclarationKind::SimpleCatchParameter, pos()))
-                    return null();
                 break;
               }
             }
@@ -7109,6 +7212,7 @@ Parser<ParseHandler, CharT>::classDefinition(YieldHandling yieldHandling,
     if (!classMethods)
         return null();
 
+    Maybe<DeclarationKind> declKind = Nothing();
     for (;;) {
         TokenKind tt;
         if (!tokenStream.getToken(&tt))
@@ -7142,7 +7246,7 @@ Parser<ParseHandler, CharT>::classDefinition(YieldHandling yieldHandling,
             return null();
 
         PropertyType propType;
-        Node propName = propertyName(yieldHandling, classMethods, &propType, &propAtom);
+        Node propName = propertyName(yieldHandling, declKind, classMethods, &propType, &propAtom);
         if (!propName)
             return null();
 
@@ -7981,26 +8085,6 @@ Parser<ParseHandler, CharT>::condExpr1(InHandling inHandling, YieldHandling yiel
     return handler.newConditional(condition, thenExpr, elseExpr);
 }
 
-class AutoClearInDestructuringDecl
-{
-    ParseContext* pc_;
-    Maybe<DeclarationKind> saved_;
-
-  public:
-    explicit AutoClearInDestructuringDecl(ParseContext* pc)
-      : pc_(pc),
-        saved_(pc->inDestructuringDecl)
-    {
-        pc->inDestructuringDecl = Nothing();
-        if (saved_ && *saved_ == DeclarationKind::FormalParameter)
-            pc->functionBox()->hasParameterExprs = true;
-    }
-
-    ~AutoClearInDestructuringDecl() {
-        pc_->inDestructuringDecl = saved_;
-    }
-};
-
 template <template <typename CharT> class ParseHandler, typename CharT>
 typename ParseHandler<CharT>::Node
 Parser<ParseHandler, CharT>::assignExpr(InHandling inHandling, YieldHandling yieldHandling,
@@ -8026,7 +8110,7 @@ Parser<ParseHandler, CharT>::assignExpr(InHandling inHandling, YieldHandling yie
     if (!tokenStream.getToken(&tt, TokenStream::Operand))
         return null();
 
-    uint32_t exprOffset = pos().begin;
+    TokenPos exprPos = pos();
 
     bool endsExpr;
 
@@ -8232,12 +8316,12 @@ Parser<ParseHandler, CharT>::assignExpr(InHandling inHandling, YieldHandling yie
             return null();
         }
 
-        if (!checkDestructuringPattern(lhs, Nothing(), &possibleErrorInner))
+        if (!possibleErrorInner.checkForDestructuringErrorOrWarning())
             return null();
     } else if (handler.isNameAnyParentheses(lhs)) {
         if (const char* chars = handler.nameIsArgumentsEvalAnyParentheses(lhs, context)) {
             // |chars| is "arguments" or "eval" here.
-            if (!strictModeErrorAt(exprOffset, JSMSG_BAD_STRICT_ASSIGN, chars))
+            if (!strictModeErrorAt(exprPos.begin, JSMSG_BAD_STRICT_ASSIGN, chars))
                 return null();
         }
 
@@ -8245,23 +8329,22 @@ Parser<ParseHandler, CharT>::assignExpr(InHandling inHandling, YieldHandling yie
     } else if (handler.isPropertyAccess(lhs)) {
         // Permitted: no additional testing/fixup needed.
     } else if (handler.isFunctionCall(lhs)) {
-        if (!strictModeErrorAt(exprOffset, JSMSG_BAD_LEFTSIDE_OF_ASS))
+        if (!strictModeErrorAt(exprPos.begin, JSMSG_BAD_LEFTSIDE_OF_ASS))
             return null();
+
+        if (possibleError)
+            possibleError->setPendingDestructuringErrorAt(exprPos, JSMSG_BAD_DESTRUCT_TARGET);
     } else {
-        errorAt(exprOffset, JSMSG_BAD_LEFTSIDE_OF_ASS);
+        errorAt(exprPos.begin, JSMSG_BAD_LEFTSIDE_OF_ASS);
         return null();
     }
 
     if (!possibleErrorInner.checkForExpressionError())
         return null();
 
-    Node rhs;
-    {
-        AutoClearInDestructuringDecl autoClear(pc);
-        rhs = assignExpr(inHandling, yieldHandling, TripledotProhibited);
-        if (!rhs)
-            return null();
-    }
+    Node rhs = assignExpr(inHandling, yieldHandling, TripledotProhibited);
+    if (!rhs)
+        return null();
 
     if (kind == PNK_ASSIGN)
         handler.checkAndSetIsDirectRHSAnonFunction(rhs);
@@ -9225,7 +9308,7 @@ Parser<ParseHandler, CharT>::identifierReference(Handle<PropertyName*> name)
     if (!pn)
         return null();
 
-    if (!pc->inDestructuringDecl && !noteUsedName(name))
+    if (!noteUsedName(name))
         return null();
 
     return pn;
@@ -9278,6 +9361,74 @@ Parser<ParseHandler, CharT>::newRegExp()
     return handler.newRegExp(reobj, pos(), *this);
 }
 
+template <template <typename CharT> class ParseHandler, typename CharT>
+void
+Parser<ParseHandler, CharT>::checkDestructuringAssignmentTarget(Node expr, TokenPos exprPos,
+                                                                PossibleError* possibleError)
+{
+    // Return early if a pending destructuring error is already present.
+    if (possibleError->hasPendingDestructuringError())
+        return;
+
+    if (pc->sc()->needStrictChecks()) {
+        if (handler.isArgumentsAnyParentheses(expr, context)) {
+            if (pc->sc()->strict()) {
+                possibleError->setPendingDestructuringErrorAt(exprPos,
+                                                              JSMSG_BAD_STRICT_ASSIGN_ARGUMENTS);
+            } else {
+                possibleError->setPendingDestructuringWarningAt(exprPos,
+                                                                JSMSG_BAD_STRICT_ASSIGN_ARGUMENTS);
+            }
+            return;
+        }
+
+        if (handler.isEvalAnyParentheses(expr, context)) {
+            if (pc->sc()->strict()) {
+                possibleError->setPendingDestructuringErrorAt(exprPos,
+                                                              JSMSG_BAD_STRICT_ASSIGN_EVAL);
+            } else {
+                possibleError->setPendingDestructuringWarningAt(exprPos,
+                                                                JSMSG_BAD_STRICT_ASSIGN_EVAL);
+            }
+            return;
+        }
+    }
+
+    // The expression must be either a simple assignment target, i.e. a name
+    // or a property accessor, or a nested destructuring pattern.
+    if (!handler.isUnparenthesizedDestructuringPattern(expr) &&
+        !handler.isNameAnyParentheses(expr) &&
+        !handler.isPropertyAccess(expr))
+    {
+        // Parentheses are forbidden around destructuring *patterns* (but
+        // allowed around names). Use our nicer error message for
+        // parenthesized, nested patterns.
+        if (handler.isParenthesizedDestructuringPattern(expr))
+            possibleError->setPendingDestructuringErrorAt(exprPos, JSMSG_BAD_DESTRUCT_PARENS);
+        else
+            possibleError->setPendingDestructuringErrorAt(exprPos, JSMSG_BAD_DESTRUCT_TARGET);
+    }
+}
+
+template <template <typename CharT> class ParseHandler, typename CharT>
+void
+Parser<ParseHandler, CharT>::checkDestructuringAssignmentElement(Node expr, TokenPos exprPos,
+                                                                 PossibleError* possibleError)
+{
+    // ES2018 draft rev 0719f44aab93215ed9a626b2f45bd34f36916834
+    // 12.15.5 Destructuring Assignment
+    //
+    // AssignmentElement[Yield, Await]:
+    //   DestructuringAssignmentTarget[?Yield, ?Await]
+    //   DestructuringAssignmentTarget[?Yield, ?Await] Initializer[+In, ?Yield, ?Await]
+
+    // If |expr| is an assignment element with an initializer expression, its
+    // destructuring assignment target was already validated in assignExpr().
+    // Otherwise we need to check that |expr| is a valid destructuring target.
+    if (!handler.isUnparenthesizedAssignment(expr))
+        checkDestructuringAssignmentTarget(expr, exprPos, possibleError);
+}
+
 template <template <typename CharT> class ParseHandler, typename CharT>
 typename ParseHandler<CharT>::Node
 Parser<ParseHandler, CharT>::arrayInitializer(YieldHandling yieldHandling,
@@ -9328,17 +9479,30 @@ Parser<ParseHandler, CharT>::arrayInitializer(YieldHandling yieldHandling,
             } else if (tt == TOK_TRIPLEDOT) {
                 tokenStream.consumeKnownToken(TOK_TRIPLEDOT, TokenStream::Operand);
                 uint32_t begin = pos().begin;
+
+                TokenPos innerPos;
+                if (!tokenStream.peekTokenPos(&innerPos, TokenStream::Operand))
+                    return null();
+
                 Node inner = assignExpr(InAllowed, yieldHandling, TripledotProhibited,
                                         possibleError);
                 if (!inner)
                     return null();
+                if (possibleError)
+                    checkDestructuringAssignmentTarget(inner, innerPos, possibleError);
                 if (!handler.addSpreadElement(literal, begin, inner))
                     return null();
             } else {
+                TokenPos elementPos;
+                if (!tokenStream.peekTokenPos(&elementPos, TokenStream::Operand))
+                    return null();
+
                 Node element = assignExpr(InAllowed, yieldHandling, TripledotProhibited,
                                           possibleError);
                 if (!element)
                     return null();
+                if (possibleError)
+                    checkDestructuringAssignmentElement(element, elementPos, possibleError);
                 if (foldConstants && !FoldConstants(context, &element, this))
                     return null();
                 handler.addArrayElement(literal, element);
@@ -9376,7 +9540,8 @@ DoubleToAtom(JSContext* cx, double value)
 
 template <template <typename CharT> class ParseHandler, typename CharT>
 typename ParseHandler<CharT>::Node
-Parser<ParseHandler, CharT>::propertyName(YieldHandling yieldHandling, Node propList,
+Parser<ParseHandler, CharT>::propertyName(YieldHandling yieldHandling,
+                                          const Maybe<DeclarationKind>& maybeDecl, Node propList,
                                           PropertyType* propType, MutableHandleAtom propAtom)
 {
     TokenKind ltok;
@@ -9443,7 +9608,7 @@ Parser<ParseHandler, CharT>::propertyName(YieldHandling yieldHandling, Node prop
         break;
 
       case TOK_LB:
-        propName = computedPropertyName(yieldHandling, propList);
+        propName = computedPropertyName(yieldHandling, maybeDecl, propList);
         if (!propName)
             return null();
         break;
@@ -9501,7 +9666,7 @@ Parser<ParseHandler, CharT>::propertyName(YieldHandling yieldHandling, Node prop
         if (tt == TOK_LB) {
             tokenStream.consumeKnownToken(TOK_LB);
 
-            return computedPropertyName(yieldHandling, propList);
+            return computedPropertyName(yieldHandling, maybeDecl, propList);
         }
 
         // Not an accessor property after all.
@@ -9573,28 +9738,25 @@ Parser<ParseHandler, CharT>::propertyName(YieldHandling yieldHandling, Node prop
 
 template <template <typename CharT> class ParseHandler, typename CharT>
 typename ParseHandler<CharT>::Node
-Parser<ParseHandler, CharT>::computedPropertyName(YieldHandling yieldHandling, Node literal)
+Parser<ParseHandler, CharT>::computedPropertyName(YieldHandling yieldHandling,
+                                                  const Maybe<DeclarationKind>& maybeDecl,
+                                                  Node literal)
 {
     uint32_t begin = pos().begin;
 
-    Node assignNode;
-    {
-        // Turn off the inDestructuringDecl flag when parsing computed property
-        // names. In short, when parsing 'let {[x + y]: z} = obj;', noteUsedName()
-        // should be called on x and y, but not on z. See the comment on
-        // Parser<>::checkDestructuringPattern() for details.
-        AutoClearInDestructuringDecl autoClear(pc);
-        assignNode = assignExpr(InAllowed, yieldHandling, TripledotProhibited);
-        if (!assignNode)
-            return null();
+    if (maybeDecl) {
+        if (*maybeDecl == DeclarationKind::FormalParameter)
+            pc->functionBox()->hasParameterExprs = true;
+    } else {
+        handler.setListFlag(literal, PNX_NONCONST);
     }
 
-    MUST_MATCH_TOKEN(TOK_RB, JSMSG_COMP_PROP_UNTERM_EXPR);
-    Node propname = handler.newComputedName(assignNode, begin, pos().end);
-    if (!propname)
+    Node assignNode = assignExpr(InAllowed, yieldHandling, TripledotProhibited);
+    if (!assignNode)
         return null();
-    handler.setListFlag(literal, PNX_NONCONST);
-    return propname;
+
+    MUST_MATCH_TOKEN(TOK_RB, JSMSG_COMP_PROP_UNTERM_EXPR);
+    return handler.newComputedName(assignNode, begin, pos().end);
 }
 
 template <template <typename CharT> class ParseHandler, typename CharT>
@@ -9612,6 +9774,7 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
 
     bool seenPrototypeMutation = false;
     bool seenCoverInitializedName = false;
+    Maybe<DeclarationKind> declKind = Nothing();
     RootedAtom propAtom(context);
     for (;;) {
         TokenKind tt;
@@ -9625,11 +9788,15 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
         tokenStream.ungetToken();
 
         PropertyType propType;
-        Node propName = propertyName(yieldHandling, literal, &propType, &propAtom);
+        Node propName = propertyName(yieldHandling, declKind, literal, &propType, &propAtom);
         if (!propName)
             return null();
 
         if (propType == PropertyType::Normal) {
+            TokenPos exprPos;
+            if (!tokenStream.peekTokenPos(&exprPos, TokenStream::Operand))
+                return null();
+
             Node propExpr = assignExpr(InAllowed, yieldHandling, TripledotProhibited,
                                        possibleError);
             if (!propExpr)
@@ -9637,6 +9804,9 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
 
             handler.checkAndSetIsDirectRHSAnonFunction(propExpr);
 
+            if (possibleError)
+                checkDestructuringAssignmentElement(propExpr, exprPos, possibleError);
+
             if (foldConstants && !FoldConstants(context, &propExpr, this))
                 return null();
 
@@ -9671,8 +9841,8 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
             }
         } else if (propType == PropertyType::Shorthand) {
             /*
-             * Support, e.g., |var {x, y} = o| as destructuring shorthand
-             * for |var {x: x, y: y} = o|, and |var o = {x, y}| as initializer
+             * Support, e.g., |({x, y} = o)| as destructuring shorthand
+             * for |({x: x, y: y} = o)|, and |var o = {x, y}| as initializer
              * shorthand for |var o = {x: x, y: y}|.
              */
             Rooted<PropertyName*> name(context, identifierReference(yieldHandling));
@@ -9683,11 +9853,14 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
             if (!nameExpr)
                 return null();
 
+            if (possibleError)
+                checkDestructuringAssignmentTarget(nameExpr, namePos, possibleError);
+
             if (!handler.addShorthand(literal, propName, nameExpr))
                 return null();
         } else if (propType == PropertyType::CoverInitializedName) {
             /*
-             * Support, e.g., |var {x=1, y=2} = o| as destructuring shorthand
+             * Support, e.g., |({x=1, y=2} = o)| as destructuring shorthand
              * with default values, as per ES6 12.14.5
              */
             Rooted<PropertyName*> name(context, identifierReference(yieldHandling));
@@ -9719,16 +9892,16 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
                 possibleError->setPendingExpressionErrorAt(pos(), JSMSG_COLON_AFTER_ID);
             }
 
-            Node rhs;
-            {
-                // Clearing `inDestructuringDecl` allows name use to be noted
-                // in Parser::identifierReference. See bug 1255167.
-                AutoClearInDestructuringDecl autoClear(pc);
-                rhs = assignExpr(InAllowed, yieldHandling, TripledotProhibited);
-                if (!rhs)
+            if (const char* chars = handler.nameIsArgumentsEvalAnyParentheses(lhs, context)) {
+                // |chars| is "arguments" or "eval" here.
+                if (!strictModeErrorAt(namePos.begin, JSMSG_BAD_STRICT_ASSIGN, chars))
                     return null();
             }
 
+            Node rhs = assignExpr(InAllowed, yieldHandling, TripledotProhibited);
+            if (!rhs)
+                return null();
+
             handler.checkAndSetIsDirectRHSAnonFunction(rhs);
 
             Node propExpr = handler.newAssignment(PNK_ASSIGN, lhs, rhs, JSOP_NOP);
@@ -9737,9 +9910,6 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
 
             if (!handler.addPropertyDefinition(literal, propName, propExpr))
                 return null();
-
-            if (!abortIfSyntaxParser())
-                return null();
         } else {
             RootedAtom funName(context);
             if (!tokenStream.isCurrentTokenType(TOK_RB)) {
@@ -9761,6 +9931,9 @@ Parser<ParseHandler, CharT>::objectLiteral(YieldHandling yieldHandling,
             JSOp op = JSOpFromPropertyType(propType);
             if (!handler.addObjectMethodDefinition(literal, propName, fn, op))
                 return null();
+
+            if (possibleError)
+                possibleError->setPendingDestructuringErrorAt(namePos, JSMSG_BAD_DESTRUCT_TARGET);
         }
 
         if (!tokenStream.getToken(&tt))
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index 1b47aa7d8501..a0ea703044fe 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -340,17 +340,6 @@ class ParseContext : public Nestable<ParseContext>
     // pointer may be nullptr.
     Directives* newDirectives;
 
-    // Set when parsing a declaration-like destructuring pattern.  This flag
-    // causes PrimaryExpr to create PN_NAME parse nodes for variable references
-    // which are not hooked into any definition's use chain, added to any tree
-    // context's AtomList, etc. etc.  checkDestructuring will do that work
-    // later.
-    //
-    // The comments atop checkDestructuring explain the distinction between
-    // assignment-like and declaration-like destructuring patterns, and why
-    // they need to be treated differently.
-    mozilla::Maybe<DeclarationKind> inDestructuringDecl;
-
     // Set when parsing a function and it has 'return <expr>;'
     bool funHasReturnExpr;
 
@@ -902,6 +891,12 @@ class ParserBase : public StrictModeGetter
      */
     MOZ_MUST_USE bool extraWarning(unsigned errorNumber, ...);
 
+    /*
+     * If extra warnings are enabled, report the given warning at the given
+     * offset.
+     */
+    MOZ_MUST_USE bool extraWarningAt(uint32_t offset, unsigned errorNumber, ...);
+
     bool isValidStrictBinding(PropertyName* name);
 
     void addTelemetry(JSCompartment::DeprecatedLanguageExtension e);
@@ -1031,7 +1026,7 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
     class MOZ_STACK_CLASS PossibleError
     {
       private:
-        enum class ErrorKind { Expression, Destructuring };
+        enum class ErrorKind { Expression, Destructuring, DestructuringWarning };
 
         enum class ErrorState { None, Pending };
 
@@ -1046,11 +1041,12 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
         Parser<ParseHandler, CharT>& parser_;
         Error exprError_;
         Error destructuringError_;
+        Error destructuringWarning_;
 
         // Returns the error report.
         Error& error(ErrorKind kind);
 
-        // Return true if an error is pending without reporting
+        // Return true if an error is pending without reporting.
         bool hasError(ErrorKind kind);
 
         // Resolve any pending error.
@@ -1062,7 +1058,11 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
 
         // If there is a pending error, report it and return false, otherwise
         // return true.
-        bool checkForError(ErrorKind kind);
+        MOZ_MUST_USE bool checkForError(ErrorKind kind);
+
+        // If there is a pending warning, report it and return either false or
+        // true depending on the werror option, otherwise return true.
+        MOZ_MUST_USE bool checkForWarning(ErrorKind kind);
 
         // Transfer an existing error to another instance.
         void transferErrorTo(ErrorKind kind, PossibleError* other);
@@ -1070,23 +1070,33 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
       public:
         explicit PossibleError(Parser<ParseHandler, CharT>& parser);
 
+        // Return true if a pending destructuring error is present.
+        bool hasPendingDestructuringError();
+
         // Set a pending destructuring error. Only a single error may be set
         // per instance, i.e. subsequent calls to this method are ignored and
         // won't overwrite the existing pending error.
         void setPendingDestructuringErrorAt(const TokenPos& pos, unsigned errorNumber);
 
+        // Set a pending destructuring warning. Only a single warning may be
+        // set per instance, i.e. subsequent calls to this method are ignored
+        // and won't overwrite the existing pending warning.
+        void setPendingDestructuringWarningAt(const TokenPos& pos, unsigned errorNumber);
+
         // Set a pending expression error. Only a single error may be set per
         // instance, i.e. subsequent calls to this method are ignored and won't
         // overwrite the existing pending error.
         void setPendingExpressionErrorAt(const TokenPos& pos, unsigned errorNumber);
 
-        // If there is a pending destructuring error, report it and return
-        // false, otherwise return true. Clears any pending expression error.
-        bool checkForDestructuringError();
+        // If there is a pending destructuring error or warning, report it and
+        // return false, otherwise return true. Clears any pending expression
+        // error.
+        MOZ_MUST_USE bool checkForDestructuringErrorOrWarning();
 
         // If there is a pending expression error, report it and return false,
-        // otherwise return true. Clears any pending destructuring error.
-        bool checkForExpressionError();
+        // otherwise return true. Clears any pending destructuring error or
+        // warning.
+        MOZ_MUST_USE bool checkForExpressionError();
 
         // Pass pending errors between possible error instances. This is useful
         // for extending the lifetime of a pending error beyond the scope of
@@ -1518,25 +1528,27 @@ class Parser final : public ParserBase, private JS::AutoGCRooter
 
     Node finishLexicalScope(ParseContext::Scope& scope, Node body);
 
-    Node propertyName(YieldHandling yieldHandling, Node propList,
+    Node propertyName(YieldHandling yieldHandling,
+                      const mozilla::Maybe<DeclarationKind>& maybeDecl, Node propList,
                       PropertyType* propType, MutableHandleAtom propAtom);
-    Node computedPropertyName(YieldHandling yieldHandling, Node literal);
+    Node computedPropertyName(YieldHandling yieldHandling,
+                              const mozilla::Maybe<DeclarationKind>& maybeDecl, Node literal);
     Node arrayInitializer(YieldHandling yieldHandling, PossibleError* possibleError);
     Node newRegExp();
 
     Node objectLiteral(YieldHandling yieldHandling, PossibleError* possibleError);
 
-    // Top-level entrypoint into destructuring pattern checking/name-analyzing.
-    bool checkDestructuringPattern(Node pattern, const mozilla::Maybe<DeclarationKind>& maybeDecl,
-                                   PossibleError* possibleError = nullptr);
+    Node bindingInitializer(Node lhs, DeclarationKind kind, YieldHandling yieldHandling);
+    Node bindingIdentifier(DeclarationKind kind, YieldHandling yieldHandling);
+    Node bindingIdentifierOrPattern(DeclarationKind kind, YieldHandling yieldHandling,
+                                    TokenKind tt);
+    Node objectBindingPattern(DeclarationKind kind, YieldHandling yieldHandling);
+    Node arrayBindingPattern(DeclarationKind kind, YieldHandling yieldHandling);
 
-    // Recursive methods for checking/name-analyzing subcomponents of a
-    // destructuring pattern.  The array/object methods *must* be passed arrays
-    // or objects.  The name method may be passed anything but will report an
-    // error if not passed a name.
-    bool checkDestructuringArray(Node arrayPattern, const mozilla::Maybe<DeclarationKind>& maybeDecl);
-    bool checkDestructuringObject(Node objectPattern, const mozilla::Maybe<DeclarationKind>& maybeDecl);
-    bool checkDestructuringName(Node expr, const mozilla::Maybe<DeclarationKind>& maybeDecl);
+    void checkDestructuringAssignmentTarget(Node expr, TokenPos exprPos,
+                                            PossibleError* possibleError);
+    void checkDestructuringAssignmentElement(Node expr, TokenPos exprPos,
+                                             PossibleError* possibleError);
 
     Node newNumber(const Token& tok) {
         return handler.newNumber(tok.number(), tok.decimalPoint(), tok.pos);
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 812fd7cd33f8..bfe5a41237f6 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -576,6 +576,10 @@ class SyntaxParseHandlerBase
                node == NodeParenthesizedName;
     }
 
+    bool isArgumentsAnyParentheses(Node node, JSContext* cx) {
+        return node == NodeUnparenthesizedArgumentsName || node == NodeParenthesizedArgumentsName;
+    }
+
     bool isEvalAnyParentheses(Node node, JSContext* cx) {
         return node == NodeUnparenthesizedEvalName || node == NodeParenthesizedEvalName;
     }
@@ -586,7 +590,7 @@ class SyntaxParseHandlerBase
 
         if (isEvalAnyParentheses(node, cx))
             return js_eval_str;
-        if (node == NodeUnparenthesizedArgumentsName || node == NodeParenthesizedArgumentsName)
+        if (isArgumentsAnyParentheses(node, cx))
             return js_arguments_str;
         return nullptr;
     }
diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp
index 073fb46b2156..d51c6e32de51 100644
--- a/js/src/gc/Zone.cpp
+++ b/js/src/gc/Zone.cpp
@@ -280,7 +280,11 @@ Zone::createJitZone(JSContext* cx)
     if (!cx->runtime()->getJitRuntime(cx))
         return nullptr;
 
-    jitZone_ = cx->new_<js::jit::JitZone>();
+    UniquePtr<jit::JitZone> jitZone(cx->new_<js::jit::JitZone>());
+    if (!jitZone || !jitZone->init(cx))
+        return nullptr;
+
+    jitZone_ = jitZone.release();
     return jitZone_;
 }
 
diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h
index 22ea4d6c3281..dc4b3a18fff8 100644
--- a/js/src/gc/Zone.h
+++ b/js/src/gc/Zone.h
@@ -178,6 +178,7 @@ struct Zone : public JS::shadow::Zone,
 
     void addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
                                 size_t* typePool,
+                                size_t* jitZone,
                                 size_t* baselineStubsOptimized,
                                 size_t* cachedCFG,
                                 size_t* uniqueIdMap,
diff --git a/js/src/gc/ZoneGroup.cpp b/js/src/gc/ZoneGroup.cpp
index 88b77fd4d0c1..464a62ccb3c3 100644
--- a/js/src/gc/ZoneGroup.cpp
+++ b/js/src/gc/ZoneGroup.cpp
@@ -24,6 +24,7 @@ ZoneGroup::ZoneGroup(JSRuntime* runtime)
 #endif
     jitZoneGroup(this, nullptr),
     debuggerList_(this),
+    numFinishedBuilders(0),
     ionLazyLinkListSize_(0)
 {}
 
@@ -67,6 +68,11 @@ ZoneGroup::enter()
         ownerContext_ = CooperatingContext(cx);
         if (cx->generationalDisabled)
             nursery().disable();
+
+        // Finish any Ion compilations in this zone group, in case compilation
+        // finished for some script in this group while no thread was in this
+        // group.
+        jit::AttachFinishedCompilations(this, nullptr);
     }
     enterCount++;
 }
@@ -100,6 +106,7 @@ ZoneGroup::ionLazyLinkListRemove(jit::IonBuilder* builder)
 {
     MOZ_ASSERT(CurrentThreadCanAccessRuntime(runtime),
                "Should only be mutated by the active thread.");
+    MOZ_ASSERT(this == builder->script()->zone()->group());
     MOZ_ASSERT(ionLazyLinkListSize_ > 0);
 
     builder->removeFrom(ionLazyLinkList());
@@ -113,6 +120,7 @@ ZoneGroup::ionLazyLinkListAdd(jit::IonBuilder* builder)
 {
     MOZ_ASSERT(CurrentThreadCanAccessRuntime(runtime),
                "Should only be mutated by the active thread.");
+    MOZ_ASSERT(this == builder->script()->zone()->group());
     ionLazyLinkList().insertFront(builder);
     ionLazyLinkListSize_++;
 }
diff --git a/js/src/gc/ZoneGroup.h b/js/src/gc/ZoneGroup.h
index b1cf22904b2a..f6b520034037 100644
--- a/js/src/gc/ZoneGroup.h
+++ b/js/src/gc/ZoneGroup.h
@@ -96,6 +96,11 @@ class ZoneGroup
   public:
     mozilla::LinkedList<js::Debugger>& debuggerList() { return debuggerList_.ref(); }
 
+    // Number of Ion compilations which were finished off thread and are
+    // waiting to be lazily linked. This is only set while holding the helper
+    // thread state lock, but may be read from at other times.
+    mozilla::Atomic<size_t> numFinishedBuilders;
+
   private:
     /* List of Ion compilation waiting to get linked. */
     typedef mozilla::LinkedList<js::jit::IonBuilder> IonBuilderList;
diff --git a/js/src/jit-test/tests/arrays/apply-optimization.js b/js/src/jit-test/tests/arrays/apply-optimization.js
new file mode 100644
index 000000000000..fc62da910f0f
--- /dev/null
+++ b/js/src/jit-test/tests/arrays/apply-optimization.js
@@ -0,0 +1,58 @@
+function make(k) {
+    var a = new Array(k);
+    for ( let i=0 ; i < k ; i++ )
+	a[i] = {}
+    return a;
+}
+
+function g() {
+    return arguments.length;
+}
+
+function f(a) {
+    var sum = 0;
+    for ( let i=0 ; i < 1000 ; i++ )
+	sum += g.apply(null, a);
+    return sum;
+}
+
+function F2() {
+    var sum = 0;
+    for ( let i=0 ; i < 1000 ; i++ )
+	sum += g.apply(null, arguments);
+    return sum;
+}
+
+function F(a) {
+    return F2.apply(null, a);
+}
+
+function time(k, t) {
+    var then = Date.now();
+    assertEq(t(), 1000*k);
+    var now = Date.now();
+    return now - then;
+}
+
+function p(v) {
+    // Uncomment to see timings
+    // print(v);
+}
+
+f(make(200));
+
+// There is currently a cutoff after 375 where we bailout in order to avoid
+// handling very large stack frames.  This slows the operation down by a factor
+// of 100 or so.
+
+p(time(374, () => f(make(374))));
+p(time(375, () => f(make(375))));
+p(time(376, () => f(make(376))));
+p(time(377, () => f(make(377))));
+
+F(make(200));
+
+p(time(374, () => F(make(374))));
+p(time(375, () => F(make(375))));
+p(time(376, () => F(make(376))));
+p(time(377, () => F(make(377))));
diff --git a/js/src/jit-test/tests/basic/string-index.js b/js/src/jit-test/tests/basic/string-index.js
new file mode 100644
index 000000000000..aee56e464769
--- /dev/null
+++ b/js/src/jit-test/tests/basic/string-index.js
@@ -0,0 +1,86 @@
+function basic() {
+    var zero = "0";
+    var one  = "1";
+    var thousand = String(1000);
+    var max = String(0xffff);
+
+    assertEq(zero, "0");
+    assertEq(Number(zero), 0);
+    assertEq(String(Number(zero)), "0");
+
+    assertEq(one, "1");
+    assertEq(Number(one), 1);
+    assertEq(String(Number(one)), "1");
+
+    assertEq(thousand, "1000");
+    assertEq(Number(thousand), 1000);
+    assertEq(String(Number(thousand)), "1000");
+
+    assertEq(max, "65535");
+    assertEq(Number(max), 0xffff);
+    assertEq(String(Number(max)), "65535");
+}
+
+function index() {
+    var zero = "0";
+    var trippleZero = "000";
+
+    var seven = "7";
+    var doubleOhSeven = "007";
+
+    var object = {0: "a", "000": "b"};
+    var object2 = {7: "a", "007": "b"};
+
+    var array = ["a"];
+    array[trippleZero] = "b";
+    var array2 = [0, 1, 2, 3, 4, 5, 6, "a"];
+    array2[doubleOhSeven] = "b";
+
+    for (var i = 0; i < 30; i++) {
+        assertEq(object[zero], "a");
+        assertEq(object[0], "a");
+        assertEq(object[trippleZero], "b");
+
+        assertEq(object2[seven], "a");
+        assertEq(object2[7], "a");
+        assertEq(object2[doubleOhSeven], "b");
+
+        assertEq(array[zero], "a");
+        assertEq(array[0], "a");
+        assertEq(array[trippleZero], "b");
+
+        assertEq(array2[seven], "a");
+        assertEq(array2[7], "a");
+        assertEq(array2[doubleOhSeven], "b");
+    }
+}
+
+function forin() {
+    var array = [0, 1, 2, 3, 4, 5, 6];
+
+    var i = 0;
+    for (var name in array) {
+        assertEq(name, String(i));
+        assertEq(Number(name), i);
+
+        assertEq(array[name], i);
+        assertEq(array.hasOwnProperty(name), true);
+
+        i++;
+    }
+}
+
+function parse() {
+    var numbers = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1000, 0xffff];
+
+    for (var number of numbers) {
+        assertEq(parseInt(String(number)), number);
+        assertEq(parseInt(String(number), 10), number);
+        assertEq(parseInt(String(number), 0), number);
+    }
+}
+
+basic();
+index();
+forin();
+parse();
diff --git a/js/src/jit-test/tests/debug/wasm-12.js b/js/src/jit-test/tests/debug/wasm-12.js
new file mode 100644
index 000000000000..85d43b094b31
--- /dev/null
+++ b/js/src/jit-test/tests/debug/wasm-12.js
@@ -0,0 +1,26 @@
+// Tests that wasm module scripts have special URLs.
+
+if (!wasmIsSupported())
+  quit();
+
+var g = newGlobal();
+g.eval(`
+function initWasm(s) { return new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary(s))); }
+o = initWasm('(module (func) (export "" 0))');
+o = initWasm('(module (func) (func) (export "" 1))');
+`);
+
+function isWasm(script) { return script.format === "wasm"; }
+
+function isValidWasmURL(url) {
+   // The URLs will have the following format:
+   //   wasm: [<uri-econded-filename-of-host> ":"] <64-bit-hash>
+   return /^wasm:(?:[^:]*:)*?[0-9a-f]{16}$/.test(url);
+}
+
+var dbg = new Debugger(g);
+var foundScripts = dbg.findScripts().filter(isWasm);
+assertEq(foundScripts.length, 2);
+assertEq(isValidWasmURL(foundScripts[0].source.url), true);
+assertEq(isValidWasmURL(foundScripts[1].source.url), true);
+assertEq(foundScripts[0].source.url != foundScripts[1].source.url, true);
diff --git a/js/src/jit/BaselineCacheIRCompiler.cpp b/js/src/jit/BaselineCacheIRCompiler.cpp
index 078eac28738d..da3ad68e6d59 100644
--- a/js/src/jit/BaselineCacheIRCompiler.cpp
+++ b/js/src/jit/BaselineCacheIRCompiler.cpp
@@ -1944,12 +1944,12 @@ jit::AttachBaselineCacheIRStub(JSContext* cx, const CacheIRWriter& writer,
         break;
     }
 
-    JitCompartment* jitCompartment = cx->compartment()->jitCompartment();
+    JitZone* jitZone = cx->zone()->jitZone();
 
     // Check if we already have JitCode for this stub.
     CacheIRStubInfo* stubInfo;
     CacheIRStubKey::Lookup lookup(kind, engine, writer.codeStart(), writer.codeLength());
-    JitCode* code = jitCompartment->getCacheIRStubCode(lookup, &stubInfo);
+    JitCode* code = jitZone->getBaselineCacheIRStubCode(lookup, &stubInfo);
     if (!code) {
         // We have to generate stub code.
         JitContext jctx(cx, nullptr);
@@ -1961,16 +1961,17 @@ jit::AttachBaselineCacheIRStub(JSContext* cx, const CacheIRWriter& writer,
         if (!code)
             return nullptr;
 
-        // Allocate the shared CacheIRStubInfo. Note that the putCacheIRStubCode
-        // call below will transfer ownership to the stub code HashMap, so we
-        // don't have to worry about freeing it below.
+        // Allocate the shared CacheIRStubInfo. Note that the
+        // putBaselineCacheIRStubCode call below will transfer ownership
+        // to the stub code HashMap, so we don't have to worry about freeing
+        // it below.
         MOZ_ASSERT(!stubInfo);
         stubInfo = CacheIRStubInfo::New(kind, engine, comp.makesGCCalls(), stubDataOffset, writer);
         if (!stubInfo)
             return nullptr;
 
         CacheIRStubKey key(stubInfo);
-        if (!jitCompartment->putCacheIRStubCode(lookup, key, code))
+        if (!jitZone->putBaselineCacheIRStubCode(lookup, key, code))
             return nullptr;
     }
 
diff --git a/js/src/jit/CacheIRCompiler.cpp b/js/src/jit/CacheIRCompiler.cpp
index 3c9c2421121e..bdb5e98d110f 100644
--- a/js/src/jit/CacheIRCompiler.cpp
+++ b/js/src/jit/CacheIRCompiler.cpp
@@ -1522,20 +1522,29 @@ CacheIRCompiler::emitGuardAndGetIndexFromString()
     if (!addFailurePath(&failure))
         return false;
 
-    LiveRegisterSet save(GeneralRegisterSet::Volatile(), liveVolatileFloatRegs());
-    masm.PushRegsInMask(save);
+    Label vmCall, done;
+    masm.loadStringIndexValue(str, output, &vmCall);
+    masm.jump(&done);
 
-    masm.setupUnalignedABICall(output);
-    masm.passABIArg(str);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, GetIndexFromString));
-    masm.mov(ReturnReg, output);
+    {
+        masm.bind(&vmCall);
+        LiveRegisterSet save(GeneralRegisterSet::Volatile(), liveVolatileFloatRegs());
+        masm.PushRegsInMask(save);
 
-    LiveRegisterSet ignore;
-    ignore.add(output);
-    masm.PopRegsInMaskIgnore(save, ignore);
+        masm.setupUnalignedABICall(output);
+        masm.passABIArg(str);
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, GetIndexFromString));
+        masm.mov(ReturnReg, output);
 
-    // GetIndexFromString returns a negative value on failure.
-    masm.branchTest32(Assembler::Signed, output, output, failure->label());
+        LiveRegisterSet ignore;
+        ignore.add(output);
+        masm.PopRegsInMaskIgnore(save, ignore);
+
+        // GetIndexFromString returns a negative value on failure.
+        masm.branchTest32(Assembler::Signed, output, output, failure->label());
+    }
+
+    masm.bind(&done);
     return true;
 }
 
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index b232914d13a6..78a2f200de23 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -4623,6 +4623,17 @@ CodeGenerator::emitApplyGeneric(T* apply)
 void
 CodeGenerator::visitApplyArgsGeneric(LApplyArgsGeneric* apply)
 {
+    // Limit the number of parameters we can handle to a number that does not risk
+    // us allocating too much stack, notably on Windows where there is a 4K guard page
+    // that has to be touched to extend the stack.  See bug 1351278.  The value "3000"
+    // is the size of the guard page minus an arbitrary, but large, safety margin.
+
+    LSnapshot* snapshot = apply->snapshot();
+    Register argcreg = ToRegister(apply->getArgc());
+
+    uint32_t limit = 3000 / sizeof(Value);
+    bailoutCmp32(Assembler::Above, argcreg, Imm32(limit), snapshot);
+
     emitApplyGeneric(apply);
 }
 
@@ -4634,7 +4645,13 @@ CodeGenerator::visitApplyArrayGeneric(LApplyArrayGeneric* apply)
 
     Address length(ToRegister(apply->getElements()), ObjectElements::offsetOfLength());
     masm.load32(length, tmp);
-    bailoutCmp32(Assembler::Above, tmp, Imm32(JitOptions.maxStackArgs), snapshot);
+
+    // See comment in visitApplyArgsGeneric, above.
+
+    uint32_t limit = 3000 / sizeof(Value);
+    bailoutCmp32(Assembler::Above, tmp, Imm32(limit), snapshot);
+
+    // Ensure that the array does not contain an uninitialized tail.
 
     Address initializedLength(ToRegister(apply->getElements()),
                               ObjectElements::offsetOfInitializedLength());
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
index 200347327eee..a6dd1549a288 100644
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -158,6 +158,7 @@ enum class InlinableNative : uint16_t {
 #define ADD_NATIVE(native) native,
     INLINABLE_NATIVE_LIST(ADD_NATIVE)
 #undef ADD_NATIVE
+    Limit
 };
 
 #define ADD_NATIVE(native) extern const JSJitInfo JitInfo_##native;
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index 84fc40522247..f89d05f6283e 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -424,7 +424,6 @@ JitZoneGroup::JitZoneGroup(ZoneGroup* group)
 
 JitCompartment::JitCompartment()
   : stubCodes_(nullptr),
-    cacheIRStubCodes_(nullptr),
     stringConcatStub_(nullptr),
     regExpMatcherStub_(nullptr),
     regExpSearcherStub_(nullptr),
@@ -435,7 +434,6 @@ JitCompartment::JitCompartment()
 JitCompartment::~JitCompartment()
 {
     js_delete(stubCodes_);
-    js_delete(cacheIRStubCodes_);
 }
 
 bool
@@ -450,15 +448,6 @@ JitCompartment::initialize(JSContext* cx)
         return false;
     }
 
-    cacheIRStubCodes_ = cx->new_<CacheIRStubCodeMap>(cx->runtime());
-    if (!cacheIRStubCodes_)
-        return false;
-
-    if (!cacheIRStubCodes_->init()) {
-        ReportOutOfMemory(cx);
-        return false;
-    }
-
     return true;
 }
 
@@ -474,6 +463,17 @@ JitCompartment::ensureIonStubsExist(JSContext* cx)
     return true;
 }
 
+bool
+JitZone::init(JSContext* cx)
+{
+    if (!baselineCacheIRStubCodes_.init()) {
+        ReportOutOfMemory(cx);
+        return false;
+    }
+
+    return true;
+}
+
 void
 jit::FinishOffThreadBuilder(JSRuntime* runtime, IonBuilder* builder,
                             const AutoLockHelperThreadState& locked)
@@ -649,7 +649,6 @@ JitCompartment::sweep(FreeOp* fop, JSCompartment* compartment)
     MOZ_ASSERT(!HasOffThreadIonCompile(compartment));
 
     stubCodes_->sweep();
-    cacheIRStubCodes_->sweep();
 
     // If the sweep removed a bailout Fallback stub, nullptr the corresponding return addr.
     for (auto& it : bailoutReturnStubInfo_) {
@@ -676,6 +675,12 @@ JitCompartment::sweep(FreeOp* fop, JSCompartment* compartment)
     }
 }
 
+void
+JitZone::sweep(FreeOp* fop)
+{
+    baselineCacheIRStubCodes_.sweep();
+}
+
 void
 JitCompartment::toggleBarriers(bool enabled)
 {
@@ -692,7 +697,12 @@ JitCompartment::toggleBarriers(bool enabled)
         JitCode* code = *e.front().value().unsafeGet();
         code->togglePreBarriers(enabled, Reprotect);
     }
-    for (CacheIRStubCodeMap::Enum e(*cacheIRStubCodes_); !e.empty(); e.popFront()) {
+}
+
+void
+JitZone::toggleBarriers(bool enabled)
+{
+    for (BaselineCacheIRStubCodeMap::Enum e(baselineCacheIRStubCodes_); !e.empty(); e.popFront()) {
         JitCode* code = *e.front().value().unsafeGet();
         code->togglePreBarriers(enabled, Reprotect);
     }
@@ -704,11 +714,23 @@ JitCompartment::sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
     size_t n = mallocSizeOf(this);
     if (stubCodes_)
         n += stubCodes_->sizeOfIncludingThis(mallocSizeOf);
-    if (cacheIRStubCodes_)
-        n += cacheIRStubCodes_->sizeOfIncludingThis(mallocSizeOf);
     return n;
 }
 
+void
+JitZone::addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
+                                size_t* jitZone,
+                                size_t* baselineStubsOptimized,
+                                size_t* cachedCFG) const
+{
+    *jitZone += mallocSizeOf(this);
+    *jitZone += baselineCacheIRStubCodes_.sizeOfExcludingThis(mallocSizeOf);
+    *jitZone += ionCacheIRStubInfoSet_.sizeOfExcludingThis(mallocSizeOf);
+
+    *baselineStubsOptimized += optimizedStubSpace_.sizeOfExcludingThis(mallocSizeOf);
+    *cachedCFG += cfgSpace_.sizeOfExcludingThis(mallocSizeOf);
+}
+
 JitCode*
 JitRuntime::getBailoutTable(const FrameSizeClass& frameClass) const
 {
@@ -1355,6 +1377,9 @@ jit::ToggleBarriers(JS::Zone* zone, bool needs)
             script->baselineScript()->toggleBarriers(needs);
     }
 
+    if (JitZone* jitZone = zone->jitZone())
+        jitZone->toggleBarriers(needs);
+
     for (CompartmentsInZoneIter comp(zone); !comp.done(); comp.next()) {
         if (comp->jitCompartment())
             comp->jitCompartment()->toggleBarriers(needs);
@@ -2024,14 +2049,16 @@ CompileBackEnd(MIRGenerator* mir)
     return GenerateCode(mir, lir);
 }
 
-// Find a finished builder for the runtime.
+// Find a builder which the current thread can finish.
 static IonBuilder*
-GetFinishedBuilder(JSContext* cx, GlobalHelperThreadState::IonBuilderVector& finished)
+GetFinishedBuilder(ZoneGroup* group, GlobalHelperThreadState::IonBuilderVector& finished)
 {
     for (size_t i = 0; i < finished.length(); i++) {
         IonBuilder* testBuilder = finished[i];
-        if (testBuilder->script()->runtimeFromAnyThread() == cx->runtime()) {
+        if (testBuilder->script()->runtimeFromAnyThread() == group->runtime &&
+            testBuilder->script()->zone()->group() == group) {
             HelperThreadState().remove(finished, &i);
+            group->numFinishedBuilders--;
             return testBuilder;
         }
     }
@@ -2040,44 +2067,46 @@ GetFinishedBuilder(JSContext* cx, GlobalHelperThreadState::IonBuilderVector& fin
 }
 
 void
-AttachFinishedCompilations(JSContext* cx)
+AttachFinishedCompilations(ZoneGroup* group, JSContext* maybecx)
 {
-    JitCompartment* ion = cx->compartment()->jitCompartment();
-    if (!ion)
+    MOZ_ASSERT_IF(maybecx, maybecx->zone()->group() == group);
+
+    if (!group->numFinishedBuilders)
         return;
 
-    {
-        AutoLockHelperThreadState lock;
+    AutoLockHelperThreadState lock;
+    GlobalHelperThreadState::IonBuilderVector& finished = HelperThreadState().ionFinishedList(lock);
 
-        GlobalHelperThreadState::IonBuilderVector& finished = HelperThreadState().ionFinishedList(lock);
+    // Incorporate any off thread compilations for the runtime which have
+    // finished, failed or have been cancelled.
+    while (true) {
+        // Find a finished builder for the zone group.
+        IonBuilder* builder = GetFinishedBuilder(group, finished);
+        if (!builder)
+            break;
 
-        // Incorporate any off thread compilations for the runtime which have
-        // finished, failed or have been cancelled.
-        while (true) {
-            // Find a finished builder for the runtime.
-            IonBuilder* builder = GetFinishedBuilder(cx, finished);
-            if (!builder)
-                break;
+        JSScript* script = builder->script();
+        MOZ_ASSERT(script->hasBaselineScript());
+        script->baselineScript()->setPendingIonBuilder(group->runtime, script, builder);
+        group->ionLazyLinkListAdd(builder);
 
-            JSScript* script = builder->script();
-            MOZ_ASSERT(script->hasBaselineScript());
-            script->baselineScript()->setPendingIonBuilder(cx->runtime(), script, builder);
-            cx->zone()->group()->ionLazyLinkListAdd(builder);
-
-            // Don't keep more than 100 lazy link builders in a zone group.
-            // Link the oldest ones immediately.
-            while (cx->zone()->group()->ionLazyLinkListSize() > 100) {
-                jit::IonBuilder* builder = cx->zone()->group()->ionLazyLinkList().getLast();
-                RootedScript script(cx, builder->script());
+        // Don't keep more than 100 lazy link builders in a zone group.
+        // Link the oldest ones immediately. Only do this if we have a valid
+        // context to use (otherwise this method might have been called in the
+        // middle of a compartment change on the current thread's context).
+        if (maybecx) {
+            while (group->ionLazyLinkListSize() > 100) {
+                jit::IonBuilder* builder = group->ionLazyLinkList().getLast();
+                RootedScript script(maybecx, builder->script());
 
                 AutoUnlockHelperThreadState unlock(lock);
-                AutoCompartment ac(cx, script);
-                jit::LinkIonScript(cx, script);
+                AutoCompartment ac(maybecx, script);
+                jit::LinkIonScript(maybecx, script);
             }
-
-            continue;
         }
     }
+
+    MOZ_ASSERT(!group->numFinishedBuilders);
 }
 
 static void
diff --git a/js/src/jit/Ion.h b/js/src/jit/Ion.h
index acc88e242018..34cd5c18eaeb 100644
--- a/js/src/jit/Ion.h
+++ b/js/src/jit/Ion.h
@@ -159,7 +159,7 @@ LIRGraph* GenerateLIR(MIRGenerator* mir);
 CodeGenerator* GenerateCode(MIRGenerator* mir, LIRGraph* lir);
 CodeGenerator* CompileBackEnd(MIRGenerator* mir);
 
-void AttachFinishedCompilations(JSContext* cx);
+void AttachFinishedCompilations(ZoneGroup* group, JSContext* maybecx);
 void FinishOffThreadBuilder(JSRuntime* runtime, IonBuilder* builder,
                             const AutoLockHelperThreadState& lock);
 
diff --git a/js/src/jit/JitCompartment.h b/js/src/jit/JitCompartment.h
index cedad72cca44..3c7ca23f7e1d 100644
--- a/js/src/jit/JitCompartment.h
+++ b/js/src/jit/JitCompartment.h
@@ -393,6 +393,14 @@ struct CacheIRStubKey : public DefaultHasher<CacheIRStubKey> {
     }
 };
 
+template<typename Key>
+struct IcStubCodeMapGCPolicy
+{
+    static bool needsSweep(Key*, ReadBarrieredJitCode* value) {
+        return IsAboutToBeFinalized(value);
+    }
+};
+
 class JitZone
 {
     // Allocated space for optimized baseline stubs.
@@ -404,7 +412,24 @@ class JitZone
     using IonCacheIRStubInfoSet = HashSet<CacheIRStubKey, CacheIRStubKey, SystemAllocPolicy>;
     IonCacheIRStubInfoSet ionCacheIRStubInfoSet_;
 
+    // Map CacheIRStubKey to shared JitCode objects.
+    using BaselineCacheIRStubCodeMap = GCHashMap<CacheIRStubKey,
+                                                 ReadBarrieredJitCode,
+                                                 CacheIRStubKey,
+                                                 SystemAllocPolicy,
+                                                 IcStubCodeMapGCPolicy<CacheIRStubKey>>;
+    BaselineCacheIRStubCodeMap baselineCacheIRStubCodes_;
+
   public:
+    MOZ_MUST_USE bool init(JSContext* cx);
+    void toggleBarriers(bool enabled);
+    void sweep(FreeOp* fop);
+
+    void addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
+                                size_t* jitZone,
+                                size_t* baselineStubsOptimized,
+                                size_t* cachedCFG) const;
+
     OptimizedICStubSpace* optimizedStubSpace() {
         return &optimizedStubSpace_;
     }
@@ -412,6 +437,25 @@ class JitZone
         return &cfgSpace_;
     }
 
+    JitCode* getBaselineCacheIRStubCode(const CacheIRStubKey::Lookup& key,
+                                        CacheIRStubInfo** stubInfo) {
+        auto p = baselineCacheIRStubCodes_.lookup(key);
+        if (p) {
+            *stubInfo = p->key().stubInfo.get();
+            return p->value();
+        }
+        *stubInfo = nullptr;
+        return nullptr;
+    }
+    MOZ_MUST_USE bool putBaselineCacheIRStubCode(const CacheIRStubKey::Lookup& lookup,
+                                                 CacheIRStubKey& key,
+                                                 JitCode* stubCode)
+    {
+        auto p = baselineCacheIRStubCodes_.lookupForAdd(lookup);
+        MOZ_ASSERT(!p);
+        return baselineCacheIRStubCodes_.add(p, Move(key), stubCode);
+    }
+
     CacheIRStubInfo* getIonCacheIRStubInfo(const CacheIRStubKey::Lookup& key) {
         if (!ionCacheIRStubInfoSet_.initialized())
             return nullptr;
@@ -444,13 +488,6 @@ class JitCompartment
 {
     friend class JitActivation;
 
-    template<typename Key>
-    struct IcStubCodeMapGCPolicy {
-        static bool needsSweep(Key*, ReadBarrieredJitCode* value) {
-            return IsAboutToBeFinalized(value);
-        }
-    };
-
     // Map ICStub keys to ICStub shared code objects.
     using ICStubCodeMap = GCHashMap<uint32_t,
                                     ReadBarrieredJitCode,
@@ -459,14 +496,6 @@ class JitCompartment
                                     IcStubCodeMapGCPolicy<uint32_t>>;
     ICStubCodeMap* stubCodes_;
 
-    // Map ICStub keys to ICStub shared code objects.
-    using CacheIRStubCodeMap = GCHashMap<CacheIRStubKey,
-                                         ReadBarrieredJitCode,
-                                         CacheIRStubKey,
-                                         RuntimeAllocPolicy,
-                                         IcStubCodeMapGCPolicy<CacheIRStubKey>>;
-    CacheIRStubCodeMap* cacheIRStubCodes_;
-
     // Keep track of offset into various baseline stubs' code at return
     // point from called script.
     struct BailoutReturnStubInfo
@@ -538,22 +567,6 @@ class JitCompartment
         }
         return true;
     }
-    JitCode* getCacheIRStubCode(const CacheIRStubKey::Lookup& key, CacheIRStubInfo** stubInfo) {
-        CacheIRStubCodeMap::Ptr p = cacheIRStubCodes_->lookup(key);
-        if (p) {
-            *stubInfo = p->key().stubInfo.get();
-            return p->value();
-        }
-        *stubInfo = nullptr;
-        return nullptr;
-    }
-    MOZ_MUST_USE bool putCacheIRStubCode(const CacheIRStubKey::Lookup& lookup, CacheIRStubKey& key,
-                                         JitCode* stubCode)
-    {
-        CacheIRStubCodeMap::AddPtr p = cacheIRStubCodes_->lookupForAdd(lookup);
-        MOZ_ASSERT(!p);
-        return cacheIRStubCodes_->add(p, Move(key), stubCode);
-    }
     void initBailoutReturnAddr(void* addr, uint32_t key, BailoutReturnStub kind) {
         MOZ_ASSERT(bailoutReturnStubInfo_[kind].addr == nullptr);
         bailoutReturnStubInfo_[kind] = BailoutReturnStubInfo { addr, key };
@@ -565,7 +578,6 @@ class JitCompartment
 
     void toggleBarriers(bool enabled);
 
-  public:
     JitCompartment();
     ~JitCompartment();
 
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index 661be3b9969c..c0deef5f888e 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -584,9 +584,10 @@ LIRGenerator::visitApplyArgs(MApplyArgs* apply)
         tempFixed(CallTempReg1),  // object register
         tempFixed(CallTempReg2)); // stack counter register
 
-    // Bailout is only needed in the case of possible non-JSFunction callee.
-    if (!apply->getSingleTarget())
-        assignSnapshot(lir, Bailout_NonJSFunctionCallee);
+    // Bailout is needed in the case of possible non-JSFunction callee or too
+    // many values in the arguments array.  I'm going to use NonJSFunctionCallee
+    // for the code even if that is not an adequate description.
+    assignSnapshot(lir, Bailout_NonJSFunctionCallee);
 
     defineReturn(lir, apply);
     assignSafepoint(lir, apply);
diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp
index 50cedbad3163..84cfa3ac42ca 100644
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -356,6 +356,8 @@ IonBuilder::inlineNativeCall(CallInfo& callInfo, JSFunction* target)
         return inlineHasClass(callInfo, &ArrayTypeDescr::class_);
       case InlinableNative::IntrinsicSetTypedObjectOffset:
         return inlineSetTypedObjectOffset(callInfo);
+      case InlinableNative::Limit:
+        break;
     }
 
     MOZ_CRASH("Shouldn't get here");
diff --git a/js/src/jit/MacroAssembler-inl.h b/js/src/jit/MacroAssembler-inl.h
index 303bc3f3d027..bc3e8f996f4a 100644
--- a/js/src/jit/MacroAssembler-inl.h
+++ b/js/src/jit/MacroAssembler-inl.h
@@ -27,6 +27,8 @@
 # error "Unknown architecture!"
 #endif
 
+#include "wasm/WasmBuiltins.h"
+
 namespace js {
 namespace jit {
 
diff --git a/js/src/jit/MacroAssembler.cpp b/js/src/jit/MacroAssembler.cpp
index ccf6061a9d07..d91f0d2d93e3 100644
--- a/js/src/jit/MacroAssembler.cpp
+++ b/js/src/jit/MacroAssembler.cpp
@@ -1422,6 +1422,20 @@ MacroAssembler::loadStringChar(Register str, Register index, Register output, La
     bind(&done);
 }
 
+void
+MacroAssembler::loadStringIndexValue(Register str, Register dest, Label* fail)
+{
+    MOZ_ASSERT(str != dest);
+
+    load32(Address(str, JSString::offsetOfFlags()), dest);
+
+    // Does not have a cached index value.
+    branchTest32(Assembler::Zero, dest, Imm32(JSString::INDEX_VALUE_BIT), fail);
+
+    // Extract the index.
+    rshift32(Imm32(JSString::INDEX_VALUE_SHIFT), dest);
+}
+
 void
 MacroAssembler::loadJSContext(Register dest)
 {
@@ -2760,6 +2774,10 @@ MacroAssembler::callWithABI(wasm::BytecodeOffset callOffset, wasm::SymbolicAddre
 {
     MOZ_ASSERT(wasm::NeedsBuiltinThunk(imm));
 
+    // We clobber WasmTlsReg below in the loadWasmTlsRegFromFrame(), but Ion
+    // assumes it is non-volatile, so preserve it manually.
+    Push(WasmTlsReg);
+
     uint32_t stackAdjust;
     callWithABIPre(&stackAdjust, /* callFromWasm = */ true);
 
@@ -2770,6 +2788,8 @@ MacroAssembler::callWithABI(wasm::BytecodeOffset callOffset, wasm::SymbolicAddre
 
     call(wasm::CallSiteDesc(callOffset.bytecodeOffset, wasm::CallSite::Symbolic), imm);
     callWithABIPost(stackAdjust, result, /* callFromWasm = */ true);
+
+    Pop(WasmTlsReg);
 }
 
 // ===============================================================
diff --git a/js/src/jit/MacroAssembler.h b/js/src/jit/MacroAssembler.h
index a63e1ad84f01..f8b3f8769adb 100644
--- a/js/src/jit/MacroAssembler.h
+++ b/js/src/jit/MacroAssembler.h
@@ -1528,6 +1528,8 @@ class MacroAssembler : public MacroAssemblerSpecific
     void loadStringChars(Register str, Register dest);
     void loadStringChar(Register str, Register index, Register output, Label* fail);
 
+    void loadStringIndexValue(Register str, Register dest, Label* fail);
+
     void loadJSContext(Register dest);
     void loadJitActivation(Register dest) {
         loadJSContext(dest);
diff --git a/js/src/jit/arm64/SharedIC-arm64.cpp b/js/src/jit/arm64/SharedIC-arm64.cpp
index 0c7aa136459c..7be813ee603c 100644
--- a/js/src/jit/arm64/SharedIC-arm64.cpp
+++ b/js/src/jit/arm64/SharedIC-arm64.cpp
@@ -13,6 +13,7 @@
 #include "jit/arm64/vixl/Debugger-vixl.h"
 #endif
 
+#include "jit/arm64/MacroAssembler-arm64-inl.h"
 
 using namespace js;
 using namespace js::jit;
diff --git a/js/src/js.msg b/js/src/js.msg
index 64818be7e639..9e554b224ab9 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -213,6 +213,8 @@ MSG_DEF(JSMSG_BAD_POW_LEFTSIDE,        0, JSEXN_SYNTAXERR, "unparenthesized unar
 MSG_DEF(JSMSG_BAD_PROP_ID,             0, JSEXN_SYNTAXERR, "invalid property id")
 MSG_DEF(JSMSG_BAD_RETURN_OR_YIELD,     1, JSEXN_SYNTAXERR, "{0} not in function")
 MSG_DEF(JSMSG_BAD_STRICT_ASSIGN,       1, JSEXN_SYNTAXERR, "'{0}' can't be defined or assigned to in strict mode code")
+MSG_DEF(JSMSG_BAD_STRICT_ASSIGN_ARGUMENTS, 0, JSEXN_SYNTAXERR, "'arguments' can't be defined or assigned to in strict mode code")
+MSG_DEF(JSMSG_BAD_STRICT_ASSIGN_EVAL,  0, JSEXN_SYNTAXERR, "'eval' can't be defined or assigned to in strict mode code")
 MSG_DEF(JSMSG_BAD_SWITCH,              0, JSEXN_SYNTAXERR, "invalid switch statement")
 MSG_DEF(JSMSG_BAD_SUPER,               0, JSEXN_SYNTAXERR, "invalid use of keyword 'super'")
 MSG_DEF(JSMSG_BAD_SUPERPROP,           1, JSEXN_SYNTAXERR, "use of super {0} accesses only valid within methods or eval code within methods")
diff --git a/js/src/jsapi-tests/testGCGrayMarking.cpp b/js/src/jsapi-tests/testGCGrayMarking.cpp
index 789490adbf95..1df7ae3f5ff7 100644
--- a/js/src/jsapi-tests/testGCGrayMarking.cpp
+++ b/js/src/jsapi-tests/testGCGrayMarking.cpp
@@ -45,6 +45,9 @@ BEGIN_TEST(testGCGrayMarking)
 {
     AutoNoAnalysisForTest disableAnalysis;
     AutoDisableCompactingGC disableCompactingGC(cx);
+#ifdef JS_GC_ZEAL
+    AutoLeaveZeal nozeal(cx);
+#endif /* JS_GC_ZEAL */
 
     CHECK(InitGlobals());
     JSAutoCompartment ac(cx, global1);
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index a26a920ac5e7..cf041376d6c3 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -36,6 +36,8 @@ using namespace js::gc;
 
 using mozilla::ArrayEnd;
 using mozilla::ArrayLength;
+using mozilla::Maybe;
+using mozilla::Nothing;
 using mozilla::RangedPtr;
 
 const char*
@@ -302,7 +304,8 @@ AtomIsPinnedInRuntime(JSRuntime* rt, JSAtom* atom)
 template <typename CharT>
 MOZ_ALWAYS_INLINE
 static JSAtom*
-AtomizeAndCopyChars(JSContext* cx, const CharT* tbchars, size_t length, PinningBehavior pin)
+AtomizeAndCopyChars(JSContext* cx, const CharT* tbchars, size_t length, PinningBehavior pin,
+                    const Maybe<uint32_t>& indexValue)
 {
     if (JSAtom* s = cx->staticStrings().lookup(tbchars, length))
         return s;
@@ -374,6 +377,9 @@ AtomizeAndCopyChars(JSContext* cx, const CharT* tbchars, size_t length, PinningB
         atom = flat->morphAtomizedStringIntoAtom(lookup.hash);
         MOZ_ASSERT(atom->hash() == lookup.hash);
 
+        if (indexValue)
+            atom->maybeInitializeIndex(*indexValue, true);
+
         // We have held the lock since looking up p, and the operations we've done
         // since then can't GC; therefore the atoms table has not been modified and
         // p is still valid.
@@ -390,10 +396,12 @@ AtomizeAndCopyChars(JSContext* cx, const CharT* tbchars, size_t length, PinningB
 }
 
 template JSAtom*
-AtomizeAndCopyChars(JSContext* cx, const char16_t* tbchars, size_t length, PinningBehavior pin);
+AtomizeAndCopyChars(JSContext* cx, const char16_t* tbchars, size_t length, PinningBehavior pin,
+                    const Maybe<uint32_t>& indexValue);
 
 template JSAtom*
-AtomizeAndCopyChars(JSContext* cx, const Latin1Char* tbchars, size_t length, PinningBehavior pin);
+AtomizeAndCopyChars(JSContext* cx, const Latin1Char* tbchars, size_t length, PinningBehavior pin,
+                    const Maybe<uint32_t>& indexValue);
 
 JSAtom*
 js::AtomizeString(JSContext* cx, JSString* str,
@@ -427,19 +435,24 @@ js::AtomizeString(JSContext* cx, JSString* str,
     if (!linear)
         return nullptr;
 
+    Maybe<uint32_t> indexValue;
+    if (str->hasIndexValue())
+        indexValue.emplace(str->getIndexValue());
+
     JS::AutoCheckCannotGC nogc;
     return linear->hasLatin1Chars()
-           ? AtomizeAndCopyChars(cx, linear->latin1Chars(nogc), linear->length(), pin)
-           : AtomizeAndCopyChars(cx, linear->twoByteChars(nogc), linear->length(), pin);
+           ? AtomizeAndCopyChars(cx, linear->latin1Chars(nogc), linear->length(), pin, indexValue)
+           : AtomizeAndCopyChars(cx, linear->twoByteChars(nogc), linear->length(), pin, indexValue);
 }
 
 JSAtom*
-js::Atomize(JSContext* cx, const char* bytes, size_t length, PinningBehavior pin)
+js::Atomize(JSContext* cx, const char* bytes, size_t length, PinningBehavior pin,
+            const Maybe<uint32_t>& indexValue)
 {
     CHECK_REQUEST(cx);
 
     const Latin1Char* chars = reinterpret_cast<const Latin1Char*>(bytes);
-    return AtomizeAndCopyChars(cx, chars, length, pin);
+    return AtomizeAndCopyChars(cx, chars, length, pin, indexValue);
 }
 
 template <typename CharT>
@@ -447,7 +460,7 @@ JSAtom*
 js::AtomizeChars(JSContext* cx, const CharT* chars, size_t length, PinningBehavior pin)
 {
     CHECK_REQUEST(cx);
-    return AtomizeAndCopyChars(cx, chars, length, pin);
+    return AtomizeAndCopyChars(cx, chars, length, pin, Nothing());
 }
 
 template JSAtom*
diff --git a/js/src/jsatom.h b/js/src/jsatom.h
index 5078040107dc..2213fefdba91 100644
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@@ -8,6 +8,7 @@
 #define jsatom_h
 
 #include "mozilla/HashFunctions.h"
+#include "mozilla/Maybe.h"
 
 #include "jsalloc.h"
 
@@ -179,7 +180,8 @@ enum PinningBehavior
 
 extern JSAtom*
 Atomize(JSContext* cx, const char* bytes, size_t length,
-        js::PinningBehavior pin = js::DoNotPinAtom);
+        js::PinningBehavior pin = js::DoNotPinAtom,
+        const mozilla::Maybe<uint32_t>& indexValue = mozilla::Nothing());
 
 template <typename CharT>
 extern JSAtom*
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index d5accdbb672f..e3d9f710f173 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -209,8 +209,13 @@ ErrorObject::classes[JSEXN_ERROR_LIMIT] = {
 size_t
 ExtraMallocSize(JSErrorReport* report)
 {
-    if (report->linebuf())
-        return (report->linebufLength() + 1) * sizeof(char16_t);
+    if (report->linebuf()) {
+        /*
+         * Count with null terminator and alignment.
+         * See CopyExtraData for the details about alignment.
+         */
+        return (report->linebufLength() + 1) * sizeof(char16_t) + 1;
+    }
 
     return 0;
 }
@@ -225,10 +230,20 @@ bool
 CopyExtraData(JSContext* cx, uint8_t** cursor, JSErrorReport* copy, JSErrorReport* report)
 {
     if (report->linebuf()) {
+        /*
+         * Make sure cursor is properly aligned for char16_t for platforms
+         * which need it and it's at the end of the buffer on exit.
+         */
+        size_t alignment_backlog = 0;
+        if (size_t(*cursor) % 2)
+            (*cursor)++;
+        else
+            alignment_backlog = 1;
+
         size_t linebufSize = (report->linebufLength() + 1) * sizeof(char16_t);
         const char16_t* linebufCopy = (const char16_t*)(*cursor);
         js_memcpy(*cursor, report->linebuf(), linebufSize);
-        *cursor += linebufSize;
+        *cursor += linebufSize + alignment_backlog;
         copy->initBorrowedLinebuf(linebufCopy, report->linebufLength(), report->tokenOffset());
     }
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 4ae24044ff3d..ff608731a467 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2184,6 +2184,9 @@ GCRuntime::sweepZoneAfterCompacting(Zone* zone)
     for (auto* cache : zone->weakCaches())
         cache->sweep();
 
+    if (jit::JitZone* jitZone = zone->jitZone())
+        jitZone->sweep(fop);
+
     for (CompartmentsInZoneIter c(zone); !c.done(); c.next()) {
         c->objectGroups.sweep(fop);
         c->sweepRegExps();
@@ -5215,8 +5218,11 @@ GCRuntime::beginSweepingSweepGroup(AutoLockForExclusiveAccess& lock)
                 c->sweepTemplateObjects();
             }
 
-            for (GCSweepGroupIter zone(rt); !zone.done(); zone.next())
+            for (GCSweepGroupIter zone(rt); !zone.done(); zone.next()) {
                 zone->sweepWeakMaps();
+                if (jit::JitZone* jitZone = zone->jitZone())
+                    jitZone->sweep(&fop);
+            }
 
             // Bug 1071218: the following two methods have not yet been
             // refactored to work on a single zone-group at once.
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index a03ab3dae81e..2191909bcc37 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -425,6 +425,14 @@ js::num_parseInt(JSContext* cx, unsigned argc, Value* vp)
                 return true;
             }
         }
+
+        if (args[0].isString()) {
+            JSString* str = args[0].toString();
+            if (str->hasIndexValue()) {
+                args.rval().setNumber(str->getIndexValue());
+                return true;
+            }
+        }
     }
 
     /* Step 1. */
@@ -631,6 +639,8 @@ js::Int32ToString(JSContext* cx, int32_t si)
     JSInlineString* str = NewInlineString<allowGC>(cx, chars);
     if (!str)
         return nullptr;
+    if (si >= 0)
+        str->maybeInitializeIndex(si);
 
     CacheNumber(cx, si, str);
     return str;
@@ -652,7 +662,11 @@ js::Int32ToAtom(JSContext* cx, int32_t si)
     size_t length;
     char* start = BackfillInt32InBuffer(si, buffer, JSFatInlineString::MAX_LENGTH_TWO_BYTE + 1, &length);
 
-    JSAtom* atom = Atomize(cx, start, length);
+    Maybe<uint32_t> indexValue;
+    if (si >= 0)
+        indexValue.emplace(si);
+
+    JSAtom* atom = Atomize(cx, start, length, js::DoNotPinAtom, indexValue);
     if (!atom)
         return nullptr;
 
@@ -1350,8 +1364,10 @@ NumberToStringWithBase(JSContext* cx, double d, int base)
     JSCompartment* comp = cx->compartment();
 
     int32_t i;
+    bool isBase10Int = false;
     if (mozilla::NumberIsInt32(d, &i)) {
-        if (base == 10 && StaticStrings::hasInt(i))
+        isBase10Int = (base == 10);
+        if (isBase10Int && StaticStrings::hasInt(i))
             return cx->staticStrings().getInt(i);
         if (unsigned(i) < unsigned(base)) {
             if (i < 10)
@@ -1383,6 +1399,11 @@ NumberToStringWithBase(JSContext* cx, double d, int base)
     }
 
     JSFlatString* s = NewStringCopyZ<allowGC>(cx, numStr);
+    if (!s)
+        return nullptr;
+
+    if (isBase10Int && i >= 0)
+        s->maybeInitializeIndex(i);
 
     comp->dtoaCache.cache(base, d, s);
     return s;
@@ -1566,6 +1587,11 @@ js::StringToNumber(JSContext* cx, JSString* str, double* result)
     if (!linearStr)
         return false;
 
+    if (str->hasIndexValue()) {
+        *result = str->getIndexValue();
+        return true;
+    }
+
     return linearStr->hasLatin1Chars()
            ? CharsToNumber(cx, linearStr->latin1Chars(nogc), str->length(), result)
            : CharsToNumber(cx, linearStr->twoByteChars(nogc), str->length(), result);
diff --git a/js/src/jsnum.h b/js/src/jsnum.h
index de7fceab07f4..1c97b82f7727 100644
--- a/js/src/jsnum.h
+++ b/js/src/jsnum.h
@@ -14,6 +14,8 @@
 
 #include "js/Conversions.h"
 
+#include "vm/String.h"
+
 
 // This macro is should be `one' if current compiler supports builtin functions
 // like __builtin_sadd_overflow.
@@ -244,6 +246,11 @@ IsDefinitelyIndex(const Value& v, uint32_t* indexp)
         return true;
     }
 
+    if (v.isString() && v.toString()->hasIndexValue()) {
+        *indexp = v.toString()->getIndexValue();
+        return true;
+    }
+
     return false;
 }
 
@@ -257,6 +264,9 @@ ToInteger(JSContext* cx, HandleValue v, double* dp)
     }
     if (v.isDouble()) {
         *dp = v.toDouble();
+    } else if (v.isString() && v.toString()->hasIndexValue()) {
+        *dp = v.toString()->getIndexValue();
+        return true;
     } else {
         extern JS_PUBLIC_API(bool) ToNumberSlow(JSContext* cx, HandleValue v, double* dp);
         if (!ToNumberSlow(cx, v, dp))
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 42aefd8242df..376c95102aec 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -4243,6 +4243,19 @@ str_encodeURI_Component(JSContext* cx, unsigned argc, Value* vp)
     return Encode(cx, str, js_isUriUnescaped, nullptr, args.rval());
 }
 
+bool
+js::EncodeURI(JSContext* cx, StringBuffer& sb, const char* chars, size_t length)
+{
+    EncodeResult result = Encode(sb, chars, length, js_isUriUnescaped, js_isUriReservedPlusPound);
+    if (result == EncodeResult::Encode_Failure)
+        return false;
+    if (result == EncodeResult::Encode_BadUri) {
+        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_BAD_URI);
+        return false;
+    }
+    return true;
+}
+
 /*
  * Convert one UCS-4 char and write it into a UTF-8 buffer, which must be at
  * least 4 bytes long.  Return the number of UTF-8 bytes of data written.
diff --git a/js/src/jsstr.h b/js/src/jsstr.h
index 0801aa5dc44c..5d69dbf0495b 100644
--- a/js/src/jsstr.h
+++ b/js/src/jsstr.h
@@ -469,6 +469,9 @@ FileEscapedString(FILE* fp, const char* chars, size_t length, uint32_t quote)
     return res;
 }
 
+bool
+EncodeURI(JSContext* cx, StringBuffer& sb, const char* chars, size_t length);
+
 JSObject*
 str_split_string(JSContext* cx, HandleObjectGroup group, HandleString str, HandleString sep,
                  uint32_t limit);
diff --git a/js/src/moz.build b/js/src/moz.build
index fe9bc7a1425d..e23e53b356d7 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -368,6 +368,7 @@ UNIFIED_SOURCES += [
     'wasm/WasmBinaryToAST.cpp',
     'wasm/WasmBinaryToExperimentalText.cpp',
     'wasm/WasmBinaryToText.cpp',
+    'wasm/WasmBuiltins.cpp',
     'wasm/WasmCode.cpp',
     'wasm/WasmCompartment.cpp',
     'wasm/WasmCompile.cpp',
@@ -377,7 +378,6 @@ UNIFIED_SOURCES += [
     'wasm/WasmIonCompile.cpp',
     'wasm/WasmJS.cpp',
     'wasm/WasmModule.cpp',
-    'wasm/WasmRuntime.cpp',
     'wasm/WasmSignalHandlers.cpp',
     'wasm/WasmStubs.cpp',
     'wasm/WasmTable.cpp',
diff --git a/js/src/tests/ecma_6/Destructuring/constant-folding.js b/js/src/tests/ecma_6/Destructuring/constant-folding.js
new file mode 100644
index 000000000000..b5aa893215a0
--- /dev/null
+++ b/js/src/tests/ecma_6/Destructuring/constant-folding.js
@@ -0,0 +1,16 @@
+function assertSyntaxError(code) {
+    assertThrowsInstanceOf(function () { Function(code); }, SyntaxError, "Function:" + code);
+    assertThrowsInstanceOf(function () { eval(code); }, SyntaxError, "eval:" + code);
+    var ieval = eval;
+    assertThrowsInstanceOf(function () { ieval(code); }, SyntaxError, "indirect eval:" + code);
+}
+
+// |true && a| is constant-folded to |a|, ensure the destructuring assignment
+// validation takes place before constant-folding.
+for (let prefix of ["null,", "var", "let", "const"]) {
+    assertSyntaxError(`${prefix} [true && a] = [];`);
+    assertSyntaxError(`${prefix} {p: true && a} = {};`);
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 09468e0e4c3f..2178287c6c7a 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -7285,15 +7285,9 @@ class DebuggerSourceGetURLMatcher
         return Nothing();
     }
     ReturnType match(Handle<WasmInstanceObject*> wasmInstance) {
-        // TODOshu: Until wasm modules have real URLs, append "> wasm" to the
-        // end to prevent them from being blacklisted by devtools by having
-        // the same value as a source mapped URL.
-        char* buf = JS_smprintf("%s > wasm", wasmInstance->instance().metadata().filename.get());
-        if (!buf)
-            return Nothing();
-        JSString* str = NewStringCopyZ<CanGC>(cx_, buf);
-        JS_smprintf_free(buf);
-        return Some(str);
+        if (JSString* str = wasmInstance->instance().code().debugDisplayURL(cx_))
+            return Some(str);
+        return Nothing();
     }
 };
 
diff --git a/js/src/vm/ErrorReporting.cpp b/js/src/vm/ErrorReporting.cpp
index dcf5fe8e34a3..6521b58b5f7d 100644
--- a/js/src/vm/ErrorReporting.cpp
+++ b/js/src/vm/ErrorReporting.cpp
@@ -14,6 +14,8 @@
 #include "jsexn.h"
 #include "jsfriendapi.h"
 
+#include "jscntxtinlines.h"
+
 using mozilla::Move;
 
 using JS::HandleObject;
diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
index db9541e607df..23a55c2ac931 100644
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -121,6 +121,7 @@ FinishOffThreadIonCompile(jit::IonBuilder* builder, const AutoLockHelperThreadSt
     AutoEnterOOMUnsafeRegion oomUnsafe;
     if (!HelperThreadState().ionFinishedList(lock).append(builder))
         oomUnsafe.crash("FinishOffThreadIonCompile");
+    builder->script()->zoneFromAnyThread()->group()->numFinishedBuilders++;
 }
 
 static JSRuntime*
@@ -222,6 +223,7 @@ js::CancelOffThreadIonCompile(const CompilationSelector& selector, bool discardL
     for (size_t i = 0; i < finished.length(); i++) {
         jit::IonBuilder* builder = finished[i];
         if (CompiledScriptMatches(selector, builder->script())) {
+            builder->script()->zone()->group()->numFinishedBuilders--;
             jit::FinishOffThreadBuilder(nullptr, builder, lock);
             HelperThreadState().remove(finished, &i);
         }
diff --git a/js/src/vm/Initialization.cpp b/js/src/vm/Initialization.cpp
index d127563bcb06..a04a18f0b172 100644
--- a/js/src/vm/Initialization.cpp
+++ b/js/src/vm/Initialization.cpp
@@ -31,6 +31,7 @@
 #include "vm/Time.h"
 #include "vm/TraceLogging.h"
 #include "vtune/VTuneWrapper.h"
+#include "wasm/WasmBuiltins.h"
 #include "wasm/WasmInstance.h"
 
 using JS::detail::InitState;
@@ -192,8 +193,10 @@ JS_ShutDown(void)
 
     js::FinishDateTimeState();
 
-    if (!JSRuntime::hasLiveRuntimes())
+    if (!JSRuntime::hasLiveRuntimes()) {
+        js::wasm::ReleaseBuiltinThunks();
         js::jit::ReleaseProcessExecutableMemory();
+    }
 
     libraryInitState = InitState::ShutDown;
 }
diff --git a/js/src/vm/MemoryMetrics.cpp b/js/src/vm/MemoryMetrics.cpp
index 3aa6eeebad08..c32aa11022c6 100644
--- a/js/src/vm/MemoryMetrics.cpp
+++ b/js/src/vm/MemoryMetrics.cpp
@@ -321,6 +321,7 @@ StatsZoneCallback(JSRuntime* rt, void* data, Zone* zone)
 
     zone->addSizeOfIncludingThis(rtStats->mallocSizeOf_,
                                  &zStats.typePool,
+                                 &zStats.jitZone,
                                  &zStats.baselineStubsOptimized,
                                  &zStats.cachedCFG,
                                  &zStats.uniqueIdMap,
diff --git a/js/src/vm/MutexIDs.h b/js/src/vm/MutexIDs.h
index 4f173fcb4124..f61419ea1753 100644
--- a/js/src/vm/MutexIDs.h
+++ b/js/src/vm/MutexIDs.h
@@ -26,6 +26,8 @@
                                       \
   _(GCLock,                      400) \
                                       \
+  _(WasmInitBuiltinThunks,       450) \
+                                      \
   _(SharedImmutableStringsCache, 500) \
   _(FutexThread,                 500) \
   _(PromiseTaskPtrVector,        500) \
diff --git a/js/src/vm/Runtime.cpp b/js/src/vm/Runtime.cpp
index c193afaf301b..244790c2b29b 100644
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -267,9 +267,6 @@ JSRuntime::init(JSContext* cx, uint32_t maxbytes, uint32_t maxNurseryBytes)
     if (!caches().init())
         return false;
 
-    if (!wasm().init())
-        return false;
-
     return true;
 }
 
@@ -282,8 +279,6 @@ JSRuntime::destroyRuntime()
 
     sharedIntlData.ref().destroyInstance();
 
-    wasm().destroy();
-
     if (gcInitialized) {
         /*
          * Finish any in-progress GCs first. This ensures the parseWaitingOnGC
@@ -511,12 +506,13 @@ static bool
 InvokeInterruptCallback(JSContext* cx)
 {
     MOZ_ASSERT(cx->requestDepth >= 1);
+    MOZ_ASSERT(!cx->compartment()->isAtomsCompartment());
 
     cx->runtime()->gc.gcIfRequested();
 
     // A worker thread may have requested an interrupt after finishing an Ion
     // compilation.
-    jit::AttachFinishedCompilations(cx);
+    jit::AttachFinishedCompilations(cx->zone()->group(), cx);
 
     // Important: Additional callbacks can occur inside the callback handler
     // if it re-enters the JS engine. The embedding must ensure that the
diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h
index cb5b584417d9..213aeba1c318 100644
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -54,7 +54,6 @@
 #include "vm/Stack.h"
 #include "vm/Stopwatch.h"
 #include "vm/Symbol.h"
-#include "wasm/WasmRuntime.h"
 
 #ifdef _MSC_VER
 #pragma warning(push)
@@ -535,13 +534,6 @@ struct JSRuntime : public js::MallocProvider<JSRuntime>
     /* AsmJSCache callbacks are runtime-wide. */
     js::UnprotectedData<JS::AsmJSCacheOps> asmJSCacheOps;
 
-  private:
-    // All runtime data needed for wasm and defined in wasm/WasmRuntime.h.
-    js::ActiveThreadData<js::wasm::Runtime> wasmRuntime_;
-
-  public:
-    js::wasm::Runtime& wasm() { return wasmRuntime_.ref(); }
-
   private:
     js::UnprotectedData<const JSPrincipals*> trustedPrincipals_;
   public:
diff --git a/js/src/vm/String.cpp b/js/src/vm/String.cpp
index 5e0f32ca9c60..c3c46229bd98 100644
--- a/js/src/vm/String.cpp
+++ b/js/src/vm/String.cpp
@@ -208,6 +208,7 @@ JSString::dumpRepresentationHeader(FILE* fp, int indent, const char* subclass) c
     if (flags & ATOM_BIT)               fputs(" ATOM", fp);
     if (isPermanentAtom())              fputs(" PERMANENT", fp);
     if (flags & LATIN1_CHARS_BIT)       fputs(" LATIN1", fp);
+    if (flags & INDEX_VALUE_BIT)        fprintf(fp, " INDEX_VALUE(%u)", getIndexValue());
     fputc('\n', fp);
 }
 
@@ -863,6 +864,9 @@ StaticStrings::init(JSContext* cx)
             HashNumber hash = mozilla::HashString(buffer, 3);
             intStaticTable[i] = s->morphAtomizedStringIntoPermanentAtom(hash);
         }
+
+        // Static string initialization can not race, so allow even without the lock.
+        intStaticTable[i]->maybeInitializeIndex(i, true);
     }
 
     return true;
diff --git a/js/src/vm/String.h b/js/src/vm/String.h
index c95bacfd157f..f8bfad2e4a15 100644
--- a/js/src/vm/String.h
+++ b/js/src/vm/String.h
@@ -95,6 +95,9 @@ static const size_t UINT32_CHAR_BUFFER_LENGTH = sizeof("4294967295") - 1;
  *    are stored as Latin1 instead of TwoByte if all characters are representable
  *    in Latin1.
  *
+ *  - To avoid slow conversions from strings to integer indexes, we cache 16 bit
+ *    unsigned indexes on strings representing such numbers.
+ *
  * Although all strings share the same basic memory layout, we can conceptually
  * arrange them into a hierarchy of operations/invariants and represent this
  * hierarchy in C++ with classes:
@@ -246,6 +249,8 @@ class JSString : public js::gc::TenuredCell
      *  to be null-terminated.  In such cases, the string must keep marking its base since
      *  there may be any number of *other* JSDependentStrings transitively depending on it.
      *
+     * If the INDEX_VALUE_BIT is set the upper 16 bits of the flag word hold the integer
+     * index.
      */
 
     static const uint32_t FLAT_BIT               = JS_BIT(0);
@@ -270,6 +275,9 @@ class JSString : public js::gc::TenuredCell
 
     static const uint32_t LATIN1_CHARS_BIT       = JS_BIT(6);
 
+    static const uint32_t INDEX_VALUE_BIT        = JS_BIT(7);
+    static const uint32_t INDEX_VALUE_SHIFT      = 16;
+
     static const uint32_t MAX_LENGTH             = js::MaxStringLength;
 
     static const JS::Latin1Char MAX_LATIN1_CHAR = 0xff;
@@ -353,6 +361,16 @@ class JSString : public js::gc::TenuredCell
         return !(d.u1.flags & LATIN1_CHARS_BIT);
     }
 
+    /* Strings might contain cached indexes. */
+    bool hasIndexValue() const {
+        return d.u1.flags & INDEX_VALUE_BIT;
+    }
+    uint32_t getIndexValue() const {
+        MOZ_ASSERT(hasIndexValue());
+        MOZ_ASSERT(isFlat());
+        return d.u1.flags >> INDEX_VALUE_SHIFT;
+    }
+
     /* Fallible conversions to more-derived string types. */
 
     inline JSLinearString* ensureLinear(JSContext* cx);
@@ -752,13 +770,7 @@ class JSFlatString : public JSLinearString
     static inline JSFlatString* new_(JSContext* cx,
                                      const CharT* chars, size_t length);
 
-    /*
-     * Returns true if this string's characters store an unsigned 32-bit
-     * integer value, initializing *indexp to that value if so.  (Thus if
-     * calling isIndex returns true, js::IndexToString(cx, *indexp) will be a
-     * string equal to this string.)
-     */
-    inline bool isIndex(uint32_t* indexp) const {
+    inline bool isIndexSlow(uint32_t* indexp) const {
         MOZ_ASSERT(JSString::isFlat());
         JS::AutoCheckCannotGC nogc;
         if (hasLatin1Chars()) {
@@ -769,6 +781,38 @@ class JSFlatString : public JSLinearString
         return JS7_ISDEC(*s) && isIndexSlow(s, length(), indexp);
     }
 
+    /*
+     * Returns true if this string's characters store an unsigned 32-bit
+     * integer value, initializing *indexp to that value if so.  (Thus if
+     * calling isIndex returns true, js::IndexToString(cx, *indexp) will be a
+     * string equal to this string.)
+     */
+    inline bool isIndex(uint32_t* indexp) const {
+        MOZ_ASSERT(JSString::isFlat());
+
+        if (JSString::hasIndexValue()) {
+            *indexp = getIndexValue();
+            return true;
+        }
+
+        return isIndexSlow(indexp);
+    }
+
+    inline void maybeInitializeIndex(uint32_t index, bool allowAtom = false) {
+        MOZ_ASSERT(JSString::isFlat());
+        MOZ_ASSERT_IF(hasIndexValue(), getIndexValue() == index);
+        MOZ_ASSERT_IF(!allowAtom, !isAtom());
+
+        if (hasIndexValue() || index > UINT16_MAX)
+            return;
+
+        mozilla::DebugOnly<uint32_t> containedIndex;
+        MOZ_ASSERT(isIndexSlow(&containedIndex));
+        MOZ_ASSERT(index == containedIndex);
+
+        d.u1.flags |= (index << INDEX_VALUE_SHIFT) | INDEX_VALUE_BIT;
+    }
+
     /*
      * Returns a property name represented by this string, or null on failure.
      * You must verify that this is not an index per isIndex before calling
diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp
index fc559207a8c9..3f34a8268f91 100644
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -4463,6 +4463,7 @@ TypeScript::destroy()
 void
 Zone::addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
                              size_t* typePool,
+                             size_t* jitZone,
                              size_t* baselineStubsOptimized,
                              size_t* cachedCFG,
                              size_t* uniqueIdMap,
@@ -4470,13 +4471,8 @@ Zone::addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
                              size_t* atomsMarkBitmaps)
 {
     *typePool += types.typeLifoAlloc().sizeOfExcludingThis(mallocSizeOf);
-    if (jitZone()) {
-        // These functions return pointers to struct that are embedded within
-        // JitZone, which is why we use sizeOfExcludingThis().
-        *baselineStubsOptimized +=
-            jitZone()->optimizedStubSpace()->sizeOfExcludingThis(mallocSizeOf);
-        *cachedCFG += jitZone()->cfgSpace()->sizeOfExcludingThis(mallocSizeOf);
-    }
+    if (jitZone_)
+        jitZone_->addSizeOfIncludingThis(mallocSizeOf, jitZone, baselineStubsOptimized, cachedCFG);
     *uniqueIdMap += uniqueIds().sizeOfExcludingThis(mallocSizeOf);
     *shapeTables += baseShapes().sizeOfExcludingThis(mallocSizeOf)
                   + initialShapes().sizeOfExcludingThis(mallocSizeOf);
diff --git a/js/src/wasm/WasmRuntime.cpp b/js/src/wasm/WasmBuiltins.cpp
similarity index 68%
rename from js/src/wasm/WasmRuntime.cpp
rename to js/src/wasm/WasmBuiltins.cpp
index 0db1a54449da..c3cac3f9aea9 100644
--- a/js/src/wasm/WasmRuntime.cpp
+++ b/js/src/wasm/WasmBuiltins.cpp
@@ -16,16 +16,17 @@
  * limitations under the License.
  */
 
-#include "wasm/WasmRuntime.h"
+#include "wasm/WasmBuiltins.h"
 
+#include "mozilla/Atomics.h"
 #include "mozilla/BinarySearch.h"
 
 #include "fdlibm.h"
-
 #include "jslibmath.h"
 
+#include "jit/InlinableNatives.h"
 #include "jit/MacroAssembler.h"
-
+#include "threading/Mutex.h"
 #include "wasm/WasmInstance.h"
 #include "wasm/WasmStubs.h"
 
@@ -36,11 +37,17 @@ using namespace js;
 using namespace jit;
 using namespace wasm;
 
+using mozilla::Atomic;
 using mozilla::BinarySearchIf;
+using mozilla::HashGeneric;
 using mozilla::IsNaN;
+using mozilla::MakeEnumeratedRange;
 
-static const unsigned BUILTIN_THUNK_LIFO_SIZE = 128;
-static const CodeKind BUILTIN_THUNK_CODEKIND = CodeKind::OTHER_CODE;
+static const unsigned BUILTIN_THUNK_LIFO_SIZE = 64 * 1024;
+
+// ============================================================================
+// WebAssembly builtin C++ functions called from wasm code to implement internal
+// wasm operations.
 
 #if defined(JS_CODEGEN_ARM)
 extern "C" {
@@ -557,102 +564,12 @@ AddressOf(SymbolicAddress imm, ABIFunctionType* abiType)
     MOZ_CRASH("Bad SymbolicAddress");
 }
 
-static bool
-GenerateBuiltinThunk(JSContext* cx, void* func, ABIFunctionType abiType, ExitReason exitReason,
-                     UniqueBuiltinThunk* thunk)
-{
-    if (!cx->compartment()->ensureJitCompartmentExists(cx))
-        return false;
-
-    LifoAlloc lifo(BUILTIN_THUNK_LIFO_SIZE);
-    TempAllocator tempAlloc(&lifo);
-    MacroAssembler masm(MacroAssembler::WasmToken(), tempAlloc);
-
-    CallableOffsets offsets = GenerateBuiltinNativeExit(masm, abiType, exitReason, func);
-
-    masm.finish();
-    if (masm.oom())
-        return false;
-
-    // The executable allocator operates on pointer-aligned sizes.
-    uint32_t codeLength = AlignBytes(masm.bytesNeeded(), sizeof(void*));
-
-    ExecutablePool* pool = nullptr;
-    ExecutableAllocator& allocator = cx->runtime()->jitRuntime()->execAlloc();
-    uint8_t* codeBase = (uint8_t*) allocator.alloc(cx, codeLength, &pool, BUILTIN_THUNK_CODEKIND);
-    if (!codeBase)
-        return false;
-
-    {
-        AutoWritableJitCode awjc(cx->runtime(), codeBase, codeLength);
-        AutoFlushICache afc("GenerateBuiltinThunk");
-
-        masm.executableCopy(codeBase);
-        masm.processCodeLabels(codeBase);
-        memset(codeBase + masm.bytesNeeded(), 0, codeLength - masm.bytesNeeded());
-
-#ifdef DEBUG
-        if (!masm.oom()) {
-            MOZ_ASSERT(masm.callSites().empty());
-            MOZ_ASSERT(masm.callFarJumps().empty());
-            MOZ_ASSERT(masm.trapSites().empty());
-            MOZ_ASSERT(masm.trapFarJumps().empty());
-            MOZ_ASSERT(masm.extractMemoryAccesses().empty());
-            MOZ_ASSERT(!masm.numSymbolicAccesses());
-        }
-#endif
-    }
-
-    *thunk = js::MakeUnique<BuiltinThunk>(codeBase, codeLength, pool, offsets);
-    return !!*thunk;
-}
-
-struct BuiltinMatcher
-{
-    const uint8_t* address;
-    explicit BuiltinMatcher(const uint8_t* address) : address(address) {}
-    int operator()(const UniqueBuiltinThunk& thunk) const {
-        if (address < thunk->base)
-            return -1;
-        if (uintptr_t(address) >= uintptr_t(thunk->base) + thunk->size)
-            return 1;
-        return 0;
-    }
-};
-
 bool
-wasm::Runtime::getBuiltinThunk(JSContext* cx, void* funcPtr, ABIFunctionType abiType,
-                               ExitReason exitReason, void** thunkPtr)
-{
-    TypedFuncPtr lookup(funcPtr, abiType);
-    auto ptr = builtinThunkMap_.lookupForAdd(lookup);
-    if (ptr) {
-        *thunkPtr = ptr->value();
-        return true;
-    }
-
-    UniqueBuiltinThunk thunk;
-    if (!GenerateBuiltinThunk(cx, funcPtr, abiType, exitReason, &thunk))
-        return false;
-
-    // Maintain sorted order of thunk addresses.
-    size_t i;
-    size_t size = builtinThunkVector_.length();
-    if (BinarySearchIf(builtinThunkVector_, 0, size, BuiltinMatcher(thunk->base), &i))
-        MOZ_CRASH("clobbering memory");
-
-    *thunkPtr = thunk->base + thunk->codeRange.begin();
-
-    return builtinThunkVector_.insert(builtinThunkVector_.begin() + i, Move(thunk)) &&
-           builtinThunkMap_.add(ptr, lookup, *thunkPtr);
-}
-
-bool
-wasm::NeedsBuiltinThunk(SymbolicAddress func)
+wasm::NeedsBuiltinThunk(SymbolicAddress sym)
 {
     // Some functions don't want to a thunk, because they already have one or
     // they don't have frame info.
-    switch (func) {
+    switch (sym) {
       case SymbolicAddress::HandleExecutionInterrupt: // GenerateInterruptExit
       case SymbolicAddress::HandleDebugTrap:          // GenerateDebugTrapStub
       case SymbolicAddress::HandleThrow:              // GenerateThrowStub
@@ -717,18 +634,274 @@ wasm::NeedsBuiltinThunk(SymbolicAddress func)
     MOZ_CRASH("unexpected symbolic address");
 }
 
-bool
-wasm::Runtime::getBuiltinThunk(JSContext* cx, SymbolicAddress func, void** thunkPtr)
-{
-    ABIFunctionType abiType;
-    void* funcPtr = AddressOf(func, &abiType);
+// ============================================================================
+// JS builtins that can be imported by wasm modules and called efficiently
+// through thunks. These thunks conform to the internal wasm ABI and thus can be
+// patched in for import calls. Calling a JS builtin through a thunk is much
+// faster than calling out through the generic import call trampoline which will
+// end up in the slowest C++ Instance::callImport path.
+//
+// Each JS builtin can have several overloads. These must all be enumerated in
+// PopulateTypedNatives() so they can be included in the process-wide thunk set.
 
-    if (!NeedsBuiltinThunk(func)) {
-        *thunkPtr = funcPtr;
-        return true;
+#define FOR_EACH_UNARY_NATIVE(_)   \
+    _(math_sin, MathSin)           \
+    _(math_tan, MathTan)           \
+    _(math_cos, MathCos)           \
+    _(math_exp, MathExp)           \
+    _(math_log, MathLog)           \
+    _(math_asin, MathASin)         \
+    _(math_atan, MathATan)         \
+    _(math_acos, MathACos)         \
+    _(math_log10, MathLog10)       \
+    _(math_log2, MathLog2)         \
+    _(math_log1p, MathLog1P)       \
+    _(math_expm1, MathExpM1)       \
+    _(math_sinh, MathSinH)         \
+    _(math_tanh, MathTanH)         \
+    _(math_cosh, MathCosH)         \
+    _(math_asinh, MathASinH)       \
+    _(math_atanh, MathATanH)       \
+    _(math_acosh, MathACosH)       \
+    _(math_sign, MathSign)         \
+    _(math_trunc, MathTrunc)       \
+    _(math_cbrt, MathCbrt)
+
+#define FOR_EACH_BINARY_NATIVE(_)  \
+    _(ecmaAtan2, MathATan2)        \
+    _(ecmaHypot, MathHypot)        \
+    _(ecmaPow, MathPow)            \
+
+#define DEFINE_UNARY_FLOAT_WRAPPER(func, _)        \
+    static float func##_uncached_f32(float x) {    \
+        return float(func##_uncached(double(x)));  \
     }
 
-    return getBuiltinThunk(cx, funcPtr, abiType, ExitReason(func), thunkPtr);
+#define DEFINE_BINARY_FLOAT_WRAPPER(func, _)       \
+    static float func##_f32(float x, float y) {    \
+        return float(func(double(x), double(y)));  \
+    }
+
+FOR_EACH_UNARY_NATIVE(DEFINE_UNARY_FLOAT_WRAPPER)
+FOR_EACH_BINARY_NATIVE(DEFINE_BINARY_FLOAT_WRAPPER)
+
+#undef DEFINE_UNARY_FLOAT_WRAPPER
+#undef DEFINE_BINARY_FLOAT_WRAPPER
+
+struct TypedNative
+{
+    InlinableNative native;
+    ABIFunctionType abiType;
+
+    TypedNative(InlinableNative native, ABIFunctionType abiType)
+      : native(native),
+        abiType(abiType)
+    {}
+
+    typedef TypedNative Lookup;
+    static HashNumber hash(const Lookup& l) {
+        return HashGeneric(uint32_t(l.native), uint32_t(l.abiType));
+    }
+    static bool match(const TypedNative& lhs, const Lookup& rhs) {
+        return lhs.native == rhs.native && lhs.abiType == rhs.abiType;
+    }
+};
+
+using TypedNativeToFuncPtrMap =
+    HashMap<TypedNative, void*, TypedNative, SystemAllocPolicy>;
+
+static bool
+PopulateTypedNatives(TypedNativeToFuncPtrMap* typedNatives)
+{
+    if (!typedNatives->init())
+        return false;
+
+#define ADD_OVERLOAD(funcName, native, abiType)                                           \
+    if (!typedNatives->putNew(TypedNative(InlinableNative::native, abiType),              \
+                              FuncCast(funcName, abiType)))                               \
+        return false;
+
+#define ADD_UNARY_OVERLOADS(funcName, native)                                             \
+    ADD_OVERLOAD(funcName##_uncached, native, Args_Double_Double)                         \
+    ADD_OVERLOAD(funcName##_uncached_f32, native, Args_Float32_Float32)
+
+#define ADD_BINARY_OVERLOADS(funcName, native)                                            \
+    ADD_OVERLOAD(funcName, native, Args_Double_DoubleDouble)                              \
+    ADD_OVERLOAD(funcName##_f32, native, Args_Float32_Float32Float32)
+
+    FOR_EACH_UNARY_NATIVE(ADD_UNARY_OVERLOADS)
+    FOR_EACH_BINARY_NATIVE(ADD_BINARY_OVERLOADS)
+
+#undef ADD_UNARY_OVERLOADS
+#undef ADD_BINARY_OVERLOADS
+
+    return true;
+}
+
+#undef FOR_EACH_UNARY_NATIVE
+#undef FOR_EACH_BINARY_NATIVE
+
+// ============================================================================
+// Process-wide builtin thunk set
+//
+// Thunks are inserted between wasm calls and the C++ callee and achieve two
+// things:
+//  - bridging the few differences between the internal wasm ABI and the external
+//    native ABI (viz. float returns on x86 and soft-fp ARM)
+//  - executing an exit prologue/epilogue which in turn allows any asynchronous
+//    interrupt to see the full stack up to the wasm operation that called out
+//
+// Thunks are created for two kinds of C++ callees, enumerated above:
+//  - SymbolicAddress: for statically compiled calls in the wasm module
+//  - Imported JS builtins: optimized calls to imports
+//
+// All thunks are created up front, lazily, when the first wasm module is
+// compiled in the process. Thunks are kept alive until the JS engine shuts down
+// in the process. No thunks are created at runtime after initialization. This
+// simple scheme allows several simplifications:
+//  - no reference counting to keep thunks alive
+//  - no problems toggling W^X permissions which, because of multiple executing
+//    threads, would require each thunk allocation to be on its own page
+// The cost for creating all thunks at once is relatively low since all thunks
+// fit within the smallest executable quanta (64k).
+
+using TypedNativeToCodeRangeMap =
+    HashMap<TypedNative, uint32_t, TypedNative, SystemAllocPolicy>;
+
+using SymbolicAddressToCodeRangeArray =
+    EnumeratedArray<SymbolicAddress, SymbolicAddress::Limit, uint32_t>;
+
+struct BuiltinThunks
+{
+    uint8_t* codeBase;
+    size_t codeSize;
+    CodeRangeVector codeRanges;
+    TypedNativeToCodeRangeMap typedNativeToCodeRange;
+    SymbolicAddressToCodeRangeArray symbolicAddressToCodeRange;
+
+    BuiltinThunks()
+      : codeBase(nullptr), codeSize(0)
+    {}
+
+    ~BuiltinThunks() {
+        if (codeBase)
+            DeallocateExecutableMemory(codeBase, codeSize);
+    }
+};
+
+Mutex initBuiltinThunks(mutexid::WasmInitBuiltinThunks);
+Atomic<const BuiltinThunks*> builtinThunks;
+
+bool
+wasm::EnsureBuiltinThunksInitialized()
+{
+    LockGuard<Mutex> guard(initBuiltinThunks);
+    if (builtinThunks)
+        return true;
+
+    auto thunks = MakeUnique<BuiltinThunks>();
+    if (!thunks)
+        return false;
+
+    LifoAlloc lifo(BUILTIN_THUNK_LIFO_SIZE);
+    TempAllocator tempAlloc(&lifo);
+    MacroAssembler masm(MacroAssembler::WasmToken(), tempAlloc);
+
+    for (auto sym : MakeEnumeratedRange(SymbolicAddress::Limit)) {
+        if (!NeedsBuiltinThunk(sym)) {
+            thunks->symbolicAddressToCodeRange[sym] = UINT32_MAX;
+            continue;
+        }
+
+        uint32_t codeRangeIndex = thunks->codeRanges.length();
+        thunks->symbolicAddressToCodeRange[sym] = codeRangeIndex;
+
+        ABIFunctionType abiType;
+        void* funcPtr = AddressOf(sym, &abiType);
+        ExitReason exitReason(sym);
+        CallableOffsets offset = GenerateBuiltinThunk(masm, abiType, exitReason, funcPtr);
+        if (masm.oom() || !thunks->codeRanges.emplaceBack(CodeRange::BuiltinThunk, offset))
+            return false;
+    }
+
+    TypedNativeToFuncPtrMap typedNatives;
+    if (!PopulateTypedNatives(&typedNatives))
+        return false;
+
+    if (!thunks->typedNativeToCodeRange.init())
+        return false;
+
+    for (TypedNativeToFuncPtrMap::Range r = typedNatives.all(); !r.empty(); r.popFront()) {
+        TypedNative typedNative = r.front().key();
+
+        uint32_t codeRangeIndex = thunks->codeRanges.length();
+        if (!thunks->typedNativeToCodeRange.putNew(typedNative, codeRangeIndex))
+            return false;
+
+        ABIFunctionType abiType = typedNative.abiType;
+        void* funcPtr = r.front().value();
+        ExitReason exitReason = ExitReason::Fixed::BuiltinNative;
+        CallableOffsets offset = GenerateBuiltinThunk(masm, abiType, exitReason, funcPtr);
+        if (masm.oom() || !thunks->codeRanges.emplaceBack(CodeRange::BuiltinThunk, offset))
+            return false;
+    }
+
+    masm.finish();
+    if (masm.oom())
+        return false;
+
+    size_t allocSize = AlignBytes(masm.bytesNeeded(), ExecutableCodePageSize);
+
+    thunks->codeSize = allocSize;
+    thunks->codeBase = (uint8_t*)AllocateExecutableMemory(allocSize, ProtectionSetting::Writable);
+    if (!thunks->codeBase)
+        return false;
+
+    masm.executableCopy(thunks->codeBase, /* flushICache = */ false);
+    memset(thunks->codeBase + masm.bytesNeeded(), 0, allocSize - masm.bytesNeeded());
+
+    masm.processCodeLabels(thunks->codeBase);
+#ifdef DEBUG
+    MOZ_ASSERT(masm.callSites().empty());
+    MOZ_ASSERT(masm.callFarJumps().empty());
+    MOZ_ASSERT(masm.trapSites().empty());
+    MOZ_ASSERT(masm.trapFarJumps().empty());
+    MOZ_ASSERT(masm.extractMemoryAccesses().empty());
+    MOZ_ASSERT(!masm.numSymbolicAccesses());
+#endif
+
+    ExecutableAllocator::cacheFlush(thunks->codeBase, thunks->codeSize);
+    if (!ExecutableAllocator::makeExecutable(thunks->codeBase, thunks->codeSize))
+        return false;
+
+    builtinThunks = thunks.release();
+    return true;
+}
+
+void
+wasm::ReleaseBuiltinThunks()
+{
+    if (builtinThunks) {
+        const BuiltinThunks* ptr = builtinThunks;
+        js_delete(const_cast<BuiltinThunks*>(ptr));
+        builtinThunks = nullptr;
+    }
+}
+
+void*
+wasm::SymbolicAddressTarget(SymbolicAddress sym)
+{
+    MOZ_ASSERT(builtinThunks);
+
+    ABIFunctionType abiType;
+    void* funcPtr = AddressOf(sym, &abiType);
+
+    if (!NeedsBuiltinThunk(sym))
+        return funcPtr;
+
+    const BuiltinThunks& thunks = *builtinThunks;
+    uint32_t codeRangeIndex = thunks.symbolicAddressToCodeRange[sym];
+    return thunks.codeBase + thunks.codeRanges[codeRangeIndex].begin();
 }
 
 static ABIFunctionType
@@ -755,36 +928,40 @@ ToABIFunctionType(const Sig& sig)
     return ABIFunctionType(abiType);
 }
 
-bool
-wasm::Runtime::getBuiltinThunk(JSContext* cx, void* funcPtr, const Sig& sig, void** thunkPtr)
+void*
+wasm::MaybeGetBuiltinThunk(HandleFunction f, const Sig& sig, JSContext* cx)
 {
-    ABIFunctionType abiType = ToABIFunctionType(sig);
-#ifdef JS_SIMULATOR
-    funcPtr = Simulator::RedirectNativeFunction(funcPtr, abiType);
-#endif
-    ExitReason nativeExitReason(ExitReason::Fixed::BuiltinNative);
-    return getBuiltinThunk(cx, funcPtr, abiType, nativeExitReason, thunkPtr);
-}
+    MOZ_ASSERT(builtinThunks);
 
-BuiltinThunk*
-wasm::Runtime::lookupBuiltin(void* pc)
-{
-    size_t index;
-    size_t length = builtinThunkVector_.length();
-    if (!BinarySearchIf(builtinThunkVector_, 0, length, BuiltinMatcher((uint8_t*)pc), &index))
+    if (!f->isNative() || !f->jitInfo() || f->jitInfo()->type() != JSJitInfo::InlinableNative)
         return nullptr;
-    return builtinThunkVector_[index].get();
+
+    InlinableNative native = f->jitInfo()->inlinableNative;
+    ABIFunctionType abiType = ToABIFunctionType(sig);
+    TypedNative typedNative(native, abiType);
+
+    const BuiltinThunks& thunks = *builtinThunks;
+    auto p = thunks.typedNativeToCodeRange.readonlyThreadsafeLookup(typedNative);
+    if (!p)
+        return nullptr;
+
+    return thunks.codeBase + thunks.codeRanges[p->value()].begin();
 }
 
-void
-wasm::Runtime::destroy()
+bool
+wasm::LookupBuiltinThunk(void* pc, const CodeRange** codeRange, uint8_t** codeBase)
 {
-    builtinThunkVector_.clear();
-    if (builtinThunkMap_.initialized())
-        builtinThunkMap_.clear();
-}
+    if (!builtinThunks)
+        return false;
 
-BuiltinThunk::~BuiltinThunk()
-{
-    executablePool->release(size, BUILTIN_THUNK_CODEKIND);
+    const BuiltinThunks& thunks = *builtinThunks;
+    if (pc < thunks.codeBase || pc >= thunks.codeBase + thunks.codeSize)
+        return false;
+
+    *codeBase = thunks.codeBase;
+
+    CodeRange::OffsetInCode target((uint8_t*)pc - thunks.codeBase);
+    *codeRange = LookupInSorted(thunks.codeRanges, target);
+
+    return !!*codeRange;
 }
diff --git a/js/src/wasm/WasmBuiltins.h b/js/src/wasm/WasmBuiltins.h
new file mode 100644
index 000000000000..c470dbc26a0f
--- /dev/null
+++ b/js/src/wasm/WasmBuiltins.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * Copyright 2017 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef wasm_builtins_h
+#define wasm_builtins_h
+
+#include "wasm/WasmTypes.h"
+
+namespace js {
+namespace wasm {
+
+// A SymbolicAddress that NeedsBuiltinThunk() will call through a thunk to the
+// C++ function. This will be true for all normal calls from normal wasm
+// function code. Only calls to C++ from other exits/thunks do not need a thunk.
+
+bool
+NeedsBuiltinThunk(SymbolicAddress sym);
+
+// This function queries whether pc is in one of the process's builtin thunks
+// and, if so, returns the CodeRange and pointer to the code segment that the
+// CodeRange is relative to.
+
+bool
+LookupBuiltinThunk(void* pc, const CodeRange** codeRange, uint8_t** codeBase);
+
+// EnsureBuiltinThunksInitialized() must be called, and must succeed, before
+// SymbolicAddressTarget() or MaybeGetBuiltinThunk(). This function creates all
+// thunks for the process. ReleaseBuiltinThunks() should be called before
+// ReleaseProcessExecutableMemory() so that the latter can assert that all
+// executable code has been released.
+
+bool
+EnsureBuiltinThunksInitialized();
+
+void*
+SymbolicAddressTarget(SymbolicAddress sym);
+
+void*
+MaybeGetBuiltinThunk(HandleFunction f, const Sig& sig, JSContext* cx);
+
+void
+ReleaseBuiltinThunks();
+
+} // namespace wasm
+} // namespace js
+
+#endif // wasm_builtins_h
diff --git a/js/src/wasm/WasmCode.cpp b/js/src/wasm/WasmCode.cpp
index a3e0bd260e58..6b0b23c9bb78 100644
--- a/js/src/wasm/WasmCode.cpp
+++ b/js/src/wasm/WasmCode.cpp
@@ -95,7 +95,7 @@ AllocateCodeSegment(JSContext* cx, uint32_t codeLength)
 }
 
 static bool
-StaticallyLink(JSContext* cx, CodeSegment& cs, const LinkData& linkData)
+StaticallyLink(CodeSegment& cs, const LinkData& linkData)
 {
     for (LinkData::InternalLink link : linkData.internalLinks) {
         uint8_t* patchAt = cs.base() + link.patchAtOffset;
@@ -106,15 +106,15 @@ StaticallyLink(JSContext* cx, CodeSegment& cs, const LinkData& linkData)
             Assembler::PatchInstructionImmediate(patchAt, PatchedImmPtr(target));
     }
 
+    if (!EnsureBuiltinThunksInitialized())
+        return false;
+
     for (auto imm : MakeEnumeratedRange(SymbolicAddress::Limit)) {
         const Uint32Vector& offsets = linkData.symbolicLinks[imm];
         if (offsets.empty())
             continue;
 
-        void* target = nullptr;
-        if (!cx->runtime()->wasm().getBuiltinThunk(cx, imm, &target))
-            return false;
-
+        void* target = SymbolicAddressTarget(imm);
         for (uint32_t offset : offsets) {
             uint8_t* patchAt = cs.base() + offset;
             Assembler::PatchDataWithValueCheck(CodeLocationLabel(patchAt),
@@ -211,7 +211,7 @@ CodeSegment::create(JSContext* cx,
         AutoFlushICache::setRange(uintptr_t(codeBase), cs->length());
 
         memcpy(codeBase, bytecode.begin(), bytecode.length());
-        if (!StaticallyLink(cx, *cs, linkData))
+        if (!StaticallyLink(*cs, linkData))
             return nullptr;
     }
 
@@ -363,7 +363,8 @@ Metadata::serializedSize() const
            SerializedPodVectorSize(callSites) +
            SerializedPodVectorSize(funcNames) +
            SerializedPodVectorSize(customSections) +
-           filename.serializedSize();
+           filename.serializedSize() +
+           sizeof(hash);
 }
 
 uint8_t*
@@ -384,6 +385,7 @@ Metadata::serialize(uint8_t* cursor) const
     cursor = SerializePodVector(cursor, funcNames);
     cursor = SerializePodVector(cursor, customSections);
     cursor = filename.serialize(cursor);
+    cursor = WriteBytes(cursor, hash, sizeof(hash));
     return cursor;
 }
 
@@ -401,7 +403,8 @@ Metadata::deserialize(const uint8_t* cursor)
     (cursor = DeserializePodVector(cursor, &callSites)) &&
     (cursor = DeserializePodVector(cursor, &funcNames)) &&
     (cursor = DeserializePodVector(cursor, &customSections)) &&
-    (cursor = filename.deserialize(cursor));
+    (cursor = filename.deserialize(cursor)) &&
+    (cursor = ReadBytes(cursor, hash, sizeof(hash)));
     debugEnabled = false;
     debugTrapFarJumpOffsets.clear();
     debugFuncToCodeRange.clear();
@@ -553,15 +556,8 @@ Code::lookupCallSite(void* returnAddress) const
 const CodeRange*
 Code::lookupRange(void* pc) const
 {
-    CodeRange::PC target((uint8_t*)pc - segment_->base());
-    size_t lowerBound = 0;
-    size_t upperBound = metadata_->codeRanges.length();
-
-    size_t match;
-    if (!BinarySearch(metadata_->codeRanges, lowerBound, upperBound, target, &match))
-        return nullptr;
-
-    return &metadata_->codeRanges[match];
+    CodeRange::OffsetInCode target((uint8_t*)pc - segment_->base());
+    return LookupInSorted(metadata_->codeRanges, target);
 }
 
 struct MemoryAccessOffset
@@ -1065,6 +1061,41 @@ Code::debugGetResultType(uint32_t funcIndex)
     return metadata_->debugFuncReturnTypes[funcIndex];
 }
 
+JSString*
+Code::debugDisplayURL(JSContext* cx) const
+{
+    // Build wasm module URL from following parts:
+    // - "wasm:" as protocol;
+    // - URI encoded filename from metadata (if can be encoded), plus ":";
+    // - 64-bit hash of the module bytes (as hex dump).
+    js::StringBuffer result(cx);
+    if (!result.append("wasm:"))
+        return nullptr;
+    if (const char* filename = metadata_->filename.get()) {
+        js::StringBuffer filenamePrefix(cx);
+        // EncodeURI returns false due to invalid chars or OOM -- fail only
+        // during OOM.
+        if (!EncodeURI(cx, filenamePrefix, filename, strlen(filename))) {
+            if (!cx->isExceptionPending())
+                return nullptr;
+            cx->clearPendingException(); // ignore invalid URI
+        } else if (!result.append(filenamePrefix.finishString()) || !result.append(":")) {
+            return nullptr;
+        }
+    }
+
+    const ModuleHash& hash = metadata().hash;
+    for (size_t i = 0; i < sizeof(ModuleHash); i++) {
+        char digit1 = hash[i] / 16, digit2 = hash[i] % 16;
+        if (!result.append((char)(digit1 < 10 ? digit1 + '0' : digit1 + 'a' - 10)))
+            return nullptr;
+        if (!result.append((char)(digit2 < 10 ? digit2 + '0' : digit2 + 'a' - 10)))
+            return nullptr;
+    }
+    return result.finishString();
+
+}
+
 void
 Code::addSizeOfMisc(MallocSizeOf mallocSizeOf,
                     Metadata::SeenSet* seenMetadata,
diff --git a/js/src/wasm/WasmCode.h b/js/src/wasm/WasmCode.h
index 1693b37372a4..b364b21272df 100644
--- a/js/src/wasm/WasmCode.h
+++ b/js/src/wasm/WasmCode.h
@@ -292,6 +292,8 @@ struct MetadataCacheablePod
     {}
 };
 
+typedef uint8_t ModuleHash[8];
+
 struct Metadata : ShareableBase<Metadata>, MetadataCacheablePod
 {
     explicit Metadata(ModuleKind kind = ModuleKind::Wasm) : MetadataCacheablePod(kind) {}
@@ -311,6 +313,7 @@ struct Metadata : ShareableBase<Metadata>, MetadataCacheablePod
     NameInBytecodeVector  funcNames;
     CustomSectionVector   customSections;
     CacheableChars        filename;
+    ModuleHash            hash;
 
     // Debug-enabled code is not serialized.
     bool                  debugEnabled;
@@ -482,6 +485,10 @@ class Code
     bool debugGetLocalTypes(uint32_t funcIndex, ValTypeVector* locals, size_t* argsLength);
     ExprType debugGetResultType(uint32_t funcIndex);
 
+    // Debug URL helpers.
+
+    JSString* debugDisplayURL(JSContext* cx) const;
+
     // about:memory reporting:
 
     void addSizeOfMisc(MallocSizeOf mallocSizeOf,
diff --git a/js/src/wasm/WasmFrameIterator.cpp b/js/src/wasm/WasmFrameIterator.cpp
index 5d1152cbc324..aa4694a37c8b 100644
--- a/js/src/wasm/WasmFrameIterator.cpp
+++ b/js/src/wasm/WasmFrameIterator.cpp
@@ -541,7 +541,7 @@ ProfilingFrameIterator::initFromExitFP()
         break;
       case CodeRange::ImportJitExit:
       case CodeRange::ImportInterpExit:
-      case CodeRange::BuiltinNativeExit:
+      case CodeRange::BuiltinThunk:
       case CodeRange::TrapExit:
       case CodeRange::DebugTrap:
       case CodeRange::Inline:
@@ -577,26 +577,23 @@ ProfilingFrameIterator::ProfilingFrameIterator(const WasmActivation& activation,
         return;
     }
 
-    code_ = activation_->compartment()->wasm.lookupCode(state.pc);
+    uint8_t* fp = (uint8_t*)state.fp;
+    uint8_t* pc = (uint8_t*)state.pc;
+    void** sp = (void**)state.sp;
 
-    const CodeRange* codeRange = nullptr;
-    uint8_t* codeBase = nullptr;
-    if (!code_) {
-        // Optimized builtin exits (see MaybeGetMatchingBuiltin in
-        // WasmInstance.cpp) are outside module's code.
-        AutoNoteSingleThreadedRegion anstr;
-        if (BuiltinThunk* thunk = activation_->cx()->runtime()->wasm().lookupBuiltin(state.pc)) {
-            codeRange = &thunk->codeRange;
-            codeBase = (uint8_t*) thunk->base;
-        } else {
-            // If pc isn't in any wasm code or builtin exit, we must be between
-            // pushing the WasmActivation and entering wasm code.
-            MOZ_ASSERT(done());
-            return;
-        }
-    } else {
-        codeRange = code_->lookupRange(state.pc);
+    // Get the CodeRange describing pc and the base address to which the
+    // CodeRange is relative. If the pc is not in a wasm module or a builtin
+    // thunk, then execution must be entering from or leaving to the C++ caller
+    // that pushed the WasmActivation.
+    const CodeRange* codeRange;
+    uint8_t* codeBase;
+    code_ = activation_->compartment()->wasm.lookupCode(pc);
+    if (code_) {
+        codeRange = code_->lookupRange(pc);
         codeBase = code_->segment().base();
+    } else if (!LookupBuiltinThunk(pc, &codeRange, &codeBase)) {
+        MOZ_ASSERT(done());
+        return;
     }
 
     // When the pc is inside the prologue/epilogue, the innermost call's Frame
@@ -605,10 +602,6 @@ ProfilingFrameIterator::ProfilingFrameIterator(const WasmActivation& activation,
     // while pc is in the prologue/epilogue would skip the second-to-innermost
     // call. To avoid this problem, we use the static structure of the code in
     // the prologue and epilogue to do the Right Thing.
-    uint8_t* fp = (uint8_t*)state.fp;
-    uint8_t* pc = (uint8_t*)state.pc;
-    void** sp = (void**)state.sp;
-
     uint32_t offsetInCode = pc - codeBase;
     MOZ_ASSERT(offsetInCode >= codeRange->begin());
     MOZ_ASSERT(offsetInCode < codeRange->end());
@@ -633,7 +626,7 @@ ProfilingFrameIterator::ProfilingFrameIterator(const WasmActivation& activation,
       case CodeRange::FarJumpIsland:
       case CodeRange::ImportJitExit:
       case CodeRange::ImportInterpExit:
-      case CodeRange::BuiltinNativeExit:
+      case CodeRange::BuiltinThunk:
       case CodeRange::TrapExit:
 #if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64) || defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
         if (offsetFromEntry == BeforePushRetAddr || codeRange->isThunk()) {
@@ -743,7 +736,7 @@ ProfilingFrameIterator::operator++()
       case CodeRange::Function:
       case CodeRange::ImportJitExit:
       case CodeRange::ImportInterpExit:
-      case CodeRange::BuiltinNativeExit:
+      case CodeRange::BuiltinThunk:
       case CodeRange::TrapExit:
       case CodeRange::DebugTrap:
       case CodeRange::Inline:
@@ -908,7 +901,7 @@ ProfilingFrameIterator::label() const
       case CodeRange::Function:          return code_->profilingLabel(codeRange_->funcIndex());
       case CodeRange::Entry:             return "entry trampoline (in wasm)";
       case CodeRange::ImportJitExit:     return importJitDescription;
-      case CodeRange::BuiltinNativeExit: return builtinNativeDescription;
+      case CodeRange::BuiltinThunk:      return builtinNativeDescription;
       case CodeRange::ImportInterpExit:  return importInterpDescription;
       case CodeRange::TrapExit:          return trapDescription;
       case CodeRange::DebugTrap:         return debugTrapDescription;
diff --git a/js/src/wasm/WasmGenerator.cpp b/js/src/wasm/WasmGenerator.cpp
index 676f7f6670b0..82d9cbfe07fc 100644
--- a/js/src/wasm/WasmGenerator.cpp
+++ b/js/src/wasm/WasmGenerator.cpp
@@ -20,6 +20,7 @@
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/EnumeratedRange.h"
+#include "mozilla/SHA1.h"
 
 #include <algorithm>
 
@@ -1097,6 +1098,19 @@ ModuleGenerator::initSigTableElems(uint32_t sigIndex, Uint32Vector&& elemFuncInd
     return true;
 }
 
+static_assert(sizeof(ModuleHash) <= sizeof(mozilla::SHA1Sum::Hash),
+              "The ModuleHash size shall not exceed the SHA1 hash size.");
+
+void
+ModuleGenerator::generateBytecodeHash(const ShareableBytes& bytecode)
+{
+    mozilla::SHA1Sum::Hash hash;
+    mozilla::SHA1Sum sha1Sum;
+    sha1Sum.update(bytecode.begin(), bytecode.length());
+    sha1Sum.finish(hash);
+    memcpy(metadata_->hash, hash, sizeof(ModuleHash));
+}
+
 SharedModule
 ModuleGenerator::finish(const ShareableBytes& bytecode)
 {
@@ -1185,6 +1199,8 @@ ModuleGenerator::finish(const ShareableBytes& bytecode)
     if (!finishLinkData())
         return nullptr;
 
+    generateBytecodeHash(bytecode);
+
     return SharedModule(js_new<Module>(Move(assumptions_),
                                        Move(code),
                                        Move(linkData_),
diff --git a/js/src/wasm/WasmGenerator.h b/js/src/wasm/WasmGenerator.h
index 3217d43dcfd7..c04e9991d584 100644
--- a/js/src/wasm/WasmGenerator.h
+++ b/js/src/wasm/WasmGenerator.h
@@ -264,6 +264,7 @@ class MOZ_STACK_CLASS ModuleGenerator
     MOZ_MUST_USE bool finishFuncExports();
     MOZ_MUST_USE bool finishCodegen();
     MOZ_MUST_USE bool finishLinkData();
+    void generateBytecodeHash(const ShareableBytes& bytecode);
     MOZ_MUST_USE bool addFuncImport(const Sig& sig, uint32_t globalDataOffset);
     MOZ_MUST_USE bool allocateGlobalBytes(uint32_t bytes, uint32_t align, uint32_t* globalDataOff);
     MOZ_MUST_USE bool allocateGlobal(GlobalDesc* global);
diff --git a/js/src/wasm/WasmInstance.cpp b/js/src/wasm/WasmInstance.cpp
index f450703881bd..6feaf4f64db0 100644
--- a/js/src/wasm/WasmInstance.cpp
+++ b/js/src/wasm/WasmInstance.cpp
@@ -21,7 +21,7 @@
 #include "jit/BaselineJIT.h"
 #include "jit/InlinableNatives.h"
 #include "jit/JitCommon.h"
-
+#include "wasm/WasmBuiltins.h"
 #include "wasm/WasmModule.h"
 
 #include "jsobjinlines.h"
@@ -317,128 +317,6 @@ Instance::currentMemory_i32(Instance* instance)
     return byteLength / wasm::PageSize;
 }
 
-// asm.js has the ability to call directly into Math builtins, which wasm can't
-// do. Instead, wasm code generators have to pass the builtins as function
-// imports, resulting in slow import calls.
-//
-// However, we can optimize this by detecting that an import is just a JSNative
-// builtin and have wasm call straight to the builtin's C++ code, since the
-// ABIs perfectly match at the call site.
-//
-// Even though we could call into float32 variants of the math functions, we
-// do not do it, so as not to change the results.
-
-#define FOREACH_UNCACHED_MATH_BUILTIN(_) \
-    _(math_sin, MathSin)           \
-    _(math_tan, MathTan)           \
-    _(math_cos, MathCos)           \
-    _(math_exp, MathExp)           \
-    _(math_log, MathLog)           \
-    _(math_asin, MathASin)         \
-    _(math_atan, MathATan)         \
-    _(math_acos, MathACos)         \
-    _(math_log10, MathLog10)       \
-    _(math_log2, MathLog2)         \
-    _(math_log1p, MathLog1P)       \
-    _(math_expm1, MathExpM1)       \
-    _(math_sinh, MathSinH)         \
-    _(math_tanh, MathTanH)         \
-    _(math_cosh, MathCosH)         \
-    _(math_asinh, MathASinH)       \
-    _(math_atanh, MathATanH)       \
-    _(math_acosh, MathACosH)       \
-    _(math_sign, MathSign)         \
-    _(math_trunc, MathTrunc)       \
-    _(math_cbrt, MathCbrt)
-
-#define UNARY_FLOAT_WRAPPER(func)                 \
-    float func##_f32(float x) {                   \
-        return float(func(double(x)));            \
-    }
-
-#define BINARY_FLOAT_WRAPPER(func)                \
-    float func##_f32(float x, float y) {          \
-        return float(func(double(x), double(y))); \
-    }
-
-#define DEFINE_FLOAT_WRAPPER(name, _) UNARY_FLOAT_WRAPPER(name##_uncached)
-FOREACH_UNCACHED_MATH_BUILTIN(DEFINE_FLOAT_WRAPPER)
-
-BINARY_FLOAT_WRAPPER(ecmaAtan2)
-BINARY_FLOAT_WRAPPER(ecmaHypot)
-BINARY_FLOAT_WRAPPER(ecmaPow)
-
-#undef DEFINE_FLOAT_WRAPPER
-#undef BINARY_FLOAT_WRAPPER
-#undef UNARY_FLOAT_WRAPPER
-
-static void*
-IsMatchingBuiltin(HandleFunction f, const Sig& sig)
-{
-    if (!f->isNative() || !f->jitInfo() || f->jitInfo()->type() != JSJitInfo::InlinableNative)
-        return nullptr;
-
-    ExprType ret = sig.ret();
-    const ValTypeVector& args = sig.args();
-
-#define UNARY_BUILTIN(double_func, float_func)                 \
-        if (args.length() != 1)                                \
-            break;                                             \
-        if (args[0] == ValType::F64 && ret == ExprType::F64)   \
-            return JS_FUNC_TO_DATA_PTR(void*, double_func);    \
-        if (args[0] == ValType::F32 && ret == ExprType::F32)   \
-            return JS_FUNC_TO_DATA_PTR(void*, float_func);     \
-        break;
-
-#define BINARY_BUILTIN(double_func, float_func)                                         \
-        if (args.length() != 2)                                                         \
-            break;                                                                      \
-        if (args[0] == ValType::F64 && args[1] == ValType::F64 && ret == ExprType::F64) \
-            return JS_FUNC_TO_DATA_PTR(void*, double_func);                             \
-        if (args[0] == ValType::F32 && args[1] == ValType::F32 && ret == ExprType::F32) \
-            return JS_FUNC_TO_DATA_PTR(void*, float_func);                              \
-        break;
-
-    switch (f->jitInfo()->inlinableNative) {
-#define MAKE_CASE(funcName, inlinableNative)                        \
-      case InlinableNative::inlinableNative:                        \
-        UNARY_BUILTIN(funcName##_uncached, funcName##_uncached_f32)
-
-      FOREACH_UNCACHED_MATH_BUILTIN(MAKE_CASE)
-
-      case InlinableNative::MathATan2:
-        BINARY_BUILTIN(ecmaAtan2, ecmaAtan2_f32)
-      case InlinableNative::MathHypot:
-        BINARY_BUILTIN(ecmaHypot, ecmaHypot_f32)
-      case InlinableNative::MathPow:
-        BINARY_BUILTIN(ecmaPow, ecmaPow_f32)
-
-      default:
-        break;
-    }
-
-#undef MAKE_CASE
-#undef UNARY_BUILTIN
-#undef BINARY_BUILTIN
-#undef FOREACH_UNCACHED_MATH_BUILTIN
-
-    return nullptr;
-}
-
-static void*
-MaybeGetMatchingBuiltin(JSContext* cx, HandleFunction f, const Sig& sig)
-{
-    void* funcPtr = IsMatchingBuiltin(f, sig);
-    if (!funcPtr)
-        return nullptr;
-
-    void* thunkPtr = nullptr;
-    if (!cx->runtime()->wasm().getBuiltinThunk(cx, funcPtr, sig, &thunkPtr))
-        return nullptr;
-
-    return thunkPtr;
-}
-
 Instance::Instance(JSContext* cx,
                    Handle<WasmInstanceObject*> object,
                    UniqueCode code,
@@ -479,7 +357,7 @@ Instance::Instance(JSContext* cx,
             import.code = calleeInstance.codeSegment().base() + codeRange.funcNormalEntry();
             import.baselineScript = nullptr;
             import.obj = calleeInstanceObj;
-        } else if (void* thunk = MaybeGetMatchingBuiltin(cx, f, fi.sig())) {
+        } else if (void* thunk = MaybeGetBuiltinThunk(f, fi.sig(), cx)) {
             import.tls = tlsData();
             import.code = thunk;
             import.baselineScript = nullptr;
diff --git a/js/src/wasm/WasmRuntime.h b/js/src/wasm/WasmRuntime.h
deleted file mode 100644
index 12a3361ea4b3..000000000000
--- a/js/src/wasm/WasmRuntime.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- *
- * Copyright 2017 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef wasm_runtime_h
-#define wasm_runtime_h
-
-#include "NamespaceImports.h"
-
-#include "jit/IonTypes.h"
-#include "wasm/WasmTypes.h"
-
-using mozilla::HashGeneric;
-
-namespace js {
-
-namespace jit {
-    class ExecutablePool;
-}
-
-namespace wasm {
-
-class ExitReason;
-
-bool
-NeedsBuiltinThunk(SymbolicAddress imm);
-
-struct TypedFuncPtr
-{
-    void* funcPtr;
-    jit::ABIFunctionType abiType;
-
-    TypedFuncPtr(void* funcPtr, jit::ABIFunctionType abiType)
-      : funcPtr(funcPtr),
-        abiType(abiType)
-    {}
-
-    typedef TypedFuncPtr Lookup;
-    static HashNumber hash(const Lookup& l) {
-        return HashGeneric(l.funcPtr, uint32_t(l.abiType));
-    }
-    static bool match(const TypedFuncPtr& lhs, const Lookup& rhs) {
-        return lhs.funcPtr == rhs.funcPtr && lhs.abiType == rhs.abiType;
-    }
-};
-
-typedef HashMap<TypedFuncPtr, void*, TypedFuncPtr, SystemAllocPolicy> BuiltinThunkMap;
-
-struct BuiltinThunk
-{
-    jit::ExecutablePool* executablePool;
-    CodeRange codeRange;
-    size_t size;
-    uint8_t* base;
-
-    BuiltinThunk(uint8_t* base, size_t size, jit::ExecutablePool* executablePool,
-                 CallableOffsets offsets)
-      : executablePool(executablePool),
-        codeRange(CodeRange(CodeRange::BuiltinNativeExit, offsets)),
-        size(size),
-        base(base)
-    {}
-    ~BuiltinThunk();
-};
-
-typedef UniquePtr<BuiltinThunk> UniqueBuiltinThunk;
-typedef Vector<UniqueBuiltinThunk, 4, SystemAllocPolicy> BuiltinThunkVector;
-
-// wasm::Runtime contains all the needed information for wasm that has the
-// lifetime of a JSRuntime.
-
-class Runtime
-{
-    BuiltinThunkMap builtinThunkMap_;
-    BuiltinThunkVector builtinThunkVector_;
-
-    bool getBuiltinThunk(JSContext* cx, void* funcPtr, jit::ABIFunctionType type,
-                         ExitReason exitReason, void** thunkPtr);
-
-  public:
-    bool init() { return builtinThunkMap_.init(); }
-    void destroy();
-
-    bool getBuiltinThunk(JSContext* cx, SymbolicAddress func, void** thunkPtr);
-    bool getBuiltinThunk(JSContext* cx, void* funcPtr, const Sig& sig, void** thunkPtr);
-    BuiltinThunk* lookupBuiltin(void* pc);
-};
-
-} // namespace wasm
-} // namespace js
-
-#endif // wasm_runtime_h
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
index 62afcab6ae5e..8a76db37da4b 100644
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -25,6 +25,7 @@
 #include "jit/AtomicOperations.h"
 #include "jit/Disassembler.h"
 #include "vm/Runtime.h"
+#include "wasm/WasmBuiltins.h"
 #include "wasm/WasmInstance.h"
 
 using namespace js;
@@ -1543,7 +1544,7 @@ js::InterruptRunningJitCode(JSContext* cx)
 }
 
 MOZ_COLD bool
-js::wasm::IsPCInWasmCode(void *pc)
+js::wasm::IsPCInWasmCode(void* pc)
 {
     JSContext* cx = TlsContext.get();
     if (!cx)
@@ -1555,6 +1556,10 @@ js::wasm::IsPCInWasmCode(void *pc)
     if (!activation)
         return false;
 
-    return !!activation->compartment()->wasm.lookupCode(pc) ||
-           !!activation->cx()->runtime()->wasm().lookupBuiltin(pc);
+    if (activation->compartment()->wasm.lookupCode(pc))
+        return true;
+
+    const CodeRange* codeRange;
+    uint8_t* codeBase;
+    return LookupBuiltinThunk(pc, &codeRange, &codeBase);
 }
diff --git a/js/src/wasm/WasmStubs.cpp b/js/src/wasm/WasmStubs.cpp
index cd8d75c2dbe1..88d2cf339248 100644
--- a/js/src/wasm/WasmStubs.cpp
+++ b/js/src/wasm/WasmStubs.cpp
@@ -899,8 +899,8 @@ struct ABIFunctionArgs
 };
 
 CallableOffsets
-wasm::GenerateBuiltinNativeExit(MacroAssembler& masm, ABIFunctionType abiType,
-                                ExitReason exitReason, void* func)
+wasm::GenerateBuiltinThunk(MacroAssembler& masm, ABIFunctionType abiType, ExitReason exitReason,
+                           void* funcPtr)
 {
     masm.setFramePushed(0);
 
@@ -936,7 +936,7 @@ wasm::GenerateBuiltinNativeExit(MacroAssembler& masm, ABIFunctionType abiType,
     }
 
     AssertStackAlignment(masm, ABIStackAlignment);
-    masm.call(ImmPtr(func, ImmPtr::NoCheckToken()));
+    masm.call(ImmPtr(funcPtr, ImmPtr::NoCheckToken()));
 
 #if defined(JS_CODEGEN_X86)
     // x86 passes the return value on the x87 FP stack.
diff --git a/js/src/wasm/WasmStubs.h b/js/src/wasm/WasmStubs.h
index ea4f320d56f0..80a6d0121448 100644
--- a/js/src/wasm/WasmStubs.h
+++ b/js/src/wasm/WasmStubs.h
@@ -49,8 +49,8 @@ extern CallableOffsets
 GenerateImportJitExit(jit::MacroAssembler& masm, const FuncImport& fi, jit::Label* throwLabel);
 
 extern CallableOffsets
-GenerateBuiltinNativeExit(jit::MacroAssembler& masm, jit::ABIFunctionType abiType,
-                          ExitReason exitReason, void* func);
+GenerateBuiltinThunk(jit::MacroAssembler& masm, jit::ABIFunctionType abiType, ExitReason exitReason,
+                     void* func);
 
 extern CallableOffsets
 GenerateTrapExit(jit::MacroAssembler& masm, Trap trap, jit::Label* throwLabel);
diff --git a/js/src/wasm/WasmTypes.cpp b/js/src/wasm/WasmTypes.cpp
index ba1f5c42f164..97236fb51d98 100644
--- a/js/src/wasm/WasmTypes.cpp
+++ b/js/src/wasm/WasmTypes.cpp
@@ -690,8 +690,8 @@ CodeRange::CodeRange(Kind kind, Offsets offsets)
       case Function:
       case TrapExit:
       case ImportJitExit:
-      case BuiltinNativeExit:
       case ImportInterpExit:
+      case BuiltinThunk:
         MOZ_CRASH("should use more specific constructor");
     }
 #endif
@@ -712,8 +712,8 @@ CodeRange::CodeRange(Kind kind, CallableOffsets offsets)
     switch (kind_) {
       case TrapExit:
       case ImportJitExit:
-      case BuiltinNativeExit:
       case ImportInterpExit:
+      case BuiltinThunk:
         break;
       case Entry:
       case DebugTrap:
@@ -740,3 +740,16 @@ CodeRange::CodeRange(uint32_t funcIndex, uint32_t funcLineOrBytecode, FuncOffset
     MOZ_ASSERT(ret_ < end_);
     MOZ_ASSERT(offsets.normalEntry - begin_ <= UINT8_MAX);
 }
+
+const CodeRange*
+wasm::LookupInSorted(const CodeRangeVector& codeRanges, CodeRange::OffsetInCode target)
+{
+    size_t lowerBound = 0;
+    size_t upperBound = codeRanges.length();
+
+    size_t match;
+    if (!BinarySearch(codeRanges, lowerBound, upperBound, target, &match))
+        return nullptr;
+
+    return &codeRanges[match];
+}
diff --git a/js/src/wasm/WasmTypes.h b/js/src/wasm/WasmTypes.h
index 89e4c2ce5516..b388c4661ab4 100644
--- a/js/src/wasm/WasmTypes.h
+++ b/js/src/wasm/WasmTypes.h
@@ -831,7 +831,7 @@ class CodeRange
         Entry,             // calls into wasm from C++
         ImportJitExit,     // fast-path calling from wasm into JIT code
         ImportInterpExit,  // slow-path calling from wasm into C++ interp
-        BuiltinNativeExit, // fast-path calling from wasm into a C++ native
+        BuiltinThunk,      // fast-path calling from wasm into a C++ native
         TrapExit,          // calls C++ to report and jumps to throw stub
         DebugTrap,         // calls C++ to handle debug event
         FarJumpIsland,     // inserted to connect otherwise out-of-range insns
@@ -875,7 +875,7 @@ class CodeRange
         return kind() == Function;
     }
     bool isImportExit() const {
-        return kind() == ImportJitExit || kind() == ImportInterpExit || kind() == BuiltinNativeExit;
+        return kind() == ImportJitExit || kind() == ImportInterpExit || kind() == BuiltinThunk;
     }
     bool isTrapExit() const {
         return kind() == TrapExit;
@@ -917,11 +917,12 @@ class CodeRange
         return funcLineOrBytecode_;
     }
 
-    // A sorted array of CodeRanges can be looked up via BinarySearch and PC.
+    // A sorted array of CodeRanges can be looked up via BinarySearch and
+    // OffsetInCode.
 
-    struct PC {
+    struct OffsetInCode {
         size_t offset;
-        explicit PC(size_t offset) : offset(offset) {}
+        explicit OffsetInCode(size_t offset) : offset(offset) {}
         bool operator==(const CodeRange& rhs) const {
             return offset >= rhs.begin() && offset < rhs.end();
         }
@@ -933,6 +934,9 @@ class CodeRange
 
 WASM_DECLARE_POD_VECTOR(CodeRange, CodeRangeVector)
 
+extern const CodeRange*
+LookupInSorted(const CodeRangeVector& codeRanges, CodeRange::OffsetInCode target);
+
 // A wasm::Trap represents a wasm-defined trap that can occur during execution
 // which triggers a WebAssembly.RuntimeError. Generated code may jump to a Trap
 // symbolically, passing the bytecode offset to report as the trap offset. The
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index aa0f8eb3f594..9e3b89b65358 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -1533,6 +1533,10 @@ ReportZoneStats(const JS::ZoneStats& zStats,
         zStats.typePool,
         "Type sets and related data.");
 
+    ZCREPORT_BYTES(pathPrefix + NS_LITERAL_CSTRING("jit-zone"),
+        zStats.jitZone,
+        "The JIT zone.");
+
     ZCREPORT_BYTES(pathPrefix + NS_LITERAL_CSTRING("baseline/optimized-stubs"),
         zStats.baselineStubsOptimized,
         "The Baseline JIT's optimized IC stubs (excluding code).");
diff --git a/layout/base/GeckoRestyleManager.cpp b/layout/base/GeckoRestyleManager.cpp
index c723f14f553f..8398011cefc8 100644
--- a/layout/base/GeckoRestyleManager.cpp
+++ b/layout/base/GeckoRestyleManager.cpp
@@ -1174,9 +1174,16 @@ ElementRestyler::ElementRestyler(ParentContextFromChildFrame,
 #endif
 {
   MOZ_ASSERT_IF(mContent, !mContent->IsStyledByServo());
-  MOZ_ASSERT(!(mHintsHandledByAncestors & nsChangeHint_ReconstructFrame),
-             "why restyle descendants if we are reconstructing the frame for "
-             "an ancestor?");
+
+  // We would assert here that we're not restyling a child provider frame if
+  // mHintsHandledByAncestors includes nsChangeHint_ReconstructFrame, but
+  // we do actually do this if the ReconstructFrame hint came from the
+  // RestyleTracker, rather than generated from CalcDifference.  (We could
+  // even try to avoid restyling the child provider frame, by returning
+  // early in ElementRestyler::Restyle if we grab out a ReconstructFrame
+  // hint from the RestyleTracker, but it's trickier to verify its correctness
+  // with all of the tree patching that happens currently, so for now we just
+  // skip the assertion.)
 }
 
 ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
diff --git a/layout/base/ServoRestyleManager.cpp b/layout/base/ServoRestyleManager.cpp
index bffb27ea1b3e..1884120b231b 100644
--- a/layout/base/ServoRestyleManager.cpp
+++ b/layout/base/ServoRestyleManager.cpp
@@ -55,6 +55,10 @@ ServoRestyleManager::PostRestyleEvent(Element* aElement,
     return;
   }
 
+  if (aRestyleHint & ~eRestyle_AllHintsWithAnimations) {
+    mHaveNonAnimationRestyles = true;
+  }
+
   Servo_NoteExplicitHints(aElement, aRestyleHint, aMinChangeHint);
 }
 
@@ -71,6 +75,8 @@ ServoRestyleManager::RebuildAllStyleData(nsChangeHint aExtraHint,
 {
   StyleSet()->RebuildData();
 
+  mHaveNonAnimationRestyles = true;
+
   // NOTE(emilio): GeckoRestlyeManager does a sync style flush, which seems
   // not to be needed in my testing.
   //
@@ -387,6 +393,9 @@ ServoRestyleManager::ProcessPendingRestyles()
   // in a loop because certain rare paths in the frame constructor (like
   // uninstalling XBL bindings) can trigger additional style validations.
   mInStyleRefresh = true;
+  if (mHaveNonAnimationRestyles) {
+    ++mAnimationGeneration;
+  }
   while (styleSet->StyleDocument()) {
     // Recreate style contexts, and queue up change hints (which also handle
     // lazy frame construction).
@@ -419,6 +428,7 @@ ServoRestyleManager::ProcessPendingRestyles()
 
   FlushOverflowChangedTracker();
 
+  mHaveNonAnimationRestyles = false;
   mInStyleRefresh = false;
   styleSet->AssertTreeIsClean();
 
diff --git a/layout/base/ServoRestyleManager.h b/layout/base/ServoRestyleManager.h
index e0de00cc810f..b3f76a13a1ee 100644
--- a/layout/base/ServoRestyleManager.h
+++ b/layout/base/ServoRestyleManager.h
@@ -148,6 +148,13 @@ private:
   // Only non-null while processing change hints. See the comment in
   // ProcessPendingRestyles.
   ReentrantChangeList* mReentrantChanges;
+
+  // We use this flag to track if the current restyle contains any non-animation
+  // update, which triggers a normal restyle, and so there might be any new
+  // transition created later. Therefore, if this flag is true, we need to
+  // increase mAnimationGeneration before creating new transitions, so their
+  // creation sequence will be correct.
+  bool mHaveNonAnimationRestyles = false;
 };
 
 } // namespace mozilla
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 28042fcb06ff..9d34728c92da 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -6786,6 +6786,7 @@ nsLayoutUtils::ComputeSizeForDrawingWithFallback(imgIContainer* aImage,
 
 /* static */ DrawResult
 nsLayoutUtils::DrawBackgroundImage(gfxContext&         aContext,
+                                   nsIFrame*           aForFrame,
                                    nsPresContext*      aPresContext,
                                    imgIContainer*      aImage,
                                    const CSSIntSize&   aImageSize,
@@ -6802,7 +6803,8 @@ nsLayoutUtils::DrawBackgroundImage(gfxContext&         aContext,
   PROFILER_LABEL("layout", "nsLayoutUtils::DrawBackgroundImage",
                  js::ProfileEntry::Category::GRAPHICS);
 
-  const Maybe<SVGImageContext> svgContext(Some(SVGImageContext(Some(aImageSize))));
+  Maybe<SVGImageContext> svgContext(Some(SVGImageContext(Some(aImageSize))));
+  SVGImageContext::MaybeStoreContextPaint(svgContext, aForFrame, aImage);
 
   /* Fast path when there is no need for image spacing */
   if (aRepeatSize.width == aDest.width && aRepeatSize.height == aDest.height) {
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index a936f6d58465..9cef968d1949 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -1774,9 +1774,10 @@ public:
    * Draw a background image.  The image's dimensions are as specified in aDest;
    * the image itself is not consulted to determine a size.
    * See https://wiki.mozilla.org/Gecko:Image_Snapping_and_Rendering
-   *   @param aRenderingContext Where to draw the image, set up with an
+   *   @param aContext          The context to draw to, already set up with an
    *                            appropriate scale and transform for drawing in
    *                            app units.
+   *   @param aForFrame         The nsIFrame that we're drawing this image for.
    *   @param aImage            The image.
    *   @param aImageSize        The unscaled size of the image being drawn.
    *                            (This might be the image's size if no scaling
@@ -1798,6 +1799,7 @@ public:
    *   @param aExtendMode       How to extend the image over the dest rect.
    */
   static DrawResult DrawBackgroundImage(gfxContext&         aContext,
+                                        nsIFrame*           aForFrame,
                                         nsPresContext*      aPresContext,
                                         imgIContainer*      aImage,
                                         const CSSIntSize&   aImageSize,
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 166e47293346..cfb10f3b358c 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -127,6 +127,7 @@
 #include "mozilla/ServoBindings.h"
 #include "mozilla/StaticPresData.h"
 #include "mozilla/dom/WebIDLGlobalNameHash.h"
+#include "mozilla/dom/ipc/IPCBlobInputStreamStorage.h"
 
 using namespace mozilla;
 using namespace mozilla::net;
@@ -315,6 +316,9 @@ nsLayoutStatics::Initialize()
   MediaPrefs::GetSingleton();
 #endif
 
+  // This must be initialized on the main-thread.
+  mozilla::dom::IPCBlobInputStreamStorage::Initialize();
+
   return NS_OK;
 }
 
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 21657f117c87..0993d6942af4 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -283,9 +283,17 @@ nsImageFrame::Init(nsIContent*       aContent,
   nsCOMPtr<imgIRequest> currentRequest;
   imageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
                           getter_AddRefs(currentRequest));
-  nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(currentRequest);
-  if (p)
-    p->AdjustPriority(-1);
+
+  if (currentRequest) {
+    uint32_t categoryToBoostPriority = imgIRequest::CATEGORY_FRAME_INIT;
+
+    // Increase load priority further if intrinsic size might be important for layout.
+    if (!HaveSpecifiedSize(StylePosition())) {
+      categoryToBoostPriority |= imgIRequest::CATEGORY_SIZE_QUERY;
+    }
+
+    currentRequest->BoostPriority(categoryToBoostPriority);
+  }
 }
 
 bool
@@ -1700,7 +1708,7 @@ nsImageFrame::PaintImage(nsRenderingContext& aRenderingContext, nsPoint aPt,
   }
 
   Maybe<SVGImageContext> svgContext;
-  SVGImageContext::MaybeInitAndStoreContextPaint(svgContext, this, aImage);
+  SVGImageContext::MaybeStoreContextPaint(svgContext, this, aImage);
 
   DrawResult result =
     nsLayoutUtils::DrawSingleImage(*aRenderingContext.ThebesContext(),
diff --git a/layout/painting/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp
index 1fa115c06143..1183f64efe4e 100644
--- a/layout/painting/FrameLayerBuilder.cpp
+++ b/layout/painting/FrameLayerBuilder.cpp
@@ -301,6 +301,15 @@ FrameLayerBuilder::DisplayItemData::GetFrameListChanges()
   return mFrameListChanges;
 }
 
+FrameLayerBuilder::DisplayItemData*
+FrameLayerBuilder::DisplayItemData::AssertDisplayItemData(FrameLayerBuilder::DisplayItemData* aData)
+{
+  MOZ_RELEASE_ASSERT(aData);
+  MOZ_RELEASE_ASSERT(sAliveDisplayItemDatas && sAliveDisplayItemDatas->Contains(aData));
+  MOZ_RELEASE_ASSERT(aData->mLayer);
+  return aData;
+}
+
 /**
  * This is the userdata we associate with a layer manager.
  */
@@ -1803,15 +1812,6 @@ FrameLayerBuilder::FlashPaint(gfxContext *aContext)
   aContext->Paint();
 }
 
-static FrameLayerBuilder::DisplayItemData*
-AssertDisplayItemData(FrameLayerBuilder::DisplayItemData* aData)
-{
-  MOZ_RELEASE_ASSERT(aData);
-  MOZ_RELEASE_ASSERT(sAliveDisplayItemDatas && sAliveDisplayItemDatas->Contains(aData));
-  MOZ_RELEASE_ASSERT(aData->mLayer);
-  return aData;
-}
-
 FrameLayerBuilder::DisplayItemData*
 FrameLayerBuilder::GetDisplayItemData(nsIFrame* aFrame, uint32_t aKey)
 {
@@ -1819,7 +1819,7 @@ FrameLayerBuilder::GetDisplayItemData(nsIFrame* aFrame, uint32_t aKey)
     aFrame->Properties().Get(LayerManagerDataProperty());
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData* item = AssertDisplayItemData(array->ElementAt(i));
+      DisplayItemData* item = DisplayItemData::AssertDisplayItemData(array->ElementAt(i));
       if (item->mDisplayItemKey == aKey &&
           item->mLayer->Manager() == mRetainingManager) {
         return item;
@@ -2049,7 +2049,7 @@ FrameLayerBuilder::GetDisplayItemDataForManager(nsDisplayItem* aItem,
     aItem->Frame()->Properties().Get(LayerManagerDataProperty());
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData* item = AssertDisplayItemData(array->ElementAt(i));
+      DisplayItemData* item = DisplayItemData::AssertDisplayItemData(array->ElementAt(i));
       if (item->mDisplayItemKey == aItem->GetPerFrameKey() &&
           item->mLayer->Manager() == aManager) {
         return item;
@@ -2066,7 +2066,7 @@ FrameLayerBuilder::HasRetainedDataFor(nsIFrame* aFrame, uint32_t aDisplayItemKey
     aFrame->Properties().Get(LayerManagerDataProperty());
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      if (AssertDisplayItemData(array->ElementAt(i))->mDisplayItemKey == aDisplayItemKey) {
+      if (DisplayItemData::AssertDisplayItemData(array->ElementAt(i))->mDisplayItemKey == aDisplayItemKey) {
         return true;
       }
     }
@@ -2084,7 +2084,7 @@ FrameLayerBuilder::IterateRetainedDataFor(nsIFrame* aFrame, DisplayItemDataCallb
   }
 
   for (uint32_t i = 0; i < array->Length(); i++) {
-    DisplayItemData* data = AssertDisplayItemData(array->ElementAt(i));
+    DisplayItemData* data = DisplayItemData::AssertDisplayItemData(array->ElementAt(i));
     if (data->mDisplayItemKey != nsDisplayItem::TYPE_ZERO) {
       aCallback(aFrame, data);
     }
@@ -2152,7 +2152,7 @@ FrameLayerBuilder::GetDebugOldLayerFor(nsIFrame* aFrame, uint32_t aDisplayItemKe
   }
 
   for (uint32_t i = 0; i < array->Length(); i++) {
-    DisplayItemData *data = AssertDisplayItemData(array->ElementAt(i));
+    DisplayItemData *data = DisplayItemData::AssertDisplayItemData(array->ElementAt(i));
 
     if (data->mDisplayItemKey == aDisplayItemKey) {
       return data->mLayer;
@@ -2161,36 +2161,6 @@ FrameLayerBuilder::GetDebugOldLayerFor(nsIFrame* aFrame, uint32_t aDisplayItemKe
   return nullptr;
 }
 
-/* static */ PaintedLayer*
-FrameLayerBuilder::GetDebugSingleOldPaintedLayerForFrame(nsIFrame* aFrame)
-{
-  const nsTArray<DisplayItemData*>* array =
-    aFrame->Properties().Get(LayerManagerDataProperty());
-
-  if (!array) {
-    return nullptr;
-  }
-
-  Layer* layer = nullptr;
-  for (DisplayItemData* data : *array) {
-    AssertDisplayItemData(data);
-    if (!data->mLayer->AsPaintedLayer()) {
-      continue;
-    }
-    if (layer && layer != data->mLayer) {
-      // More than one layer assigned, bail.
-      return nullptr;
-    }
-    layer = data->mLayer;
-  }
-
-  if (!layer) {
-    return nullptr;
-  }
-
-  return layer->AsPaintedLayer();
-}
-
 // Reset state that should not persist when a layer is recycled.
 static void
 ResetLayerStateForRecycling(Layer* aLayer) {
@@ -5811,7 +5781,7 @@ FrameLayerBuilder::InvalidateAllLayersForFrame(nsIFrame *aFrame)
     aFrame->Properties().Get(LayerManagerDataProperty());
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      AssertDisplayItemData(array->ElementAt(i))->mParent->mInvalidateAllLayers = true;
+      DisplayItemData::AssertDisplayItemData(array->ElementAt(i))->mParent->mInvalidateAllLayers = true;
     }
   }
 }
@@ -5828,7 +5798,7 @@ FrameLayerBuilder::GetDedicatedLayer(nsIFrame* aFrame, uint32_t aDisplayItemKey)
     aFrame->Properties().Get(LayerManagerDataProperty());
   if (array) {
     for (uint32_t i = 0; i < array->Length(); i++) {
-      DisplayItemData *element = AssertDisplayItemData(array->ElementAt(i));
+      DisplayItemData *element = DisplayItemData::AssertDisplayItemData(array->ElementAt(i));
       if (!element->mParent->mLayerManager->IsWidgetLayerManager()) {
         continue;
       }
@@ -5887,7 +5857,7 @@ FrameLayerBuilder::GetPaintedLayerScaleForFrame(nsIFrame* aFrame)
     }
 
     for (uint32_t i = 0; i < array->Length(); i++) {
-      Layer* layer = AssertDisplayItemData(array->ElementAt(i))->mLayer;
+      Layer* layer = DisplayItemData::AssertDisplayItemData(array->ElementAt(i))->mLayer;
       ContainerLayer* container = layer->AsContainerLayer();
       if (!container ||
           !layer->Manager()->IsWidgetLayerManager()) {
@@ -6327,7 +6297,7 @@ FrameLayerBuilder::GetMostRecentGeometry(nsDisplayItem* aItem)
   // Find our display item data, if it exists, and return its geometry.
   uint32_t itemPerFrameKey = aItem->GetPerFrameKey();
   for (uint32_t i = 0; i < dataArray->Length(); i++) {
-    DisplayItemData* data = AssertDisplayItemData(dataArray->ElementAt(i));
+    DisplayItemData* data = DisplayItemData::AssertDisplayItemData(dataArray->ElementAt(i));
     if (data->GetDisplayItemKey() == itemPerFrameKey) {
       return data->GetGeometry();
     }
diff --git a/layout/painting/FrameLayerBuilder.h b/layout/painting/FrameLayerBuilder.h
index 183cac67008e..4a1acbc82292 100644
--- a/layout/painting/FrameLayerBuilder.h
+++ b/layout/painting/FrameLayerBuilder.h
@@ -370,7 +370,36 @@ public:
    * frame's display items (i.e. zero, or more than one).
    * This function is for testing purposes and not performance sensitive.
    */
-  static PaintedLayer* GetDebugSingleOldPaintedLayerForFrame(nsIFrame* aFrame);
+  template<class T>
+  static T*
+  GetDebugSingleOldLayerForFrame(nsIFrame* aFrame)
+  {
+    const nsTArray<DisplayItemData*>* array =
+      aFrame->Properties().Get(LayerManagerDataProperty());
+
+    if (!array) {
+      return nullptr;
+    }
+
+    Layer* layer = nullptr;
+    for (DisplayItemData* data : *array) {
+      DisplayItemData::AssertDisplayItemData(data);
+      if (data->mLayer->GetType() != T::Type()) {
+        continue;
+      }
+      if (layer && layer != data->mLayer) {
+        // More than one layer assigned, bail.
+        return nullptr;
+      }
+      layer = data->mLayer;
+    }
+
+    if (!layer) {
+      return nullptr;
+    }
+
+    return static_cast<T*>(layer);
+  }
 
   /**
    * Destroy any stored LayerManagerDataProperty and the associated data for
@@ -451,6 +480,8 @@ public:
     void Invalidate() { mIsInvalid = true; }
     void ClearAnimationCompositorState();
 
+    static DisplayItemData* AssertDisplayItemData(DisplayItemData* aData);
+
   private:
     DisplayItemData(LayerManagerData* aParent,
                     uint32_t aKey,
diff --git a/layout/painting/nsImageRenderer.cpp b/layout/painting/nsImageRenderer.cpp
index c84c7ea11539..090810359c7f 100644
--- a/layout/painting/nsImageRenderer.cpp
+++ b/layout/painting/nsImageRenderer.cpp
@@ -513,7 +513,7 @@ nsImageRenderer::Draw(nsPresContext*       aPresContext,
       CSSIntSize imageSize(nsPresContext::AppUnitsToIntCSSPixels(mSize.width),
                            nsPresContext::AppUnitsToIntCSSPixels(mSize.height));
       result =
-        nsLayoutUtils::DrawBackgroundImage(*ctx,
+        nsLayoutUtils::DrawBackgroundImage(*ctx, mForFrame,
                                            aPresContext,
                                            mImageContainer, imageSize,
                                            samplingFilter,
@@ -920,7 +920,7 @@ nsImageRenderer::DrawBorderImageComponent(nsPresContext*       aPresContext,
     nsRect tile = ComputeTile(fillRect, aHFill, aVFill, aUnitSize, repeatSize);
     CSSIntSize imageSize(srcRect.width, srcRect.height);
     return nsLayoutUtils::DrawBackgroundImage(*aRenderingContext.ThebesContext(),
-                                              aPresContext,
+                                              mForFrame, aPresContext,
                                               subImage, imageSize, samplingFilter,
                                               tile, fillRect, repeatSize,
                                               tile.TopLeft(), aDirtyRect,
diff --git a/layout/reftests/forms/progress/reftest-stylo.list b/layout/reftests/forms/progress/reftest-stylo.list
index 2c9fd8f1367e..c8619c5219b1 100644
--- a/layout/reftests/forms/progress/reftest-stylo.list
+++ b/layout/reftests/forms/progress/reftest-stylo.list
@@ -1,29 +1,29 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails == values.html values.html
-fails == values-rtl.html values-rtl.html
-fails == margin-padding.html margin-padding.html
-fails == margin-padding-rtl.html margin-padding-rtl.html
+== values.html values.html
+== values-rtl.html values-rtl.html
+== margin-padding.html margin-padding.html
+== margin-padding-rtl.html margin-padding-rtl.html
 fails == bar-pseudo-element.html bar-pseudo-element.html
-fails == bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-fails == indeterminate-style-width.html indeterminate-style-width.html
+== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
+== indeterminate-style-width.html indeterminate-style-width.html
 
 # vertical tests
-fails == values-vertical.html values-vertical.html
-fails == values-vertical-rtl.html values-vertical-rtl.html
-fails == margin-padding-vertical.html margin-padding-vertical.html
-fails == margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-fails == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-fails == bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-fails == indeterminate-style-height.html indeterminate-style-height.html
+== values-vertical.html values-vertical.html
+== values-vertical-rtl.html values-vertical-rtl.html
+== margin-padding-vertical.html margin-padding-vertical.html
+== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
+== bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
+== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
+== indeterminate-style-height.html indeterminate-style-height.html
 
 # The following test is disabled but kept in the repository because the
 # transformations will not behave exactly the same for <progress> and two divs.
 # However, it would be possible to manually check those.
-fails == transformations.html transformations.html
+== transformations.html transformations.html
 
 # Tests for bugs:
-fails == block-invalidate.html block-invalidate.html
-fails == in-cells.html in-cells.html
+== block-invalidate.html block-invalidate.html
+== in-cells.html in-cells.html
 == max-height.html max-height.html
 
 # Tests for block and inline orientation in combination with writing-mode
diff --git a/layout/reftests/svg/as-image/blue100x100-border-ref.html b/layout/reftests/svg/as-image/blue100x100-border-ref.html
new file mode 100644
index 000000000000..1bd865856c8e
--- /dev/null
+++ b/layout/reftests/svg/as-image/blue100x100-border-ref.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+  <div style="width: 100px; height: 100px; border: 10px solid blue; box-sizing: border-box;"></div>
+</body>
+</html>
diff --git a/layout/reftests/svg/as-image/context-fill-bg-image-01.html b/layout/reftests/svg/as-image/context-fill-bg-image-01.html
new file mode 100644
index 000000000000..a1681fbc088d
--- /dev/null
+++ b/layout/reftests/svg/as-image/context-fill-bg-image-01.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Basic context-fill in background-image test</title>
+    <style>
+
+div {
+  width: 100px;
+  height: 100px;
+  background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect width='100%' height='100%' fill='context-fill red'/></svg>");
+  fill: blue;
+}
+
+    </style>
+  </head>
+  <body>
+    <div></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/svg/as-image/context-stroke-bg-image-01.html b/layout/reftests/svg/as-image/context-stroke-bg-image-01.html
new file mode 100644
index 000000000000..37f853f7a04e
--- /dev/null
+++ b/layout/reftests/svg/as-image/context-stroke-bg-image-01.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Basic context-stroke in background-image test</title>
+    <style>
+
+div {
+  width: 100px;
+  height: 100px;
+  background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect x='5' y='5' width='90' height='90' fill='none' stroke='context-stroke red' stroke-width='10'/></svg>");
+  stroke: blue;
+}
+
+    </style>
+  </head>
+  <body>
+    <div></div>
+  </body>
+</html>
+
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index cede2b332ace..e48ae86a80fd 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -55,6 +55,7 @@ fuzzy(1,2) fuzzy-if(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-d
 == canvas-drawImage-transform-restored.html canvas-drawImage-transform-restored-ref.html
 
 # Context paint tests (this feature is currently not part of any spec.)
+# context-fill:
 == context-fill-01.html blue100x100-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-fill-01.html lime100x100-ref.html
 == context-fill-02.html transparent100x100-w-border-ref.html
@@ -65,6 +66,8 @@ fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,tru
 test-pref(svg.context-properties.content.enabled,true) == context-fill-05.html context-fill-or-stroke-05-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-fill-06.html lime100x100-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-fill-07.html context-fill-07-ref.html
+test-pref(svg.context-properties.content.enabled,true) == context-fill-bg-image-01.html blue100x100-ref.html
+# context-stroke:
 == context-stroke-01.html blue100x100-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-01.html lime100x100-ref.html
 == context-stroke-02.html transparent100x100-w-border-ref.html
@@ -75,6 +78,7 @@ fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,tru
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-05.html context-fill-or-stroke-05-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-06.html lime100x100-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-07.html context-stroke-07-ref.html
+test-pref(svg.context-properties.content.enabled,true) == context-stroke-bg-image-01.html blue100x100-border-ref.html
 
 # Simple <img> tests
 == img-simple-1.html  lime100x100-ref.html
@@ -180,6 +184,9 @@ HTTP == svg-stylesheet-external-1.html blue100x100.svg
 != svg-image-visited-2-helper.svg about:blank
 == svg-image-visited-2.html       lime100x100.svg
 
+# tests for SVG <image> that should have a synthetic viewBox
+== svg-image-synthetic-viewBox-01.svg svg-image-synthetic-viewBox-01-ref.svg
+
 # Test for painting problems with SVGs used in border images.
 # XXXseth: The underlying problems also apply to media fragments,
 # but the test case would be much simpler. This should be switched
diff --git a/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-1.svg b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-1.svg
new file mode 100644
index 000000000000..9a185877a6fb
--- /dev/null
+++ b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-1.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200">
+  <circle cx="100" cy="100" r="100" fill="blue"/>
+</svg>
+
diff --git a/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-2.svg b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-2.svg
new file mode 100644
index 000000000000..83f49b787f74
--- /dev/null
+++ b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-helper-2.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">
+  <circle cx="50" cy="50" r="50" fill="blue"/>
+</svg>
+
diff --git a/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-ref.svg b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-ref.svg
new file mode 100644
index 000000000000..c93d68fc3044
--- /dev/null
+++ b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01-ref.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <image width="100" height="100" href="svg-image-synthetic-viewBox-01-helper-2.svg"/>
+</svg>
+
diff --git a/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01.svg b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01.svg
new file mode 100644
index 000000000000..449c61862ea4
--- /dev/null
+++ b/layout/reftests/svg/as-image/svg-image-synthetic-viewBox-01.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <image width="100" height="100" href="svg-image-synthetic-viewBox-01-helper-1.svg"/>
+</svg>
+
diff --git a/layout/reftests/webkit-gradient/reftest-stylo.list b/layout/reftests/webkit-gradient/reftest-stylo.list
index ae56ea94f411..cef27e0e3d73 100644
--- a/layout/reftests/webkit-gradient/reftest-stylo.list
+++ b/layout/reftests/webkit-gradient/reftest-stylo.list
@@ -3,10 +3,9 @@
 # They require webkit prefix support to be enabled.
 default-preferences pref(layout.css.prefixes.webkit,true)
 
-# Tests where we don't render a "-webkit-gradient" exactly correctly.
-# (These just ensure that our approximate/do-something rendering does not
+# In this test, we don't render a "-webkit-gradient" exactly correctly.
+# (It's just here to ensure that our approximate/do-something rendering doesn't
 # change unexpectedly.)
-fails == webkit-gradient-approx-linear-1.html webkit-gradient-approx-linear-1.html
 fails == webkit-gradient-approx-radial-1.html webkit-gradient-approx-radial-1.html
 
 # Tests for -webkit-gradient(linear, ...)
diff --git a/layout/reftests/webkit-gradient/reftest.list b/layout/reftests/webkit-gradient/reftest.list
index 0f822256d839..32e88827d2dd 100644
--- a/layout/reftests/webkit-gradient/reftest.list
+++ b/layout/reftests/webkit-gradient/reftest.list
@@ -2,10 +2,9 @@
 # They require webkit prefix support to be enabled.
 default-preferences pref(layout.css.prefixes.webkit,true)
 
-# Tests where we don't render a "-webkit-gradient" exactly correctly.
-# (These just ensure that our approximate/do-something rendering does not
+# In this test, we don't render a "-webkit-gradient" exactly correctly.
+# (It's just here to ensure that our approximate/do-something rendering doesn't
 # change unexpectedly.)
-fuzzy-if(cocoaWidget,3,3369) == webkit-gradient-approx-linear-1.html webkit-gradient-approx-linear-1-ref.html # bug 1225372
 == webkit-gradient-approx-radial-1.html webkit-gradient-approx-radial-1-ref.html
 
 # Tests for -webkit-gradient(linear, ...)
diff --git a/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1-ref.html b/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1-ref.html
deleted file mode 100644
index 32660744024e..000000000000
--- a/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1-ref.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>CSS Reference</title>
-  <style>
-    div {
-      border: 1px solid black;
-      width:  50px;
-      height: 30px;
-      margin: 1px;
-      float: left;
-    }
-    br { clear: both; }
-  </style>
-</head>
-<body>
-  <!-- Start point and end point are the same, in testcase:
-       We end up detecting that the start & end have the same "y" value,
-       so we render a gradient going from left to right horizontally. -->
-  <div style="background: linear-gradient(to right,
-                                          blue, yellow)"></div>
-  <div style="background: linear-gradient(to right,
-                                          blue, yellow)"></div>
-  <div style="background: linear-gradient(to right,
-                                          blue, yellow)"></div>
-  <br>
-
-  <!-- For the rest of the gradients here, we end up rendering a "legacy"
-       gradient (-moz-linear-gradient) with the gradient line starting at the
-       testcase's specified "start" point, and we ignore the "end" point. -->
-  <div style="background: -moz-linear-gradient(center center,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(left top,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(10px 15px,
-                                               blue, yellow)"></div>
-  <br>
-
-  <div style="background: -moz-linear-gradient(-10px -15px,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(-100px 10px,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(10px -100px,
-                                               blue, yellow)"></div>
-  <br>
-
-  <div style="background: -moz-linear-gradient(center top,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(left center,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(right center,
-                                               blue, yellow)"></div>
-  <br>
-
-  <div style="background: -moz-linear-gradient(right top,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(left top,
-                                               blue, yellow)"></div>
-  <div style="background: -moz-linear-gradient(left bottom,
-                                               blue, yellow)"></div>
-  <br>
-
-</body>
-</html>
diff --git a/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1.html b/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1.html
deleted file mode 100644
index e1642b92a8cd..000000000000
--- a/layout/reftests/webkit-gradient/webkit-gradient-approx-linear-1.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>
-    CSS Test: -webkit-gradient(linear, ...) expressions which we don't render
-    quite correctly because they can't easily be represented with modern syntax.
-  </title>
-  <style>
-    div {
-      border: 1px solid black;
-      width:  50px;
-      height: 30px;
-      margin: 1px;
-      float: left;
-
-      /* We include a fallback background, to easily distinguish failures at
-       * parse time (which fall back to this value) vs. something later on. */
-      background: red;
-    }
-    br { clear: both; }
-  </style>
-</head>
-<body>
-  <!-- Start point and end point are the same: -->
-  <div style="background: -webkit-gradient(linear, left top, left top,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, 40 40, 40 40,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, center center, center center,
-                                           from(blue), to(yellow))"></div>
-  <br>
-
-  <!-- Gradient starting and/or ending somewhere in the middle (not an edge): -->
-  <div style="background: -webkit-gradient(linear, center center, right top,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, left top, center center,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, 10 15, 5 20,
-                                           from(blue), to(yellow))"></div>
-  <br>
-
-  <!-- Gradient starting and/or ending somewhere arbitrary outside: -->
-  <div style="background: -webkit-gradient(linear, -10 -15, left top,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, -100 10, 20 30,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, 10 -100, 100 10,
-                                           from(blue), to(yellow))"></div>
-  <br>
-
-  <!-- Slanted gradient between sides/corners: -->
-  <div style="background: -webkit-gradient(linear, center top, left center,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, left center, center top,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, right center, center top,
-                                           from(blue), to(yellow))"></div>
-  <br>
-
-  <div style="background: -webkit-gradient(linear, right top, center bottom,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, left top, right bottom,
-                                           from(blue), to(yellow))"></div>
-  <div style="background: -webkit-gradient(linear, left bottom, right top,
-                                           from(blue), to(yellow))"></div>
-  <br>
-
-</body>
-</html>
diff --git a/layout/reftests/xul/reftest-stylo.list b/layout/reftests/xul/reftest-stylo.list
index bf986b568dd2..09801eaeaf9c 100644
--- a/layout/reftests/xul/reftest-stylo.list
+++ b/layout/reftests/xul/reftest-stylo.list
@@ -6,7 +6,7 @@ random-if(Android) fails-if(winWidget) == menulist-shrinkwrap-2.xul menulist-shr
 == textbox-overflow-1.xul textbox-overflow-1.xul
 # accesskeys are not normally displayed on Mac, so skip this test
 skip-if(cocoaWidget) == accesskey.xul accesskey.xul
-fails-if(cocoaWidget) fails-if(browserIsRemote&&dwrite) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1.xul
+fails-if(cocoaWidget) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1.xul
 == tree-row-outline-1.xul tree-row-outline-1.xul
 == text-crop.xul text-crop.xul
 == text-small-caps-1.xul text-small-caps-1.xul
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list
index ee162a3966f6..59b98dd422fb 100644
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -7,7 +7,7 @@ random-if(Android) fails-if(winWidget) == menulist-shrinkwrap-2.xul menulist-shr
 == textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658
 # accesskeys are not normally displayed on Mac, so skip this test
 skip-if(cocoaWidget) == accesskey.xul accesskey-ref.xul
-fails-if(cocoaWidget) fails-if(browserIsRemote&&dwrite) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # win8: bug 1254832
+fails-if(cocoaWidget) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # win8: bug 1254832
 != tree-row-outline-1.xul tree-row-outline-1-notref.xul
 == text-crop.xul text-crop-ref.xul
 == text-small-caps-1.xul text-small-caps-1-ref.xul
diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp
index e1e796f68b35..68ad5b36a9e5 100644
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -1031,7 +1031,7 @@ CSSStyleSheet::ReparseSheet(const nsAString& aInput)
     NS_ASSERTION(child->mParent == this, "Child sheet is not parented to this!");
     StyleSheet* next = child->mNext;
     child->mParent = nullptr;
-    child->mDocument = nullptr;
+    child->SetAssociatedDocument(nullptr, NotOwnedByDocument);
     child->mNext = nullptr;
     child = next;
   }
diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp
index d86f7ebbcf53..aef6eff20883 100644
--- a/layout/style/ServoBindings.cpp
+++ b/layout/style/ServoBindings.cpp
@@ -36,6 +36,7 @@
 #include "nsString.h"
 #include "nsStyleStruct.h"
 #include "nsStyleUtil.h"
+#include "nsSVGElement.h"
 #include "nsTArray.h"
 #include "nsTransitionManager.h"
 
@@ -456,7 +457,7 @@ Gecko_UpdateAnimations(RawGeckoElementBorrowed aElement,
                        ServoComputedValuesBorrowedOrNull aOldComputedValues,
                        ServoComputedValuesBorrowedOrNull aComputedValues,
                        ServoComputedValuesBorrowedOrNull aParentComputedValues,
-                       UpdateAnimationsTasks aTaskBits)
+                       UpdateAnimationsTasks aTasks)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aElement);
@@ -469,7 +470,6 @@ Gecko_UpdateAnimations(RawGeckoElementBorrowed aElement,
     return;
   }
 
-  UpdateAnimationsTasks tasks = static_cast<UpdateAnimationsTasks>(aTaskBits);
   if (presContext->IsDynamic() && aElement->IsInComposedDoc()) {
     const ServoComputedValuesWithParent servoValues =
       { aComputedValues, aParentComputedValues };
@@ -477,12 +477,23 @@ Gecko_UpdateAnimations(RawGeckoElementBorrowed aElement,
       nsCSSPseudoElements::GetPseudoType(aPseudoTagOrNull,
                                          CSSEnabledState::eForAllContent);
 
-    if (tasks & UpdateAnimationsTasks::CSSAnimations) {
+    if (aTasks & UpdateAnimationsTasks::CSSAnimations) {
       presContext->AnimationManager()->
         UpdateAnimations(const_cast<dom::Element*>(aElement), pseudoType,
                          servoValues);
     }
-    if (tasks & UpdateAnimationsTasks::CSSTransitions) {
+
+    // aComputedValues might be nullptr if the target element is now in a
+    // display:none subtree. We still call Gecko_UpdateAnimations in this case
+    // because we need to stop CSS animations in the display:none subtree.
+    // However, we don't need to update transitions since they are stopped by
+    // RestyleManager::AnimationsWithDestroyedFrame so we just return early
+    // here.
+    if (!aComputedValues) {
+      return;
+    }
+
+    if (aTasks & UpdateAnimationsTasks::CSSTransitions) {
       MOZ_ASSERT(aOldComputedValues);
       const ServoComputedValuesWithParent oldServoValues =
         { aOldComputedValues, nullptr };
@@ -490,7 +501,7 @@ Gecko_UpdateAnimations(RawGeckoElementBorrowed aElement,
         UpdateTransitions(const_cast<dom::Element*>(aElement), pseudoType,
                           oldServoValues, servoValues);
     }
-    if (tasks & UpdateAnimationsTasks::EffectProperties) {
+    if (aTasks & UpdateAnimationsTasks::EffectProperties) {
       presContext->EffectCompositor()->UpdateEffectProperties(
         servoValues, const_cast<dom::Element*>(aElement), pseudoType);
     }
@@ -957,6 +968,33 @@ Gecko_AtomEqualsUTF8IgnoreCase(nsIAtom* aAtom, const char* aString, uint32_t aLe
   return nsContentUtils::EqualsIgnoreASCIICase(atomStr, inStr);
 }
 
+void
+Gecko_EnsureMozBorderColors(nsStyleBorder* aBorder)
+{
+  aBorder->EnsureBorderColors();
+}
+
+void Gecko_ClearMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide)
+{
+  aBorder->ClearBorderColors(aSide);
+}
+
+void
+Gecko_AppendMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide,
+                            nscolor aColor)
+{
+  aBorder->AppendBorderColor(aSide, aColor);
+}
+
+void
+Gecko_CopyMozBorderColors(nsStyleBorder* aDest, const nsStyleBorder* aSrc,
+                          mozilla::Side aSide)
+{
+  if (aSrc->mBorderColors) {
+    aDest->CopyBorderColorsFrom(aSrc->mBorderColors[aSide], aSide);
+  }
+}
+
 void
 Gecko_FontFamilyList_Clear(FontFamilyList* aList) {
   aList->Clear();
diff --git a/layout/style/ServoBindings.h b/layout/style/ServoBindings.h
index 0d8883da67f8..18117c14fb95 100644
--- a/layout/style/ServoBindings.h
+++ b/layout/style/ServoBindings.h
@@ -36,6 +36,7 @@ namespace mozilla {
   class FontFamilyList;
   enum FontFamilyType : uint32_t;
   struct Keyframe;
+  enum Side;
   namespace css {
     struct URLValue;
   };
@@ -200,7 +201,7 @@ void Gecko_UpdateAnimations(RawGeckoElementBorrowed aElement,
                             ServoComputedValuesBorrowedOrNull aOldComputedValues,
                             ServoComputedValuesBorrowedOrNull aComputedValues,
                             ServoComputedValuesBorrowedOrNull aParentComputedValues,
-                            mozilla::UpdateAnimationsTasks aTaskBits);
+                            mozilla::UpdateAnimationsTasks aTasks);
 bool Gecko_ElementHasAnimations(RawGeckoElementBorrowed aElement,
                                 nsIAtom* aPseudoTagOrNull);
 bool Gecko_ElementHasCSSAnimations(RawGeckoElementBorrowed aElement,
@@ -239,6 +240,14 @@ const uint16_t* Gecko_GetAtomAsUTF16(nsIAtom* aAtom, uint32_t* aLength);
 bool Gecko_AtomEqualsUTF8(nsIAtom* aAtom, const char* aString, uint32_t aLength);
 bool Gecko_AtomEqualsUTF8IgnoreCase(nsIAtom* aAtom, const char* aString, uint32_t aLength);
 
+// Border style
+void Gecko_EnsureMozBorderColors(nsStyleBorder* aBorder);
+void Gecko_ClearMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide);
+void Gecko_AppendMozBorderColors(nsStyleBorder* aBorder, mozilla::Side aSide,
+                                 nscolor aColor);
+void Gecko_CopyMozBorderColors(nsStyleBorder* aDest, const nsStyleBorder* aSrc,
+                               mozilla::Side aSide);
+
 // Font style
 void Gecko_FontFamilyList_Clear(FontFamilyList* aList);
 void Gecko_FontFamilyList_AppendNamed(FontFamilyList* aList, nsIAtom* aName, bool aQuoted);
diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp
index ad75b41aea5e..91b25654fb13 100644
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -85,7 +85,12 @@ StyleSheet::UnlinkInner()
   while (child) {
     MOZ_ASSERT(child->mParent == this, "We have a unique inner!");
     child->mParent = nullptr;
-    child->mDocument = nullptr;
+    // We (and child) might still think we're owned by a document, because
+    // unlink order is non-deterministic, so the document's unlink, which would
+    // tell us it does't own us anymore, may not have happened yet.  But if
+    // we're being unlinked, clearly we're not owned by a document anymore
+    // conceptually!
+    child->SetAssociatedDocument(nullptr, NotOwnedByDocument);
 
     RefPtr<StyleSheet> next;
     // Null out child->mNext, but don't let it die yet
@@ -504,6 +509,9 @@ StyleSheet::UnparentChildren()
        child = child->mNext) {
     if (child->mParent == this) {
       child->mParent = nullptr;
+      MOZ_ASSERT(child->mDocumentAssociationMode == NotOwnedByDocument,
+                 "How did we get to the destructor, exactly, if we're owned "
+                 "by a document?");
       child->mDocument = nullptr;
     }
   }
@@ -614,7 +622,7 @@ StyleSheet::AppendStyleSheet(StyleSheet* aSheet)
   // This is not reference counted. Our parent tells us when
   // it's going away.
   aSheet->mParent = this;
-  aSheet->mDocument = mDocument;
+  aSheet->SetAssociatedDocument(mDocument, mDocumentAssociationMode);
   DidDirty();
 }
 
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 0cfb2620f94b..a52205abe723 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -10235,11 +10235,20 @@ CSSParserImpl::ParseLinearGradient(nsCSSValue& aValue,
     // If we got an angle, we might now have a comma, ending the gradient-line.
     bool haveAngleComma = haveAngle && ExpectSymbol(',', true);
 
-    // If we're webkit-prefixed & didn't get an angle,
-    // OR if we're moz-prefixed & didn't get an angle+comma,
-    // then proceed to parse a box-position.
-    if (((aFlags & eGradient_WebkitLegacy) && !haveAngle) ||
-        ((aFlags & eGradient_MozLegacy) && !haveAngleComma)) {
+    // And in fact, if we're -webkit-linear-gradient and got an angle, there
+    // *must* be a comma after the angle. (Though -moz-linear-gradient is more
+    // permissive because it will allow box-position before the comma.)
+    if (aFlags & eGradient_WebkitLegacy && haveAngle && !haveAngleComma) {
+      SkipUntil(')');
+      return false;
+    }
+
+    // If we're prefixed & didn't get an angle + comma, then proceed to parse a
+    // box-position. (Note that due to the above webkit-specific early-return,
+    // this will only parse an *initial* box-position inside of
+    // -webkit-linear-gradient, vs. an initial OR post-angle box-position
+    // inside of -moz-linear-gradient.)
+    if (((aFlags & eGradient_AnyLegacy) && !haveAngleComma)) {
       // (Note: 3rd arg controls whether the "center" keyword is allowed.
       // -moz-linear-gradient allows it; -webkit-linear-gradient does not.)
       if (!ParseBoxPositionValues(cssGradient->mBgPos, false,
@@ -10800,13 +10809,17 @@ IsWebkitGradientCoordLarger(const nsCSSValue& aStartCoord,
 //
 // Note: linear gradients progress along a line between two points.  The
 // -webkit-gradient(linear, ...) syntax lets the author precisely specify the
-// starting and ending point. However, our internal gradient structures
-// only store one point, and the other point is implicitly its reflection
-// across the painted area's center. (The legacy -moz-linear-gradient syntax
-// also lets us store an angle.)
+// starting and ending point. However, our internal gradient structures only
+// store ONE point (which for modern linear-gradient() expressions is a side or
+// corner & represents the ending point of the gradient -- and the starting
+// point is implicitly the opposite side/corner).
 //
-// In this function, we try to go from the two-point representation to an
-// equivalent or approximately-equivalent one-point representation.
+// In this function, we analyze the start & end points from a
+// -webkit-gradient(linear, ...) expression, and we choose an appropriate
+// target point to produce a modern linear-gradient() representation that has
+// the same rough trajectory.  If we can't determine a target point for some
+// reason, we just fall back to the default top-to-bottom linear-gradient()
+// directionality.
 void
 CSSParserImpl::FinalizeLinearWebkitGradient(nsCSSValueGradient* aGradient,
                                             const nsCSSValuePair& aStartPoint,
@@ -10814,51 +10827,53 @@ CSSParserImpl::FinalizeLinearWebkitGradient(nsCSSValueGradient* aGradient,
 {
   MOZ_ASSERT(!aGradient->mIsRadial, "passed-in gradient must be linear");
 
-  // If the start & end points have the same Y-coordinate, then we can treat
-  // this as a horizontal gradient progressing towards the center of the left
-  // or right side.
-  if (aStartPoint.mYValue == aEndPoint.mYValue) {
-    aGradient->mBgPos.mYValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_CENTER,
+  if (aStartPoint == aEndPoint ||
+      aStartPoint.mXValue.GetUnit() != aEndPoint.mXValue.GetUnit() ||
+      aStartPoint.mYValue.GetUnit() != aEndPoint.mYValue.GetUnit()) {
+    // Start point & end point are the same, OR they use different units for at
+    // least one coordinate.  Either way, this isn't something we can represent
+    // using an unprefixed linear-gradient expression, so instead we'll just
+    // arbitrarily pretend this is a top-to-bottom gradient (which is the
+    // default for modern linear-gradient if a direction is unspecified).
+    aGradient->mBgPos.mYValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_BOTTOM,
                                           eCSSUnit_Enumerated);
-    if (IsWebkitGradientCoordLarger(aStartPoint.mXValue, aEndPoint.mXValue)) {
-      aGradient->mBgPos.mXValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_LEFT,
-                                            eCSSUnit_Enumerated);
-    } else {
-      aGradient->mBgPos.mXValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_RIGHT,
-                                            eCSSUnit_Enumerated);
-    }
-    return;
-  }
-
-  // If the start & end points have the same X-coordinate, then we can treat
-  // this as a horizontal gradient progressing towards the center of the top
-  // or bottom side.
-  if (aStartPoint.mXValue == aEndPoint.mXValue) {
     aGradient->mBgPos.mXValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_CENTER,
                                           eCSSUnit_Enumerated);
-    if (IsWebkitGradientCoordLarger(aStartPoint.mYValue, aEndPoint.mYValue)) {
-      aGradient->mBgPos.mYValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_TOP,
-                                            eCSSUnit_Enumerated);
-    } else {
-      aGradient->mBgPos.mYValue.SetIntValue(NS_STYLE_IMAGELAYER_POSITION_BOTTOM,
-                                            eCSSUnit_Enumerated);
-    }
     return;
   }
 
-  // OK, the gradient is angled, which means we likely can't represent it
-  // exactly in |aGradient|, without doing analysis on the two points to
-  // extract an angle (which we might not be able to do depending on the units
-  // used).  For now, we'll just do something really basic -- just use the
-  // first point as if it were the starting point in a legacy
-  // -moz-linear-gradient() expression. That way, the rendered gradient will
-  // progress from this first point, towards the center of the covered element,
-  // to a reflected end point on the far side. Note that we have to use
-  // mIsLegacySyntax=true for this to work, because standardized (non-legacy)
-  // gradients place some restrictions on the reference point [namely, that it
-  // use percent units & be on the border of the element].
-  aGradient->mIsLegacySyntax = true;
-  aGradient->mBgPos = aStartPoint;
+  // Set the target point to one of the box's corners (or the center of an
+  // edge), by comparing aStartPoint and aEndPoint to extract a general
+  // direction.
+
+  int32_t targetX;
+  if (aStartPoint.mXValue == aEndPoint.mXValue) {
+    targetX = NS_STYLE_IMAGELAYER_POSITION_CENTER;
+  } else if (IsWebkitGradientCoordLarger(aStartPoint.mXValue,
+                                         aEndPoint.mXValue)) {
+    targetX = NS_STYLE_IMAGELAYER_POSITION_LEFT;
+  } else {
+    MOZ_ASSERT(IsWebkitGradientCoordLarger(aEndPoint.mXValue,
+                                           aStartPoint.mXValue),
+               "IsWebkitGradientCoordLarger returning inconsistent results?");
+    targetX = NS_STYLE_IMAGELAYER_POSITION_RIGHT;
+  }
+
+  int32_t targetY;
+  if (aStartPoint.mYValue == aEndPoint.mYValue) {
+    targetY = NS_STYLE_IMAGELAYER_POSITION_CENTER;
+  } else if (IsWebkitGradientCoordLarger(aStartPoint.mYValue,
+                                         aEndPoint.mYValue)) {
+    targetY = NS_STYLE_IMAGELAYER_POSITION_TOP;
+  } else {
+    MOZ_ASSERT(IsWebkitGradientCoordLarger(aEndPoint.mYValue,
+                                           aStartPoint.mYValue),
+               "IsWebkitGradientCoordLarger returning inconsistent results?");
+    targetY = NS_STYLE_IMAGELAYER_POSITION_BOTTOM;
+  }
+
+  aGradient->mBgPos.mXValue.SetIntValue(targetX, eCSSUnit_Enumerated);
+  aGradient->mBgPos.mYValue.SetIntValue(targetY, eCSSUnit_Enumerated);
 }
 
 // Finalize our internal representation of a -webkit-gradient(radial, ...)
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index a7bb3413fe4b..3e310236dd16 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -366,13 +366,8 @@ nsStyleBorder::nsStyleBorder(const nsStyleBorder& aSrc)
 {
   MOZ_COUNT_CTOR(nsStyleBorder);
   if (aSrc.mBorderColors) {
-    EnsureBorderColors();
-    for (int32_t i = 0; i < 4; i++) {
-      if (aSrc.mBorderColors[i]) {
-        mBorderColors[i] = aSrc.mBorderColors[i]->Clone();
-      } else {
-        mBorderColors[i] = nullptr;
-      }
+    NS_FOR_CSS_SIDES(side) {
+      CopyBorderColorsFrom(aSrc.mBorderColors[side], side);
     }
   }
 
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 7bf901639203..e2631f11dc6e 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1162,6 +1162,14 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleBorder
     }
   }
 
+  void CopyBorderColorsFrom(const nsBorderColors* aSrcBorderColors, mozilla::Side aSide) {
+    if (aSrcBorderColors) {
+      EnsureBorderColors();
+      ClearBorderColors(aSide);
+      mBorderColors[aSide] = aSrcBorderColors->Clone();
+    }
+  }
+
   // Return whether aStyle is a visible style.  Invisible styles cause
   // the relevant computed border width to be 0.
   // Note that this does *not* consider the effects of 'border-image':
diff --git a/layout/style/res/html.css b/layout/style/res/html.css
index 382dbb52c6a6..13d33d667f0d 100644
--- a/layout/style/res/html.css
+++ b/layout/style/res/html.css
@@ -773,7 +773,6 @@ video > .caption-box {
   width: 100%;
   height: 100%;
   position: relative;
-  overflow: hidden;
 }
 
 /* ::cue default settings */
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index bdc1ce3d252c..f9c53003f26f 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -392,6 +392,13 @@ var invalidGradientAndElementValues = [
   "-moz-linear-gradient(top left 0, red, blue)",
   "-moz-linear-gradient(5px 5px 0, red, blue)",
   "linear-gradient(0, red, blue)",
+  /* There must be a comma between gradient-line (e.g. <angle>) and colors */
+  "-moz-linear-gradient(30deg red, blue)",
+  "-moz-linear-gradient(5px 5px 30deg red, blue)",
+  "-moz-linear-gradient(5px 5px red, blue)",
+  "-moz-linear-gradient(top left 30deg red, blue)",
+  "linear-gradient(to top left red, blue)",
+  "linear-gradient(to right red, blue)",
   /* Invalid color, calc() or -moz-image-rect() function */
   "linear-gradient(red, rgb(0, rubbish, 0) 50%, red)",
   "linear-gradient(red, red calc(50% + rubbish), red)",
@@ -707,12 +714,12 @@ if (IsCSSPropertyPrefEnabled("layout.css.prefixes.webkit")) {
 
     // Angled linear-gradients (valid when prefixed or unprefixed):
     "-webkit-linear-gradient(135deg, red, blue)",
+    "-webkit-linear-gradient( 135deg  , red  , blue )",
     "-webkit-linear-gradient(280deg, red 60%, blue)",
 
     // Linear-gradient with unitless-0 <angle> (normally invalid for <angle>
     // but accepted here for better webkit emulation):
     "-webkit-linear-gradient(0, red, blue)",
-    "-webkit-linear-gradient(0 red, blue)",
 
     // Basic radial-gradient syntax (valid when prefixed or unprefixed):
     "-webkit-radial-gradient(circle, white, black)",
@@ -858,6 +865,12 @@ if (IsCSSPropertyPrefEnabled("layout.css.prefixes.webkit")) {
     "-webkit-repeating-linear-gradient()",
     "-webkit-repeating-radial-gradient()",
 
+    // * missing comma between <legacy-gradient-line> and color list:
+    "-webkit-linear-gradient(0 red, blue)",
+    "-webkit-linear-gradient(30deg red, blue)",
+    "-webkit-linear-gradient(top right red, blue)",
+    "-webkit-linear-gradient(bottom red, blue)",
+
     // Linear syntax that's invalid for both -webkit & unprefixed, but valid
     // for -moz:
     // * initial <legacy-gradient-line> which includes a length:
diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md
index b55107f043e3..bf1ec7e64519 100644
--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -78,7 +78,7 @@ to mochitest command.
   * test_value_storage.html `transition` [218]
   * Events:
     * test_animations_event_order.html [2]
-* test_computed_style.html `gradient`: -moz-prefixed radient value [9]
+* test_computed_style.html `gradient`: -moz- and -webkit-prefixed gradient values [30]
 * ... `mask`: mask-image isn't set properly bug 1341667 [10]
 * ... `fill`: svg paint should distinguish whether there is fallback bug 1347409 [2]
 * ... `stroke`: svg paint should distinguish whether there is fallback bug 1347409 [2]
@@ -105,9 +105,6 @@ to mochitest command.
   * test_font_face_parser.html `font-language-override`: bug 1355364 [8]
   * ... `font-feature-settings`: bug 1355366 [10]
 * test_font_face_parser.html `font-weight`: keyword values should be preserved in \@font-face [4]
-* unicode-range parsing bugs
-  * servo/rust-cssparser#133
-  * test_font_face_parser.html `4E00`: servo/rust-cssparser#135 [2]
 * @font-face support bug 1290237
   * test_descriptor_storage.html [1]
   * test_font_face_parser.html `@font-face` [8]
@@ -134,14 +131,6 @@ to mochitest command.
   * test_inherit_computation.html `border-image` [2]
   * test_initial_computation.html `border-image` [4]
 * Unimplemented prefixed properties:
-  * -moz-border-*-colors bug 1348173
-    * test_compute_data_with_start_struct.html `-colors` [8]
-    * test_inherit_computation.html `-colors` [8]
-    * test_inherit_storage.html `-colors` [12]
-    * test_initial_computation.html `-colors` [16]
-    * test_initial_storage.html `-colors` [24]
-    * test_value_storage.html `-colors` [96]
-    * test_shorthand_property_getters.html `-colors` [1]
   * -moz-force-broken-image-icon servo/servo#16001
     * test_compute_data_with_start_struct.html `-moz-force-broken-image-icon` [2]
     * test_inherit_computation.html `-moz-force-broken-image-icon` [2]
@@ -190,7 +179,6 @@ to mochitest command.
     * ... `-moz-repeating-` [298]
   * webkit-prefixed gradient functions servo/servo#15441
     * test_value_storage.html `-webkit-gradient` [225]
-    * ... `-webkit-linear-gradient` [5]
   * moz-prefixed intrinsic width values bug 1355402
     * test_box_size_keywords.html [16]
     * test_flexbox_flex_shorthand.html `-moz-fit-content` [4]
@@ -251,7 +239,7 @@ to mochitest command.
   * :-moz-window-inactive bug 1348489
     * test_selectors.html `:-moz-window-inactive` [2]
   * :dir
-    * test_selectors.html `:dir` [18]
+    * test_selectors.html `:dir` [8]
 * issues arround font shorthand bug 1349417
   * test_value_storage.html `'font'` [128]
   * test_shorthand_property_getters.html `font shorthand` [1]
diff --git a/layout/style/test/test_computed_style.html b/layout/style/test/test_computed_style.html
index 9ba9403af841..4af7c5f4dafc 100644
--- a/layout/style/test/test_computed_style.html
+++ b/layout/style/test/test_computed_style.html
@@ -342,6 +342,122 @@ var noframe_container = document.getElementById("content");
   p.remove();
 })();
 
+(function test_bug_1241623() {
+  // Test that -webkit-gradient() styles are approximated the way we expect:
+
+  // For compactness, we'll pull out the common prefix & suffix from all of the
+  // specified & expected styles, and construct the full expression on the fly:
+  const specPrefix = "-webkit-gradient(linear, ";
+  const specSuffix = ", from(blue), to(lime))";
+
+  const expPrefix = "linear-gradient(";
+  const expSuffix = "rgb(0, 0, 255) 0%, rgb(0, 255, 0) 100%)";
+
+  let testcases = [
+    //
+    // [ legacyDirection,
+    //   modernDirection, // (empty string means use default direction)
+    //   descriptionOfTestcase ],
+
+    // If start & end are at same point, we just produce a gradient with
+    // the default direction.
+    [ "left top, left top",
+      "",
+      "start & end point are the same" ],
+    [ "40 40, 40 40",
+      "",
+      "start & end point are the same" ],
+    [ "center center, center center",
+      "",
+      "start & end point are the same" ],
+
+    // If start & end use different units in the same coordinate, we generally
+    // can't extract a direction (because we can't know whether arbitrary
+    // percent values are larger or smaller than arbitrary pixel values). So
+    // we produce a gradient in the default direction.
+    [ "left top, 30 100%",  // (Note: keywords like "left" are really % vals.)
+      "",
+      "start & end point have different units" ],
+    [ "100% 15, right bottom",
+      "",
+      "start & end point have different units" ],
+    [ "0 0%, 20 20",
+      "",
+      "start & end point have different units" ],
+    [ "0 0, 100% 20",
+      "",
+      "start & end point have different units" ],
+    [ "5% 30, 20 50%",
+      "",
+      "start & end point have different units" ],
+    [ "5% 6%, 20 30",
+      "",
+      "start & end point have different units" ],
+
+    // Gradient starting/ending somewhere arbitrary in middle:
+    [ "center center, right top",
+      "to top right",
+      "from center to top right" ],
+    [ "left top, center center",
+      "to bottom right",
+      "from left top to center" ],
+    [ "10 15, 5 20",
+      "to bottom left",
+      "from arbitrary point to another point in lower-left direction" ],
+
+    // Gradient using negative coordinates:
+    [ "-10 -15, 0 0",
+      "to bottom right",
+      "from negative point to origin" ],
+    [ "-100 10, 20 30",
+      "to bottom right",
+      "from negative-x point to another point in lower-right direction" ],
+    [ "10 -100, 5 10",
+      "to bottom left",
+      "from negative-y point to another point in lower-left direction" ],
+
+    // Diagonal gradient between sides/corners:
+    [ "center top, left center",
+      "to bottom left",
+      "left/bottom-wards, using edge keywords" ],
+    [ "left center, center top",
+      "to top right",
+      "top/right-wards, using edge keywords" ],
+    [ "right center, center top",
+      "to top left",
+      "top/left-wards, using edge keywords" ],
+    [ "right top, center bottom",
+      "to bottom left",
+      "bottom/left-wards, using edge keywords" ],
+    [ "left top, right bottom",
+      "to bottom right",
+      "bottom/right-wards, using edge keywords" ],
+    [ "left bottom, right top",
+      "to top right",
+      "top/right-wards, using edge keywords" ],
+  ];
+
+  let p = document.createElement("p");
+  let cs = getComputedStyle(p, "");
+  frame_container.appendChild(p);
+
+  for (let test of testcases) {
+    let specifiedStyle = specPrefix + test[0] + specSuffix;
+    let expectedStyle = expPrefix;
+    if (test[1] != "") {
+      expectedStyle += test[1] + ", ";
+    }
+    expectedStyle += expSuffix;
+
+    p.style.backgroundImage = specifiedStyle;
+    is(cs.backgroundImage, expectedStyle,
+       "computed value of -webkit-gradient expression (" + test[2] + ")");
+    p.style.backgroundImage = "";
+  }
+
+  p.remove();
+})();
+
 (function test_bug_1293164() {
 
   var p = document.createElement("p");
diff --git a/layout/svg/AutoReferenceChainGuard.h b/layout/svg/AutoReferenceChainGuard.h
index d44614bbfd25..779364851fb9 100644
--- a/layout/svg/AutoReferenceChainGuard.h
+++ b/layout/svg/AutoReferenceChainGuard.h
@@ -6,6 +6,7 @@
 #ifndef NS_AUTOREFERENCELIMITER_H
 #define NS_AUTOREFERENCELIMITER_H
 
+#include "Element.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrancyGuard.h"
diff --git a/layout/svg/SVGImageContext.cpp b/layout/svg/SVGImageContext.cpp
index a520a5c71390..a2dde725d98a 100644
--- a/layout/svg/SVGImageContext.cpp
+++ b/layout/svg/SVGImageContext.cpp
@@ -16,15 +16,13 @@
 namespace mozilla {
 
 /* static */ void
-SVGImageContext::MaybeInitAndStoreContextPaint(Maybe<SVGImageContext>& aContext,
-                                               nsIFrame* aFromFrame,
-                                               imgIContainer* aImgContainer)
+SVGImageContext::MaybeStoreContextPaint(Maybe<SVGImageContext>& aContext,
+                                        nsIFrame* aFromFrame,
+                                        imgIContainer* aImgContainer)
 {
   static bool sEnabledForContent = false;
   static bool sEnabledForContentCached = false;
 
-  MOZ_ASSERT(!aContext, "The emplace() call below with overwrite this object");
-
   if (!sEnabledForContentCached) {
     Preferences::AddBoolVarCache(&sEnabledForContent,
                                  "svg.context-properties.content.enabled", false);
@@ -62,7 +60,9 @@ SVGImageContext::MaybeInitAndStoreContextPaint(Maybe<SVGImageContext>& aContext,
   }
 
   if (haveContextPaint) {
-    aContext.emplace();
+    if (!aContext) {
+      aContext.emplace();
+    }
     aContext->mContextPaint = contextPaint.forget();
   }
 }
diff --git a/layout/svg/SVGImageContext.h b/layout/svg/SVGImageContext.h
index 8c9727f7b2b3..ab0568ebfb31 100644
--- a/layout/svg/SVGImageContext.h
+++ b/layout/svg/SVGImageContext.h
@@ -23,9 +23,7 @@ namespace mozilla {
 class SVGImageContext
 {
 public:
-  SVGImageContext()
-    : mIsPaintingSVGImageElement(false)
-  { }
+  SVGImageContext() {}
 
   /**
    * Currently it seems that the aViewportSize parameter ends up being used
@@ -42,21 +40,16 @@ public:
    * in order to get the size that's created for |fallbackContext|.  At some
    * point we need to clean this code up, make our abstractions clear, create
    * that utility and stop using Maybe for this parameter.
-   *
-   * Note: 'aIsPaintingSVGImageElement' should be used to indicate whether
-   * the SVG image in question is being painted for an SVG <image> element.
    */
   explicit SVGImageContext(const Maybe<CSSIntSize>& aViewportSize,
-                           const Maybe<SVGPreserveAspectRatio>& aPreserveAspectRatio  = Nothing(),
-                           bool aIsPaintingSVGImageElement = false)
+                           const Maybe<SVGPreserveAspectRatio>& aPreserveAspectRatio  = Nothing())
     : mViewportSize(aViewportSize)
     , mPreserveAspectRatio(aPreserveAspectRatio)
-    , mIsPaintingSVGImageElement(aIsPaintingSVGImageElement)
   { }
 
-  static void MaybeInitAndStoreContextPaint(Maybe<SVGImageContext>& aContext,
-                                            nsIFrame* aFromFrame,
-                                            imgIContainer* aImgContainer);
+  static void MaybeStoreContextPaint(Maybe<SVGImageContext>& aContext,
+                                     nsIFrame* aFromFrame,
+                                     imgIContainer* aImgContainer);
 
   const Maybe<CSSIntSize>& GetViewportSize() const {
     return mViewportSize;
@@ -78,10 +71,6 @@ public:
     return mContextPaint.get();
   }
 
-  bool IsPaintingForSVGImageElement() const {
-    return mIsPaintingSVGImageElement;
-  }
-
   bool operator==(const SVGImageContext& aOther) const {
     bool contextPaintIsEqual =
       // neither have context paint, or they have the same object:
@@ -92,8 +81,7 @@ public:
 
     return contextPaintIsEqual &&
            mViewportSize == aOther.mViewportSize &&
-           mPreserveAspectRatio == aOther.mPreserveAspectRatio &&
-           mIsPaintingSVGImageElement == aOther.mIsPaintingSVGImageElement;
+           mPreserveAspectRatio == aOther.mPreserveAspectRatio;
   }
 
   bool operator!=(const SVGImageContext& aOther) const {
@@ -107,8 +95,7 @@ public:
     }
     return HashGeneric(hash,
                        mViewportSize.map(HashSize).valueOr(0),
-                       mPreserveAspectRatio.map(HashPAR).valueOr(0),
-                       mIsPaintingSVGImageElement);
+                       mPreserveAspectRatio.map(HashPAR).valueOr(0));
   }
 
 private:
@@ -123,7 +110,6 @@ private:
   RefPtr<SVGEmbeddingContextPaint> mContextPaint;
   Maybe<CSSIntSize>             mViewportSize;
   Maybe<SVGPreserveAspectRatio> mPreserveAspectRatio;
-  bool                          mIsPaintingSVGImageElement;
 };
 
 } // namespace mozilla
diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp
index 9b00e21bc8c1..80f66a2f51bb 100644
--- a/layout/svg/nsSVGImageFrame.cpp
+++ b/layout/svg/nsSVGImageFrame.cpp
@@ -406,8 +406,7 @@ nsSVGImageFrame::PaintSVG(gfxContext& aContext,
       // with preserveAspectRatio and viewBox.
       const Maybe<SVGImageContext> context(
         Some(SVGImageContext(Some(CSSIntSize::Truncate(width, height)),
-                             Some(imgElem->mPreserveAspectRatio.GetAnimValue()),
-                             /* aIsPaintingSVGImageElement */ true)));
+                             Some(imgElem->mPreserveAspectRatio.GetAnimValue()))));
 
       // For the actual draw operation to draw crisply (and at the right size),
       // our destination rect needs to be |width|x|height|, *in dev pixels*.
diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp
index c04aa9f3c587..9d46548c971e 100644
--- a/layout/xul/nsImageBoxFrame.cpp
+++ b/layout/xul/nsImageBoxFrame.cpp
@@ -410,7 +410,7 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
   }
 
   Maybe<SVGImageContext> svgContext;
-  SVGImageContext::MaybeInitAndStoreContextPaint(svgContext, this, imgCon);
+  SVGImageContext::MaybeStoreContextPaint(svgContext, this, imgCon);
 
   return nsLayoutUtils::DrawSingleImage(
            *aRenderingContext.ThebesContext(),
diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp
index c7b99ecf39ad..04bd63c6007b 100644
--- a/layout/xul/nsSliderFrame.cpp
+++ b/layout/xul/nsSliderFrame.cpp
@@ -1004,7 +1004,8 @@ nsSliderFrame::StartAPZDrag(WidgetGUIEvent* aEvent)
     return;
   }
 
-  nsContainerFrame* scrollFrame = GetScrollbar()->GetParent();
+  nsIFrame* scrollbarBox = GetScrollbar();
+  nsContainerFrame* scrollFrame = scrollbarBox->GetParent();
   if (!scrollFrame) {
     return;
   }
@@ -1025,6 +1026,28 @@ nsSliderFrame::StartAPZDrag(WidgetGUIEvent* aEvent)
     return;
   }
 
+  nsScrollbarFrame* scrollbarFrame = do_QueryFrame(scrollbarBox);
+  if (!scrollbarFrame) {
+    return;
+  }
+  if (nsIScrollbarMediator* mediator = scrollbarFrame->GetScrollbarMediator()) {
+    nsIScrollableFrame* scrollFrame = do_QueryFrame(mediator);
+    // The scrollbar mediator is not the scroll frame.
+    // That means this scroll frame has a custom scrollbar mediator.
+    // That's not supported in the APZ codepath.
+    if (!scrollFrame) {
+      return;
+    }
+  }
+
+  nsIFrame* thumbFrame = mFrames.FirstChild();
+  if (!thumbFrame) {
+    return;
+  }
+  bool isHorizontal = IsXULHorizontal();
+  nsSize thumbSize = thumbFrame->GetSize();
+  nscoord thumbLength = isHorizontal ? thumbSize.width : thumbSize.height;
+
   mozilla::layers::FrameMetrics::ViewID scrollTargetId;
   bool hasID = nsLayoutUtils::FindIDFor(scrollableContent, &scrollTargetId);
   bool hasAPZView = hasID && (scrollTargetId != layers::FrameMetrics::NULL_SCROLL_ID);
@@ -1033,7 +1056,6 @@ nsSliderFrame::StartAPZDrag(WidgetGUIEvent* aEvent)
     return;
   }
 
-  nsIFrame* scrollbarBox = GetScrollbar();
   nsCOMPtr<nsIContent> scrollbar = GetContentOfBox(scrollbarBox);
 
   nsRect sliderTrack;
@@ -1051,8 +1073,10 @@ nsSliderFrame::StartAPZDrag(WidgetGUIEvent* aEvent)
                                NSAppUnitsToFloatPixels(mDragStart,
                                  float(AppUnitsPerCSSPixel())),
                                sliderTrackCSS,
-                               IsXULHorizontal() ? AsyncDragMetrics::HORIZONTAL :
-                                                   AsyncDragMetrics::VERTICAL);
+                               NSAppUnitsToFloatPixels(thumbLength,
+                                 float(AppUnitsPerCSSPixel())),
+                               isHorizontal ? AsyncDragMetrics::HORIZONTAL :
+                                              AsyncDragMetrics::VERTICAL);
 
   if (!nsLayoutUtils::HasDisplayPort(scrollableContent)) {
     return;
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
index 94c8c9d2c490..c65b53b80f63 100644
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -32,8 +32,6 @@ if CONFIG['MOZ_PULSEAUDIO']:
     ]
     DEFINES['USE_PULSE'] = True
     DEFINES['USE_PULSE_RUST'] = True
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-        DEFINES['DISABLE_LIBPULSE_DLOPEN'] = True
 
 if CONFIG['MOZ_JACK']:
     SOURCES += [
diff --git a/media/mtransport/transportlayerdtls.cpp b/media/mtransport/transportlayerdtls.cpp
index d86fa49b6224..2b8c4b51ddd0 100644
--- a/media/mtransport/transportlayerdtls.cpp
+++ b/media/mtransport/transportlayerdtls.cpp
@@ -370,6 +370,9 @@ static const struct PRIOMethods TransportLayerMethods = {
 };
 
 TransportLayerDtls::~TransportLayerDtls() {
+  // Destroy the NSS instance first so it can still send out an alert before
+  // we disable the nspr_io_adapter_.
+  ssl_fd_ = nullptr;
   nspr_io_adapter_->SetEnabled(false);
   if (timer_) {
     timer_->Cancel();
diff --git a/mobile/android/app/findbugs-exclude.xml b/mobile/android/app/findbugs-exclude.xml
index 6e21ac2295b4..f618c6b0fbf2 100644
--- a/mobile/android/app/findbugs-exclude.xml
+++ b/mobile/android/app/findbugs-exclude.xml
@@ -57,4 +57,12 @@
     <Bug pattern="VO_VOLATILE_INCREMENT" />
   </Match>
 
+    <!-- FindBugs doesn't like the resource classes provided by both ourselves, and the android
+         support libraries. -->
+    <Match>
+        <Class name="~.*\.R\$.*"/>
+    </Match>
+    <Match>
+        <Class name="~.*\.Manifest\$.*"/>
+    </Match>
 </FindBugsFilter>
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index 572563d72220..bca8e545fa82 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -40,7 +40,7 @@
 
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/>
 
-        <meta-data android:name="android.max_aspect" android:value="2.0"/>
+        <meta-data android:name="android.max_aspect" android:value="2.1"/>
 
 #ifdef MOZ_NATIVE_DEVICES
         <!-- This resources comes from Google Play Services. Required for casting support. -->
@@ -312,8 +312,11 @@
 
 #ifdef MOZ_ANDROID_CUSTOM_TABS
         <activity android:name="org.mozilla.gecko.customtabs.CustomTabsActivity"
-            android:theme="@style/GeckoCustomTabs" />
+                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|locale|layoutDirection|smallestScreenSize|screenLayout"
+                  android:windowSoftInputMode="stateUnspecified|adjustResize"
+                  android:theme="@style/GeckoCustomTabs" />
 #endif
+
         <activity android:name="org.mozilla.gecko.webapps.WebAppActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
 
diff --git a/mobile/android/base/java/org/mozilla/gecko/Tabs.java b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
index b03c5e227a69..fb24dc74fdf9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/Tabs.java
+++ b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
@@ -52,6 +52,7 @@ import static org.mozilla.gecko.Tab.TabType;
 public class Tabs implements BundleEventListener {
     private static final String LOGTAG = "GeckoTabs";
 
+    private static final String PRIVATE_TAB_INTENT_EXTRA = "private_tab";
     // mOrder and mTabs are always of the same cardinality, and contain the same values.
     private volatile CopyOnWriteArrayList<Tab> mOrder = new CopyOnWriteArrayList<Tab>();
 
@@ -971,7 +972,7 @@ public class Tabs implements BundleEventListener {
         // delayLoad implies background tab
         boolean background = delayLoad || (flags & LOADURL_BACKGROUND) != 0;
 
-        boolean isPrivate = (flags & LOADURL_PRIVATE) != 0;
+        boolean isPrivate = (flags & LOADURL_PRIVATE) != 0 || (intent != null && intent.getBooleanExtra(PRIVATE_TAB_INTENT_EXTRA, false));
         boolean userEntered = (flags & LOADURL_USER_ENTERED) != 0;
         boolean desktopMode = (flags & LOADURL_DESKTOP) != 0;
         boolean external = (flags & LOADURL_EXTERNAL) != 0;
diff --git a/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java b/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
index 72be6ee976f9..2d4bdfa78f50 100644
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
@@ -179,7 +179,12 @@ public class ActionBarPresenter {
 
     private void initIndicator() {
         mActionBar.setDisplayHomeAsUpEnabled(true);
-        final Drawable icon = mActionBar.getThemedContext().getDrawable(R.drawable.ic_close_light);
+
+        @SuppressWarnings("deprecation")
+        final Drawable icon = mActionBar.getThemedContext()
+                .getResources()
+                .getDrawable(R.drawable.ic_close_light);
+
         DrawableCompat.setTint(icon, mTextPrimaryColor);
         mActionBar.setHomeAsUpIndicator(icon);
     }
diff --git a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
index 08f9a46c3799..8aa82f7ddf89 100644
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -241,7 +241,10 @@ public class CustomTabsActivity extends GeckoApp implements Tabs.OnTabsChangedLi
 
         // insert an action button for menu. click it to show popup menu
         popupMenu = createCustomPopupMenu();
-        actionBarPresenter.addActionButton(menu, getDrawable(R.drawable.ab_menu), true)
+
+        @SuppressWarnings("deprecation")
+        Drawable icon = getResources().getDrawable(R.drawable.ab_menu);
+        actionBarPresenter.addActionButton(menu, icon, true)
                 .setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View anchor) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java
index 3b8ea2e522f5..03db25dfda06 100644
--- a/mobile/android/base/java/org/mozilla/gecko/push/PushService.java
+++ b/mobile/android/base/java/org/mozilla/gecko/push/PushService.java
@@ -61,6 +61,12 @@ public class PushService implements BundleEventListener {
     public static final String SERVICE_WEBPUSH = "webpush";
     public static final String SERVICE_FXA = "fxa";
 
+    public static final double ERROR_GCM_DISABLED = 2154627078L; // = NS_ERROR_DOM_PUSH_GCM_DISABLED
+
+    public static final String REPLY_BUNDLE_KEY_ERROR = "error";
+    public static final String ERROR_BUNDLE_KEY_MESSAGE = "message";
+    public static final String ERROR_BUNDLE_KEY_RESULT = "result";
+
     private static PushService sInstance;
 
     private static final String[] GECKO_EVENTS = new String[] {
@@ -170,7 +176,7 @@ public class PushService implements BundleEventListener {
             }
 
             // We'll obtain a new subscription as part of device registration.
-            if (FxAccountDeviceRegistrator.needToRenewRegistration(fxAccount.getDeviceRegistrationTimestamp())) {
+            if (FxAccountDeviceRegistrator.shouldRenewRegistration(fxAccount)) {
                 Log.i(LOG_TAG, "FxA device needs registration renewal");
                 FxAccountDeviceRegistrator.renewRegistration(context);
             }
@@ -467,7 +473,13 @@ public class PushService implements BundleEventListener {
             // with the WebPush?  Perhaps we can show a dialog when interacting with the Push
             // permissions, and then be more aggressive showing this notification when we have
             // registrations and subscriptions that can't be advanced.
-            callback.sendError("To handle event [" + event + "], user interaction is needed to enable Google Play Services.");
+            String msg = "To handle event [" + event + "], user interaction is needed to enable Google Play Services.";
+            GeckoBundle reply = new GeckoBundle();
+            GeckoBundle error = new GeckoBundle();
+            error.putString(ERROR_BUNDLE_KEY_MESSAGE, msg);
+            error.putDouble(ERROR_BUNDLE_KEY_RESULT, ERROR_GCM_DISABLED);
+            reply.putBundle(REPLY_BUNDLE_KEY_ERROR, error);
+            callback.sendError(reply);
         }
     }
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 2e1c72998902..bf9cdf04243a 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3440,9 +3440,15 @@ nsBrowserAccess.prototype = {
     return browser ? browser.contentWindow : null;
   },
 
-  openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aFlags) {
+  openURIInFrame: function browser_openURIInFrame(aURI, aParams, aWhere, aFlags,
+                                                  aNextTabParentId) {
+    // We currently ignore aNextTabParentId on mobile.  This needs to change
+    // when Fennec starts to support e10s.  Assertions will fire if this code
+    // isn't fixed by then.
     let browser = this._getBrowser(aURI, null, aWhere, aFlags);
-    return browser ? browser.QueryInterface(Ci.nsIFrameLoaderOwner) : null;
+    if (browser)
+      return browser.QueryInterface(Ci.nsIFrameLoaderOwner);
+    return null;
   },
 
   isTabContentWindow: function(aWindow) {
diff --git a/mobile/android/components/FxAccountsPush.js b/mobile/android/components/FxAccountsPush.js
index f83c3235b153..2bf0e3394a0f 100644
--- a/mobile/android/components/FxAccountsPush.js
+++ b/mobile/android/components/FxAccountsPush.js
@@ -3,9 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -60,7 +58,9 @@ FxAccountsPush.prototype = {
             resolve(subscription);
           } else {
             Log.w("FxAccountsPush failed to subscribe", result);
-            reject(new Error("FxAccountsPush failed to subscribe"));
+            const err = new Error("FxAccountsPush failed to subscribe");
+            err.result = result;
+            reject(err);
           }
         });
     })
@@ -76,6 +76,10 @@ FxAccountsPush.prototype = {
     })
     .catch(err => {
       Log.i("Error when registering FxA push endpoint " + err);
+      EventDispatcher.instance.sendRequest({
+        type: "FxAccountsPush:Subscribe:Response",
+        error: err.result.toString() // Convert to string because the GeckoBundle can't getLong();
+      });
     });
   },
 
diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDevice.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDevice.java
index cd46ae2bd583..e8a1fa57b12d 100644
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDevice.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDevice.java
@@ -35,16 +35,6 @@ public class FxAccountDevice {
     this.pushAuthKey = pushAuthKey;
   }
 
-  public static FxAccountDevice forRegister(String name, String type, String pushCallback,
-                                            String pushPublicKey, String pushAuthKey) {
-    return new FxAccountDevice(name, null, type, null, pushCallback, pushPublicKey, pushAuthKey);
-  }
-
-  public static FxAccountDevice forUpdate(String id, String name, String pushCallback,
-                                          String pushPublicKey, String pushAuthKey) {
-    return new FxAccountDevice(name, id, null, null, pushCallback, pushPublicKey, pushAuthKey);
-  }
-
   public static FxAccountDevice fromJson(ExtendedJSONObject json) {
     String name = json.getString(JSON_KEY_NAME);
     String id = json.getString(JSON_KEY_ID);
@@ -78,4 +68,47 @@ public class FxAccountDevice {
     }
     return body;
   }
+
+  public static class Builder {
+    private String id;
+    private String name;
+    private String type;
+    private Boolean isCurrentDevice;
+    private String pushCallback;
+    private String pushPublicKey;
+    private String pushAuthKey;
+
+    public void id(String id) {
+      this.id = id;
+    }
+
+    public void name(String name) {
+      this.name = name;
+    }
+
+    public void type(String type) {
+      this.type = type;
+    }
+
+    public void isCurrentDevice() {
+      this.isCurrentDevice = Boolean.TRUE;
+    }
+
+    public void pushCallback(String pushCallback) {
+      this.pushCallback = pushCallback;
+    }
+
+    public void pushPublicKey(String pushPublicKey) {
+      this.pushPublicKey = pushPublicKey;
+    }
+
+    public void pushAuthKey(String pushAuthKey) {
+      this.pushAuthKey = pushAuthKey;
+    }
+
+    public FxAccountDevice build() {
+      return new FxAccountDevice(this.name, this.id, this.type, this.isCurrentDevice,
+                                 this.pushCallback, this.pushPublicKey, this.pushAuthKey);
+    }
+  }
 }
diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java
index 8dfc765bd264..75b4b8d59eb3 100644
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java
@@ -6,7 +6,9 @@ package org.mozilla.gecko.fxa;
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -34,7 +36,7 @@ import java.util.concurrent.Executors;
 
 /* This class provides a way to register the current device against FxA
  * and also stores the registration details in the Android FxAccount.
- * This should be used in a state where we possess a sessionToken, most likely the Married state.
+ * This should be used in a state where we possess a sessionToken, most likely the Engaged/Married states.
  */
 public class FxAccountDeviceRegistrator implements BundleEventListener {
   private static final String LOG_TAG = "FxADeviceRegistrator";
@@ -44,38 +46,60 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
   // expiring from underneath us, we unsubscribe and resubscribe every 21 days.
   // Note that this simple schedule means that we might unsubscribe perfectly valid (but old)
   // subscriptions. This will be improved as part of Bug 1345651.
-  private static final long TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS = 21 * 24 * 60 * 60 * 1000L;
+  @VisibleForTesting
+  static final long TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS = 21 * 24 * 60 * 60 * 1000L;
+
+  @VisibleForTesting
+  static final long RETRY_TIME_AFTER_GCM_DISABLED_ERROR = 15 * 24 * 60 * 60 * 1000L;
+
+
+  public static final String PUSH_SUBSCRIPTION_REPLY_BUNDLE_KEY_ERROR = "error";
+  @VisibleForTesting
+  static final long ERROR_GCM_DISABLED = 2154627078L; // = NS_ERROR_DOM_PUSH_GCM_DISABLED
 
   // The current version of the device registration, we use this to re-register
   // devices after we update what we send on device registration.
-  public static final Integer DEVICE_REGISTRATION_VERSION = 2;
+  @VisibleForTesting
+  static final Integer DEVICE_REGISTRATION_VERSION = 2;
 
   private static FxAccountDeviceRegistrator instance;
   private final WeakReference<Context> context;
 
   private FxAccountDeviceRegistrator(Context appContext) {
-    this.context = new WeakReference<Context>(appContext);
+    this.context = new WeakReference<>(appContext);
   }
 
   private static FxAccountDeviceRegistrator getInstance(Context appContext) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
     if (instance == null) {
-      FxAccountDeviceRegistrator tempInstance = new FxAccountDeviceRegistrator(appContext);
+      final FxAccountDeviceRegistrator tempInstance = new FxAccountDeviceRegistrator(appContext);
       tempInstance.setupListeners(); // Set up listener for FxAccountPush:Subscribe:Response
       instance = tempInstance;
     }
     return instance;
   }
 
-  public static boolean needToRenewRegistration(final long timestamp) {
+  public static boolean shouldRegister(final AndroidFxAccount fxAccount) {
+    if (fxAccount.getDeviceRegistrationVersion() != FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION ||
+            TextUtils.isEmpty(fxAccount.getDeviceId())) {
+      return true;
+    }
+    // At this point, we have a working up-to-date registration, but it might be a partial one
+    // (no push registration).
+    return fxAccount.getDevicePushRegistrationError() == ERROR_GCM_DISABLED &&
+           (System.currentTimeMillis() - fxAccount.getDevicePushRegistrationErrorTime()) > RETRY_TIME_AFTER_GCM_DISABLED_ERROR;
+  }
+
+  public static boolean shouldRenewRegistration(final AndroidFxAccount fxAccount) {
+    final long deviceRegistrationTimestamp = fxAccount.getDeviceRegistrationTimestamp();
     // NB: we're comparing wall clock to wall clock, at different points in time.
     // It's possible that wall clocks have changed, and our comparison will be meaningless.
     // However, this happens in the context of a sync, and we won't be able to sync anyways if our
     // wall clock deviates too much from time on the server.
-    return (System.currentTimeMillis() - timestamp) > TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS;
+    return (System.currentTimeMillis() - deviceRegistrationTimestamp) > TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS;
   }
 
   public static void register(Context context) {
-    Context appContext = context.getApplicationContext();
+    final Context appContext = context.getApplicationContext();
     try {
       getInstance(appContext).beginRegistration(appContext);
     } catch (Exception e) {
@@ -84,7 +108,7 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
   }
 
   public static void renewRegistration(Context context) {
-    Context appContext = context.getApplicationContext();
+    final Context appContext = context.getApplicationContext();
     try {
       getInstance(appContext).beginRegistrationRenewal(appContext);
     } catch (Exception e) {
@@ -122,30 +146,51 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
   @Override
   public void handleMessage(String event, GeckoBundle message, EventCallback callback) {
     if ("FxAccountsPush:Subscribe:Response".equals(event)) {
-      doFxaRegistration(message.getBundle("subscription"));
+      handlePushSubscriptionResponse(message);
     } else {
       Log.e(LOG_TAG, "No action defined for " + event);
     }
   }
 
-  private void doFxaRegistration(GeckoBundle subscription) {
+  private void handlePushSubscriptionResponse(final GeckoBundle message) {
+    // Make sure the context has not been gc'd during the push registration
+    // and the FxAccount still exists.
     final Context context = this.context.get();
-    if (this.context == null) {
+    if (context == null) {
       throw new IllegalStateException("Application context has been gc'ed");
     }
-    doFxaRegistration(context, subscription, true);
-  }
-
-  private static void doFxaRegistration(final Context context, final GeckoBundle subscription, final boolean allowRecursion) {
-    String pushCallback = subscription.getString("pushCallback");
-    String pushPublicKey = subscription.getString("pushPublicKey");
-    String pushAuthKey = subscription.getString("pushAuthKey");
-
     final AndroidFxAccount fxAccount = AndroidFxAccount.fromContext(context);
     if (fxAccount == null) {
       Log.e(LOG_TAG, "AndroidFxAccount is null");
       return;
     }
+
+    fxAccount.resetDevicePushRegistrationError();
+    final long error = getSubscriptionReplyError(message);
+
+    final FxAccountDevice device;
+    if (error == 0L) {
+      Log.i(LOG_TAG, "Push registration succeeded. Beginning normal FxA Registration.");
+      device = buildFxAccountDevice(context, fxAccount, message.getBundle("subscription"));
+    } else {
+      fxAccount.setDevicePushRegistrationError(error, System.currentTimeMillis());
+      Log.i(LOG_TAG, "Push registration failed. Beginning degraded FxA Registration.");
+      device = buildFxAccountDevice(context, fxAccount);
+    }
+
+    doFxaRegistration(context, fxAccount, device, true);
+  }
+
+  private long getSubscriptionReplyError(final GeckoBundle message) {
+    String errorStr = message.getString(PUSH_SUBSCRIPTION_REPLY_BUNDLE_KEY_ERROR);
+    if (TextUtils.isEmpty(errorStr)) {
+      return 0L;
+    }
+    return Long.parseLong(errorStr);
+  }
+
+  private static void doFxaRegistration(final Context context, final AndroidFxAccount fxAccount,
+                                        final FxAccountDevice device, final boolean allowRecursion) {
     final byte[] sessionToken;
     try {
       sessionToken = fxAccount.getState().getSessionToken();
@@ -153,19 +198,14 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
       Log.e(LOG_TAG, "Could not get a session token", e);
       return;
     }
-    final FxAccountDevice device;
-    String deviceId = fxAccount.getDeviceId();
-    String clientName = getClientName(fxAccount, context);
-    if (TextUtils.isEmpty(deviceId)) {
+
+    if (device.id == null) {
       Log.i(LOG_TAG, "Attempting registration for a new device");
-      device = FxAccountDevice.forRegister(clientName, "mobile", pushCallback, pushPublicKey, pushAuthKey);
     } else {
       Log.i(LOG_TAG, "Attempting registration for an existing device");
-      Logger.pii(LOG_TAG, "Device ID: " + deviceId);
-      device = FxAccountDevice.forUpdate(deviceId, clientName, pushCallback, pushPublicKey, pushAuthKey);
     }
 
-    ExecutorService executor = Executors.newSingleThreadExecutor(); // Not called often, it's okay to spawn another thread
+    final ExecutorService executor = Executors.newSingleThreadExecutor(); // Not called often, it's okay to spawn another thread
     final FxAccountClient20 fxAccountClient =
             new FxAccountClient20(fxAccount.getAccountServerURI(), executor);
     fxAccountClient.registerOrUpdateDevice(sessionToken, device, new RequestDelegate<FxAccountDevice>() {
@@ -185,8 +225,10 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
           if (error.apiErrorNumber == FxAccountRemoteError.UNKNOWN_DEVICE) {
             recoverFromUnknownDevice(fxAccount);
           } else if (error.apiErrorNumber == FxAccountRemoteError.DEVICE_SESSION_CONFLICT) {
-            recoverFromDeviceSessionConflict(error, fxAccountClient, sessionToken, fxAccount, context,
-                    subscription, allowRecursion);
+            // This can happen if a device was already registered using our session token, and we
+            // tried to create a new one (no id field).
+            recoverFromDeviceSessionConflict(error, fxAccountClient, sessionToken, fxAccount, device,
+                    context, allowRecursion);
           }
         } else
         if (error.httpStatusCode == 401
@@ -201,11 +243,44 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
       public void handleSuccess(FxAccountDevice result) {
         Log.i(LOG_TAG, "Device registration complete");
         Logger.pii(LOG_TAG, "Registered device ID: " + result.id);
+        Log.i(LOG_TAG, "Setting DEVICE_REGISTRATION_VERSION to " + DEVICE_REGISTRATION_VERSION);
         fxAccount.setFxAUserData(result.id, DEVICE_REGISTRATION_VERSION, System.currentTimeMillis());
       }
     });
   }
 
+  private static FxAccountDevice buildFxAccountDevice(Context context, AndroidFxAccount fxAccount) {
+    return makeFxADeviceCommonBuilder(context, fxAccount).build();
+  }
+
+  private static FxAccountDevice buildFxAccountDevice(Context context, AndroidFxAccount fxAccount, @NonNull GeckoBundle subscription) {
+    final FxAccountDevice.Builder builder = makeFxADeviceCommonBuilder(context, fxAccount);
+    final String pushCallback = subscription.getString("pushCallback");
+    final String pushPublicKey = subscription.getString("pushPublicKey");
+    final String pushAuthKey = subscription.getString("pushAuthKey");
+    if (!TextUtils.isEmpty(pushCallback) && !TextUtils.isEmpty(pushPublicKey) &&
+        !TextUtils.isEmpty(pushAuthKey)) {
+      builder.pushCallback(pushCallback);
+      builder.pushPublicKey(pushPublicKey);
+      builder.pushAuthKey(pushAuthKey);
+    }
+    return builder.build();
+  }
+
+  // Do not call this directly, use buildFxAccountDevice instead.
+  private static FxAccountDevice.Builder makeFxADeviceCommonBuilder(Context context, AndroidFxAccount fxAccount) {
+    final String deviceId = fxAccount.getDeviceId();
+    final String clientName = getClientName(fxAccount, context);
+
+    final FxAccountDevice.Builder builder = new FxAccountDevice.Builder();
+    builder.name(clientName);
+    builder.type("mobile");
+    if (!TextUtils.isEmpty(deviceId)) {
+      builder.id(deviceId);
+    }
+    return builder;
+  }
+
   private static void logErrorAndResetDeviceRegistrationVersionAndTimestamp(
       final FxAccountClientRemoteException error, final AndroidFxAccount fxAccount) {
     Log.e(LOG_TAG, "Device registration failed", error);
@@ -216,7 +291,7 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
   @Nullable
   private static String getClientName(final AndroidFxAccount fxAccount, final Context context) {
     try {
-      SharedPreferencesClientsDataDelegate clientsDataDelegate =
+      final SharedPreferencesClientsDataDelegate clientsDataDelegate =
           new SharedPreferencesClientsDataDelegate(fxAccount.getSyncPrefs(), context);
       return clientsDataDelegate.getClientName();
     } catch (UnsupportedEncodingException | GeneralSecurityException e) {
@@ -242,7 +317,7 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
 
       @Override
       public void handleSuccess(AccountStatusResponse result) {
-        State doghouseState = fxAccount.getState().makeDoghouseState();
+        final State doghouseState = fxAccount.getState().makeDoghouseState();
         if (!result.exists) {
           Log.i(LOG_TAG, "token invalidated because the account no longer exists");
           // TODO: Should be in a "I have an Android account, but the FxA is gone." State.
@@ -268,9 +343,12 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
                                                        final FxAccountClient fxAccountClient,
                                                        final byte[] sessionToken,
                                                        final AndroidFxAccount fxAccount,
+                                                       final FxAccountDevice device,
                                                        final Context context,
-                                                       final GeckoBundle subscription,
                                                        final boolean allowRecursion) {
+    // Recovery strategy: re-try a registration, UPDATING (instead of creating) the device.
+    // We do that by finding the device ID who conflicted with us and try a registration update
+    // using that id.
     Log.w(LOG_TAG, "device session conflict, attempting to ascertain the correct device id");
     fxAccountClient.deviceList(sessionToken, new RequestDelegate<FxAccountDevice[]>() {
       private void onError() {
@@ -290,16 +368,20 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
 
       @Override
       public void handleSuccess(FxAccountDevice[] devices) {
-        for (FxAccountDevice device : devices) {
-          if (device.isCurrentDevice) {
-            fxAccount.setFxAUserData(device.id, 0, 0L); // Reset device registration version/timestamp
-            if (!allowRecursion) {
-              Log.d(LOG_TAG, "Failure to register a device on the second try");
-              break;
-            }
-            doFxaRegistration(context, subscription, false);
-            return;
+        for (final FxAccountDevice fxaDevice : devices) {
+          if (!fxaDevice.isCurrentDevice) {
+            continue;
           }
+          fxAccount.setFxAUserData(fxaDevice.id, 0, 0L); // Reset device registration version/timestamp
+          if (!allowRecursion) {
+            Log.d(LOG_TAG, "Failure to register a device on the second try");
+            break;
+          }
+          final FxAccountDevice updatedDevice = new FxAccountDevice(device.name, fxaDevice.id, device.type,
+                                                                    device.isCurrentDevice, device.pushCallback,
+                                                                    device.pushPublicKey, device.pushAuthKey);
+          doFxaRegistration(context, fxAccount, updatedDevice, false);
+          return;
         }
         onError();
       }
@@ -309,10 +391,10 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
   private void setupListeners() throws ClassNotFoundException, NoSuchMethodException,
           InvocationTargetException, IllegalAccessException {
     // We have no choice but to use reflection here, sorry :(
-    Class<?> eventDispatcher = Class.forName("org.mozilla.gecko.EventDispatcher");
-    Method getInstance = eventDispatcher.getMethod("getInstance");
-    Object instance = getInstance.invoke(null);
-    Method registerBackgroundThreadListener = eventDispatcher.getMethod("registerBackgroundThreadListener",
+    final Class<?> eventDispatcher = Class.forName("org.mozilla.gecko.EventDispatcher");
+    final Method getInstance = eventDispatcher.getMethod("getInstance");
+    final Object instance = getInstance.invoke(null);
+    final Method registerBackgroundThreadListener = eventDispatcher.getMethod("registerBackgroundThreadListener",
             BundleEventListener.class, String[].class);
     registerBackgroundThreadListener.invoke(instance, this, new String[] { "FxAccountsPush:Subscribe:Response" });
   }
diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java
index 7070c209c4b1..9eb4b8538e4d 100644
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/authenticator/AndroidFxAccount.java
@@ -15,7 +15,6 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
@@ -39,6 +38,8 @@ import org.mozilla.gecko.util.ThreadUtils;
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
+import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -80,6 +81,8 @@ public class AndroidFxAccount {
   public static final String ACCOUNT_KEY_DEVICE_ID = "deviceId";
   public static final String ACCOUNT_KEY_DEVICE_REGISTRATION_VERSION = "deviceRegistrationVersion";
   private static final String ACCOUNT_KEY_DEVICE_REGISTRATION_TIMESTAMP = "deviceRegistrationTimestamp";
+  private static final String ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR = "devicePushRegistrationError";
+  private static final String ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR_TIME = "devicePushRegistrationErrorTime";
 
   // Account authentication token type for fetching account profile.
   public static final String PROFILE_OAUTH_TOKEN_TYPE = "oauth::profile";
@@ -802,40 +805,39 @@ public class AndroidFxAccount {
     });
   }
 
+  @SuppressWarnings("unchecked")
+  private <T extends Number> T getUserDataNumber(String key, T defaultValue) {
+    final String numStr = accountManager.getUserData(account, key);
+    if (TextUtils.isEmpty(numStr)) {
+      return defaultValue;
+    }
+    try {
+      return (T) NumberFormat.getInstance().parse(numStr);
+    } catch (ParseException e) {
+      Logger.warn(LOG_TAG, "Couldn't parse " + key + "; defaulting to 0L.", e);
+      return defaultValue;
+    }
+  }
+
   @Nullable
   public synchronized String getDeviceId() {
     return accountManager.getUserData(account, ACCOUNT_KEY_DEVICE_ID);
   }
 
-  @NonNull
   public synchronized int getDeviceRegistrationVersion() {
-    String versionStr = accountManager.getUserData(account, ACCOUNT_KEY_DEVICE_REGISTRATION_VERSION);
-    if (TextUtils.isEmpty(versionStr)) {
-      return 0;
-    } else {
-      try {
-        return Integer.parseInt(versionStr);
-      } catch (NumberFormatException ex) {
-        return 0;
-      }
-    }
+    return getUserDataNumber(ACCOUNT_KEY_DEVICE_REGISTRATION_VERSION, 0);
   }
 
   public synchronized long getDeviceRegistrationTimestamp() {
-    final String timestampStr = accountManager.getUserData(account, ACCOUNT_KEY_DEVICE_REGISTRATION_TIMESTAMP);
+    return getUserDataNumber(ACCOUNT_KEY_DEVICE_REGISTRATION_TIMESTAMP, 0L);
+  }
 
-    if (TextUtils.isEmpty(timestampStr)) {
-      return 0L;
-    }
+  public synchronized long getDevicePushRegistrationError() {
+    return getUserDataNumber(ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR, 0L);
+  }
 
-    // Long.parseLong might throw; while it's not expected that this might happen, let's not risk
-    // crashing here as this method will be called on startup.
-    try {
-      return Long.parseLong(timestampStr);
-    } catch (NumberFormatException e) {
-      Logger.warn(LOG_TAG, "Couldn't parse deviceRegistrationTimestamp; defaulting to 0L.", e);
-      return 0L;
-    }
+  public synchronized long getDevicePushRegistrationErrorTime() {
+    return getUserDataNumber(ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR_TIME, 0L);
   }
 
   public synchronized void setDeviceId(String id) {
@@ -864,6 +866,15 @@ public class AndroidFxAccount {
             Long.toString(timestamp));
   }
 
+  public synchronized void setDevicePushRegistrationError(long error, long errorTimeMs) {
+    accountManager.setUserData(account, ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR, Long.toString(error));
+    accountManager.setUserData(account, ACCOUNT_KEY_DEVICE_PUSH_REGISTRATION_ERROR_TIME, Long.toString(errorTimeMs));
+  }
+
+  public synchronized void resetDevicePushRegistrationError() {
+    setDevicePushRegistrationError(0L, 0l);
+  }
+
   @SuppressLint("ParcelCreator") // The CREATOR field is defined in the super class.
   private class ProfileResultReceiver extends ResultReceiver {
     public ProfileResultReceiver(Handler handler) {
diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncAdapter.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncAdapter.java
index eb2f6452ff89..83d629eb1e44 100644
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncAdapter.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/sync/FxAccountSyncAdapter.java
@@ -409,13 +409,12 @@ public class FxAccountSyncAdapter extends AbstractThreadedSyncAdapter {
     // As part of device registration, we obtain a PushSubscription, register our push endpoint
     // with FxA, and update account data with fxaDeviceId, which is part of our synced
     // clients record.
-    if (fxAccount.getDeviceRegistrationVersion() != FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION
-            || TextUtils.isEmpty(fxAccount.getDeviceId())) {
+    if (FxAccountDeviceRegistrator.shouldRegister(fxAccount)) {
       FxAccountDeviceRegistrator.register(context);
       // We might need to re-register periodically to ensure our FxA push subscription is valid.
       // This involves unsubscribing, subscribing and updating remote FxA device record with
       // new push subscription information.
-    } else if (FxAccountDeviceRegistrator.needToRenewRegistration(fxAccount.getDeviceRegistrationTimestamp())) {
+    } else if (FxAccountDeviceRegistrator.shouldRenewRegistration(fxAccount)) {
       FxAccountDeviceRegistrator.renewRegistration(context);
     }
   }
diff --git a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/TestFxAccountDeviceRegistrator.java b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/TestFxAccountDeviceRegistrator.java
new file mode 100644
index 000000000000..296ab6a78103
--- /dev/null
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/fxa/TestFxAccountDeviceRegistrator.java
@@ -0,0 +1,91 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.gecko.fxa;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mozilla.gecko.background.testhelpers.TestRunner;
+import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+@RunWith(TestRunner.class)
+public class TestFxAccountDeviceRegistrator {
+
+    @Mock
+    AndroidFxAccount fxAccount;
+
+    @Before
+    public void init() {
+        // Process Mockito annotations
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void shouldRegister() {
+        // Assuming there is no previous push registration errors recorded:
+        when(fxAccount.getDevicePushRegistrationError()).thenReturn(0L);
+        when(fxAccount.getDevicePushRegistrationErrorTime()).thenReturn(0L);
+
+        // Should return false if the device registration version is up-to-date and a device ID is stored.
+        // (general case after a successful device registration)
+        when(fxAccount.getDeviceRegistrationVersion()).thenReturn(FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION);
+        when(fxAccount.getDeviceId()).thenReturn("bogusdeviceid");
+        assertFalse(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return true if the device registration version is up-to-date but no device ID is stored.
+        // (data mangling)
+        when(fxAccount.getDeviceRegistrationVersion()).thenReturn(FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION);
+        when(fxAccount.getDeviceId()).thenReturn(null);
+        assertTrue(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return true if the device ID is stored but no device registration version can be found.
+        // (data mangling)
+        when(fxAccount.getDeviceRegistrationVersion()).thenReturn(0);
+        when(fxAccount.getDeviceId()).thenReturn("bogusid");
+        assertTrue(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return true if the device registration version is too old.
+        // (code update pushed)
+        when(fxAccount.getDeviceRegistrationVersion()).thenReturn(FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION - 1);
+        assertTrue(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return true if the device registration is OK, but we didn't get a push subscription because
+        // Google Play Services were unavailable at the time and the retry delay is passed.
+        when(fxAccount.getDeviceRegistrationVersion()).thenReturn(FxAccountDeviceRegistrator.DEVICE_REGISTRATION_VERSION);
+        when(fxAccount.getDevicePushRegistrationError()).thenReturn(FxAccountDeviceRegistrator.ERROR_GCM_DISABLED);
+        when(fxAccount.getDevicePushRegistrationErrorTime()).thenReturn(System.currentTimeMillis() -
+                                                                        FxAccountDeviceRegistrator.RETRY_TIME_AFTER_GCM_DISABLED_ERROR - 1);
+        assertTrue(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return false if the device registration is OK, but we didn't get a push subscription because
+        // Google Play Services were unavailable at the time and the retry delay has not passed.
+        // We assume that RETRY_TIME_AFTER_GCM_DISABLED_ERROR is longer than the time it takes to execute this test :)
+        when(fxAccount.getDevicePushRegistrationErrorTime()).thenReturn(System.currentTimeMillis());
+        assertFalse(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+
+        // Should return false if the device registration is OK, but we didn't get a push subscription because
+        // an unknown error happened at the time.
+        when(fxAccount.getDevicePushRegistrationError()).thenReturn(12345L);
+        assertFalse(FxAccountDeviceRegistrator.shouldRegister(fxAccount));
+    }
+
+    @Test
+    public void shouldRenewRegistration() {
+        // Should return true if our last push registration was done a day before our expiration threshold.
+        when(fxAccount.getDeviceRegistrationTimestamp()).thenReturn(System.currentTimeMillis() -
+                                                                    FxAccountDeviceRegistrator.TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS -
+                                                                    1 * 24 * 60 * 60 * 1000L);
+
+        // Should return false if our last push registration is recent enough.
+        // We assume that TIME_BETWEEN_CHANNEL_REGISTRATION_IN_MILLIS is longer than a day + the time it takes to run this test.
+        when(fxAccount.getDeviceRegistrationTimestamp()).thenReturn(System.currentTimeMillis() -
+                                                                    1 * 24 * 60 * 60 * 1000L);
+    }
+}
diff --git a/mobile/android/tests/browser/robocop/robocop.ini b/mobile/android/tests/browser/robocop/robocop.ini
index 4d908deeb88d..8b9f87ce2c74 100644
--- a/mobile/android/tests/browser/robocop/robocop.ini
+++ b/mobile/android/tests/browser/robocop/robocop.ini
@@ -63,6 +63,7 @@ skip-if = android_version == "18"
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testSessionOOMSave.java]
 [src/org/mozilla/gecko/tests/testSessionOOMRestore.java]
+[src/org/mozilla/gecko/tests/testSettingsPages.java]
 # [src/org/mozilla/gecko/tests/testShareLink.java] # see bug 915897
 # [src/org/mozilla/gecko/tests/testThumbnails.java] # see bug 813107
 # [src/org/mozilla/gecko/tests/testVkbOverlap.java] # see bug 907274
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
index 6f5db560d911..bc0c64adbac0 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
@@ -105,7 +105,14 @@ public class StringHelper {
     public final String DISTRIBUTION2_LABEL = "Distribution 2";
 
     // Settings menu strings
+    public final String GENERAL_SECTION_LABEL;
+    public final String SEARCH_SECTION_LABEL;
     public final String PRIVACY_SECTION_LABEL;
+    public final String ACCESSIBILITY_SECTION_LABEL;
+    public final String NOTIFICATIONS_SECTION_LABEL;
+    public final String ADVANCED_SECTION_LABEL;
+    public final String CLEAR_PRIVATE_DATA_SECTION_LABEL;
+    public final String DEFAULT_BROWSER_SECTION_LABEL;
     public final String MOZILLA_SECTION_LABEL;
 
     // Mozilla
@@ -187,10 +194,23 @@ public class StringHelper {
     public final String HISTORY;
     public final String PANELS;
 
+    // General Settings
+    public final String LANGUAGE_LABEL;
+
     // Search Settings
     public final String SEARCH_TITLE;
     public final String SEARCH_SUGGESTIONS;
     public final String SEARCH_INSTALLED;
+    public final String SHOW_SEARCH_HISTORY_LABEL;
+
+    // Privacy Settings
+    public final String DO_NOT_TRACK_LABEL;
+
+    // Accessibility Settings
+    public final String ALWAYS_ZOOM_LABEL;
+
+    // Notifications Settings
+    public final String NEW_IN_FIREFOX_LABEL;
 
     // Advanced Settings
     public final String ADVANCED;
@@ -199,6 +219,14 @@ public class StringHelper {
     public final String DISABLED;
     public final String TAP_TO_PLAY;
     public final String HIDE_TITLE_BAR;
+    public final String RESTORE_TABS_LABEL;
+
+    // Clear Private Data Section
+    public final String SITE_SETTINGS_LABEL;
+
+    // Mozilla Firefox Section
+    public final String FAQS_LABEL;
+
 
     // Update Settings
     public final String AUTOMATIC_UPDATES;
@@ -282,7 +310,14 @@ public class StringHelper {
         TITLE_PLACE_HOLDER = res.getString(R.string.url_bar_default_text);
 
         // Settings menu strings
+        GENERAL_SECTION_LABEL = res.getString(R.string.pref_category_general);
+        SEARCH_SECTION_LABEL = res.getString(R.string.pref_category_search);
         PRIVACY_SECTION_LABEL = res.getString(R.string.pref_category_privacy_short);
+        ACCESSIBILITY_SECTION_LABEL = res.getString(R.string.pref_category_accessibility);
+        NOTIFICATIONS_SECTION_LABEL = res.getString(R.string.pref_category_notifications);
+        ADVANCED_SECTION_LABEL = res.getString(R.string.pref_category_advanced);
+        CLEAR_PRIVATE_DATA_SECTION_LABEL = res.getString(R.string.pref_clear_private_data_now);
+        DEFAULT_BROWSER_SECTION_LABEL = res.getString(R.string.pref_default_browser);
         MOZILLA_SECTION_LABEL = res.getString(R.string.pref_category_vendor);
 
         // Labels for the about:home tabs
@@ -342,10 +377,23 @@ public class StringHelper {
         ENABLED = res.getString(R.string.pref_home_updates_enabled);
         HISTORY = res.getString(R.string.home_history_title);
 
+        // General Settings
+        LANGUAGE_LABEL = res.getString(R.string.pref_category_language);
+
         // Search Settings
         SEARCH_TITLE = res.getString(R.string.search);
         SEARCH_SUGGESTIONS = res.getString(R.string.pref_search_suggestions);
         SEARCH_INSTALLED = res.getString(R.string.pref_category_installed_search_engines);
+        SHOW_SEARCH_HISTORY_LABEL = res.getString(R.string.pref_history_search_suggestions);
+
+        // Privacy Settings
+        DO_NOT_TRACK_LABEL = res.getString(R.string.pref_donottrack_title);
+
+        // Accessibility Settings
+        ALWAYS_ZOOM_LABEL = res.getString(R.string.pref_zoom_force_enabled);
+
+        // Notification Settings
+        NEW_IN_FIREFOX_LABEL = res.getString(R.string.pref_whats_new_notification);
 
         // Advanced Settings
         ADVANCED = res.getString(R.string.pref_category_advanced);
@@ -354,6 +402,13 @@ public class StringHelper {
         DISABLED = res.getString(R.string.pref_plugins_disabled );
         TAP_TO_PLAY = res.getString(R.string.pref_plugins_tap_to_play);
         HIDE_TITLE_BAR = res.getString(R.string.pref_scroll_title_bar_summary );
+        RESTORE_TABS_LABEL = res.getString(R.string.pref_restore);
+
+        // Clear Private Data Settings
+        SITE_SETTINGS_LABEL = res.getString(R.string.pref_private_data_siteSettings);
+
+        // Mozilla Firefox Settings
+        FAQS_LABEL = res.getString(R.string.pref_vendor_faqs);
 
         // Update Settings
         AUTOMATIC_UPDATES = res.getString(R.string.pref_home_updates);
diff --git a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSettingsPages.java b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSettingsPages.java
new file mode 100644
index 000000000000..f68a74b7c12e
--- /dev/null
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSettingsPages.java
@@ -0,0 +1,103 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.tests;
+
+/* Tests the working of Settings menu:
+ *  Traverses through every setting item and tests it.
+ */
+
+public class testSettingsPages extends BaseTest {
+
+    public void testSettingsPages() {
+        blockForGeckoReady();
+
+        // Open Settings Menu
+        selectMenuItem(mStringHelper.SETTINGS_LABEL);
+        // Assert that we are inside the Settings screen by checking if "General" section label is present and enabled
+        String itemName = "^" + mStringHelper.GENERAL_SECTION_LABEL + "$";
+        mAsserter.ok(waitForEnabledText(itemName), "Waiting for menu item " + itemName, itemName + " is present and enabled");
+
+        // Now traverse the Settings menu items one by one.
+        testGeneralSection();
+        testSearchSection();
+        testPrivacySection();
+        testAccessibilitySection();
+        testNotificationsSection();
+        testAdvancedSection();
+        testClearPrivateDataSection();
+        testMozillaSection();
+    }
+
+    private void testGeneralSection() {
+        selectSettingsSection(mStringHelper.GENERAL_SECTION_LABEL);
+        /* Assert that screen was successfully opened by searching any one label.
+         * For example, check "Language" label for "General" section */
+        String itemName = "^" + mStringHelper.LANGUAGE_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testSearchSection() {
+        selectSettingsSection(mStringHelper.SEARCH_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.SHOW_SEARCH_HISTORY_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testPrivacySection() {
+        selectSettingsSection(mStringHelper.PRIVACY_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.DO_NOT_TRACK_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testAccessibilitySection() {
+        selectSettingsSection(mStringHelper.ACCESSIBILITY_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.ALWAYS_ZOOM_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testNotificationsSection() {
+        selectSettingsSection(mStringHelper.NOTIFICATIONS_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.NEW_IN_FIREFOX_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testAdvancedSection() {
+        selectSettingsSection(mStringHelper.ADVANCED_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.RESTORE_TABS_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testClearPrivateDataSection() {
+        selectSettingsSection(mStringHelper.CLEAR_PRIVATE_DATA_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.SITE_SETTINGS_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    private void testMozillaSection() {
+        selectSettingsSection(mStringHelper.MOZILLA_SECTION_LABEL);
+        String itemName = "^" + mStringHelper.FAQS_LABEL + "$";
+        mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find label " + itemName, itemName + " found");
+        mSolo.goBack();
+    }
+
+    /**
+     * Select <sectionName> from Settings.
+     */
+    private void selectSettingsSection(String sectionName) {
+        if (!sectionName.isEmpty()) {
+            String itemName = "^" + sectionName + "$";
+            mAsserter.ok(waitForPreferencesText(itemName), "Waiting for and scrolling once to find section " + itemName, itemName + " found");
+            mAsserter.ok(waitForEnabledText(itemName), "Waiting for enabled text " + itemName, itemName + " option is present and enabled");
+            mSolo.clickOnText(itemName);
+        }
+    }
+
+}
diff --git a/mobile/android/themes/core/touchcontrols.css b/mobile/android/themes/core/touchcontrols.css
index 8f43bf71897c..8ddabbab248f 100644
--- a/mobile/android/themes/core/touchcontrols.css
+++ b/mobile/android/themes/core/touchcontrols.css
@@ -188,10 +188,6 @@
   height: 36px;
 }
 
-.statusIcon[type="throbber"] {
-  background: url(chrome://global/skin/media/throbber.png) no-repeat center;
-}
-
 .statusIcon[type="error"] {
   background: url(chrome://global/skin/media/error.png) no-repeat center;
 }
diff --git a/netwerk/base/Predictor.cpp b/netwerk/base/Predictor.cpp
index 5396190f1f37..599926dc0b1f 100644
--- a/netwerk/base/Predictor.cpp
+++ b/netwerk/base/Predictor.cpp
@@ -691,6 +691,47 @@ private:
   nsCOMPtr<nsIFile> mDBFile;
 };
 
+class PredictorLearnRunnable final : public Runnable {
+public:
+  PredictorLearnRunnable(nsIURI *targetURI, nsIURI *sourceURI,
+                         PredictorLearnReason reason, const OriginAttributes &oa)
+    : mTargetURI(targetURI)
+    , mSourceURI(sourceURI)
+    , mReason(reason)
+    , mOA(oa)
+  { }
+
+  ~PredictorLearnRunnable() { }
+
+  NS_IMETHOD Run() override
+  {
+    if (!gNeckoChild) {
+      // This may have gone away between when this runnable was dispatched and
+      // when it actually runs, so let's be safe here, even though we asserted
+      // earlier.
+      PREDICTOR_LOG(("predictor::learn (async) gNeckoChild went away"));
+      return NS_OK;
+    }
+
+    ipc::URIParams serTargetURI;
+    SerializeURI(mTargetURI, serTargetURI);
+
+    ipc::OptionalURIParams serSourceURI;
+    SerializeURI(mSourceURI, serSourceURI);
+
+    PREDICTOR_LOG(("predictor::learn (async) forwarding to parent"));
+    gNeckoChild->SendPredLearn(serTargetURI, serSourceURI, mReason, mOA);
+
+    return NS_OK;
+  }
+
+private:
+  nsCOMPtr<nsIURI> mTargetURI;
+  nsCOMPtr<nsIURI> mSourceURI;
+  PredictorLearnReason mReason;
+  const OriginAttributes mOA;
+};
+
 } // namespace
 
 void
@@ -1506,15 +1547,10 @@ Predictor::LearnNative(nsIURI *targetURI, nsIURI *sourceURI,
 
     PREDICTOR_LOG(("    called on child process"));
 
-    ipc::URIParams serTargetURI;
-    SerializeURI(targetURI, serTargetURI);
+    RefPtr<PredictorLearnRunnable> runnable = new PredictorLearnRunnable(
+      targetURI, sourceURI, reason, originAttributes);
+    NS_DispatchToMainThread(runnable);
 
-    ipc::OptionalURIParams serSourceURI;
-    SerializeURI(sourceURI, serSourceURI);
-
-    PREDICTOR_LOG(("    forwarding to parent"));
-    gNeckoChild->SendPredLearn(serTargetURI, serSourceURI, reason,
-                               originAttributes);
     return NS_OK;
   }
 
diff --git a/netwerk/base/nsFileStreams.cpp b/netwerk/base/nsFileStreams.cpp
index 687c24122ac5..ee1714ea5bc5 100644
--- a/netwerk/base/nsFileStreams.cpp
+++ b/netwerk/base/nsFileStreams.cpp
@@ -397,6 +397,7 @@ NS_INTERFACE_MAP_BEGIN(nsFileInputStream)
     NS_INTERFACE_MAP_ENTRY(nsILineInputStream)
     NS_INTERFACE_MAP_ENTRY(nsIIPCSerializableInputStream)
     NS_IMPL_QUERY_CLASSINFO(nsFileInputStream)
+    NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsICloneableInputStream, IsCloneable())
 NS_INTERFACE_MAP_END_INHERITING(nsFileStreamBase)
 
 NS_IMPL_CI_INTERFACE_GETTER(nsFileInputStream,
@@ -682,6 +683,27 @@ nsFileInputStream::ExpectedSerializedLength()
     return Nothing();
 }
 
+bool
+nsFileInputStream::IsCloneable() const
+{
+    return XRE_IsParentProcess();
+}
+
+NS_IMETHODIMP
+nsFileInputStream::GetCloneable(bool* aCloneable)
+{
+    *aCloneable = IsCloneable();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFileInputStream::Clone(nsIInputStream** aResult)
+{
+    MOZ_ASSERT(IsCloneable());
+    return NS_NewLocalFileInputStream(aResult, mFile, mIOFlags, mPerm,
+                                      mBehaviorFlags);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsFileOutputStream
 
diff --git a/netwerk/base/nsFileStreams.h b/netwerk/base/nsFileStreams.h
index 225aeea08edf..e987c5e3309d 100644
--- a/netwerk/base/nsFileStreams.h
+++ b/netwerk/base/nsFileStreams.h
@@ -9,6 +9,7 @@
 #include "nsAutoPtr.h"
 #include "nsIFileStreams.h"
 #include "nsIFile.h"
+#include "nsICloneableInputStream.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsISafeOutputStream.h"
@@ -113,16 +114,21 @@ protected:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-class nsFileInputStream : public nsFileStreamBase,
-                          public nsIFileInputStream,
-                          public nsILineInputStream,
-                          public nsIIPCSerializableInputStream
+// nsFileInputStream is cloneable only on the parent process because only there
+// it can open the same file multiple times.
+
+class nsFileInputStream : public nsFileStreamBase
+                        , public nsIFileInputStream
+                        , public nsILineInputStream
+                        , public nsIIPCSerializableInputStream
+                        , public nsICloneableInputStream
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSIFILEINPUTSTREAM
     NS_DECL_NSILINEINPUTSTREAM
     NS_DECL_NSIIPCSERIALIZABLEINPUTSTREAM
+    NS_DECL_NSICLONEABLEINPUTSTREAM
 
     NS_IMETHOD Close() override;
     NS_IMETHOD Tell(int64_t *aResult) override;
@@ -183,6 +189,8 @@ protected:
      * Init() analogues.
      */
     nsresult Open(nsIFile* file, int32_t ioFlags, int32_t perm);
+
+    bool IsCloneable() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/netwerk/base/nsInputStreamPump.cpp b/netwerk/base/nsInputStreamPump.cpp
index 28eca57ee9ba..1cf08bb21f2b 100644
--- a/netwerk/base/nsInputStreamPump.cpp
+++ b/netwerk/base/nsInputStreamPump.cpp
@@ -17,6 +17,7 @@
 #include "nsIStreamListener.h"
 #include "nsILoadGroup.h"
 #include "nsNetCID.h"
+#include "nsStreamUtils.h"
 #include <algorithm>
 
 static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);
@@ -101,18 +102,21 @@ nsInputStreamPump::PeekStream(PeekSegmentFun callback, void* closure)
 
   NS_ASSERTION(mAsyncStream, "PeekStream called without stream");
 
+  nsresult rv = CreateBufferedStreamIfNeeded();
+  NS_ENSURE_SUCCESS(rv, rv);
+
   // See if the pipe is closed by checking the return of Available.
   uint64_t dummy64;
-  nsresult rv = mAsyncStream->Available(&dummy64);
+  rv = mBufferedStream->Available(&dummy64);
   if (NS_FAILED(rv))
     return rv;
   uint32_t dummy = (uint32_t)std::min(dummy64, (uint64_t)UINT32_MAX);
 
   PeekData data(callback, closure);
-  return mAsyncStream->ReadSegments(CallPeekFunc,
-                                    &data,
-                                    nsIOService::gDefaultSegmentSize,
-                                    &dummy);
+  return mBufferedStream->ReadSegments(CallPeekFunc,
+                                       &data,
+                                       nsIOService::gDefaultSegmentSize,
+                                       &dummy);
 }
 
 nsresult
@@ -550,10 +554,13 @@ nsInputStreamPump::OnStateTransfer()
     if (NS_FAILED(mStatus))
         return STATE_STOP;
 
-    nsresult rv;
+    nsresult rv = CreateBufferedStreamIfNeeded();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return STATE_STOP;
+    }
 
     uint64_t avail;
-    rv = mAsyncStream->Available(&avail);
+    rv = mBufferedStream->Available(&avail);
     LOG(("  Available returned [stream=%p rv=%" PRIx32 " avail=%" PRIu64 "]\n", mAsyncStream.get(),
          static_cast<uint32_t>(rv), avail));
 
@@ -583,7 +590,7 @@ nsInputStreamPump::OnStateTransfer()
             // in most cases this QI will succeed (mAsyncStream is almost always
             // a nsPipeInputStream, which implements nsISeekableStream::Tell).
             int64_t offsetBefore;
-            nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mAsyncStream);
+            nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mBufferedStream);
             if (seekable && NS_FAILED(seekable->Tell(&offsetBefore))) {
                 NS_NOTREACHED("Tell failed on readable stream");
                 offsetBefore = 0;
@@ -602,7 +609,7 @@ nsInputStreamPump::OnStateTransfer()
                 // nsInputStreamPumps are needed (e.g. nsHttpChannel).
                 mMonitor.Exit();
                 rv = mListener->OnDataAvailable(this, mListenerContext,
-                                                mAsyncStream, mStreamOffset,
+                                                mBufferedStream, mStreamOffset,
                                                 odaAvail);
                 mMonitor.Enter();
             }
@@ -647,7 +654,7 @@ nsInputStreamPump::OnStateTransfer()
             // Available may return 0 bytes available at the moment; that
             // would not mean that we are done.
             // XXX async streams should have a GetStatus method!
-            rv = mAsyncStream->Available(&avail);
+            rv = mBufferedStream->Available(&avail);
             if (NS_SUCCEEDED(rv))
                 return STATE_TRANSFER;
             if (rv != NS_BASE_STREAM_CLOSED)
@@ -708,6 +715,7 @@ nsInputStreamPump::OnStateStop()
         mAsyncStream->Close();
 
     mAsyncStream = nullptr;
+    mBufferedStream = nullptr;
     mTargetThread = nullptr;
     mIsPending = false;
     {
@@ -727,6 +735,28 @@ nsInputStreamPump::OnStateStop()
     return STATE_IDLE;
 }
 
+nsresult
+nsInputStreamPump::CreateBufferedStreamIfNeeded()
+{
+  if (mBufferedStream) {
+    return NS_OK;
+  }
+
+  // ReadSegments is not available for any nsIAsyncInputStream. In order to use
+  // it, we wrap a nsIBufferedInputStream around it, if needed.
+
+  if (NS_InputStreamIsBuffered(mAsyncStream)) {
+    mBufferedStream = mAsyncStream;
+    return NS_OK;
+  }
+
+  nsresult rv = NS_NewBufferedInputStream(getter_AddRefs(mBufferedStream),
+                                          mAsyncStream, 4096);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // nsIThreadRetargetableRequest
 //-----------------------------------------------------------------------------
diff --git a/netwerk/base/nsInputStreamPump.h b/netwerk/base/nsInputStreamPump.h
index c9b7bd64cca2..3440b65b26e6 100644
--- a/netwerk/base/nsInputStreamPump.h
+++ b/netwerk/base/nsInputStreamPump.h
@@ -75,6 +75,7 @@ protected:
     uint32_t OnStateStart();
     uint32_t OnStateTransfer();
     uint32_t OnStateStop();
+    nsresult CreateBufferedStreamIfNeeded();
 
     uint32_t                      mState;
     nsCOMPtr<nsILoadGroup>        mLoadGroup;
@@ -83,6 +84,7 @@ protected:
     nsCOMPtr<nsIEventTarget>      mTargetThread;
     nsCOMPtr<nsIInputStream>      mStream;
     nsCOMPtr<nsIAsyncInputStream> mAsyncStream;
+    nsCOMPtr<nsIInputStream>      mBufferedStream;
     uint64_t                      mStreamOffset;
     uint64_t                      mStreamLength;
     uint32_t                      mSegSize;
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 0742df96a633..e85bb8f27178 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -828,11 +828,17 @@ namespace {
 
 void
 CopyComplete(void* aClosure, nsresult aStatus) {
+#ifdef DEBUG
   // Called on the STS thread by NS_AsyncCopy
+  nsCOMPtr<nsIEventTarget> sts =
+    do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
+  bool result = false;
+  sts->IsOnCurrentThread(&result);
+  MOZ_ASSERT(result, "Should only be called on the STS thread.");
+#endif
+
   auto channel = static_cast<HttpBaseChannel*>(aClosure);
-  nsCOMPtr<nsIRunnable> runnable = NewRunnableMethod<nsresult>(
-    channel, &HttpBaseChannel::EnsureUploadStreamIsCloneableComplete, aStatus);
-  NS_DispatchToMainThread(runnable.forget());
+  channel->OnCopyComplete(aStatus);
 }
 
 } // anonymous namespace
@@ -900,6 +906,18 @@ HttpBaseChannel::EnsureUploadStreamIsCloneable(nsIRunnable* aCallback)
   return NS_OK;
 }
 
+void
+HttpBaseChannel::OnCopyComplete(nsresult aStatus)
+{
+  // Assert in parent process because we don't have to label the runnable
+  // in parent process.
+  MOZ_ASSERT(XRE_IsParentProcess());
+
+  nsCOMPtr<nsIRunnable> runnable = NewRunnableMethod<nsresult>(
+    this, &HttpBaseChannel::EnsureUploadStreamIsCloneableComplete, aStatus);
+  NS_DispatchToMainThread(runnable.forget());
+}
+
 void
 HttpBaseChannel::EnsureUploadStreamIsCloneableComplete(nsresult aStatus)
 {
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index f11aa43ed9b9..3b611801e9d0 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -354,9 +354,10 @@ public: /* Necko internal use only... */
     DoApplyContentConversions(nsIStreamListener *aNextListener,
                               nsIStreamListener **aNewNextListener);
 
-    // Callback on main thread when NS_AsyncCopy() is finished populating
-    // the new mUploadStream.
-    void EnsureUploadStreamIsCloneableComplete(nsresult aStatus);
+    // Callback on STS thread called by CopyComplete when NS_AsyncCopy()
+    // is finished. This function works as a proxy function to dispatch
+    // |EnsureUploadStreamIsCloneableComplete| to main thread.
+    virtual void OnCopyComplete(nsresult aStatus);
 
     void SetIsTrackingResource()
     {
@@ -414,6 +415,10 @@ protected:
   // for a possible synthesized response instead.
   bool ShouldIntercept(nsIURI* aURI = nullptr);
 
+  // Callback on main thread when NS_AsyncCopy() is finished populating
+  // the new mUploadStream.
+  void EnsureUploadStreamIsCloneableComplete(nsresult aStatus);
+
 #ifdef DEBUG
   // Check if mPrivateBrowsingId matches between LoadInfo and LoadContext.
   void AssertPrivateBrowsingId();
@@ -653,8 +658,8 @@ public:
   // AsyncCall calls a member function asynchronously (via an event).
   // retval isn't refcounted and is set only when event was successfully
   // posted, the event is returned for the purpose of cancelling when needed
-  MOZ_MUST_USE nsresult AsyncCall(void (T::*funcPtr)(),
-                                  nsRunnableMethod<T> **retval = nullptr);
+  MOZ_MUST_USE virtual nsresult AsyncCall(void (T::*funcPtr)(),
+                                          nsRunnableMethod<T> **retval = nullptr);
 private:
   T *mThis;
 
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index b127c2eede90..7ceed08dd3c3 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -773,6 +773,8 @@ HttpChannelChild::OnTransportAndData(const nsresult& channelStatus,
   } else {
     RefPtr<HttpChannelChild> self = this;
     nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+    MOZ_ASSERT(neckoTarget);
+
     DebugOnly<nsresult> rv =
       neckoTarget->Dispatch(
         NS_NewRunnableFunction([self, transportStatus, progress, progressMax]() {
@@ -1371,7 +1373,12 @@ HttpChannelChild::RecvFinishInterceptedRedirect()
 
   // The IPDL connection was torn down by a interception logic in
   // CompleteRedirectSetup, and we need to call FinishInterceptedRedirect.
-  NS_DispatchToMainThread(NewRunnableMethod(this, &HttpChannelChild::FinishInterceptedRedirect));
+  nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+  MOZ_ASSERT(neckoTarget);
+
+ Unused << neckoTarget->Dispatch(
+    NewRunnableMethod(this, &HttpChannelChild::FinishInterceptedRedirect),
+                      NS_DISPATCH_NORMAL);
 
   return IPC_OK();
 }
@@ -1949,9 +1956,14 @@ HttpChannelChild::OnRedirectVerifyCallback(nsresult result)
     RefPtr<InterceptStreamListener> streamListener =
         new InterceptStreamListener(redirectedChannel, mListenerContext);
 
-    NS_DispatchToMainThread(new OverrideRunnable(this, redirectedChannel,
-                                                 streamListener, mSynthesizedInput,
-                                                 mResponseHead));
+    nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+    MOZ_ASSERT(neckoTarget);
+
+    Unused << neckoTarget->Dispatch(
+      new OverrideRunnable(this, redirectedChannel, streamListener,
+                           mSynthesizedInput, mResponseHead),
+      NS_DISPATCH_NORMAL);
+
     return NS_OK;
   }
 
@@ -3112,12 +3124,47 @@ HttpChannelChild::TrySendDeletingChannel()
     return;
   }
 
+  nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+  MOZ_ASSERT(neckoTarget);
+
   DebugOnly<nsresult> rv =
-    NS_DispatchToMainThread(
-      NewNonOwningRunnableMethod(this, &HttpChannelChild::TrySendDeletingChannel));
+    neckoTarget->Dispatch(
+      NewNonOwningRunnableMethod(this, &HttpChannelChild::TrySendDeletingChannel),
+      NS_DISPATCH_NORMAL);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 }
 
+void
+HttpChannelChild::OnCopyComplete(nsresult aStatus)
+{
+  nsCOMPtr<nsIRunnable> runnable = NewRunnableMethod<nsresult>(
+    this, &HttpChannelChild::EnsureUploadStreamIsCloneableComplete, aStatus);
+  nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+  MOZ_ASSERT(neckoTarget);
+
+  Unused << neckoTarget->Dispatch(runnable, NS_DISPATCH_NORMAL);
+}
+
+nsresult
+HttpChannelChild::AsyncCall(void (HttpChannelChild::*funcPtr)(),
+                            nsRunnableMethod<HttpChannelChild> **retval)
+{
+  nsresult rv;
+
+  RefPtr<nsRunnableMethod<HttpChannelChild>> event =
+    NewRunnableMethod(this, funcPtr);
+  nsCOMPtr<nsIEventTarget> neckoTarget = GetNeckoTarget();
+  MOZ_ASSERT(neckoTarget);
+
+  rv = neckoTarget->Dispatch(event, NS_DISPATCH_NORMAL);
+
+  if (NS_SUCCEEDED(rv) && retval) {
+    *retval = event;
+  }
+
+  return rv;
+}
+
 class CancelEvent final : public ChannelEvent
 {
 public:
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index bcaaa077e38e..20b1959b7e3e 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -115,6 +115,8 @@ public:
   void FlushedForDiversion();
   mozilla::ipc::IPCResult RecvSetClassifierMatchedInfo(const ClassifierInfo& aInfo) override;
 
+  void OnCopyComplete(nsresult aStatus) override;
+
 protected:
   mozilla::ipc::IPCResult RecvOnStartRequest(const nsresult& channelStatus,
                                              const nsHttpResponseHead& responseHead,
@@ -168,6 +170,10 @@ protected:
 
   NS_IMETHOD GetResponseSynthesized(bool* aSynthesized) override;
 
+  nsresult
+  AsyncCall(void (HttpChannelChild::*funcPtr)(),
+            nsRunnableMethod<HttpChannelChild> **retval = nullptr) override;
+
 private:
   // this section is for main-thread-only object
   // all the references need to be proxy released on main thread.
diff --git a/netwerk/protocol/http/nsHttpAtomList.h b/netwerk/protocol/http/nsHttpAtomList.h
index fc139aa5ff5b..8410df29db8b 100644
--- a/netwerk/protocol/http/nsHttpAtomList.h
+++ b/netwerk/protocol/http/nsHttpAtomList.h
@@ -77,6 +77,7 @@ HTTP_ATOM(Service_Worker_Allowed,    "Service-Worker-Allowed")
 HTTP_ATOM(Set_Cookie,                "Set-Cookie")
 HTTP_ATOM(Set_Cookie2,               "Set-Cookie2")
 HTTP_ATOM(Status_URI,                "Status-URI")
+HTTP_ATOM(Strict_Transport_Security, "Strict-Transport-Security")
 HTTP_ATOM(TE,                        "TE")
 HTTP_ATOM(Title,                     "Title")
 HTTP_ATOM(Timeout,                   "Timeout")
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 3c1cf621571b..8c1594dec938 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -6397,6 +6397,18 @@ nsHttpChannel::ForceIntercepted(uint64_t aInterceptionID)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsHttpChannel::SetChannelIsForDownload(bool aChannelIsForDownload)
+{
+  if (aChannelIsForDownload) {
+    AddClassFlags(nsIClassOfService::Throttleable);
+  } else {
+    ClearClassFlags(nsIClassOfService::Throttleable);
+  }
+
+  return HttpBaseChannel::SetChannelIsForDownload(aChannelIsForDownload);
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 5422ffafa271..6e246886ec67 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -157,6 +157,7 @@ public:
     // nsIHttpChannelInternal
     NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey) override;
     NS_IMETHOD ForceIntercepted(uint64_t aInterceptionID) override;
+    NS_IMETHOD SetChannelIsForDownload(bool aChannelIsForDownload) override;
     // nsISupportsPriority
     NS_IMETHOD SetPriority(int32_t value) override;
     // nsIClassOfService
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.cpp b/netwerk/protocol/http/nsHttpHeaderArray.cpp
index 670300dea50b..e87ef7f1cf48 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.cpp
+++ b/netwerk/protocol/http/nsHttpHeaderArray.cpp
@@ -54,7 +54,7 @@ nsHttpHeaderArray::SetHeader(nsHttpAtom header,
         return SetHeader_internal(header, value, variety);
     } else if (merge && !IsSingletonHeader(header)) {
         return MergeHeader(header, entry, value, variety);
-    } else {
+    } else if (!IsIgnoreMultipleHeader(header)) {
         // Replace the existing string with the new value
         if (entry->variety == eVarietyResponseNetOriginalAndResponse) {
             MOZ_ASSERT(variety == eVarietyResponse);
@@ -151,7 +151,7 @@ nsHttpHeaderArray::SetHeaderFromNet(nsHttpAtom header,
                                     eVarietyResponseNetOriginal);
         }
         return rv;
-    } else {
+    } else if (!IsIgnoreMultipleHeader(header)) {
         // Multiple instances of non-mergeable header received from network
         // - ignore if same value
         if (!entry->value.Equals(value)) {
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.h b/netwerk/protocol/http/nsHttpHeaderArray.h
index bcf61e5bebb5..d338ab23d48e 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.h
+++ b/netwerk/protocol/http/nsHttpHeaderArray.h
@@ -151,6 +151,8 @@ private:
 
     // Header cannot be merged: only one value possible
     bool    IsSingletonHeader(nsHttpAtom header);
+    // Header cannot be merged, and subsequent values should be ignored
+    bool    IsIgnoreMultipleHeader(nsHttpAtom header);
     // For some headers we want to track empty values to prevent them being
     // combined with non-empty ones as a CRLF attack vector
     bool    TrackEmptyHeader(nsHttpAtom header);
@@ -222,7 +224,22 @@ nsHttpHeaderArray::IsSingletonHeader(nsHttpAtom header)
            header == nsHttp::If_Unmodified_Since         ||
            header == nsHttp::From                        ||
            header == nsHttp::Location                    ||
-           header == nsHttp::Max_Forwards;
+           header == nsHttp::Max_Forwards                ||
+           // Ignore-multiple-headers are singletons in the sense that they
+           // shouldn't be merged.
+           IsIgnoreMultipleHeader(header);
+}
+
+// These are headers for which, in the presence of multiple values, we only
+// consider the first.
+inline bool nsHttpHeaderArray::IsIgnoreMultipleHeader(nsHttpAtom header)
+{
+    // https://tools.ietf.org/html/rfc6797#section-8:
+    //
+    //     If a UA receives more than one STS header field in an HTTP
+    //     response message over secure transport, then the UA MUST process
+    //     only the first such header field.
+    return header == nsHttp::Strict_Transport_Security;
 }
 
 inline bool
diff --git a/netwerk/test/gtest/TestHeaders.cpp b/netwerk/test/gtest/TestHeaders.cpp
new file mode 100644
index 000000000000..46f2051e0d82
--- /dev/null
+++ b/netwerk/test/gtest/TestHeaders.cpp
@@ -0,0 +1,29 @@
+#include "gtest/gtest.h"
+
+#include "nsHttpHeaderArray.h"
+
+
+TEST(TestHeaders, DuplicateHSTS) {
+    // When the Strict-Transport-Security header is sent multiple times, its
+    // effective value is the value of the first item. It is not merged as other
+    // headers are.
+    mozilla::net::nsHttpHeaderArray headers;
+    nsresult rv = headers.SetHeaderFromNet(
+        mozilla::net::nsHttp::Strict_Transport_Security, NS_LITERAL_CSTRING("max-age=360"), true
+    );
+    ASSERT_EQ(rv, NS_OK);
+
+    nsAutoCString h;
+    rv = headers.GetHeader(mozilla::net::nsHttp::Strict_Transport_Security, h);
+    ASSERT_EQ(rv, NS_OK);
+    ASSERT_EQ(h.get(), "max-age=360");
+
+    rv = headers.SetHeaderFromNet(
+        mozilla::net::nsHttp::Strict_Transport_Security, NS_LITERAL_CSTRING("max-age=720"), true
+    );
+    ASSERT_EQ(rv, NS_OK);
+
+    rv = headers.GetHeader(mozilla::net::nsHttp::Strict_Transport_Security, h);
+    ASSERT_EQ(rv, NS_OK);
+    ASSERT_EQ(h.get(), "max-age=360");
+}
diff --git a/netwerk/test/gtest/moz.build b/netwerk/test/gtest/moz.build
index c05e962a63c3..6031abb32607 100644
--- a/netwerk/test/gtest/moz.build
+++ b/netwerk/test/gtest/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
+    'TestHeaders.cpp',
     'TestHttpAuthUtils.cpp',
     'TestProtocolProxyService.cpp',
     'TestStandardURL.cpp',
diff --git a/netwerk/test/unit/test_http2.js b/netwerk/test/unit/test_http2.js
index ef66530a6737..d197879832da 100644
--- a/netwerk/test/unit/test_http2.js
+++ b/netwerk/test/unit/test_http2.js
@@ -1139,7 +1139,6 @@ function run_test() {
   altsvcpref2 = prefs.getBoolPref("network.http.altsvc.oe", true);
 
   prefs.setBoolPref("network.http.spdy.enabled", true);
-  prefs.setBoolPref("network.http.spdy.enabled.v3-1", true);
   prefs.setBoolPref("network.http.spdy.allow-push", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   prefs.setBoolPref("network.http.altsvc.enabled", true);
diff --git a/netwerk/test/unit/test_predictor.js b/netwerk/test/unit/test_predictor.js
index 1adb49bdd4d6..de9c1c486240 100644
--- a/netwerk/test/unit/test_predictor.js
+++ b/netwerk/test/unit/test_predictor.js
@@ -215,15 +215,30 @@ function continue_test_pageload() {
 
   // This is necessary to learn the origin stuff
   predictor.learn(pageload_toplevel, null, predictor.LEARN_LOAD_TOPLEVEL, origin_attributes);
+  do_timeout(0, () => { // allow the learn() to run on the main thread
   var preconns = [];
-  for (var i = 0; i < subresources.length; i++) {
-    var sruri = newURI(subresources[i]);
-    predictor.learn(sruri, pageload_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
-    preconns.push(extract_origin(sruri));
-  }
+
+  var sruri = newURI(subresources[0]);
+  predictor.learn(sruri, pageload_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
+
+  sruri = newURI(subresources[1]);
+  predictor.learn(sruri, pageload_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
+
+  sruri = newURI(subresources[2]);
+  predictor.learn(sruri, pageload_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
 
   var verifier = new Verifier("pageload", [], preconns, []);
   predictor.predict(pageload_toplevel, null, predictor.PREDICT_LOAD, origin_attributes, verifier);
+  });
+  });
+  });
+  });
 }
 
 function test_pageload() {
@@ -247,19 +262,38 @@ function continue_test_redrect() {
   ];
 
   predictor.learn(redirect_inituri, null, predictor.LEARN_LOAD_TOPLEVEL, origin_attributes);
+  do_timeout(0, () => {
   predictor.learn(redirect_targeturi, null, predictor.LEARN_LOAD_TOPLEVEL, origin_attributes);
+  do_timeout(0, () => {
   predictor.learn(redirect_targeturi, redirect_inituri, predictor.LEARN_LOAD_REDIRECT, origin_attributes);
+  do_tiemout(0, () => {
 
   var preconns = [];
   preconns.push(extract_origin(redirect_targeturi));
-  for (var i = 0; i < subresources.length; i++) {
-    var sruri = newURI(subresources[i]);
-    predictor.learn(sruri, redirect_targeturi, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
-    preconns.push(extract_origin(sruri));
-  }
+
+  var sruri = newURI(subresources[0]);
+  predictor.learn(sruri, redirect_targeturi, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
+
+  sruri = newURI(subresources[1]);
+  predictor.learn(sruris[1], redirect_targeturi, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
+
+  sruri = newURI(subresources[2]);
+  predictor.learn(sruris[2], redirect_targeturi, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(sruri));
 
   var verifier = new Verifier("redirect", [], preconns, []);
   predictor.predict(redirect_inituri, null, predictor.PREDICT_LOAD, origin_attributes, verifier);
+  });
+  });
+  });
+  });
+  });
+  });
 }
 
 function test_redirect() {
@@ -285,14 +319,20 @@ function test_startup() {
     "http://localhost:4443/startup"
   ];
   var preconns = [];
-  for (var i = 0; i < uris.length; i++) {
-    var uri = newURI(uris[i]);
-    predictor.learn(uri, null, predictor.LEARN_STARTUP, origin_attributes);
-    preconns.push(extract_origin(uri));
-  }
+  var uri = newURI(uris[0]);
+  predictor.learn(uri, null, predictor.LEARN_STARTUP, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(uri));
+
+  uri = newURI(uris[1]);
+  predictor.learn(uri, null, predictor.LEARN_STARTUP, origin_attributes);
+  do_timeout(0, () => {
+  preconns.push(extract_origin(uri));
 
   var verifier = new Verifier("startup", [], preconns, []);
   predictor.predict(null, null, predictor.PREDICT_STARTUP, origin_attributes, verifier);
+  });
+  });
 }
 
 const dns_toplevel = newURI("http://localhost:4444/index.html");
@@ -301,12 +341,16 @@ function continue_test_dns() {
   var subresource = "http://localhost:4443/jquery.js";
 
   predictor.learn(dns_toplevel, null, predictor.LEARN_LOAD_TOPLEVEL, origin_attributes);
+  do_timeout(0, () => {
   var sruri = newURI(subresource);
   predictor.learn(sruri, dns_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
 
   var preresolves = [extract_origin(sruri)];
   var verifier = new Verifier("dns", [], [], preresolves);
   predictor.predict(dns_toplevel, null, predictor.PREDICT_LOAD, origin_attributes, verifier);
+  });
+  });
 }
 
 function test_dns() {
@@ -330,19 +374,40 @@ function continue_test_origin() {
     "http://localhost:4444/image.png"
   ];
   predictor.learn(origin_toplevel, null, predictor.LEARN_LOAD_TOPLEVEL, origin_attributes);
+  do_timeout(0, () => {
   var preconns = [];
-  for (var i = 0; i < subresources.length; i++) {
-    var sruri = newURI(subresources[i]);
-    predictor.learn(sruri, origin_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
-    var origin = extract_origin(sruri);
-    if (preconns.indexOf(origin) === -1) {
-      preconns.push(origin);
-    }
+
+  var sruri = newURI(subresources[0]);
+  predictor.learn(sruri, origin_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  var origin = extract_origin(sruri);
+  if (preconns.indexOf(origin) === -1) {
+    preconns.push(origin);
+  }
+
+  sruri = newURI(subresources[1]);
+  predictor.learn(sruri, origin_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  var origin = extract_origin(sruri);
+  if (preconns.indexOf(origin) === -1) {
+    preconns.push(origin);
+  }
+
+  sruri = newURI(subresources[2]);
+  predictor.learn(sruri, origin_toplevel, predictor.LEARN_LOAD_SUBRESOURCE, origin_attributes);
+  do_timeout(0, () => {
+  var origin = extract_origin(sruri);
+  if (preconns.indexOf(origin) === -1) {
+    preconns.push(origin);
   }
 
   var loaduri = newURI("http://localhost:4444/anotherpage.html");
   var verifier = new Verifier("origin", [], preconns, []);
   predictor.predict(loaduri, null, predictor.PREDICT_LOAD, origin_attributes, verifier);
+  });
+  });
+  });
+  });
 }
 
 function test_origin() {
diff --git a/nsprpub/pr/src/io/prsocket.c b/nsprpub/pr/src/io/prsocket.c
index 8cd4f0438371..0a18d4b2e8e6 100644
--- a/nsprpub/pr/src/io/prsocket.c
+++ b/nsprpub/pr/src/io/prsocket.c
@@ -315,9 +315,9 @@ static PRStatus PR_CALLBACK SocketConnectContinue(
     if (fd->secret->alreadyConnected) {
         fd->secret->alreadyConnected = PR_FALSE;
     }
-    // TCP Fast Open on Windows must use ConnectEx, which uses overlapped
-    // input/output.
-    // To get result we need to use GetOverlappedResult.
+    /* TCP Fast Open on Windows must use ConnectEx, which uses overlapped
+     * input/output.
+     * To get result we need to use GetOverlappedResult. */
     if (fd->secret->overlappedActive) {
         PR_ASSERT(fd->secret->nonblocking);
         PRInt32 rvSent;
@@ -325,9 +325,9 @@ static PRStatus PR_CALLBACK SocketConnectContinue(
             fd->secret->overlappedActive = FALSE;
             PR_LOG(_pr_io_lm, PR_LOG_MIN,
                ("SocketConnectContinue GetOverlappedResult succeeded\n"));
-            // When ConnectEx is used, all previously set socket options and
-            // property are not enabled and to enable them
-            // SO_UPDATE_CONNECT_CONTEXT option need to be set.
+            /* When ConnectEx is used, all previously set socket options and
+             * property are not enabled and to enable them
+             * SO_UPDATE_CONNECT_CONTEXT option need to be set. */
             if (setsockopt((SOCKET)osfd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) != 0) {
                 err = WSAGetLastError();
                 PR_LOG(_pr_io_lm, PR_LOG_MIN,
@@ -1198,7 +1198,7 @@ static PRIOMethods tcpMethods = {
 	SocketSend,
 	(PRRecvfromFN)_PR_InvalidInt,
 #if defined(_WIN64) && defined(WIN95)
-	SocketTCPSendTo, // This is for fast open. We imitate Linux interface.
+	SocketTCPSendTo, /* This is for fast open. We imitate Linux interface. */
 #else
 	(PRSendtoFN)_PR_InvalidInt,
 #endif
diff --git a/nsprpub/pr/src/md/windows/w95sock.c b/nsprpub/pr/src/md/windows/w95sock.c
index 89d547fb2a96..f0712c157fe1 100644
--- a/nsprpub/pr/src/md/windows/w95sock.c
+++ b/nsprpub/pr/src/md/windows/w95sock.c
@@ -410,7 +410,7 @@ _PR_MD_TCPSENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
         return -1;
     }
 
-    // ConnectEx requires the socket to be initially bound. We will use INADDR_ANY
+    /* ConnectEx requires the socket to be initially bound. We will use INADDR_ANY. */
     PRNetAddr bindAddr;
     memset(&bindAddr, 0, sizeof(bindAddr));
     if (addr->raw.family == PR_AF_INET) {
@@ -432,13 +432,13 @@ _PR_MD_TCPSENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
 
     rvSent = 0;
     memset(&fd->secret->ol, 0, sizeof(fd->secret->ol));
-    // ConnectEx return TRUE on a success and FALSE on an error.
+    /* ConnectEx return TRUE on a success and FALSE on an error. */
     if (_pr_win_connectex( (SOCKET)osfd, (struct sockaddr *) addr,
                            addrlen, buf, amount,
                            &rvSent, &fd->secret->ol) == TRUE) {
-        // When ConnectEx is used, all previously set socket options and
-        // property are not enabled and to enable them
-        // SO_UPDATE_CONNECT_CONTEXT option need to be set.
+        /* When ConnectEx is used, all previously set socket options and
+         * property are not enabled and to enable them
+         * SO_UPDATE_CONNECT_CONTEXT option need to be set. */
         rv = setsockopt((SOCKET)osfd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0);
         if (rv != 0) {
             err = WSAGetLastError();
@@ -447,10 +447,10 @@ _PR_MD_TCPSENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
             _PR_MD_MAP_SETSOCKOPT_ERROR(err);
             return -1;
         }
-        // We imitate Linux here. SendTo will return number of bytes send but
-        // it can not return connection success at the same time, so we return
-        // number of bytes send and "connection success" will be return on the
-        // connectcontinue.
+        /* We imitate Linux here. SendTo will return number of bytes send but
+         * it can not return connection success at the same time, so we return
+         * number of bytes send and "connection success" will be return on the
+         * connectcontinue. */
         fd->secret->alreadyConnected = PR_TRUE;
         return rvSent;
     } else {
@@ -461,13 +461,13 @@ _PR_MD_TCPSENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags,
             _PR_MD_MAP_CONNECT_ERROR(err);
             return -1;
         } else if (fd->secret->nonblocking) {
-            // Remember that overlapped structure is set. We will neede to get
-            // the final result of ConnectEx call.
+            /* Remember that overlapped structure is set. We will neede to get
+             * the final result of ConnectEx call. */
             fd->secret->overlappedActive = PR_TRUE;
             _PR_MD_MAP_CONNECT_ERROR(WSAEWOULDBLOCK);
-            // ConnectEx will copy supplied data to a internal buffer and send
-            // them during Fast Open or after connect. Therefore we can assumed
-            // this data already send.
+            /* ConnectEx will copy supplied data to a internal buffer and send
+             * them during Fast Open or after connect. Therefore we can assumed
+             * this data already send. */
             return amount;
         }
         while (err == ERROR_IO_PENDING) {
diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c
index 655d15b4b52f..53206bd165e3 100644
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -2056,14 +2056,15 @@ static PRInt32 pt_SendTo(
     return bytes;
 }  /* pt_SendTo */
 
-// Linux uses SendTo to send data during TCP Fast Open. OSX uses connectx, but
-// we will make it imitate the Linux's interface.
+#if defined(LINUX) || defined(DARWIN)
+/* Linux uses SendTo to send data during TCP Fast Open. OSX uses connectx, but
+ * we will make it imitate the Linux's interface. */
 static PRInt32 pt_TCP_SendTo(
     PRFileDesc *fd, const void *buf,
     PRInt32 amount, PRIntn flags, const PRNetAddr *addr,
     PRIntervalTime timeout)
 {
-#if !defined(DARWIN) || HAS_CONNECTX
+#if defined(LINUX) || HAS_CONNECTX
     PRInt32 syserrno, bytes = -1;
     PRBool fNeedContinue = PR_FALSE;
     pt_SockLen addr_len;
@@ -2084,8 +2085,8 @@ static PRInt32 pt_TCP_SendTo(
 #ifdef _PR_HAVE_SOCKADDR_LEN
         md_af = AF_INET6;
 #else
-        // If _PR_INET6 is defined and it is PR_AF_INET6 we set family
-        // to AF_INET6.
+        /* If _PR_INET6 is defined and it is PR_AF_INET6 we set family
+         * to AF_INET6. */
         addrCopy = *addr;
         addrCopy.raw.family = AF_INET6;
         addrp = &addrCopy;
@@ -2094,8 +2095,8 @@ static PRInt32 pt_TCP_SendTo(
 #endif
 
 #ifdef _PR_HAVE_SOCKADDR_LEN
-    // if _PR_HAVE_SOCKADDR_LEN is defined and it is PR_AF_INET6 we set family
-    // to AF_INET6 and we set address length.
+    /* if _PR_HAVE_SOCKADDR_LEN is defined and it is PR_AF_INET6 we set family
+     * to AF_INET6 and we set address length. */
     addrCopy = *addr;
     ((struct sockaddr*)&addrCopy)->sa_len = addr_len;
     ((struct sockaddr*)&addrCopy)->sa_family = md_af;
@@ -2143,11 +2144,12 @@ static PRInt32 pt_TCP_SendTo(
         pt_MapError(_PR_MD_MAP_SENDTO_ERROR, syserrno);
     }
     return bytes;
-#else
+#else /* !HAS_CONNECTX */
     PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
     return -1;
 #endif
 }  /* pt_TCP_SendTo */
+#endif /* LINUX || DARWIN */
 
 static PRInt32 pt_RecvFrom(PRFileDesc *fd, void *buf, PRInt32 amount,
     PRIntn flags, PRNetAddr *addr, PRIntervalTime timeout)
@@ -3260,7 +3262,11 @@ static PRIOMethods _pr_tcp_methods = {
     pt_Recv,
     pt_Send,
     (PRRecvfromFN)_PR_InvalidInt,
-    pt_TCP_SendTo, // This is for TCP Fast Open. Linux uses SendTo function for this. OSX uses connectx, but we imitate Linux.
+#if defined(LINUX) || defined(DARWIN)
+    pt_TCP_SendTo, /* This is for TCP Fast Open. Linux uses SendTo function for this. OSX uses connectx, but we imitate Linux. */
+#else
+    (PRSendtoFN)_PR_InvalidInt,
+#endif
     pt_Poll,
     pt_AcceptRead,
     pt_TransmitFile,
diff --git a/security/manager/.eslintrc.js b/security/manager/.eslintrc.js
index 94fa37d11665..ea9475bc379a 100644
--- a/security/manager/.eslintrc.js
+++ b/security/manager/.eslintrc.js
@@ -26,18 +26,9 @@ module.exports = {
     // Require `foo.bar` dot notation instead of `foo["bar"]` notation.
     "dot-notation": "error",
 
-    // Always require a trailing EOL
-    "eol-last": "error",
-
-    // No spaces between function name and parentheses.
-    "func-call-spacing": ["error", "never"],
-
     // Require function* name()
     "generator-star-spacing": ["error", {"before": false, "after": true}],
 
-    // Space after colon not before in property declarations
-    "key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
-
     // Always require parenthesis for new calls
     "new-parens": "error",
 
@@ -85,9 +76,6 @@ module.exports = {
     // No reassigning native JS objects or read only globals.
     "no-global-assign": "error",
 
-    // Disallow implied eval().
-    "no-implied-eval": "error",
-
     // Disallow primitive wrapper instances like `new Boolean(false)`, which
     // seem like they should act like primitives but don't.
     "no-new-wrappers": "error",
@@ -111,9 +99,6 @@ module.exports = {
     // |throw new Error("error")|)
     "no-throw-literal": "error",
 
-    // No using undeclared variables
-    "no-undef": "error",
-
     // Disallow unmodified loop conditions.
     "no-unmodified-loop-condition": "error",
 
@@ -149,9 +134,6 @@ module.exports = {
     // No space padding in parentheses
     "space-in-parens": ["error", "never"],
 
-    // Require spaces around operators
-    "space-infix-ops": "error",
-
     // ++ and -- should not need spacing
     "space-unary-ops": ["error", { "words": true, "nonwords": false }],
 
@@ -167,10 +149,5 @@ module.exports = {
 
     // Disallow Yoda conditions.
     "yoda": ["error", "never"],
-  },
-
-  "globals": {
-    "Components": false,
-    "dump": false
   }
 };
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h
index af0a9a7406f2..c3a70986a623 100644
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -1158,4 +1158,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1501426532646000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1501512662566000);
diff --git a/security/manager/ssl/nsSTSPreloadList.errors b/security/manager/ssl/nsSTSPreloadList.errors
index 9876330c39fc..c0a3f96c1749 100644
--- a/security/manager/ssl/nsSTSPreloadList.errors
+++ b/security/manager/ssl/nsSTSPreloadList.errors
@@ -26,6 +26,7 @@
 1a-jva.de: could not connect to host
 1cover.com: could not connect to host
 1k8b.com: could not connect to host
+1kando.com: did not receive HSTS header
 1password.com: did not receive HSTS header
 1s.tn: did not receive HSTS header
 1xcess.com: did not receive HSTS header
@@ -50,7 +51,6 @@
 360gradus.com: did not receive HSTS header
 365.or.jp: could not connect to host
 368mibn.com: could not connect to host
-3ags.de: did not receive HSTS header
 3chit.cf: could not connect to host
 3click-loan.com: could not connect to host
 3delivered.com: could not connect to host
@@ -61,7 +61,6 @@
 404404.info: could not connect to host
 420dongstorm.com: could not connect to host
 42ms.org: could not connect to host
-441jj.com: did not receive HSTS header
 4455software.com: did not receive HSTS header
 4679.space: could not connect to host
 47ronin.com: could not connect to host
@@ -103,6 +102,7 @@ abearofsoap.com: could not connect to host
 abecodes.net: could not connect to host
 abeestrada.com: did not receive HSTS header
 abilitylist.org: did not receive HSTS header
+abilymp06.net: could not connect to host
 abioniere.de: could not connect to host
 ablogagency.net: could not connect to host
 abnarnro.com: could not connect to host
@@ -121,6 +121,7 @@ accounts-p.com: could not connect to host
 accuenergy.com: max-age too low: 0
 acelpb.com: did not receive HSTS header
 acevik.de: could not connect to host
+acg18.us: did not receive HSTS header
 acgmoon.org: did not receive HSTS header
 acisonline.net: did not receive HSTS header
 acorns.com: did not receive HSTS header
@@ -206,6 +207,7 @@ alariel.de: did not receive HSTS header
 alarmsystemreviews.com: did not receive HSTS header
 albertopimienta.com: did not receive HSTS header
 alcazaar.com: could not connect to host
+alecvannoten.be: did not receive HSTS header
 alenan.org: could not connect to host
 alessandro.pw: did not receive HSTS header
 alethearose.com: did not receive HSTS header
@@ -218,7 +220,7 @@ alittlebitcheeky.com: did not receive HSTS header
 aljaspod.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 alkami.com: did not receive HSTS header
 all-subtitles.com: did not receive HSTS header
-all.tf: did not receive HSTS header
+all.tf: could not connect to host
 alldaymonitoring.com: could not connect to host
 allforyou.at: could not connect to host
 allinnote.com: could not connect to host
@@ -307,6 +309,7 @@ antoniorequena.com.ve: could not connect to host
 antscript.com: did not receive HSTS header
 anycoin.me: could not connect to host
 aocast.info: could not connect to host
+aojf.fr: could not connect to host
 aosc.io: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 apachelounge.com: did not receive HSTS header
 apeasternpower.com: could not connect to host
@@ -341,6 +344,7 @@ aran.me.uk: could not connect to host
 arbeitskreis-asyl-eningen.de: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 arboineuropa.nl: did not receive HSTS header
 arbu.eu: could not connect to host
+aristilabs.com: did not receive HSTS header
 arlen.se: could not connect to host
 armory.consulting: could not connect to host
 armory.supplies: could not connect to host
@@ -411,6 +415,7 @@ ausoptic.com.au: max-age too low: 2592000
 aussiecable.org: did not receive HSTS header
 auth.mail.ru: did not receive HSTS header
 authentication.io: could not connect to host
+authint.com: could not connect to host
 authoritynutrition.com: did not receive HSTS header
 auto-serwis.zgorzelec.pl: did not receive HSTS header
 auto4trade.nl: could not connect to host
@@ -435,7 +440,9 @@ awg-mode.de: did not receive HSTS header
 awxg.com: could not connect to host
 axado.com.br: did not receive HSTS header
 axeny.com: did not receive HSTS header
+ayahuascaadvisor.com: could not connect to host
 az.search.yahoo.com: did not receive HSTS header
+azazy.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 azino777.ru: could not connect to host
 azprep.us: did not receive HSTS header
 azuxul.fr: could not connect to host
@@ -446,7 +453,7 @@ baby-click.de: did not receive HSTS header
 babybic.hu: did not receive HSTS header
 babyhouse.xyz: could not connect to host
 babymasaze.cz: did not receive HSTS header
-babysaying.me: max-age too low: 6000
+babysaying.me: could not connect to host
 bacchanallia.com: could not connect to host
 back-bone.nl: did not receive HSTS header
 badcronjob.com: could not connect to host
@@ -493,12 +500,10 @@ bcnx.de: max-age too low: 0
 bcsytv.com: could not connect to host
 bcweightlifting.ca: could not connect to host
 bde-epitech.fr: could not connect to host
-bdvg.org: could not connect to host
 be.search.yahoo.com: did not receive HSTS header
 beach-inspector.com: did not receive HSTS header
 beachi.es: could not connect to host
 beaglewatch.com: could not connect to host
-beanjuice.me: could not connect to host
 beardydave.com: did not receive HSTS header
 beastowner.com: did not receive HSTS header
 beautyconcept.co: did not receive HSTS header
@@ -513,7 +518,6 @@ behere.be: could not connect to host
 beholdthehurricane.com: could not connect to host
 beier.io: could not connect to host
 belairsewvac.com: could not connect to host
-belegit.org: could not connect to host
 belics.com: did not receive HSTS header
 belltower.io: could not connect to host
 bemyvictim.com: max-age too low: 2678400
@@ -530,7 +534,6 @@ bermytraq.bm: [Exception... "Component returned failure code: 0x80004005 (NS_ERR
 berrymark.be: max-age too low: 0
 besixdouze.world: could not connect to host
 besola.de: did not receive HSTS header
-best-wallpaper.net: max-age too low: 0
 bestbeards.ca: could not connect to host
 bestcellular.com: did not receive HSTS header
 besthost.cz: did not receive HSTS header
@@ -539,7 +542,6 @@ bethditto.com: could not connect to host
 betnet.fr: could not connect to host
 betplanning.it: did not receive HSTS header
 bets.de: did not receive HSTS header
-betterlifemakers.com: could not connect to host
 bettween.com: could not connect to host
 betz.ro: did not receive HSTS header
 bevapehappy.com: did not receive HSTS header
@@ -578,6 +580,7 @@ biophysik-ssl.de: did not receive HSTS header
 birkman.com: did not receive HSTS header
 bisterfeldt.com: could not connect to host
 bitchan.it: could not connect to host
+bitcoinindia.com: did not receive HSTS header
 bitcoinprivacy.net: did not receive HSTS header
 bitcoinworld.me: could not connect to host
 bitconcepts.co.uk: did not receive HSTS header
@@ -619,7 +622,6 @@ blog.lookout.com: did not receive HSTS header
 bloglikepro.com: could not connect to host
 blubbablasen.de: could not connect to host
 blucas.org: did not receive HSTS header
-bluechilli.com: could not connect to host
 blueglobalmedia.com: could not connect to host
 blueliv.com: did not receive HSTS header
 bluescloud.xyz: could not connect to host
@@ -637,7 +639,6 @@ bodyweightsolution.com: could not connect to host
 boensou.com: did not receive HSTS header
 bogosity.se: could not connect to host
 bohan.life: could not connect to host
-boilesen.com: could not connect to host
 bolwerk.com.br: could not connect to host
 bonapp.restaurant: could not connect to host
 bonfi.net: did not receive HSTS header
@@ -735,7 +736,6 @@ bwear4all.de: did not receive HSTS header
 bws16.de: could not connect to host
 by4cqb.cn: could not connect to host
 bydisk.com: could not connect to host
-bynet.cz: could not connect to host
 bypassed.press: could not connect to host
 bypassed.today: did not receive HSTS header
 bypassed.works: did not receive HSTS header
@@ -759,6 +759,7 @@ cafe-murr.de: could not connect to host
 cafe-scientifique.org.ec: could not connect to host
 caim.cz: did not receive HSTS header
 cainhosting.com: did not receive HSTS header
+caizx.com: could not connect to host
 cajapopcorn.com: did not receive HSTS header
 cake.care: could not connect to host
 calendarr.com: did not receive HSTS header
@@ -812,6 +813,7 @@ casovi.cf: could not connect to host
 catarsisvr.com: could not connect to host
 catinmay.com: did not receive HSTS header
 catnapstudios.com: could not connect to host
+caulong-ao.net: could not connect to host
 caveclan.org: did not receive HSTS header
 cavedroid.xyz: could not connect to host
 cbhq.net: could not connect to host
@@ -824,6 +826,7 @@ cd0.us: could not connect to host
 cdnb.co: could not connect to host
 cdndepo.com: could not connect to host
 cdreporting.co.uk: did not receive HSTS header
+cecipu.gob.cl: could not connect to host
 celina-reads.de: did not receive HSTS header
 cellsites.nz: could not connect to host
 centillien.com: did not receive HSTS header
@@ -831,7 +834,6 @@ centralvacsunlimited.net: could not connect to host
 centrepoint-community.com: could not connect to host
 ceritamalam.net: could not connect to host
 cerize.love: could not connect to host
-cerpa.com.br: could not connect to host
 cert.se: max-age too low: 2628001
 certifi.io: could not connect to host
 certmgr.org: could not connect to host
@@ -926,7 +928,6 @@ cleanmta.com: could not connect to host
 clearc.tk: could not connect to host
 clemovementlaw.com: could not connect to host
 clerkendweller.uk: could not connect to host
-clevertarget.ru: did not receive HSTS header
 clickandgo.com: did not receive HSTS header
 clickandshoot.nl: did not receive HSTS header
 clickgram.biz: did not receive HSTS header
@@ -985,7 +986,6 @@ codelayer.ca: could not connect to host
 codelitmus.com: did not receive HSTS header
 codemonkeyrawks.net: did not receive HSTS header
 codepoet.de: could not connect to host
-codepult.com: could not connect to host
 codepx.com: did not receive HSTS header
 codiva.io: max-age too low: 2592000
 codyevanscomputer.com: could not connect to host
@@ -1003,7 +1003,6 @@ colo-tech.com: could not connect to host
 colognegaming.net: could not connect to host
 coloradocomputernetworking.net: could not connect to host
 colorlib.com: did not receive HSTS header
-combron.nl: did not receive HSTS header
 comfortdom.ua: did not receive HSTS header
 comfortticket.de: did not receive HSTS header
 comicspines.com: could not connect to host
@@ -1074,6 +1073,7 @@ create-test-publish.co.uk: could not connect to host
 creativephysics.ml: could not connect to host
 creativeplayuk.com: did not receive HSTS header
 crendontech.com: could not connect to host
+crestasantos.com: could not connect to host
 crestoncottage.com: could not connect to host
 crimewatch.net.za: could not connect to host
 crizk.com: could not connect to host
@@ -1118,6 +1118,7 @@ ct.search.yahoo.com: did not receive HSTS header
 cthulhuden.com: could not connect to host
 cubeserver.eu: could not connect to host
 cubewano.com: could not connect to host
+cubostecnologia.com: could not connect to host
 cucc.date: did not receive HSTS header
 cuibonobo.com: could not connect to host
 cujanovic.com: did not receive HSTS header
@@ -1145,12 +1146,12 @@ d-rickroll-e.pw: could not connect to host
 dad256.tk: could not connect to host
 dadtheimpaler.com: could not connect to host
 dah5.com: did not receive HSTS header
-dahlberg.cologne: could not connect to host
 dailybits.be: did not receive HSTS header
 dailystormerpodcasts.com: could not connect to host
 daimadi.com: could not connect to host
 dakrib.net: could not connect to host
 daku.gdn: could not connect to host
+dale-electric.com: could not connect to host
 dalfiume.it: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 dalingk.co: could not connect to host
 damedrogy.cz: could not connect to host
@@ -1163,6 +1164,7 @@ danielheal.net: could not connect to host
 danieliancu.com: could not connect to host
 danielworthy.com: did not receive HSTS header
 danijobs.com: could not connect to host
+dannyrohde.de: could not connect to host
 danrl.de: could not connect to host
 daolerp.xyz: could not connect to host
 dargasia.is: could not connect to host
@@ -1312,7 +1314,6 @@ dl.google.com: did not receive HSTS header (error ignored - included regardless)
 dlc.viasinc.com: could not connect to host
 dlemper.de: did not receive HSTS header
 dlitz.net: could not connect to host
-dlld.com: could not connect to host
 dlscomputers.com.au: did not receive HSTS header
 dmcibulldog.com: did not receive HSTS header
 dmtry.me: did not receive HSTS header
@@ -1396,7 +1397,6 @@ dutchrank.com: could not connect to host
 duuu.ch: could not connect to host
 dvorupotocnych.sk: could not connect to host
 dwhd.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
-dworzak.ch: could not connect to host
 dycontrol.de: could not connect to host
 dylanscott.com.au: did not receive HSTS header
 dynamic-innovations.net: could not connect to host
@@ -1560,7 +1560,6 @@ errors.zenpayroll.com: could not connect to host
 ersindemirtas.com: did not receive HSTS header
 eru.me: did not receive HSTS header
 escalate.eu: could not connect to host
-escargotbistro.com: could not connect to host
 escotour.com: could not connect to host
 esec.rs: did not receive HSTS header
 esko.bar: could not connect to host
@@ -1623,7 +1622,6 @@ extratorrentlive.xyz: could not connect to host
 extreemhost.nl: did not receive HSTS header
 extremenetworking.net: could not connect to host
 exy.pw: could not connect to host
-eyasc.nl: could not connect to host
 eyedarts.com: did not receive HSTS header
 eyeglassuniverse.com: did not receive HSTS header
 ez.fi: could not connect to host
@@ -1668,6 +1666,7 @@ fatgeekflix.net: could not connect to host
 fatherhood.gov: did not receive HSTS header
 fatlossguide.xyz: could not connect to host
 fatwin.pw: could not connect to host
+faucetbox.com: could not connect to host
 fayolle.info: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 fbox.li: could not connect to host
 fdj.im: could not connect to host
@@ -1733,7 +1732,6 @@ flags.ninja: could not connect to host
 flamewall.net: could not connect to host
 flareon.net: could not connect to host
 flawcheck.com: did not receive HSTS header
-fleurette.me: max-age too low: 0
 fliexer.com: could not connect to host
 flirchi.com: did not receive HSTS header
 floless.co.uk: did not receive HSTS header
@@ -1768,7 +1766,6 @@ foreveralone.io: could not connect to host
 forex-dan.com: did not receive HSTS header
 forgix.com: could not connect to host
 formazioneopen.it: could not connect to host
-formbetter.com: could not connect to host
 formula.cf: could not connect to host
 fotiu.com: could not connect to host
 fotm.net: max-age too low: 30000
@@ -1876,7 +1873,6 @@ gamerz-point.de: did not receive HSTS header
 gamesdepartment.co.uk: did not receive HSTS header
 gameserver-sponsor.de: could not connect to host
 gamingmedia.eu: did not receive HSTS header
-gamingreinvented.com: could not connect to host
 gampenhof.de: did not receive HSTS header
 gaptek.id: could not connect to host
 garciamartin.me: could not connect to host
@@ -1885,6 +1881,7 @@ gatapro.net: could not connect to host
 gatorsa.es: could not connect to host
 gdegem.org: did not receive HSTS header
 gdpventure.com: max-age too low: 0
+gdz-spishy.com: did not receive HSTS header
 gdz.tv: did not receive HSTS header
 gedankenbude.info: could not connect to host
 geekcast.co.uk: did not receive HSTS header
@@ -1929,6 +1926,7 @@ getremembrall.com: could not connect to host
 getsello.com: could not connect to host
 getwashdaddy.com: could not connect to host
 gfm.tech: could not connect to host
+gfournier.ca: could not connect to host
 gfwsb.ml: could not connect to host
 ggss.ml: could not connect to host
 gheorghesarcov.ga: could not connect to host
@@ -1985,8 +1983,7 @@ goldegg-training.com: did not receive HSTS header
 goldendata.io: could not connect to host
 goldminer.ga: could not connect to host
 golocal-media.de: could not connect to host
-gonzalosanchez.mx: did not receive HSTS header
-gooby.co: could not connect to host
+gonzalosanchez.mx: could not connect to host
 goodenough.nz: did not receive HSTS header
 goodtech.com.br: could not connect to host
 goodwin43.ru: could not connect to host
@@ -2011,7 +2008,7 @@ gparent.org: did not receive HSTS header
 gpsfix.cz: did not receive HSTS header
 gpstuner.com: did not receive HSTS header
 grabi.ga: could not connect to host
-gracesofgrief.com: max-age too low: 86400
+gracesofgrief.com: could not connect to host
 gradienthosting.co.uk: did not receive HSTS header
 grandmascookieblog.com: did not receive HSTS header
 grantedby.me: max-age too low: 0
@@ -2025,6 +2022,7 @@ graymalk.in: could not connect to host
 grazetech.com: could not connect to host
 grcnode.co.uk: could not connect to host
 greatnet.de: did not receive HSTS header
+greatsong.net: did not receive HSTS header
 greenhillantiques.co.uk: did not receive HSTS header
 greenvines.com.tw: did not receive HSTS header
 greg.red: could not connect to host
@@ -2059,7 +2057,6 @@ guenthernoack.de: could not connect to host
 guge.gq: could not connect to host
 gugga.dk: did not receive HSTS header
 guilde-vindicta.fr: did not receive HSTS header
-guineapigmustach.es: could not connect to host
 gulenet.com: could not connect to host
 gunnarhafdal.com: did not receive HSTS header
 gunnaro.com: could not connect to host
@@ -2144,6 +2141,7 @@ hasinase.de: did not receive HSTS header
 haste.ch: could not connect to host
 hastherebeenamassshooting.today: could not connect to host
 hatoko.net: could not connect to host
+haucke.xyz: could not connect to host
 haufschild.de: could not connect to host
 haurumcraft.net: could not connect to host
 hausarzt-stader-str.de: did not receive HSTS header
@@ -2177,7 +2175,6 @@ helpmebuild.com: did not receive HSTS header
 hemdal.se: could not connect to host
 hencagon.com: could not connect to host
 henriknoerr.com: could not connect to host
-heptafrogs.de: could not connect to host
 herrenfahrt.com: did not receive HSTS header
 herzbotschaft.de: did not receive HSTS header
 heutger.net: did not receive HSTS header
@@ -2204,7 +2201,6 @@ hiphopconvention.nl: could not connect to host
 hirake55.com: could not connect to host
 hitoy.org: did not receive HSTS header
 hittipps.com: did not receive HSTS header
-hloe0xff.ru: could not connect to host
 hlyue.com: did not receive HSTS header
 hmm.nyc: could not connect to host
 hn.search.yahoo.com: did not receive HSTS header
@@ -2217,6 +2213,7 @@ holymoly.lu: could not connect to host
 homa.website: could not connect to host
 homeclouding.de: could not connect to host
 homedna.com: did not receive HSTS header
+hometownmall.com: did not receive HSTS header
 honeytracks.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 hongzhaxiaofendui.com: could not connect to host
 honoo.com: could not connect to host
@@ -2240,6 +2237,7 @@ hotchoc.io: did not receive HSTS header
 houkago-step.com: did not receive HSTS header
 housemaadiah.org: did not receive HSTS header
 housingstudents.org.uk: could not connect to host
+howbigismybuilding.com: could not connect to host
 howrandom.org: could not connect to host
 howtocuremysciatica.com: could not connect to host
 hr-intranet.com: could not connect to host
@@ -2285,6 +2283,7 @@ iapws.com: could not connect to host
 iban.is: could not connect to host
 ibarf.nl: did not receive HSTS header
 ice.yt: could not connect to host
+icebat.dyndns.org: could not connect to host
 icewoman.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 icfl.com.br: could not connect to host
 ichnichtskaufmann.de: could not connect to host
@@ -2307,12 +2306,12 @@ identitylabs.uk: could not connect to host
 idgsupply.com: could not connect to host
 idlekernel.com: could not connect to host
 idontexist.me: did not receive HSTS header
-idvl.de: could not connect to host
 ie.search.yahoo.com: did not receive HSTS header
 ierna.com: did not receive HSTS header
 ies-italia.it: did not receive HSTS header
 ies.id.lv: could not connect to host
 ifad.org: did not receive HSTS header
+ifconfig.co: did not receive HSTS header
 ifleurs.com: could not connect to host
 ifx.ee: could not connect to host
 ignatisd.gr: did not receive HSTS header
@@ -2354,7 +2353,7 @@ imrejonk.nl: could not connect to host
 imu.li: did not receive HSTS header
 imusic.dk: did not receive HSTS header
 inb4.us: could not connect to host
-inbox.li: did not receive HSTS header
+inbox.li: could not connect to host
 incendiary-arts.com: could not connect to host
 inche-ali.com: could not connect to host
 inchomatic.com: did not receive HSTS header
@@ -2398,6 +2397,7 @@ intel.li: did not receive HSTS header
 interference.io: could not connect to host
 interhosts.co.za: could not connect to host
 interlun.com: could not connect to host
+internect.co.za: did not receive HSTS header
 internetcasinos.de: could not connect to host
 internetcensus.org: could not connect to host
 interserved.com: did not receive HSTS header
@@ -2416,7 +2416,7 @@ iora.fr: could not connect to host
 iosmods.com: did not receive HSTS header
 iostips.ru: could not connect to host
 iotsms.io: could not connect to host
-ip6.im: did not receive HSTS header
+ip6.im: could not connect to host
 ipmimagazine.com: did not receive HSTS header
 iprice.co.id: did not receive HSTS header
 iprice.hk: did not receive HSTS header
@@ -2460,16 +2460,15 @@ ithakama.com: did not receive HSTS header
 ithakama.cz: did not receive HSTS header
 itos.asia: did not receive HSTS header
 itos.pl: did not receive HSTS header
+itpros.ru: did not receive HSTS header
 itriskltd.com: could not connect to host
 itsadog.co.uk: did not receive HSTS header
 itsagadget.com: did not receive HSTS header
 itsamurai.ru: max-age too low: 2592000
-itsatrap.nl: could not connect to host
 itsecurityassurance.pw: could not connect to host
 itsg-faq.de: could not connect to host
 itshost.ru: could not connect to host
 itskayla.com: did not receive HSTS header
-itspawned.com: could not connect to host
 itsryan.com: did not receive HSTS header
 ivi-fertility.com: max-age too low: 0
 ivi.es: max-age too low: 0
@@ -2540,6 +2539,7 @@ jdav-leipzig.de: could not connect to host
 jdcdirectsales.com.ph: did not receive HSTS header
 jebengotai.com: did not receive HSTS header
 jeff393.com: could not connect to host
+jeffsanders.com: did not receive HSTS header
 jenjoit.de: could not connect to host
 jennedebleser.com: could not connect to host
 jensenbanden.no: could not connect to host
@@ -2563,6 +2563,7 @@ jhejderup.me: could not connect to host
 jia1hao.com: could not connect to host
 jiaidu.com: could not connect to host
 jichi.io: did not receive HSTS header
+jie.dance: could not connect to host
 jikken.de: could not connect to host
 jimas.eu: did not receive HSTS header
 jimgao.tk: did not receive HSTS header
@@ -2616,7 +2617,6 @@ junjung.me: max-age too low: 0
 junqtion.com: could not connect to host
 jupp0r.de: did not receive HSTS header
 justanothercompany.name: could not connect to host
-justchunks.net: did not receive HSTS header
 justinlemay.com: did not receive HSTS header
 justlikethat.hosting: did not receive HSTS header
 justnaw.co.uk: could not connect to host
@@ -2681,7 +2681,6 @@ ki-on.net: did not receive HSTS header
 kickass.al: could not connect to host
 kid-dachau.de: did not receive HSTS header
 kiel-media.de: did not receive HSTS header
-kienlen.org: could not connect to host
 killerit.in: could not connect to host
 kimpost.org: could not connect to host
 kinderly.co.uk: did not receive HSTS header
@@ -2719,6 +2718,7 @@ klicktojob.de: could not connect to host
 kmartin.io: did not receive HSTS header
 knccloud.com: could not connect to host
 knightsbridgegroup.org: could not connect to host
+knowledgesnap.com: could not connect to host
 knowledgesnapsites.com: could not connect to host
 kodexplorer.ml: could not connect to host
 kodiaklabs.org: could not connect to host
@@ -2753,7 +2753,6 @@ krayx.com: did not receive HSTS header
 kreavis.com: did not receive HSTS header
 kredite.sale: could not connect to host
 kriegt.es: did not receive HSTS header
-kristikala.nl: could not connect to host
 krizevci.info: did not receive HSTS header
 kroetenfuchs.de: could not connect to host
 kropkait.pl: could not connect to host
@@ -2817,7 +2816,6 @@ laplaceduvillage.net: could not connect to host
 laquack.com: could not connect to host
 laredsemanario.com: could not connect to host
 laserfuchs.de: did not receive HSTS header
-laserpc.net: could not connect to host
 lashstuff.com: did not receive HSTS header
 latinred.com: could not connect to host
 latus.xyz: could not connect to host
@@ -2833,6 +2831,7 @@ lbrt.xyz: could not connect to host
 ldarby.me.uk: could not connect to host
 leadership9.com: could not connect to host
 leardev.de: did not receive HSTS header
+learnedovo.com: did not receive HSTS header
 learnfrenchfluently.com: did not receive HSTS header
 learningorder.com: could not connect to host
 ledgerscope.net: could not connect to host
@@ -2851,7 +2850,6 @@ lenovogaming.com: did not receive HSTS header
 lentri.com: did not receive HSTS header
 leob.in: did not receive HSTS header
 leon-jaekel.com: could not connect to host
-leonhooijer.nl: could not connect to host
 leopold.email: could not connect to host
 leopoldina.net: could not connect to host
 leopotamgroup.com: could not connect to host
@@ -2882,7 +2880,6 @@ lianye3.cc: could not connect to host
 lianye4.cc: could not connect to host
 lianye5.cc: could not connect to host
 lianye6.cc: could not connect to host
-lianyexiuchang.in: could not connect to host
 liaoshuma.com: could not connect to host
 libanco.com: could not connect to host
 libertyrp.org: could not connect to host
@@ -2948,6 +2945,7 @@ locktheirphone.com: could not connect to host
 locomotive.ca: did not receive HSTS header
 loftboard.eu: could not connect to host
 logario.com.br: could not connect to host
+logicaladvertising.com: could not connect to host
 login.corp.google.com: max-age too low: 7776000 (error ignored - included regardless)
 loginseite.com: could not connect to host
 lognot.net: could not connect to host
@@ -3034,7 +3032,6 @@ mafiareturns.com: max-age too low: 2592000
 magenx.com: did not receive HSTS header
 mahamed91.pw: could not connect to host
 mahefa.co.uk: could not connect to host
-maidofhonorcleaning.net: could not connect to host
 mail-settings.google.com: did not receive HSTS header (error ignored - included regardless)
 mail.google.com: did not receive HSTS header (error ignored - included regardless)
 maildragon.com: could not connect to host
@@ -3042,7 +3039,6 @@ mailhost.it: could not connect to host
 majesnix.org: did not receive HSTS header
 makeitdynamic.com: could not connect to host
 makerstuff.net: did not receive HSTS header
-makeyourank.com: could not connect to host
 malena.com.ua: did not receive HSTS header
 malerversand.de: did not receive HSTS header
 malfait.nl: could not connect to host
@@ -3057,7 +3053,6 @@ mamaxi.org: did not receive HSTS header
 mammothmail.com: could not connect to host
 mammothmail.net: could not connect to host
 mammothmail.org: could not connect to host
-manaboutahor.se: could not connect to host
 manage.zenpayroll.com: did not receive HSTS header
 managemynetsuite.com: did not receive HSTS header
 maniadeprazer.com.br: could not connect to host
@@ -3077,7 +3072,6 @@ mariannematthew.com: could not connect to host
 marie-curie.fr: could not connect to host
 marie-elisabeth.dk: did not receive HSTS header
 marie-en-provence.com: did not receive HSTS header
-marie.club: could not connect to host
 markaconnor.com: could not connect to host
 markayapilandirma.com: could not connect to host
 market.android.com: did not receive HSTS header (error ignored - included regardless)
@@ -3108,6 +3102,7 @@ mattandreko.com: did not receive HSTS header
 mattberryman.com: did not receive HSTS header
 matterconcern.com: could not connect to host
 mattfin.ch: could not connect to host
+matthewkenny.co.uk: could not connect to host
 matthewprenger.com: could not connect to host
 matthiassteen.be: max-age too low: 0
 mattressinsider.com: max-age too low: 3153600
@@ -3173,6 +3168,7 @@ meritz.rocks: could not connect to host
 merson.me: could not connect to host
 meshok.ru: did not receive HSTS header
 mesmoque.com: did not receive HSTS header
+metachris.com: could not connect to host
 metagrader.com: could not connect to host
 metebalci.com: did not receive HSTS header
 meteosky.net: could not connect to host
@@ -3219,7 +3215,6 @@ mikeburns.com: could not connect to host
 mikeg.de: did not receive HSTS header
 mikek.work: did not receive HSTS header
 mikeology.org: could not connect to host
-mikepair.net: did not receive HSTS header
 mikrom.cz: did not receive HSTS header
 miku.be: did not receive HSTS header
 miku.hatsune.my: max-age too low: 5184000
@@ -3231,6 +3226,7 @@ mindoktor.se: did not receive HSTS header
 minecraftserverz.com: could not connect to host
 minecraftvoter.com: could not connect to host
 mineover.es: could not connect to host
+minh.at: could not connect to host
 minikneet.nl: did not receive HSTS header
 minnesotadata.com: could not connect to host
 minora.io: could not connect to host
@@ -3245,7 +3241,6 @@ mister.hosting: could not connect to host
 misterl.net: did not receive HSTS header
 mitchellrenouf.ca: could not connect to host
 mitsign.com: could not connect to host
-mitsu-szene.de: did not receive HSTS header
 mittenhacks.com: could not connect to host
 mivcon.net: could not connect to host
 mixtape.moe: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
@@ -3278,6 +3273,7 @@ moebel-nagel.de: did not receive HSTS header
 moefi.xyz: did not receive HSTS header
 moelord.org: could not connect to host
 moen.io: did not receive HSTS header
+moeyi.xyz: did not receive HSTS header
 mogry.net: could not connect to host
 moho.kr: could not connect to host
 mokhtarmial.com: max-age too low: 2592000
@@ -3372,7 +3368,6 @@ myairshop.gr: could not connect to host
 mybon.at: could not connect to host
 mybudget.xyz: could not connect to host
 mychocolateweightloss.com: did not receive HSTS header
-myclientsplus.com: did not receive HSTS header
 mycollab.net: could not connect to host
 mycoted.com: did not receive HSTS header
 mydeos.com: could not connect to host
@@ -3383,7 +3378,6 @@ myepass.de: could not connect to host
 mygate.at: could not connect to host
 mygdut.com: did not receive HSTS header
 mygov.scot: did not receive HSTS header
-myimds.com: did not receive HSTS header
 myiocc.org: could not connect to host
 mykolab.com: did not receive HSTS header
 mykreuzfahrt.de: could not connect to host
@@ -3467,7 +3461,6 @@ netbox.cc: could not connect to host
 netherwind.eu: did not receive HSTS header
 netlilo.com: could not connect to host
 netloanusa.com: could not connect to host
-netlocal.ru: could not connect to host
 netmagik.com: did not receive HSTS header
 netresourcedesign.com: did not receive HSTS header
 nettefoundation.com: could not connect to host
@@ -3504,7 +3497,6 @@ nfo.so: could not connect to host
 ng-security.com: could not connect to host
 ngine.ch: did not receive HSTS header
 nginxnudes.com: could not connect to host
-nginxyii.tk: could not connect to host
 nglr.org: could not connect to host
 ngt-service.ru: did not receive HSTS header
 ni.search.yahoo.com: did not receive HSTS header
@@ -3521,12 +3513,14 @@ nightwinds.tk: could not connect to host
 niho.jp: did not receive HSTS header
 nikcub.com: could not connect to host
 niklaslindblad.se: did not receive HSTS header
+nikobradshaw.com: did not receive HSTS header
 nikomo.fi: could not connect to host
 ninchisho-online.com: did not receive HSTS header
 ninhs.org: did not receive HSTS header
 nippler.org: did not receive HSTS header
 nippombashi.net: did not receive HSTS header
 nipponcareers.com: did not receive HSTS header
+nitropur.com: did not receive HSTS header
 nixien.fr: could not connect to host
 nkinka.de: did not receive HSTS header
 nll.fi: could not connect to host
@@ -3565,12 +3559,11 @@ novascan.net: could not connect to host
 novatrucking.de: could not connect to host
 nowak.ninja: did not receive HSTS header
 noworrywp.com: could not connect to host
-nozoe.jp: did not receive HSTS header
+nozoe.jp: could not connect to host
 np.search.yahoo.com: did not receive HSTS header
 npol.de: could not connect to host
 nqesh.com: could not connect to host
 nrechn.de: could not connect to host
-nstremsdoerfer.ovh: could not connect to host
 ntbs.pro: could not connect to host
 ntse.xyz: could not connect to host
 nu3.at: did not receive HSTS header
@@ -3639,6 +3632,7 @@ oldchaphome.nl: did not receive HSTS header
 oldoakflorist.com: could not connect to host
 oliveraiedelabastideblanche.fr: did not receive HSTS header
 oliverdunk.com: did not receive HSTS header
+oliverfaircliff.com: could not connect to host
 ollehbizev.co.kr: could not connect to host
 ollie.io: did not receive HSTS header
 omacostudio.com: could not connect to host
@@ -3736,7 +3730,6 @@ ottospora.nl: could not connect to host
 ourbank.com: did not receive HSTS header
 outdoorproducts.com: did not receive HSTS header
 outetc.com: could not connect to host
-outofcontrol.ca: did not receive HSTS header
 outreachbuddy.com: could not connect to host
 outsider.im: could not connect to host
 outurnate.com: could not connect to host
@@ -3807,12 +3800,11 @@ pastaf.com: could not connect to host
 paste.linode.com: could not connect to host
 pastebin.linode.com: could not connect to host
 pastenib.com: could not connect to host
-paster.li: did not receive HSTS header
+paster.li: could not connect to host
 pasteros.io: could not connect to host
 pataua.kiwi: did not receive HSTS header
 paternitydnatest.com: could not connect to host
 patientinsight.net: could not connect to host
-patrz.eu: could not connect to host
 patt.us: did not receive HSTS header
 paul-kerebel.pro: could not connect to host
 paulchen.at: could not connect to host
@@ -3869,7 +3861,6 @@ pexieapp.com: did not receive HSTS header
 pflege.de: did not receive HSTS header
 pflegedienst-gratia.de: could not connect to host
 pgpm.io: could not connect to host
-pgpmail.cc: could not connect to host
 phalconist.com: did not receive HSTS header
 pharmgkb.org: could not connect to host
 phillprice.com: could not connect to host
@@ -3953,7 +3944,7 @@ poleartschool.com: could not connect to host
 policeiwitness.sg: could not connect to host
 polimat.org: could not connect to host
 politically-incorrect.xyz: could not connect to host
-politologos.org: did not receive HSTS header
+politologos.org: could not connect to host
 polycoise.com: could not connect to host
 polypho.nyc: could not connect to host
 pompefunebrilariviera.it: could not connect to host
@@ -3967,6 +3958,7 @@ portalplatform.net: could not connect to host
 portraitsystem.biz: could not connect to host
 poshpak.com: max-age too low: 86400
 postcodewise.co.uk: did not receive HSTS header
+posterspy.com: did not receive HSTS header
 postscheduler.org: could not connect to host
 posylka.de: did not receive HSTS header
 potatoheads.net: could not connect to host
@@ -4024,6 +4016,7 @@ prontolight.com: did not receive HSTS header
 prontomovers.co.uk: could not connect to host
 propactrading.com: could not connect to host
 property-catalogue.eu: did not receive HSTS header
+proposalonline.com: did not receive HSTS header
 prosocialmachines.com: could not connect to host
 prosoft.sk: did not receive HSTS header
 prosperident.com: did not receive HSTS header
@@ -4066,7 +4059,6 @@ qccqld.org.au: could not connect to host
 qingpat.com: could not connect to host
 qingxuan.info: max-age too low: 864000
 qinxi1992.com: could not connect to host
-qirinus.com: could not connect to host
 qldconservation.org: could not connect to host
 qonqa.de: did not receive HSTS header
 qop.io: could not connect to host
@@ -4125,7 +4117,6 @@ ratuseks.net: could not connect to host
 ratuseks.us: could not connect to host
 rauchenwald.net: did not receive HSTS header
 raulfraile.net: could not connect to host
-raumzeitlabor.de: did not receive HSTS header
 raven.lipetsk.ru: could not connect to host
 ravengergaming.ga: could not connect to host
 rawet.se: did not receive HSTS header
@@ -4142,7 +4133,7 @@ rcafox.com: could not connect to host
 rcorporation.be: did not receive HSTS header
 rcpcbd.com: did not receive HSTS header
 rdh.asia: could not connect to host
-rdns.im: did not receive HSTS header
+rdns.im: could not connect to host
 re-customer.net: did not receive HSTS header
 reachr.com: could not connect to host
 reader.ga: could not connect to host
@@ -4221,6 +4212,7 @@ rhering.de: could not connect to host
 richiemail.net: did not receive HSTS header
 richmondsunlight.com: did not receive HSTS header
 richsiciliano.com: could not connect to host
+rickrongen.nl: could not connect to host
 rid-wan.com: could not connect to host
 rideworks.com: did not receive HSTS header
 riesenweber.id.au: did not receive HSTS header
@@ -4247,7 +4239,6 @@ rob.uk.com: did not receive HSTS header
 robertglastra.com: could not connect to host
 robigalia.org: did not receive HSTS header
 robteix.com: did not receive HSTS header
-robtex.com: did not receive HSTS header
 robtex.net: did not receive HSTS header
 robtex.org: did not receive HSTS header
 rochman.id: could not connect to host
@@ -4338,7 +4329,6 @@ saml2.com: could not connect to host
 sampoznay.ru: did not receive HSTS header
 samraskauskas.com: could not connect to host
 samsen.club: did not receive HSTS header
-sanael.net: could not connect to host
 sanasalud.org: could not connect to host
 sandviks.com: did not receive HSTS header
 sanguoxiu.com: could not connect to host
@@ -4415,8 +4405,11 @@ sebastian-lutsch.de: could not connect to host
 sebster.com: did not receive HSTS header
 secandtech.com: could not connect to host
 secondary-survivor.com: could not connect to host
+secondary-survivor.help: could not connect to host
 secondary-survivor.net: could not connect to host
+secondarysurvivor.help: could not connect to host
 secondarysurvivorportal.com: could not connect to host
+secondarysurvivorportal.help: could not connect to host
 secondbyte.nl: could not connect to host
 secondspace.ca: did not receive HSTS header
 sectia22.ro: could not connect to host
@@ -4433,6 +4426,7 @@ securityglance.com: could not connect to host
 securityinet.biz: did not receive HSTS header
 securityinet.net: did not receive HSTS header
 securityinet.org.il: did not receive HSTS header
+securitystreak.com: did not receive HSTS header
 securiviera.ch: did not receive HSTS header
 sedrubal.de: could not connect to host
 seedboxers.net: could not connect to host
@@ -4484,7 +4478,6 @@ shareimg.xyz: could not connect to host
 sharepass.pw: could not connect to host
 shauncrowley.co.uk: could not connect to host
 shaunwheelhou.se: could not connect to host
-shawnh.net: could not connect to host
 shazzlemd.com: did not receive HSTS header
 sheehyinfinitioftysonsparts.com: could not connect to host
 shellj.me: max-age too low: 86400
@@ -4533,7 +4526,7 @@ silverhome.ninja: could not connect to host
 silverpvp.com: could not connect to host
 simbast.com: could not connect to host
 simbihaiti.com: did not receive HSTS header
-simobilklub.si: could not connect to host
+simobilklub.si: did not receive HSTS header
 simod.org: could not connect to host
 simon.butcher.name: max-age too low: 2629743
 simongong.net: did not receive HSTS header
@@ -4546,7 +4539,6 @@ simply-premium.com: did not receive HSTS header
 sin30.net: could not connect to host
 sincron.org: could not connect to host
 sinful.pw: could not connect to host
-sinfulforums.net: could not connect to host
 singul4rity.com: could not connect to host
 sinosky.org: did not receive HSTS header
 siriad.com: could not connect to host
@@ -4639,10 +4631,10 @@ sonic.network: did not receive HSTS header
 sonicrainboom.rocks: did not receive HSTS header
 soobi.org: did not receive HSTS header
 soondy.com: did not receive HSTS header
-sortaweird.net: could not connect to host
 sosaka.ml: could not connect to host
 sotiran.com: could not connect to host
 sotor.de: did not receive HSTS header
+soucorneteiro.com.br: could not connect to host
 soulema.com: could not connect to host
 soulfulglamour.uk: could not connect to host
 sourcelair.com: did not receive HSTS header
@@ -4711,6 +4703,7 @@ ssworld.ga: could not connect to host
 staack.com: did not receive HSTS header
 stabletoken.com: could not connect to host
 stadjerspasonline.nl: could not connect to host
+stadtbauwerk.at: could not connect to host
 staffjoy.com: did not receive HSTS header
 staffjoystaging.com: could not connect to host
 stahl.xyz: could not connect to host
@@ -4719,7 +4712,6 @@ stalkthe.net: could not connect to host
 stalschermer.nl: could not connect to host
 standardssuck.org: did not receive HSTS header
 standingmist.com: did not receive HSTS header
-star-killer.net: could not connect to host
 stargatepartners.com: did not receive HSTS header
 starina.ru: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 starmusic.ga: did not receive HSTS header
@@ -4730,7 +4722,7 @@ stassi.ch: could not connect to host
 state-sponsored-actors.net: could not connect to host
 statementinsertsforless.com: did not receive HSTS header
 stateofexception.io: could not connect to host
-static.or.at: did not receive HSTS header
+static.or.at: could not connect to host
 staticanime.net: could not connect to host
 staticisnoise.com: could not connect to host
 stationaryjourney.com: did not receive HSTS header
@@ -4773,7 +4765,7 @@ storeden.com: did not receive HSTS header
 storefrontify.com: did not receive HSTS header
 stormhub.org: could not connect to host
 stqry.com: did not receive HSTS header
-str0.at: did not receive HSTS header
+str0.at: could not connect to host
 strasweb.fr: did not receive HSTS header
 strbt.de: could not connect to host
 streamingeverywhere.com: did not receive HSTS header
@@ -4812,6 +4804,7 @@ suksit.com: could not connect to host
 sumoatm.com: did not receive HSTS header
 sumoscout.de: did not receive HSTS header
 suncountrymarine.com: did not receive HSTS header
+sunflyer.cn: did not receive HSTS header
 sunnyfruit.ru: did not receive HSTS header
 sunshinepress.org: could not connect to host
 sunyanzi.tk: could not connect to host
@@ -4878,6 +4871,7 @@ tafoma.com: did not receive HSTS header
 tageau.com: could not connect to host
 taglondon.org: did not receive HSTS header
 tails.com.ar: did not receive HSTS header
+tales-of-interia.de: did not receive HSTS header
 talk.google.com: did not receive HSTS header (error ignored - included regardless)
 talktwincities.com: could not connect to host
 tallr.se: could not connect to host
@@ -4893,6 +4887,7 @@ tapka.cz: did not receive HSTS header
 tappublisher.com: did not receive HSTS header
 taravancil.com: did not receive HSTS header
 tarhauskielto.fi: did not receive HSTS header
+tartaneagle.org.uk: could not connect to host
 tartaros.fi: could not connect to host
 taskstats.com: could not connect to host
 taskulu.ir: could not connect to host
@@ -5009,13 +5004,13 @@ thenextstep.events: could not connect to host
 theodorejones.info: could not connect to host
 theojones.name: could not connect to host
 thepartywarehouse.co.uk: did not receive HSTS header
+thepcweb.tk: could not connect to host
 thepiratebay.al: could not connect to host
 thepiratebay.poker: could not connect to host
 thepiratebay.tech: could not connect to host
 therewill.be: could not connect to host
 theseed.io: could not connect to host
 theseedbox.xyz: could not connect to host
-theshopally.com: could not connect to host
 thestack.xyz: could not connect to host
 thestagchorleywood.co.uk: did not receive HSTS header
 theurbanyoga.com: did not receive HSTS header
@@ -5033,6 +5028,7 @@ thirty5.net: did not receive HSTS header
 thisisacompletetest.ga: could not connect to host
 thisisforager.com: could not connect to host
 thiswebhost.com: did not receive HSTS header
+thomascloud.ddns.net: could not connect to host
 thomaskliszowski.fr: did not receive HSTS header
 thomasschweizer.net: could not connect to host
 thorncreek.net: did not receive HSTS header
@@ -5051,6 +5047,7 @@ tiensnet.com: did not receive HSTS header
 tightlineproductions.com: did not receive HSTS header
 tikutiku.pl: could not connect to host
 tildebot.com: could not connect to host
+tiledailyshop.com: could not connect to host
 tiliaze.be: could not connect to host
 tiliaze.eu: could not connect to host
 tilkah.com.au: could not connect to host
@@ -5130,6 +5127,7 @@ toucedo.de: could not connect to host
 touchbasemail.com: did not receive HSTS header
 touchscreen-handy.de: did not receive HSTS header
 tourpeer.com: did not receive HSTS header
+toursandtransfers.it: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 toxme.se: could not connect to host
 toyotamotala.se: could not connect to host
 tpbcdn.com: could not connect to host
@@ -5216,11 +5214,13 @@ tzappa.net: could not connect to host
 u-blox.com: max-age too low: 0
 ua.search.yahoo.com: did not receive HSTS header
 uadp.pw: could not connect to host
+uangteman.com: did not receive HSTS header
 uber.com.au: did not receive HSTS header
 uberfunction.com: did not receive HSTS header
 ubicloud.de: could not connect to host
 ubicv.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 ublox.com: did not receive HSTS header
+uborcare.com: could not connect to host
 ubuntuhot.com: did not receive HSTS header
 uega.net: did not receive HSTS header
 uesociedadlimitada.com: did not receive HSTS header
@@ -5259,7 +5259,6 @@ unblockmyproxy.site: could not connect to host
 unccdesign.club: could not connect to host
 unclegen.xyz: could not connect to host
 under30stravelinsurance.com.au: did not receive HSTS header
-underskatten.tk: could not connect to host
 unfiltered.nyc: did not receive HSTS header
 unfuddle.cn: could not connect to host
 uni-games.com: could not connect to host
@@ -5362,7 +5361,7 @@ vhost.co.id: could not connect to host
 viadeux.com: could not connect to host
 vicianovi.cz: could not connect to host
 videnskabsklubben.dk: did not receive HSTS header
-videomuz.com: could not connect to host
+videomuz.com: did not receive HSTS header
 videotogel.net: did not receive HSTS header
 vidid.net: did not receive HSTS header
 vidz.ga: could not connect to host
@@ -5408,6 +5407,7 @@ voidpay.com: could not connect to host
 voidpay.net: could not connect to host
 voidpay.org: could not connect to host
 volcrado.com: did not receive HSTS header
+voliere-info.nl: did not receive HSTS header
 volkden.com: could not connect to host
 vortexhobbies.com: did not receive HSTS header
 voshod.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
@@ -5446,7 +5446,6 @@ warehost.de: did not receive HSTS header
 warhistoryonline.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 warlions.info: did not receive HSTS header
 warped.com: did not receive HSTS header
-warr.ath.cx: could not connect to host
 warsentech.com: could not connect to host
 washingtonviews.com: did not receive HSTS header
 watchium.com: did not receive HSTS header
@@ -5467,10 +5466,9 @@ webandwords.com.au: could not connect to host
 webapps.directory: could not connect to host
 webassadors.com: could not connect to host
 webchat.domains: did not receive HSTS header
-webdeflect.com: could not connect to host
+webdeflect.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 webdesign-kronberg.de: did not receive HSTS header
 webdev.mobi: could not connect to host
-webdosh.com: could not connect to host
 webeconomia.it: did not receive HSTS header
 weberjulia.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 webhosting4.net: did not receive HSTS header
@@ -5536,7 +5534,7 @@ wikiclash.info: could not connect to host
 wikisports.eu: could not connect to host
 wilf1rst.com: could not connect to host
 willcipriano.com: could not connect to host
-william.si: did not receive HSTS header
+william.si: could not connect to host
 willosagiede.com: did not receive HSTS header
 winaes.com: did not receive HSTS header
 winclient.cn: could not connect to host
@@ -5574,7 +5572,6 @@ wolfesden.com: could not connect to host
 womosale.de: could not connect to host
 wonderfall.xyz: could not connect to host
 wonderhost.info: could not connect to host
-wondermags.com: could not connect to host
 woodmafia.com.au: max-age too low: 0
 woording.com: could not connect to host
 wootton95.com: could not connect to host
@@ -5582,6 +5579,7 @@ word-grabber.com: did not receive HSTS header
 woresite.jp: did not receive HSTS header
 workfone.io: did not receive HSTS header
 workpermit.com.vn: did not receive HSTS header
+workwithgo.com: could not connect to host
 worldsbeststory.com: did not receive HSTS header
 wowapi.org: could not connect to host
 wpblog.com.tw: did not receive HSTS header
@@ -5597,7 +5595,6 @@ wuhengmin.com: did not receive HSTS header
 wukongmusic.us: did not receive HSTS header
 wurzelzwerg.net: could not connect to host
 wusx.club: could not connect to host
-www.amazon.com: did not receive HSTS header
 www.apollo-auto.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 www.braintreepayments.com: did not receive HSTS header
 www.calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
@@ -5682,7 +5679,6 @@ xoffy.com: did not receive HSTS header
 xombra.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 xpi.fr: could not connect to host
 xsmobile.de: could not connect to host
-xss.ht: did not receive HSTS header
 xtream-hosting.com: could not connect to host
 xtream-hosting.de: could not connect to host
 xtream-hosting.eu: could not connect to host
@@ -5692,7 +5688,6 @@ xuntier.ch: could not connect to host
 xuri.me: max-age too low: 2592000
 xuwei.de: could not connect to host
 xuyh0120.win: could not connect to host
-xwalck.se: could not connect to host
 xxbase.com: could not connect to host
 xynex.us: could not connect to host
 y-o-w.com: did not receive HSTS header
@@ -5736,7 +5731,6 @@ youngandunited.nl: did not receive HSTS header
 youon.tokyo: could not connect to host
 yourbapp.ch: could not connect to host
 yourcomputer.expert: did not receive HSTS header
-yourdaddy.dk: did not receive HSTS header
 yoursecondphone.co: could not connect to host
 yourstrongbox.com: could not connect to host
 youyoulemon.com: could not connect to host
@@ -5782,6 +5776,7 @@ zentralwolke.de: did not receive HSTS header
 zera.com.au: could not connect to host
 zeroday.sk: did not receive HSTS header
 zerolab.org: could not connect to host
+zertif.info: could not connect to host
 zerudi.com: did not receive HSTS header
 zett4.me: could not connect to host
 zeytin.pro: could not connect to host
@@ -5804,7 +5799,7 @@ zking.ga: could not connect to host
 zmsastro.co.za: could not connect to host
 zmy.im: did not receive HSTS header
 zocken.com: did not receive HSTS header
-zoe.vc: did not receive HSTS header
+zoe.vc: could not connect to host
 zomerschoen.nl: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 118"  data: no]
 zomiac.pp.ua: could not connect to host
 zoneminder.com: did not receive HSTS header
diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc
index e4370b57fa86..32627dd4c11d 100644
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1503845721797000);
+const PRTime gPreloadListExpirationTime = INT64_C(1503931851947000);
 
 static const char kSTSHostTable[] = {
   /* "0.me.uk", true */ '0', '.', 'm', 'e', '.', 'u', 'k', '\0',
@@ -104,7 +104,6 @@ static const char kSTSHostTable[] = {
   /* "1hourproofreading.com", true */ '1', 'h', 'o', 'u', 'r', 'p', 'r', 'o', 'o', 'f', 'r', 'e', 'a', 'd', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "1item.co.il", true */ '1', 'i', 't', 'e', 'm', '.', 'c', 'o', '.', 'i', 'l', '\0',
   /* "1js.de", true */ '1', 'j', 's', '.', 'd', 'e', '\0',
-  /* "1kando.com", true */ '1', 'k', 'a', 'n', 'd', 'o', '.', 'c', 'o', 'm', '\0',
   /* "1km.ro", true */ '1', 'k', 'm', '.', 'r', 'o', '\0',
   /* "1kmi.co", true */ '1', 'k', 'm', 'i', '.', 'c', 'o', '\0',
   /* "1on1on1.de", true */ '1', 'o', 'n', '1', 'o', 'n', '1', '.', 'd', 'e', '\0',
@@ -177,6 +176,7 @@ static const char kSTSHostTable[] = {
   /* "38sihu.com", false */ '3', '8', 's', 'i', 'h', 'u', '.', 'c', 'o', 'm', '\0',
   /* "398.info", true */ '3', '9', '8', '.', 'i', 'n', 'f', 'o', '\0',
   /* "39sihu.com", false */ '3', '9', 's', 'i', 'h', 'u', '.', 'c', 'o', 'm', '\0',
+  /* "3ags.de", true */ '3', 'a', 'g', 's', '.', 'd', 'e', '\0',
   /* "3bakayottu.com", true */ '3', 'b', 'a', 'k', 'a', 'y', 'o', 't', 't', 'u', '.', 'c', 'o', 'm', '\0',
   /* "3bigking.com", true */ '3', 'b', 'i', 'g', 'k', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "3c-d.de", true */ '3', 'c', '-', 'd', '.', 'd', 'e', '\0',
@@ -199,6 +199,7 @@ static const char kSTSHostTable[] = {
   /* "41where.com", true */ '4', '1', 'w', 'h', 'e', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "42day.info", true */ '4', '2', 'd', 'a', 'y', '.', 'i', 'n', 'f', 'o', '\0',
   /* "439191.com", true */ '4', '3', '9', '1', '9', '1', '.', 'c', 'o', 'm', '\0',
+  /* "441jj.com", true */ '4', '4', '1', 'j', 'j', '.', 'c', 'o', 'm', '\0',
   /* "4500.co.il", true */ '4', '5', '0', '0', '.', 'c', 'o', '.', 'i', 'l', '\0',
   /* "491mhz.net", true */ '4', '9', '1', 'm', 'h', 'z', '.', 'n', 'e', 't', '\0',
   /* "4azino777.ru", true */ '4', 'a', 'z', 'i', 'n', 'o', '7', '7', '7', '.', 'r', 'u', '\0',
@@ -300,7 +301,6 @@ static const char kSTSHostTable[] = {
   /* "abiapp.net", true */ 'a', 'b', 'i', 'a', 'p', 'p', '.', 'n', 'e', 't', '\0',
   /* "abilitynet.org.uk", true */ 'a', 'b', 'i', 'l', 'i', 't', 'y', 'n', 'e', 't', '.', 'o', 'r', 'g', '.', 'u', 'k', '\0',
   /* "abilma.com", true */ 'a', 'b', 'i', 'l', 'm', 'a', '.', 'c', 'o', 'm', '\0',
-  /* "abilymp06.net", true */ 'a', 'b', 'i', 'l', 'y', 'm', 'p', '0', '6', '.', 'n', 'e', 't', '\0',
   /* "abimelec.com", true */ 'a', 'b', 'i', 'm', 'e', 'l', 'e', 'c', '.', 'c', 'o', 'm', '\0',
   /* "abiturma.de", true */ 'a', 'b', 'i', 't', 'u', 'r', 'm', 'a', '.', 'd', 'e', '\0',
   /* "ablak-nyilaszaro.info", true */ 'a', 'b', 'l', 'a', 'k', '-', 'n', 'y', 'i', 'l', 'a', 's', 'z', 'a', 'r', 'o', '.', 'i', 'n', 'f', 'o', '\0',
@@ -347,7 +347,6 @@ static const char kSTSHostTable[] = {
   /* "acemobileforce.com", true */ 'a', 'c', 'e', 'm', 'o', 'b', 'i', 'l', 'e', 'f', 'o', 'r', 'c', 'e', '.', 'c', 'o', 'm', '\0',
   /* "acessoeducacao.com", true */ 'a', 'c', 'e', 's', 's', 'o', 'e', 'd', 'u', 'c', 'a', 'c', 'a', 'o', '.', 'c', 'o', 'm', '\0',
   /* "acg.sb", false */ 'a', 'c', 'g', '.', 's', 'b', '\0',
-  /* "acg18.us", true */ 'a', 'c', 'g', '1', '8', '.', 'u', 's', '\0',
   /* "acgaudio.com", true */ 'a', 'c', 'g', 'a', 'u', 'd', 'i', 'o', '.', 'c', 'o', 'm', '\0',
   /* "acheconcursos.com.br", true */ 'a', 'c', 'h', 'e', 'c', 'o', 'n', 'c', 'u', 'r', 's', 'o', 's', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "achenar.net", true */ 'a', 'c', 'h', 'e', 'n', 'a', 'r', '.', 'n', 'e', 't', '\0',
@@ -636,7 +635,6 @@ static const char kSTSHostTable[] = {
   /* "alecpap.com", true */ 'a', 'l', 'e', 'c', 'p', 'a', 'p', '.', 'c', 'o', 'm', '\0',
   /* "alecpapierniak.com", true */ 'a', 'l', 'e', 'c', 'p', 'a', 'p', 'i', 'e', 'r', 'n', 'i', 'a', 'k', '.', 'c', 'o', 'm', '\0',
   /* "alecrust.com", true */ 'a', 'l', 'e', 'c', 'r', 'u', 's', 't', '.', 'c', 'o', 'm', '\0',
-  /* "alecvannoten.be", false */ 'a', 'l', 'e', 'c', 'v', 'a', 'n', 'n', 'o', 't', 'e', 'n', '.', 'b', 'e', '\0',
   /* "aleksib.fi", true */ 'a', 'l', 'e', 'k', 's', 'i', 'b', '.', 'f', 'i', '\0',
   /* "alela.fr", true */ 'a', 'l', 'e', 'l', 'a', '.', 'f', 'r', '\0',
   /* "alertaenlinea.gov", true */ 'a', 'l', 'e', 'r', 't', 'a', 'e', 'n', 'l', 'i', 'n', 'e', 'a', '.', 'g', 'o', 'v', '\0',
@@ -977,7 +975,6 @@ static const char kSTSHostTable[] = {
   /* "anzeiger.ag", true */ 'a', 'n', 'z', 'e', 'i', 'g', 'e', 'r', '.', 'a', 'g', '\0',
   /* "ao-dev.com", true */ 'a', 'o', '-', 'd', 'e', 'v', '.', 'c', 'o', 'm', '\0',
   /* "ao2.it", true */ 'a', 'o', '2', '.', 'i', 't', '\0',
-  /* "aojf.fr", true */ 'a', 'o', 'j', 'f', '.', 'f', 'r', '\0',
   /* "aojiao.org", false */ 'a', 'o', 'j', 'i', 'a', 'o', '.', 'o', 'r', 'g', '\0',
   /* "aoku3d.com", true */ 'a', 'o', 'k', 'u', '3', 'd', '.', 'c', 'o', 'm', '\0',
   /* "aolabs.nz", true */ 'a', 'o', 'l', 'a', 'b', 's', '.', 'n', 'z', '\0',
@@ -1111,7 +1108,6 @@ static const char kSTSHostTable[] = {
   /* "ariege-pyrenees.net", true */ 'a', 'r', 'i', 'e', 'g', 'e', '-', 'p', 'y', 'r', 'e', 'n', 'e', 'e', 's', '.', 'n', 'e', 't', '\0',
   /* "arigato-java.download", true */ 'a', 'r', 'i', 'g', 'a', 't', 'o', '-', 'j', 'a', 'v', 'a', '.', 'd', 'o', 'w', 'n', 'l', 'o', 'a', 'd', '\0',
   /* "arima.co.ke", true */ 'a', 'r', 'i', 'm', 'a', '.', 'c', 'o', '.', 'k', 'e', '\0',
-  /* "aristilabs.com", true */ 'a', 'r', 'i', 's', 't', 'i', 'l', 'a', 'b', 's', '.', 'c', 'o', 'm', '\0',
   /* "aristocrates.co", true */ 'a', 'r', 'i', 's', 't', 'o', 'c', 'r', 'a', 't', 'e', 's', '.', 'c', 'o', '\0',
   /* "aritec-la.com", true */ 'a', 'r', 'i', 't', 'e', 'c', '-', 'l', 'a', '.', 'c', 'o', 'm', '\0',
   /* "arivo.com.br", false */ 'a', 'r', 'i', 'v', 'o', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
@@ -1343,7 +1339,6 @@ static const char kSTSHostTable[] = {
   /* "australiancattle.dog", true */ 'a', 'u', 's', 't', 'r', 'a', 'l', 'i', 'a', 'n', 'c', 'a', 't', 't', 'l', 'e', '.', 'd', 'o', 'g', '\0',
   /* "auszeit.bio", true */ 'a', 'u', 's', 'z', 'e', 'i', 't', '.', 'b', 'i', 'o', '\0',
   /* "auth.adult", true */ 'a', 'u', 't', 'h', '.', 'a', 'd', 'u', 'l', 't', '\0',
-  /* "authint.com", true */ 'a', 'u', 't', 'h', 'i', 'n', 't', '.', 'c', 'o', 'm', '\0',
   /* "author24.ru", true */ 'a', 'u', 't', 'h', 'o', 'r', '2', '4', '.', 'r', 'u', '\0',
   /* "autimatisering.nl", true */ 'a', 'u', 't', 'i', 'm', 'a', 't', 'i', 's', 'e', 'r', 'i', 'n', 'g', '.', 'n', 'l', '\0',
   /* "auto-anleitung.de", true */ 'a', 'u', 't', 'o', '-', 'a', 'n', 'l', 'e', 'i', 't', 'u', 'n', 'g', '.', 'd', 'e', '\0',
@@ -1416,7 +1411,6 @@ static const char kSTSHostTable[] = {
   /* "axolotlfarm.org", true */ 'a', 'x', 'o', 'l', 'o', 't', 'l', 'f', 'a', 'r', 'm', '.', 'o', 'r', 'g', '\0',
   /* "axolsoft.com", true */ 'a', 'x', 'o', 'l', 's', 'o', 'f', 't', '.', 'c', 'o', 'm', '\0',
   /* "axrec.de", true */ 'a', 'x', 'r', 'e', 'c', '.', 'd', 'e', '\0',
-  /* "ayahuascaadvisor.com", true */ 'a', 'y', 'a', 'h', 'u', 'a', 's', 'c', 'a', 'a', 'd', 'v', 'i', 's', 'o', 'r', '.', 'c', 'o', 'm', '\0',
   /* "ayesh.me", true */ 'a', 'y', 'e', 's', 'h', '.', 'm', 'e', '\0',
   /* "aykutcevik.com", true */ 'a', 'y', 'k', 'u', 't', 'c', 'e', 'v', 'i', 'k', '.', 'c', 'o', 'm', '\0',
   /* "aylak.com", true */ 'a', 'y', 'l', 'a', 'k', '.', 'c', 'o', 'm', '\0',
@@ -1425,7 +1419,6 @@ static const char kSTSHostTable[] = {
   /* "ayurveda101.com", false */ 'a', 'y', 'u', 'r', 'v', 'e', 'd', 'a', '1', '0', '1', '.', 'c', 'o', 'm', '\0',
   /* "azabani.com", true */ 'a', 'z', 'a', 'b', 'a', 'n', 'i', '.', 'c', 'o', 'm', '\0',
   /* "azamra.com", true */ 'a', 'z', 'a', 'm', 'r', 'a', '.', 'c', 'o', 'm', '\0',
-  /* "azazy.net", true */ 'a', 'z', 'a', 'z', 'y', '.', 'n', 'e', 't', '\0',
   /* "azbuki.by", true */ 'a', 'z', 'b', 'u', 'k', 'i', '.', 'b', 'y', '\0',
   /* "azimut.fr", true */ 'a', 'z', 'i', 'm', 'u', 't', '.', 'f', 'r', '\0',
   /* "azirevpn.com", true */ 'a', 'z', 'i', 'r', 'e', 'v', 'p', 'n', '.', 'c', 'o', 'm', '\0',
@@ -1627,11 +1620,13 @@ static const char kSTSHostTable[] = {
   /* "bddemir.com", true */ 'b', 'd', 'd', 'e', 'm', 'i', 'r', '.', 'c', 'o', 'm', '\0',
   /* "bdikaros-network.net", true */ 'b', 'd', 'i', 'k', 'a', 'r', 'o', 's', '-', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'n', 'e', 't', '\0',
   /* "bdsmxxxpics.com", true */ 'b', 'd', 's', 'm', 'x', 'x', 'x', 'p', 'i', 'c', 's', '.', 'c', 'o', 'm', '\0',
+  /* "bdvg.org", true */ 'b', 'd', 'v', 'g', '.', 'o', 'r', 'g', '\0',
   /* "be-ka-tec.de", true */ 'b', 'e', '-', 'k', 'a', '-', 't', 'e', 'c', '.', 'd', 'e', '\0',
   /* "be-real.life", true */ 'b', 'e', '-', 'r', 'e', 'a', 'l', '.', 'l', 'i', 'f', 'e', '\0',
   /* "be-webdesign.com", true */ 'b', 'e', '-', 'w', 'e', 'b', 'd', 'e', 's', 'i', 'g', 'n', '.', 'c', 'o', 'm', '\0',
   /* "be2cloud.de", true */ 'b', 'e', '2', 'c', 'l', 'o', 'u', 'd', '.', 'd', 'e', '\0',
   /* "beamitapp.com", true */ 'b', 'e', 'a', 'm', 'i', 't', 'a', 'p', 'p', '.', 'c', 'o', 'm', '\0',
+  /* "beanjuice.me", true */ 'b', 'e', 'a', 'n', 'j', 'u', 'i', 'c', 'e', '.', 'm', 'e', '\0',
   /* "beans-one.com", false */ 'b', 'e', 'a', 'n', 's', '-', 'o', 'n', 'e', '.', 'c', 'o', 'm', '\0',
   /* "beanworks.ca", true */ 'b', 'e', 'a', 'n', 'w', 'o', 'r', 'k', 's', '.', 'c', 'a', '\0',
   /* "bearden.io", true */ 'b', 'e', 'a', 'r', 'd', 'e', 'n', '.', 'i', 'o', '\0',
@@ -1691,6 +1686,7 @@ static const char kSTSHostTable[] = {
   /* "belarto.nl", true */ 'b', 'e', 'l', 'a', 'r', 't', 'o', '.', 'n', 'l', '\0',
   /* "belarto.pl", true */ 'b', 'e', 'l', 'a', 'r', 't', 'o', '.', 'p', 'l', '\0',
   /* "belcompany.nl", false */ 'b', 'e', 'l', 'c', 'o', 'm', 'p', 'a', 'n', 'y', '.', 'n', 'l', '\0',
+  /* "belegit.org", true */ 'b', 'e', 'l', 'e', 'g', 'i', 't', '.', 'o', 'r', 'g', '\0',
   /* "belge.rs", true */ 'b', 'e', 'l', 'g', 'e', '.', 'r', 's', '\0',
   /* "belgers.com", true */ 'b', 'e', 'l', 'g', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
   /* "belgien.guide", true */ 'b', 'e', 'l', 'g', 'i', 'e', 'n', '.', 'g', 'u', 'i', 'd', 'e', '\0',
@@ -1765,6 +1761,7 @@ static const char kSTSHostTable[] = {
   /* "beryl.net", true */ 'b', 'e', 'r', 'y', 'l', '.', 'n', 'e', 't', '\0',
   /* "besnik.de", true */ 'b', 'e', 's', 'n', 'i', 'k', '.', 'd', 'e', '\0',
   /* "bespokestraps.com", true */ 'b', 'e', 's', 'p', 'o', 'k', 'e', 's', 't', 'r', 'a', 'p', 's', '.', 'c', 'o', 'm', '\0',
+  /* "best-wallpaper.net", true */ 'b', 'e', 's', 't', '-', 'w', 'a', 'l', 'l', 'p', 'a', 'p', 'e', 'r', '.', 'n', 'e', 't', '\0',
   /* "best-wedding-quotes.com", true */ 'b', 'e', 's', 't', '-', 'w', 'e', 'd', 'd', 'i', 'n', 'g', '-', 'q', 'u', 'o', 't', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "bestbestbitcoin.com", true */ 'b', 'e', 's', 't', 'b', 'e', 's', 't', 'b', 'i', 't', 'c', 'o', 'i', 'n', '.', 'c', 'o', 'm', '\0',
   /* "bestbrakes.com", true */ 'b', 'e', 's', 't', 'b', 'r', 'a', 'k', 'e', 's', '.', 'c', 'o', 'm', '\0',
@@ -1797,6 +1794,7 @@ static const char kSTSHostTable[] = {
   /* "betterbabyshop.com.au", true */ 'b', 'e', 't', 't', 'e', 'r', 'b', 'a', 'b', 'y', 's', 'h', 'o', 'p', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "bettercrypto.org", true */ 'b', 'e', 't', 't', 'e', 'r', 'c', 'r', 'y', 'p', 't', 'o', '.', 'o', 'r', 'g', '\0',
   /* "betterhelp.com", true */ 'b', 'e', 't', 't', 'e', 'r', 'h', 'e', 'l', 'p', '.', 'c', 'o', 'm', '\0',
+  /* "betterlifemakers.com", true */ 'b', 'e', 't', 't', 'e', 'r', 'l', 'i', 'f', 'e', 'm', 'a', 'k', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
   /* "betterscience.org", true */ 'b', 'e', 't', 't', 'e', 'r', 's', 'c', 'i', 'e', 'n', 'c', 'e', '.', 'o', 'r', 'g', '\0',
   /* "bettertest.it", true */ 'b', 'e', 't', 't', 'e', 'r', 't', 'e', 's', 't', '.', 'i', 't', '\0',
   /* "bettflaschen.ch", true */ 'b', 'e', 't', 't', 'f', 'l', 'a', 's', 'c', 'h', 'e', 'n', '.', 'c', 'h', '\0',
@@ -1958,7 +1956,6 @@ static const char kSTSHostTable[] = {
   /* "bitcoinbitcoin.com", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'b', 'i', 't', 'c', 'o', 'i', 'n', '.', 'c', 'o', 'm', '\0',
   /* "bitcoincore.org", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'c', 'o', 'r', 'e', '.', 'o', 'r', 'g', '\0',
   /* "bitcoinhk.org", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'h', 'k', '.', 'o', 'r', 'g', '\0',
-  /* "bitcoinindia.com", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'i', 'n', 'd', 'i', 'a', '.', 'c', 'o', 'm', '\0',
   /* "bitcoinjpn.com", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'j', 'p', 'n', '.', 'c', 'o', 'm', '\0',
   /* "bitcoinrealestate.com.au", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'r', 'e', 'a', 'l', 'e', 's', 't', 'a', 't', 'e', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "bitcoinx.ro", true */ 'b', 'i', 't', 'c', 'o', 'i', 'n', 'x', '.', 'r', 'o', '\0',
@@ -2115,6 +2112,7 @@ static const char kSTSHostTable[] = {
   /* "blue-leaf81.net", true */ 'b', 'l', 'u', 'e', '-', 'l', 'e', 'a', 'f', '8', '1', '.', 'n', 'e', 't', '\0',
   /* "blue42.net", true */ 'b', 'l', 'u', 'e', '4', '2', '.', 'n', 'e', 't', '\0',
   /* "bluebill.net", true */ 'b', 'l', 'u', 'e', 'b', 'i', 'l', 'l', '.', 'n', 'e', 't', '\0',
+  /* "bluechilli.com", true */ 'b', 'l', 'u', 'e', 'c', 'h', 'i', 'l', 'l', 'i', '.', 'c', 'o', 'm', '\0',
   /* "blueflare.org", true */ 'b', 'l', 'u', 'e', 'f', 'l', 'a', 'r', 'e', '.', 'o', 'r', 'g', '\0',
   /* "bluefuzz.nl", true */ 'b', 'l', 'u', 'e', 'f', 'u', 'z', 'z', '.', 'n', 'l', '\0',
   /* "blueimp.net", true */ 'b', 'l', 'u', 'e', 'i', 'm', 'p', '.', 'n', 'e', 't', '\0',
@@ -2163,6 +2161,7 @@ static const char kSTSHostTable[] = {
   /* "bohaishibei.com", true */ 'b', 'o', 'h', 'a', 'i', 's', 'h', 'i', 'b', 'e', 'i', '.', 'c', 'o', 'm', '\0',
   /* "bohramt.de", true */ 'b', 'o', 'h', 'r', 'a', 'm', 't', '.', 'd', 'e', '\0',
   /* "boiadeirodeberna.com", true */ 'b', 'o', 'i', 'a', 'd', 'e', 'i', 'r', 'o', 'd', 'e', 'b', 'e', 'r', 'n', 'a', '.', 'c', 'o', 'm', '\0',
+  /* "boilesen.com", true */ 'b', 'o', 'i', 'l', 'e', 's', 'e', 'n', '.', 'c', 'o', 'm', '\0',
   /* "boiseonlinemall.com", true */ 'b', 'o', 'i', 's', 'e', 'o', 'n', 'l', 'i', 'n', 'e', 'm', 'a', 'l', 'l', '.', 'c', 'o', 'm', '\0',
   /* "bokeyy.com", true */ 'b', 'o', 'k', 'e', 'y', 'y', '.', 'c', 'o', 'm', '\0',
   /* "boldmediagroup.com", true */ 'b', 'o', 'l', 'd', 'm', 'e', 'd', 'i', 'a', 'g', 'r', 'o', 'u', 'p', '.', 'c', 'o', 'm', '\0',
@@ -2489,6 +2488,7 @@ static const char kSTSHostTable[] = {
   /* "bygningsregistrering.dk", true */ 'b', 'y', 'g', 'n', 'i', 'n', 'g', 's', 'r', 'e', 'g', 'i', 's', 't', 'r', 'e', 'r', 'i', 'n', 'g', '.', 'd', 'k', '\0',
   /* "bymark.co", true */ 'b', 'y', 'm', 'a', 'r', 'k', '.', 'c', 'o', '\0',
   /* "bymike.co", true */ 'b', 'y', 'm', 'i', 'k', 'e', '.', 'c', 'o', '\0',
+  /* "bynet.cz", true */ 'b', 'y', 'n', 'e', 't', '.', 'c', 'z', '\0',
   /* "bynumlaw.net", true */ 'b', 'y', 'n', 'u', 'm', 'l', 'a', 'w', '.', 'n', 'e', 't', '\0',
   /* "bypass.kr", true */ 'b', 'y', 'p', 'a', 's', 's', '.', 'k', 'r', '\0',
   /* "bypassed.bid", true */ 'b', 'y', 'p', 'a', 's', 's', 'e', 'd', '.', 'b', 'i', 'd', '\0',
@@ -2566,7 +2566,6 @@ static const char kSTSHostTable[] = {
   /* "cairnterrier.com.br", true */ 'c', 'a', 'i', 'r', 'n', 't', 'e', 'r', 'r', 'i', 'e', 'r', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "cais.de", true */ 'c', 'a', 'i', 's', '.', 'd', 'e', '\0',
   /* "caitcs.com", true */ 'c', 'a', 'i', 't', 'c', 's', '.', 'c', 'o', 'm', '\0',
-  /* "caizx.com", false */ 'c', 'a', 'i', 'z', 'x', '.', 'c', 'o', 'm', '\0',
   /* "caja-pdf.es", true */ 'c', 'a', 'j', 'a', '-', 'p', 'd', 'f', '.', 'e', 's', '\0',
   /* "cajio.ru", true */ 'c', 'a', 'j', 'i', 'o', '.', 'r', 'u', '\0',
   /* "cajunuk.co.uk", true */ 'c', 'a', 'j', 'u', 'n', 'u', 'k', '.', 'c', 'o', '.', 'u', 'k', '\0',
@@ -2762,7 +2761,6 @@ static const char kSTSHostTable[] = {
   /* "cattivo.nl", false */ 'c', 'a', 't', 't', 'i', 'v', 'o', '.', 'n', 'l', '\0',
   /* "caulfieldeastapartments.com.au", true */ 'c', 'a', 'u', 'l', 'f', 'i', 'e', 'l', 'd', 'e', 'a', 's', 't', 'a', 'p', 'a', 'r', 't', 'm', 'e', 'n', 't', 's', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "caulfieldracecourseapartments.com.au", true */ 'c', 'a', 'u', 'l', 'f', 'i', 'e', 'l', 'd', 'r', 'a', 'c', 'e', 'c', 'o', 'u', 'r', 's', 'e', 'a', 'p', 'a', 'r', 't', 'm', 'e', 'n', 't', 's', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
-  /* "caulong-ao.net", true */ 'c', 'a', 'u', 'l', 'o', 'n', 'g', '-', 'a', 'o', '.', 'n', 'e', 't', '\0',
   /* "cavac.at", true */ 'c', 'a', 'v', 'a', 'c', '.', 'a', 't', '\0',
   /* "cavaleria.ro", true */ 'c', 'a', 'v', 'a', 'l', 'e', 'r', 'i', 'a', '.', 'r', 'o', '\0',
   /* "cavalierkingcharlesspaniel.com.br", true */ 'c', 'a', 'v', 'a', 'l', 'i', 'e', 'r', 'k', 'i', 'n', 'g', 'c', 'h', 'a', 'r', 'l', 'e', 's', 's', 'p', 'a', 'n', 'i', 'e', 'l', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
@@ -2795,7 +2793,6 @@ static const char kSTSHostTable[] = {
   /* "cdt.org", true */ 'c', 'd', 't', '.', 'o', 'r', 'g', '\0',
   /* "ce-agentur.de", true */ 'c', 'e', '-', 'a', 'g', 'e', 'n', 't', 'u', 'r', '.', 'd', 'e', '\0',
   /* "ceciliacolombara.com", true */ 'c', 'e', 'c', 'i', 'l', 'i', 'a', 'c', 'o', 'l', 'o', 'm', 'b', 'a', 'r', 'a', '.', 'c', 'o', 'm', '\0',
-  /* "cecipu.gob.cl", true */ 'c', 'e', 'c', 'i', 'p', 'u', '.', 'g', 'o', 'b', '.', 'c', 'l', '\0',
   /* "ced-services.nl", true */ 'c', 'e', 'd', '-', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '.', 'n', 'l', '\0',
   /* "cee.io", true */ 'c', 'e', 'e', '.', 'i', 'o', '\0',
   /* "cegfw.com", true */ 'c', 'e', 'g', 'f', 'w', '.', 'c', 'o', 'm', '\0',
@@ -2838,6 +2835,7 @@ static const char kSTSHostTable[] = {
   /* "cerebelo.info", true */ 'c', 'e', 'r', 'e', 'b', 'e', 'l', 'o', '.', 'i', 'n', 'f', 'o', '\0',
   /* "cermak.photos", true */ 'c', 'e', 'r', 'm', 'a', 'k', '.', 'p', 'h', 'o', 't', 'o', 's', '\0',
   /* "cernega.ro", true */ 'c', 'e', 'r', 'n', 'e', 'g', 'a', '.', 'r', 'o', '\0',
+  /* "cerpa.com.br", true */ 'c', 'e', 'r', 'p', 'a', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "cerstve-korenie.sk", true */ 'c', 'e', 'r', 's', 't', 'v', 'e', '-', 'k', 'o', 'r', 'e', 'n', 'i', 'e', '.', 's', 'k', '\0',
   /* "cerstvekorenie.sk", true */ 'c', 'e', 'r', 's', 't', 'v', 'e', 'k', 'o', 'r', 'e', 'n', 'i', 'e', '.', 's', 'k', '\0',
   /* "certcenter.ch", true */ 'c', 'e', 'r', 't', 'c', 'e', 'n', 't', 'e', 'r', '.', 'c', 'h', '\0',
@@ -3159,6 +3157,7 @@ static const char kSTSHostTable[] = {
   /* "clearviewwealthprojector.com.au", true */ 'c', 'l', 'e', 'a', 'r', 'v', 'i', 'e', 'w', 'w', 'e', 'a', 'l', 't', 'h', 'p', 'r', 'o', 'j', 'e', 'c', 't', 'o', 'r', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "cles.jp", true */ 'c', 'l', 'e', 's', '.', 'j', 'p', '\0',
   /* "clevelandokla.com", true */ 'c', 'l', 'e', 'v', 'e', 'l', 'a', 'n', 'd', 'o', 'k', 'l', 'a', '.', 'c', 'o', 'm', '\0',
+  /* "clevertarget.ru", true */ 'c', 'l', 'e', 'v', 'e', 'r', 't', 'a', 'r', 'g', 'e', 't', '.', 'r', 'u', '\0',
   /* "cleververmarkten.com", true */ 'c', 'l', 'e', 'v', 'e', 'r', 'v', 'e', 'r', 'm', 'a', 'r', 'k', 't', 'e', 'n', '.', 'c', 'o', 'm', '\0',
   /* "cleververmarkten.de", true */ 'c', 'l', 'e', 'v', 'e', 'r', 'v', 'e', 'r', 'm', 'a', 'r', 'k', 't', 'e', 'n', '.', 'd', 'e', '\0',
   /* "clevisto.com", true */ 'c', 'l', 'e', 'v', 'i', 's', 't', 'o', '.', 'c', 'o', 'm', '\0',
@@ -3289,6 +3288,7 @@ static const char kSTSHostTable[] = {
   /* "codeplay.org", true */ 'c', 'o', 'd', 'e', 'p', 'l', 'a', 'y', '.', 'o', 'r', 'g', '\0',
   /* "codepoints.net", true */ 'c', 'o', 'd', 'e', 'p', 'o', 'i', 'n', 't', 's', '.', 'n', 'e', 't', '\0',
   /* "codepref.com", true */ 'c', 'o', 'd', 'e', 'p', 'r', 'e', 'f', '.', 'c', 'o', 'm', '\0',
+  /* "codepult.com", true */ 'c', 'o', 'd', 'e', 'p', 'u', 'l', 't', '.', 'c', 'o', 'm', '\0',
   /* "codera.co.uk", true */ 'c', 'o', 'd', 'e', 'r', 'a', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "codercross.com", true */ 'c', 'o', 'd', 'e', 'r', 'c', 'r', 'o', 's', 's', '.', 'c', 'o', 'm', '\0',
   /* "codereview.appspot.com", false */ 'c', 'o', 'd', 'e', 'r', 'e', 'v', 'i', 'e', 'w', '.', 'a', 'p', 'p', 's', 'p', 'o', 't', '.', 'c', 'o', 'm', '\0',
@@ -3362,6 +3362,7 @@ static const char kSTSHostTable[] = {
   /* "comalia.com", true */ 'c', 'o', 'm', 'a', 'l', 'i', 'a', '.', 'c', 'o', 'm', '\0',
   /* "comarkinstruments.net", true */ 'c', 'o', 'm', 'a', 'r', 'k', 'i', 'n', 's', 't', 'r', 'u', 'm', 'e', 'n', 't', 's', '.', 'n', 'e', 't', '\0',
   /* "combatshield.cz", true */ 'c', 'o', 'm', 'b', 'a', 't', 's', 'h', 'i', 'e', 'l', 'd', '.', 'c', 'z', '\0',
+  /* "combron.nl", true */ 'c', 'o', 'm', 'b', 'r', 'o', 'n', '.', 'n', 'l', '\0',
   /* "comchezmeme.com", true */ 'c', 'o', 'm', 'c', 'h', 'e', 'z', 'm', 'e', 'm', 'e', '.', 'c', 'o', 'm', '\0',
   /* "comdotgame.com", true */ 'c', 'o', 'm', 'd', 'o', 't', 'g', 'a', 'm', 'e', '.', 'c', 'o', 'm', '\0',
   /* "comdurav.com", true */ 'c', 'o', 'm', 'd', 'u', 'r', 'a', 'v', '.', 'c', 'o', 'm', '\0',
@@ -3617,7 +3618,6 @@ static const char kSTSHostTable[] = {
   /* "crena.ch", true */ 'c', 'r', 'e', 'n', 'a', '.', 'c', 'h', '\0',
   /* "crepererum.net", true */ 'c', 'r', 'e', 'p', 'e', 'r', 'e', 'r', 'u', 'm', '.', 'n', 'e', 't', '\0',
   /* "crescent.gr.jp", true */ 'c', 'r', 'e', 's', 'c', 'e', 'n', 't', '.', 'g', 'r', '.', 'j', 'p', '\0',
-  /* "crestasantos.com", true */ 'c', 'r', 'e', 's', 't', 'a', 's', 'a', 'n', 't', 'o', 's', '.', 'c', 'o', 'm', '\0',
   /* "cretdupuy.com", true */ 'c', 'r', 'e', 't', 'd', 'u', 'p', 'u', 'y', '.', 'c', 'o', 'm', '\0',
   /* "crge.eu", true */ 'c', 'r', 'g', 'e', '.', 'e', 'u', '\0',
   /* "criena.net", false */ 'c', 'r', 'i', 'e', 'n', 'a', '.', 'n', 'e', 't', '\0',
@@ -3715,7 +3715,6 @@ static const char kSTSHostTable[] = {
   /* "cubecraftstore.net", true */ 'c', 'u', 'b', 'e', 'c', 'r', 'a', 'f', 't', 's', 't', 'o', 'r', 'e', '.', 'n', 'e', 't', '\0',
   /* "cubekrowd.net", true */ 'c', 'u', 'b', 'e', 'k', 'r', 'o', 'w', 'd', '.', 'n', 'e', 't', '\0',
   /* "cubos.io", true */ 'c', 'u', 'b', 'o', 's', '.', 'i', 'o', '\0',
-  /* "cubostecnologia.com", true */ 'c', 'u', 'b', 'o', 's', 't', 'e', 'c', 'n', 'o', 'l', 'o', 'g', 'i', 'a', '.', 'c', 'o', 'm', '\0',
   /* "cubostecnologia.com.br", true */ 'c', 'u', 'b', 'o', 's', 't', 'e', 'c', 'n', 'o', 'l', 'o', 'g', 'i', 'a', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "cubua.com", true */ 'c', 'u', 'b', 'u', 'a', '.', 'c', 'o', 'm', '\0',
   /* "cuddlecomfort.com", true */ 'c', 'u', 'd', 'd', 'l', 'e', 'c', 'o', 'm', 'f', 'o', 'r', 't', '.', 'c', 'o', 'm', '\0',
@@ -3853,6 +3852,7 @@ static const char kSTSHostTable[] = {
   /* "daemon.xin", true */ 'd', 'a', 'e', 'm', 'o', 'n', '.', 'x', 'i', 'n', '\0',
   /* "dag-konsult.com", true */ 'd', 'a', 'g', '-', 'k', 'o', 'n', 's', 'u', 'l', 't', '.', 'c', 'o', 'm', '\0',
   /* "dahl-pind.dk", true */ 'd', 'a', 'h', 'l', '-', 'p', 'i', 'n', 'd', '.', 'd', 'k', '\0',
+  /* "dahlberg.cologne", true */ 'd', 'a', 'h', 'l', 'b', 'e', 'r', 'g', '.', 'c', 'o', 'l', 'o', 'g', 'n', 'e', '\0',
   /* "dailyenglishchallenge.com", true */ 'd', 'a', 'i', 'l', 'y', 'e', 'n', 'g', 'l', 'i', 's', 'h', 'c', 'h', 'a', 'l', 'l', 'e', 'n', 'g', 'e', '.', 'c', 'o', 'm', '\0',
   /* "dailylifefinancial.com", false */ 'd', 'a', 'i', 'l', 'y', 'l', 'i', 'f', 'e', 'f', 'i', 'n', 'a', 'n', 'c', 'i', 'a', 'l', '.', 'c', 'o', 'm', '\0',
   /* "dairyshrine.org", true */ 'd', 'a', 'i', 'r', 'y', 's', 'h', 'r', 'i', 'n', 'e', '.', 'o', 'r', 'g', '\0',
@@ -3862,7 +3862,6 @@ static const char kSTSHostTable[] = {
   /* "dakl-shop.de", true */ 'd', 'a', 'k', 'l', '-', 's', 'h', 'o', 'p', '.', 'd', 'e', '\0',
   /* "daknob.net", true */ 'd', 'a', 'k', 'n', 'o', 'b', '.', 'n', 'e', 't', '\0',
   /* "daladubbeln.se", true */ 'd', 'a', 'l', 'a', 'd', 'u', 'b', 'b', 'e', 'l', 'n', '.', 's', 'e', '\0',
-  /* "dale-electric.com", true */ 'd', 'a', 'l', 'e', '-', 'e', 'l', 'e', 'c', 't', 'r', 'i', 'c', '.', 'c', 'o', 'm', '\0',
   /* "dalek.co.nz", true */ 'd', 'a', 'l', 'e', 'k', '.', 'c', 'o', '.', 'n', 'z', '\0',
   /* "dalfsennet.nl", true */ 'd', 'a', 'l', 'f', 's', 'e', 'n', 'n', 'e', 't', '.', 'n', 'l', '\0',
   /* "dalingk.com", true */ 'd', 'a', 'l', 'i', 'n', 'g', 'k', '.', 'c', 'o', 'm', '\0',
@@ -3911,7 +3910,6 @@ static const char kSTSHostTable[] = {
   /* "danminkevitch.com", true */ 'd', 'a', 'n', 'm', 'i', 'n', 'k', 'e', 'v', 'i', 't', 'c', 'h', '.', 'c', 'o', 'm', '\0',
   /* "danny.fm", true */ 'd', 'a', 'n', 'n', 'y', '.', 'f', 'm', '\0',
   /* "dannycrichton.com", true */ 'd', 'a', 'n', 'n', 'y', 'c', 'r', 'i', 'c', 'h', 't', 'o', 'n', '.', 'c', 'o', 'm', '\0',
-  /* "dannyrohde.de", true */ 'd', 'a', 'n', 'n', 'y', 'r', 'o', 'h', 'd', 'e', '.', 'd', 'e', '\0',
   /* "danonsecurity.com", true */ 'd', 'a', 'n', 'o', 'n', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'c', 'o', 'm', '\0',
   /* "danoz.net", true */ 'd', 'a', 'n', 'o', 'z', '.', 'n', 'e', 't', '\0',
   /* "danpiel.net", false */ 'd', 'a', 'n', 'p', 'i', 'e', 'l', '.', 'n', 'e', 't', '\0',
@@ -4473,6 +4471,7 @@ static const char kSTSHostTable[] = {
   /* "dlaspania.pl", true */ 'd', 'l', 'a', 's', 'p', 'a', 'n', 'i', 'a', '.', 'p', 'l', '\0',
   /* "dldl.fr", true */ 'd', 'l', 'd', 'l', '.', 'f', 'r', '\0',
   /* "dlg.im", true */ 'd', 'l', 'g', '.', 'i', 'm', '\0',
+  /* "dlld.com", true */ 'd', 'l', 'l', 'd', '.', 'c', 'o', 'm', '\0',
   /* "dlouwrink.nl", true */ 'd', 'l', 'o', 'u', 'w', 'r', 'i', 'n', 'k', '.', 'n', 'l', '\0',
   /* "dlzz.net", true */ 'd', 'l', 'z', 'z', '.', 'n', 'e', 't', '\0',
   /* "dm.lookout.com", false */ 'd', 'm', '.', 'l', 'o', 'o', 'k', 'o', 'u', 't', '.', 'c', 'o', 'm', '\0',
@@ -4788,6 +4787,7 @@ static const char kSTSHostTable[] = {
   /* "dvotx.org", true */ 'd', 'v', 'o', 't', 'x', '.', 'o', 'r', 'g', '\0',
   /* "dvwc.org", true */ 'd', 'v', 'w', 'c', '.', 'o', 'r', 'g', '\0',
   /* "dwnld.me", true */ 'd', 'w', 'n', 'l', 'd', '.', 'm', 'e', '\0',
+  /* "dworzak.ch", true */ 'd', 'w', 'o', 'r', 'z', 'a', 'k', '.', 'c', 'h', '\0',
   /* "dwtm.ch", true */ 'd', 'w', 't', 'm', '.', 'c', 'h', '\0',
   /* "dxa.io", false */ 'd', 'x', 'a', '.', 'i', 'o', '\0',
   /* "dxgl.info", true */ 'd', 'x', 'g', 'l', '.', 'i', 'n', 'f', 'o', '\0',
@@ -5304,6 +5304,7 @@ static const char kSTSHostTable[] = {
   /* "escael.org", true */ 'e', 's', 'c', 'a', 'e', 'l', '.', 'o', 'r', 'g', '\0',
   /* "escapees.com", true */ 'e', 's', 'c', 'a', 'p', 'e', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "escapeplaza.de", true */ 'e', 's', 'c', 'a', 'p', 'e', 'p', 'l', 'a', 'z', 'a', '.', 'd', 'e', '\0',
+  /* "escargotbistro.com", true */ 'e', 's', 'c', 'a', 'r', 'g', 'o', 't', 'b', 'i', 's', 't', 'r', 'o', '.', 'c', 'o', 'm', '\0',
   /* "escavador.com", true */ 'e', 's', 'c', 'a', 'v', 'a', 'd', 'o', 'r', '.', 'c', 'o', 'm', '\0',
   /* "esclear.de", true */ 'e', 's', 'c', 'l', 'e', 'a', 'r', '.', 'd', 'e', '\0',
   /* "escolaengenharia.com.br", true */ 'e', 's', 'c', 'o', 'l', 'a', 'e', 'n', 'g', 'e', 'n', 'h', 'a', 'r', 'i', 'a', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
@@ -5515,6 +5516,7 @@ static const char kSTSHostTable[] = {
   /* "extreme-gaming.us", true */ 'e', 'x', 't', 'r', 'e', 'm', 'e', '-', 'g', 'a', 'm', 'i', 'n', 'g', '.', 'u', 's', '\0',
   /* "extrememanual.net", true */ 'e', 'x', 't', 'r', 'e', 'm', 'e', 'm', 'a', 'n', 'u', 'a', 'l', '.', 'n', 'e', 't', '\0',
   /* "exyplis.com", true */ 'e', 'x', 'y', 'p', 'l', 'i', 's', '.', 'c', 'o', 'm', '\0',
+  /* "eyasc.nl", true */ 'e', 'y', 'a', 's', 'c', '.', 'n', 'l', '\0',
   /* "eydesignguidelines.com", true */ 'e', 'y', 'd', 'e', 's', 'i', 'g', 'n', 'g', 'u', 'i', 'd', 'e', 'l', 'i', 'n', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "eye-carat.com", true */ 'e', 'y', 'e', '-', 'c', 'a', 'r', 'a', 't', '.', 'c', 'o', 'm', '\0',
   /* "eyeonid.com", true */ 'e', 'y', 'e', 'o', 'n', 'i', 'd', '.', 'c', 'o', 'm', '\0',
@@ -5654,7 +5656,6 @@ static const char kSTSHostTable[] = {
   /* "fastworx.com", true */ 'f', 'a', 's', 't', 'w', 'o', 'r', 'x', '.', 'c', 'o', 'm', '\0',
   /* "fatox.de", true */ 'f', 'a', 't', 'o', 'x', '.', 'd', 'e', '\0',
   /* "fatzebra.com.au", false */ 'f', 'a', 't', 'z', 'e', 'b', 'r', 'a', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
-  /* "faucetbox.com", true */ 'f', 'a', 'u', 'c', 'e', 't', 'b', 'o', 'x', '.', 'c', 'o', 'm', '\0',
   /* "favorit.club", true */ 'f', 'a', 'v', 'o', 'r', 'i', 't', '.', 'c', 'l', 'u', 'b', '\0',
   /* "fawkex.me", true */ 'f', 'a', 'w', 'k', 'e', 'x', '.', 'm', 'e', '\0',
   /* "fawong.com", true */ 'f', 'a', 'w', 'o', 'n', 'g', '.', 'c', 'o', 'm', '\0',
@@ -5883,6 +5884,7 @@ static const char kSTSHostTable[] = {
   /* "fleetssl.com", true */ 'f', 'l', 'e', 'e', 't', 's', 's', 'l', '.', 'c', 'o', 'm', '\0',
   /* "fleisch.club", true */ 'f', 'l', 'e', 'i', 's', 'c', 'h', '.', 'c', 'l', 'u', 'b', '\0',
   /* "fletchto99.com", true */ 'f', 'l', 'e', 't', 'c', 'h', 't', 'o', '9', '9', '.', 'c', 'o', 'm', '\0',
+  /* "fleurette.me", true */ 'f', 'l', 'e', 'u', 'r', 'e', 't', 't', 'e', '.', 'm', 'e', '\0',
   /* "flexapplications.se", true */ 'f', 'l', 'e', 'x', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 's', '.', 's', 'e', '\0',
   /* "fleximus.org", false */ 'f', 'l', 'e', 'x', 'i', 'm', 'u', 's', '.', 'o', 'r', 'g', '\0',
   /* "flexinvesting.fi", true */ 'f', 'l', 'e', 'x', 'i', 'n', 'v', 'e', 's', 't', 'i', 'n', 'g', '.', 'f', 'i', '\0',
@@ -6000,6 +6002,7 @@ static const char kSTSHostTable[] = {
   /* "forextimes.ru", false */ 'f', 'o', 'r', 'e', 'x', 't', 'i', 'm', 'e', 's', '.', 'r', 'u', '\0',
   /* "formationseeker.com", true */ 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 's', 'e', 'e', 'k', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "formationsfactory.co.uk", false */ 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 's', 'f', 'a', 'c', 't', 'o', 'r', 'y', '.', 'c', 'o', '.', 'u', 'k', '\0',
+  /* "formbetter.com", true */ 'f', 'o', 'r', 'm', 'b', 'e', 't', 't', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "formini.dz", true */ 'f', 'o', 'r', 'm', 'i', 'n', 'i', '.', 'd', 'z', '\0',
   /* "foro.io", false */ 'f', 'o', 'r', 'o', '.', 'i', 'o', '\0',
   /* "forodeespanol.com", true */ 'f', 'o', 'r', 'o', 'd', 'e', 'e', 's', 'p', 'a', 'n', 'o', 'l', '.', 'c', 'o', 'm', '\0',
@@ -6333,6 +6336,7 @@ static const char kSTSHostTable[] = {
   /* "gametium.com", true */ 'g', 'a', 'm', 'e', 't', 'i', 'u', 'm', '.', 'c', 'o', 'm', '\0',
   /* "gametium.es", true */ 'g', 'a', 'm', 'e', 't', 'i', 'u', 'm', '.', 'e', 's', '\0',
   /* "gamingexodus.com", true */ 'g', 'a', 'm', 'i', 'n', 'g', 'e', 'x', 'o', 'd', 'u', 's', '.', 'c', 'o', 'm', '\0',
+  /* "gamingreinvented.com", true */ 'g', 'a', 'm', 'i', 'n', 'g', 'r', 'e', 'i', 'n', 'v', 'e', 'n', 't', 'e', 'd', '.', 'c', 'o', 'm', '\0',
   /* "gamingwithcromulent.com", true */ 'g', 'a', 'm', 'i', 'n', 'g', 'w', 'i', 't', 'h', 'c', 'r', 'o', 'm', 'u', 'l', 'e', 'n', 't', '.', 'c', 'o', 'm', '\0',
   /* "gamingzoneservers.com", true */ 'g', 'a', 'm', 'i', 'n', 'g', 'z', 'o', 'n', 'e', 's', 'e', 'r', 'v', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
   /* "gamishou.fr", true */ 'g', 'a', 'm', 'i', 's', 'h', 'o', 'u', '.', 'f', 'r', '\0',
@@ -6390,7 +6394,6 @@ static const char kSTSHostTable[] = {
   /* "gdutnic.com", true */ 'g', 'd', 'u', 't', 'n', 'i', 'c', '.', 'c', 'o', 'm', '\0',
   /* "gdv.me", true */ 'g', 'd', 'v', '.', 'm', 'e', '\0',
   /* "gdz-otvety.com", true */ 'g', 'd', 'z', '-', 'o', 't', 'v', 'e', 't', 'y', '.', 'c', 'o', 'm', '\0',
-  /* "gdz-spishy.com", true */ 'g', 'd', 'z', '-', 's', 'p', 'i', 's', 'h', 'y', '.', 'c', 'o', 'm', '\0',
   /* "ge1.me", false */ 'g', 'e', '1', '.', 'm', 'e', '\0',
   /* "ge3k.net", false */ 'g', 'e', '3', 'k', '.', 'n', 'e', 't', '\0',
   /* "gear-acquisition-syndrome.community", true */ 'g', 'e', 'a', 'r', '-', 'a', 'c', 'q', 'u', 'i', 's', 'i', 't', 'i', 'o', 'n', '-', 's', 'y', 'n', 'd', 'r', 'o', 'm', 'e', '.', 'c', 'o', 'm', 'm', 'u', 'n', 'i', 't', 'y', '\0',
@@ -6525,7 +6528,6 @@ static const char kSTSHostTable[] = {
   /* "gfk-kunststoff-luebben.de", true */ 'g', 'f', 'k', '-', 'k', 'u', 'n', 's', 't', 's', 't', 'o', 'f', 'f', '-', 'l', 'u', 'e', 'b', 'b', 'e', 'n', '.', 'd', 'e', '\0',
   /* "gflame.de", true */ 'g', 'f', 'l', 'a', 'm', 'e', '.', 'd', 'e', '\0',
   /* "gflclan.ru", true */ 'g', 'f', 'l', 'c', 'l', 'a', 'n', '.', 'r', 'u', '\0',
-  /* "gfournier.ca", true */ 'g', 'f', 'o', 'u', 'r', 'n', 'i', 'e', 'r', '.', 'c', 'a', '\0',
   /* "ggl-luzern.ch", true */ 'g', 'g', 'l', '-', 'l', 'u', 'z', 'e', 'r', 'n', '.', 'c', 'h', '\0',
   /* "gglks.com", true */ 'g', 'g', 'l', 'k', 's', '.', 'c', 'o', 'm', '\0',
   /* "ggmmontascale.it", true */ 'g', 'g', 'm', 'm', 'o', 'n', 't', 'a', 's', 'c', 'a', 'l', 'e', '.', 'i', 't', '\0',
@@ -6790,7 +6792,6 @@ static const char kSTSHostTable[] = {
   /* "grc.com", false */ 'g', 'r', 'c', '.', 'c', 'o', 'm', '\0',
   /* "greatfire.org", true */ 'g', 'r', 'e', 'a', 't', 'f', 'i', 'r', 'e', '.', 'o', 'r', 'g', '\0',
   /* "greatlakeside.de", true */ 'g', 'r', 'e', 'a', 't', 'l', 'a', 'k', 'e', 's', 'i', 'd', 'e', '.', 'd', 'e', '\0',
-  /* "greatsong.net", true */ 'g', 'r', 'e', 'a', 't', 's', 'o', 'n', 'g', '.', 'n', 'e', 't', '\0',
   /* "greboid.co.uk", true */ 'g', 'r', 'e', 'b', 'o', 'i', 'd', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "greboid.com", true */ 'g', 'r', 'e', 'b', 'o', 'i', 'd', '.', 'c', 'o', 'm', '\0',
   /* "greedbutt.com", true */ 'g', 'r', 'e', 'e', 'd', 'b', 'u', 't', 't', '.', 'c', 'o', 'm', '\0',
@@ -6917,6 +6918,7 @@ static const char kSTSHostTable[] = {
   /* "guim.co.uk", true */ 'g', 'u', 'i', 'm', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "guinea-pig.co", true */ 'g', 'u', 'i', 'n', 'e', 'a', '-', 'p', 'i', 'g', '.', 'c', 'o', '\0',
   /* "guineafruitcorp.com", true */ 'g', 'u', 'i', 'n', 'e', 'a', 'f', 'r', 'u', 'i', 't', 'c', 'o', 'r', 'p', '.', 'c', 'o', 'm', '\0',
+  /* "guineapigmustach.es", true */ 'g', 'u', 'i', 'n', 'e', 'a', 'p', 'i', 'g', 'm', 'u', 's', 't', 'a', 'c', 'h', '.', 'e', 's', '\0',
   /* "guitarmarketing.com", false */ 'g', 'u', 'i', 't', 'a', 'r', 'm', 'a', 'r', 'k', 'e', 't', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "gulch.in.ua", false */ 'g', 'u', 'l', 'c', 'h', '.', 'i', 'n', '.', 'u', 'a', '\0',
   /* "gulenbase.no", true */ 'g', 'u', 'l', 'e', 'n', 'b', 'a', 's', 'e', '.', 'n', 'o', '\0',
@@ -7098,7 +7100,6 @@ static const char kSTSHostTable[] = {
   /* "hatcherlawgroupnm.com", true */ 'h', 'a', 't', 'c', 'h', 'e', 'r', 'l', 'a', 'w', 'g', 'r', 'o', 'u', 'p', 'n', 'm', '.', 'c', 'o', 'm', '\0',
   /* "hatethe.uk", true */ 'h', 'a', 't', 'e', 't', 'h', 'e', '.', 'u', 'k', '\0',
   /* "hatisenang.com", false */ 'h', 'a', 't', 'i', 's', 'e', 'n', 'a', 'n', 'g', '.', 'c', 'o', 'm', '\0',
-  /* "haucke.xyz", true */ 'h', 'a', 'u', 'c', 'k', 'e', '.', 'x', 'y', 'z', '\0',
   /* "hauntedfishtank.com", false */ 'h', 'a', 'u', 'n', 't', 'e', 'd', 'f', 'i', 's', 'h', 't', 'a', 'n', 'k', '.', 'c', 'o', 'm', '\0',
   /* "haus-garten-test.de", true */ 'h', 'a', 'u', 's', '-', 'g', 'a', 'r', 't', 'e', 'n', '-', 't', 'e', 's', 't', '.', 'd', 'e', '\0',
   /* "hausverbrauch.de", true */ 'h', 'a', 'u', 's', 'v', 'e', 'r', 'b', 'r', 'a', 'u', 'c', 'h', '.', 'd', 'e', '\0',
@@ -7242,6 +7243,7 @@ static const char kSTSHostTable[] = {
   /* "hentschke-betonfertigteilwerk.de", true */ 'h', 'e', 'n', 't', 's', 'c', 'h', 'k', 'e', '-', 'b', 'e', 't', 'o', 'n', 'f', 'e', 'r', 't', 'i', 'g', 't', 'e', 'i', 'l', 'w', 'e', 'r', 'k', '.', 'd', 'e', '\0',
   /* "hentschke-invest.de", true */ 'h', 'e', 'n', 't', 's', 'c', 'h', 'k', 'e', '-', 'i', 'n', 'v', 'e', 's', 't', '.', 'd', 'e', '\0',
   /* "heppler.net", true */ 'h', 'e', 'p', 'p', 'l', 'e', 'r', '.', 'n', 'e', 't', '\0',
+  /* "heptafrogs.de", true */ 'h', 'e', 'p', 't', 'a', 'f', 'r', 'o', 'g', 's', '.', 'd', 'e', '\0',
   /* "hepteract.us", true */ 'h', 'e', 'p', 't', 'e', 'r', 'a', 'c', 't', '.', 'u', 's', '\0',
   /* "heptner24.de", true */ 'h', 'e', 'p', 't', 'n', 'e', 'r', '2', '4', '.', 'd', 'e', '\0',
   /* "herbandpat.org", true */ 'h', 'e', 'r', 'b', 'a', 'n', 'd', 'p', 'a', 't', '.', 'o', 'r', 'g', '\0',
@@ -7339,6 +7341,7 @@ static const char kSTSHostTable[] = {
   /* "hledejlevne.cz", true */ 'h', 'l', 'e', 'd', 'e', 'j', 'l', 'e', 'v', 'n', 'e', '.', 'c', 'z', '\0',
   /* "hledejpravnika.cz", true */ 'h', 'l', 'e', 'd', 'e', 'j', 'p', 'r', 'a', 'v', 'n', 'i', 'k', 'a', '.', 'c', 'z', '\0',
   /* "hlfh.space", true */ 'h', 'l', 'f', 'h', '.', 's', 'p', 'a', 'c', 'e', '\0',
+  /* "hloe0xff.ru", true */ 'h', 'l', 'o', 'e', '0', 'x', 'f', 'f', '.', 'r', 'u', '\0',
   /* "hm1ch.com", true */ 'h', 'm', '1', 'c', 'h', '.', 'c', 'o', 'm', '\0',
   /* "hm1ch.ovh", true */ 'h', 'm', '1', 'c', 'h', '.', 'o', 'v', 'h', '\0',
   /* "hmhotelec.com", true */ 'h', 'm', 'h', 'o', 't', 'e', 'l', 'e', 'c', '.', 'c', 'o', 'm', '\0',
@@ -7391,7 +7394,6 @@ static const char kSTSHostTable[] = {
   /* "homeprivate.de", true */ 'h', 'o', 'm', 'e', 'p', 'r', 'i', 'v', 'a', 't', 'e', '.', 'd', 'e', '\0',
   /* "homeseller.co.uk", true */ 'h', 'o', 'm', 'e', 's', 'e', 'l', 'l', 'e', 'r', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "homeseller.com", true */ 'h', 'o', 'm', 'e', 's', 'e', 'l', 'l', 'e', 'r', '.', 'c', 'o', 'm', '\0',
-  /* "hometownmall.com", true */ 'h', 'o', 'm', 'e', 't', 'o', 'w', 'n', 'm', 'a', 'l', 'l', '.', 'c', 'o', 'm', '\0',
   /* "homewatt.co.uk", true */ 'h', 'o', 'm', 'e', 'w', 'a', 't', 't', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "homeyantra.com", true */ 'h', 'o', 'm', 'e', 'y', 'a', 'n', 't', 'r', 'a', '.', 'c', 'o', 'm', '\0',
   /* "homeyou.com", true */ 'h', 'o', 'm', 'e', 'y', 'o', 'u', '.', 'c', 'o', 'm', '\0',
@@ -7478,7 +7480,6 @@ static const char kSTSHostTable[] = {
   /* "how2fsbo.com", true */ 'h', 'o', 'w', '2', 'f', 's', 'b', 'o', '.', 'c', 'o', 'm', '\0',
   /* "howardtyson.com", true */ 'h', 'o', 'w', 'a', 'r', 'd', 't', 'y', 's', 'o', 'n', '.', 'c', 'o', 'm', '\0',
   /* "howbehealthy.com", true */ 'h', 'o', 'w', 'b', 'e', 'h', 'e', 'a', 'l', 't', 'h', 'y', '.', 'c', 'o', 'm', '\0',
-  /* "howbigismybuilding.com", true */ 'h', 'o', 'w', 'b', 'i', 'g', 'i', 's', 'm', 'y', 'b', 'u', 'i', 'l', 'd', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "howfargames.com", true */ 'h', 'o', 'w', 'f', 'a', 'r', 'g', 'a', 'm', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "howlongtobeatsteam.com", true */ 'h', 'o', 'w', 'l', 'o', 'n', 'g', 't', 'o', 'b', 'e', 'a', 't', 's', 't', 'e', 'a', 'm', '.', 'c', 'o', 'm', '\0',
   /* "howsecureismypassword.net", true */ 'h', 'o', 'w', 's', 'e', 'c', 'u', 'r', 'e', 'i', 's', 'm', 'y', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '.', 'n', 'e', 't', '\0',
@@ -7637,7 +7638,6 @@ static const char kSTSHostTable[] = {
   /* "ic-lighting.com.au", true */ 'i', 'c', '-', 'l', 'i', 'g', 'h', 't', 'i', 'n', 'g', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "ic3.gov", true */ 'i', 'c', '3', '.', 'g', 'o', 'v', '\0',
   /* "icarlos.net", true */ 'i', 'c', 'a', 'r', 'l', 'o', 's', '.', 'n', 'e', 't', '\0',
-  /* "icebat.dyndns.org", true */ 'i', 'c', 'e', 'b', 'a', 't', '.', 'd', 'y', 'n', 'd', 'n', 's', '.', 'o', 'r', 'g', '\0',
   /* "iceberg.academy", true */ 'i', 'c', 'e', 'b', 'e', 'r', 'g', '.', 'a', 'c', 'a', 'd', 'e', 'm', 'y', '\0',
   /* "icecars.net", true */ 'i', 'c', 'e', 'c', 'a', 'r', 's', '.', 'n', 'e', 't', '\0',
   /* "iceloch.com", true */ 'i', 'c', 'e', 'l', 'o', 'c', 'h', '.', 'c', 'o', 'm', '\0',
@@ -7697,6 +7697,7 @@ static const char kSTSHostTable[] = {
   /* "idsafe.co.za", true */ 'i', 'd', 's', 'a', 'f', 'e', '.', 'c', 'o', '.', 'z', 'a', '\0',
   /* "idtheft.gov", true */ 'i', 'd', 't', 'h', 'e', 'f', 't', '.', 'g', 'o', 'v', '\0',
   /* "idubaj.cz", true */ 'i', 'd', 'u', 'b', 'a', 'j', '.', 'c', 'z', '\0',
+  /* "idvl.de", true */ 'i', 'd', 'v', 'l', '.', 'd', 'e', '\0',
   /* "iec.pe", true */ 'i', 'e', 'c', '.', 'p', 'e', '\0',
   /* "ieeespmb.org", true */ 'i', 'e', 'e', 'e', 's', 'p', 'm', 'b', '.', 'o', 'r', 'g', '\0',
   /* "ieval.ro", true */ 'i', 'e', 'v', 'a', 'l', '.', 'r', 'o', '\0',
@@ -7704,7 +7705,6 @@ static const char kSTSHostTable[] = {
   /* "ifasec.de", false */ 'i', 'f', 'a', 's', 'e', 'c', '.', 'd', 'e', '\0',
   /* "ifastuniversity.com", true */ 'i', 'f', 'a', 's', 't', 'u', 'n', 'i', 'v', 'e', 'r', 's', 'i', 't', 'y', '.', 'c', 'o', 'm', '\0',
   /* "ifcfg.me", true */ 'i', 'f', 'c', 'f', 'g', '.', 'm', 'e', '\0',
-  /* "ifconfig.co", true */ 'i', 'f', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', '\0',
   /* "ifengge.cn", true */ 'i', 'f', 'e', 'n', 'g', 'g', 'e', '.', 'c', 'n', '\0',
   /* "ifengge.me", true */ 'i', 'f', 'e', 'n', 'g', 'g', 'e', '.', 'm', 'e', '\0',
   /* "ifightsurveillance.com", true */ 'i', 'f', 'i', 'g', 'h', 't', 's', 'u', 'r', 'v', 'e', 'i', 'l', 'l', 'a', 'n', 'c', 'e', '.', 'c', 'o', 'm', '\0',
@@ -7995,7 +7995,6 @@ static const char kSTSHostTable[] = {
   /* "intermedinet.nl", true */ 'i', 'n', 't', 'e', 'r', 'm', 'e', 'd', 'i', 'n', 'e', 't', '.', 'n', 'l', '\0',
   /* "internaldh.com", true */ 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'd', 'h', '.', 'c', 'o', 'm', '\0',
   /* "internaut.co.za", true */ 'i', 'n', 't', 'e', 'r', 'n', 'a', 'u', 't', '.', 'c', 'o', '.', 'z', 'a', '\0',
-  /* "internect.co.za", true */ 'i', 'n', 't', 'e', 'r', 'n', 'e', 'c', 't', '.', 'c', 'o', '.', 'z', 'a', '\0',
   /* "internet-pornografie.de", true */ 'i', 'n', 't', 'e', 'r', 'n', 'e', 't', '-', 'p', 'o', 'r', 'n', 'o', 'g', 'r', 'a', 'f', 'i', 'e', '.', 'd', 'e', '\0',
   /* "internetaanbieders.eu", true */ 'i', 'n', 't', 'e', 'r', 'n', 'e', 't', 'a', 'a', 'n', 'b', 'i', 'e', 'd', 'e', 'r', 's', '.', 'e', 'u', '\0',
   /* "internetbank.swedbank.se", true */ 'i', 'n', 't', 'e', 'r', 'n', 'e', 't', 'b', 'a', 'n', 'k', '.', 's', 'w', 'e', 'd', 'b', 'a', 'n', 'k', '.', 's', 'e', '\0',
@@ -8217,15 +8216,16 @@ static const char kSTSHostTable[] = {
   /* "itooky.com", true */ 'i', 't', 'o', 'o', 'k', 'y', '.', 'c', 'o', 'm', '\0',
   /* "itpol.dk", true */ 'i', 't', 'p', 'o', 'l', '.', 'd', 'k', '\0',
   /* "itpro.ua", true */ 'i', 't', 'p', 'r', 'o', '.', 'u', 'a', '\0',
-  /* "itpros.ru", true */ 'i', 't', 'p', 'r', 'o', 's', '.', 'r', 'u', '\0',
   /* "its-gutachten.de", true */ 'i', 't', 's', '-', 'g', 'u', 't', 'a', 'c', 'h', 't', 'e', 'n', '.', 'd', 'e', '\0',
   /* "its-schindler.de", true */ 'i', 't', 's', '-', 's', 'c', 'h', 'i', 'n', 'd', 'l', 'e', 'r', '.', 'd', 'e', '\0',
   /* "its-v.de", true */ 'i', 't', 's', '-', 'v', '.', 'd', 'e', '\0',
   /* "its4living.com", true */ 'i', 't', 's', '4', 'l', 'i', 'v', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "itsanicedoor.co.uk", true */ 'i', 't', 's', 'a', 'n', 'i', 'c', 'e', 'd', 'o', 'o', 'r', '.', 'c', 'o', '.', 'u', 'k', '\0',
+  /* "itsatrap.nl", false */ 'i', 't', 's', 'a', 't', 'r', 'a', 'p', '.', 'n', 'l', '\0',
   /* "itsecguy.com", true */ 'i', 't', 's', 'e', 'c', 'g', 'u', 'y', '.', 'c', 'o', 'm', '\0',
   /* "itsgoingdown.org", true */ 'i', 't', 's', 'g', 'o', 'i', 'n', 'g', 'd', 'o', 'w', 'n', '.', 'o', 'r', 'g', '\0',
   /* "itsok.de", true */ 'i', 't', 's', 'o', 'k', '.', 'd', 'e', '\0',
+  /* "itspawned.com", true */ 'i', 't', 's', 'p', 'a', 'w', 'n', 'e', 'd', '.', 'c', 'o', 'm', '\0',
   /* "itspersonaltraining.nl", true */ 'i', 't', 's', 'p', 'e', 'r', 's', 'o', 'n', 'a', 'l', 't', 'r', 'a', 'i', 'n', 'i', 'n', 'g', '.', 'n', 'l', '\0',
   /* "itsstefan.eu", true */ 'i', 't', 's', 's', 't', 'e', 'f', 'a', 'n', '.', 'e', 'u', '\0',
   /* "itu2015.de", true */ 'i', 't', 'u', '2', '0', '1', '5', '.', 'd', 'e', '\0',
@@ -8423,7 +8423,6 @@ static const char kSTSHostTable[] = {
   /* "jeffersonregan.com", true */ 'j', 'e', 'f', 'f', 'e', 'r', 's', 'o', 'n', 'r', 'e', 'g', 'a', 'n', '.', 'c', 'o', 'm', '\0',
   /* "jeffersonregan.net", true */ 'j', 'e', 'f', 'f', 'e', 'r', 's', 'o', 'n', 'r', 'e', 'g', 'a', 'n', '.', 'n', 'e', 't', '\0',
   /* "jeffersonregan.org", true */ 'j', 'e', 'f', 'f', 'e', 'r', 's', 'o', 'n', 'r', 'e', 'g', 'a', 'n', '.', 'o', 'r', 'g', '\0',
-  /* "jeffsanders.com", true */ 'j', 'e', 'f', 'f', 's', 'a', 'n', 'd', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
   /* "jefftickle.com", true */ 'j', 'e', 'f', 'f', 't', 'i', 'c', 'k', 'l', 'e', '.', 'c', 'o', 'm', '\0',
   /* "jeil-makes.co.kr", true */ 'j', 'e', 'i', 'l', '-', 'm', 'a', 'k', 'e', 's', '.', 'c', 'o', '.', 'k', 'r', '\0',
   /* "jekhar.com", true */ 'j', 'e', 'k', 'h', 'a', 'r', '.', 'c', 'o', 'm', '\0',
@@ -8475,7 +8474,6 @@ static const char kSTSHostTable[] = {
   /* "jialinwu.com", true */ 'j', 'i', 'a', 'l', 'i', 'n', 'w', 'u', '.', 'c', 'o', 'm', '\0',
   /* "jiangzm.com", true */ 'j', 'i', 'a', 'n', 'g', 'z', 'm', '.', 'c', 'o', 'm', '\0',
   /* "jichi.me", true */ 'j', 'i', 'c', 'h', 'i', '.', 'm', 'e', '\0',
-  /* "jie.dance", true */ 'j', 'i', 'e', '.', 'd', 'a', 'n', 'c', 'e', '\0',
   /* "jigsawdevelopments.com", true */ 'j', 'i', 'g', 's', 'a', 'w', 'd', 'e', 'v', 'e', 'l', 'o', 'p', 'm', 'e', 'n', 't', 's', '.', 'c', 'o', 'm', '\0',
   /* "jimbraaten.com", true */ 'j', 'i', 'm', 'b', 'r', 'a', 'a', 't', 'e', 'n', '.', 'c', 'o', 'm', '\0',
   /* "jimmehcai.com", true */ 'j', 'i', 'm', 'm', 'e', 'h', 'c', 'a', 'i', '.', 'c', 'o', 'm', '\0',
@@ -8683,6 +8681,7 @@ static const char kSTSHostTable[] = {
   /* "jurko.cz", true */ 'j', 'u', 'r', 'k', 'o', '.', 'c', 'z', '\0',
   /* "jurriaan.ninja", true */ 'j', 'u', 'r', 'r', 'i', 'a', 'a', 'n', '.', 'n', 'i', 'n', 'j', 'a', '\0',
   /* "just-a-clanpage.de", true */ 'j', 'u', 's', 't', '-', 'a', '-', 'c', 'l', 'a', 'n', 'p', 'a', 'g', 'e', '.', 'd', 'e', '\0',
+  /* "justchunks.net", true */ 'j', 'u', 's', 't', 'c', 'h', 'u', 'n', 'k', 's', '.', 'n', 'e', 't', '\0',
   /* "justgalak.com", true */ 'j', 'u', 's', 't', 'g', 'a', 'l', 'a', 'k', '.', 'c', 'o', 'm', '\0',
   /* "justice4assange.com", true */ 'j', 'u', 's', 't', 'i', 'c', 'e', '4', 'a', 's', 's', 'a', 'n', 'g', 'e', '.', 'c', 'o', 'm', '\0',
   /* "justinellingwood.com", true */ 'j', 'u', 's', 't', 'i', 'n', 'e', 'l', 'l', 'i', 'n', 'g', 'w', 'o', 'o', 'd', '.', 'c', 'o', 'm', '\0',
@@ -8966,6 +8965,7 @@ static const char kSTSHostTable[] = {
   /* "kiefer-networks.de", true */ 'k', 'i', 'e', 'f', 'e', 'r', '-', 'n', 'e', 't', 'w', 'o', 'r', 'k', 's', '.', 'd', 'e', '\0',
   /* "kiekin.org", true */ 'k', 'i', 'e', 'k', 'i', 'n', '.', 'o', 'r', 'g', '\0',
   /* "kielderweather.org.uk", true */ 'k', 'i', 'e', 'l', 'd', 'e', 'r', 'w', 'e', 'a', 't', 'h', 'e', 'r', '.', 'o', 'r', 'g', '.', 'u', 'k', '\0',
+  /* "kienlen.org", true */ 'k', 'i', 'e', 'n', 'l', 'e', 'n', '.', 'o', 'r', 'g', '\0',
   /* "kieranjones.uk", true */ 'k', 'i', 'e', 'r', 'a', 'n', 'j', 'o', 'n', 'e', 's', '.', 'u', 'k', '\0',
   /* "kiesuwkerstkaart.nl", true */ 'k', 'i', 'e', 's', 'u', 'w', 'k', 'e', 'r', 's', 't', 'k', 'a', 'a', 'r', 't', '.', 'n', 'l', '\0',
   /* "kiffmarks.com", true */ 'k', 'i', 'f', 'f', 'm', 'a', 'r', 'k', 's', '.', 'c', 'o', 'm', '\0',
@@ -9112,7 +9112,6 @@ static const char kSTSHostTable[] = {
   /* "knot-store.com", true */ 'k', 'n', 'o', 't', '-', 's', 't', 'o', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "knowdebt.org", true */ 'k', 'n', 'o', 'w', 'd', 'e', 'b', 't', '.', 'o', 'r', 'g', '\0',
   /* "knowledgehook.com", true */ 'k', 'n', 'o', 'w', 'l', 'e', 'd', 'g', 'e', 'h', 'o', 'o', 'k', '.', 'c', 'o', 'm', '\0',
-  /* "knowledgesnap.com", true */ 'k', 'n', 'o', 'w', 'l', 'e', 'd', 'g', 'e', 's', 'n', 'a', 'p', '.', 'c', 'o', 'm', '\0',
   /* "knthost.com", true */ 'k', 'n', 't', 'h', 'o', 's', 't', '.', 'c', 'o', 'm', '\0',
   /* "knutur.is", true */ 'k', 'n', 'u', 't', 'u', 'r', '.', 'i', 's', '\0',
   /* "knygos.lt", true */ 'k', 'n', 'y', 'g', 'o', 's', '.', 'l', 't', '\0',
@@ -9235,6 +9234,7 @@ static const char kSTSHostTable[] = {
   /* "kriptosec.com", true */ 'k', 'r', 'i', 'p', 't', 'o', 's', 'e', 'c', '.', 'c', 'o', 'm', '\0',
   /* "krislamoureux.com", true */ 'k', 'r', 'i', 's', 'l', 'a', 'm', 'o', 'u', 'r', 'e', 'u', 'x', '.', 'c', 'o', 'm', '\0',
   /* "krisstarkey.co.uk", true */ 'k', 'r', 'i', 's', 's', 't', 'a', 'r', 'k', 'e', 'y', '.', 'c', 'o', '.', 'u', 'k', '\0',
+  /* "kristikala.nl", true */ 'k', 'r', 'i', 's', 't', 'i', 'k', 'a', 'l', 'a', '.', 'n', 'l', '\0',
   /* "kristinbailey.com", true */ 'k', 'r', 'i', 's', 't', 'i', 'n', 'b', 'a', 'i', 'l', 'e', 'y', '.', 'c', 'o', 'm', '\0',
   /* "kristjanrang.eu", true */ 'k', 'r', 'i', 's', 't', 'j', 'a', 'n', 'r', 'a', 'n', 'g', '.', 'e', 'u', '\0',
   /* "kristofferkoch.com", true */ 'k', 'r', 'i', 's', 't', 'o', 'f', 'f', 'e', 'r', 'k', 'o', 'c', 'h', '.', 'c', 'o', 'm', '\0',
@@ -9439,6 +9439,7 @@ static const char kSTSHostTable[] = {
   /* "larsmerke.de", true */ 'l', 'a', 'r', 's', 'm', 'e', 'r', 'k', 'e', '.', 'd', 'e', '\0',
   /* "lasercloud.ml", true */ 'l', 'a', 's', 'e', 'r', 'c', 'l', 'o', 'u', 'd', '.', 'm', 'l', '\0',
   /* "lasereyess.net", true */ 'l', 'a', 's', 'e', 'r', 'e', 'y', 'e', 's', 's', '.', 'n', 'e', 't', '\0',
+  /* "laserpc.net", true */ 'l', 'a', 's', 'e', 'r', 'p', 'c', '.', 'n', 'e', 't', '\0',
   /* "laserplaza.de", true */ 'l', 'a', 's', 'e', 'r', 'p', 'l', 'a', 'z', 'a', '.', 'd', 'e', '\0',
   /* "laserplaza.net", true */ 'l', 'a', 's', 'e', 'r', 'p', 'l', 'a', 'z', 'a', '.', 'n', 'e', 't', '\0',
   /* "lask.in", true */ 'l', 'a', 's', 'k', '.', 'i', 'n', '\0',
@@ -9524,7 +9525,6 @@ static const char kSTSHostTable[] = {
   /* "leanplando.com", true */ 'l', 'e', 'a', 'n', 'p', 'l', 'a', 'n', 'd', 'o', '.', 'c', 'o', 'm', '\0',
   /* "leaodarodesia.com.br", true */ 'l', 'e', 'a', 'o', 'd', 'a', 'r', 'o', 'd', 'e', 's', 'i', 'a', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "learnedhacker.com", true */ 'l', 'e', 'a', 'r', 'n', 'e', 'd', 'h', 'a', 'c', 'k', 'e', 'r', '.', 'c', 'o', 'm', '\0',
-  /* "learnedovo.com", true */ 'l', 'e', 'a', 'r', 'n', 'e', 'd', 'o', 'v', 'o', '.', 'c', 'o', 'm', '\0',
   /* "learnflakes.net", true */ 'l', 'e', 'a', 'r', 'n', 'f', 'l', 'a', 'k', 'e', 's', '.', 'n', 'e', 't', '\0',
   /* "learntube.cz", true */ 'l', 'e', 'a', 'r', 'n', 't', 'u', 'b', 'e', '.', 'c', 'z', '\0',
   /* "leaseit24.com", true */ 'l', 'e', 'a', 's', 'e', 'i', 't', '2', '4', '.', 'c', 'o', 'm', '\0',
@@ -9603,6 +9603,7 @@ static const char kSTSHostTable[] = {
   /* "leonardcamacho.me", true */ 'l', 'e', 'o', 'n', 'a', 'r', 'd', 'c', 'a', 'm', 'a', 'c', 'h', 'o', '.', 'm', 'e', '\0',
   /* "leonax.net", true */ 'l', 'e', 'o', 'n', 'a', 'x', '.', 'n', 'e', 't', '\0',
   /* "leondenard.com", true */ 'l', 'e', 'o', 'n', 'd', 'e', 'n', 'a', 'r', 'd', '.', 'c', 'o', 'm', '\0',
+  /* "leonhooijer.nl", true */ 'l', 'e', 'o', 'n', 'h', 'o', 'o', 'i', 'j', 'e', 'r', '.', 'n', 'l', '\0',
   /* "leonklingele.de", true */ 'l', 'e', 'o', 'n', 'k', 'l', 'i', 'n', 'g', 'e', 'l', 'e', '.', 'd', 'e', '\0',
   /* "leonmahler.consulting", true */ 'l', 'e', 'o', 'n', 'm', 'a', 'h', 'l', 'e', 'r', '.', 'c', 'o', 'n', 's', 'u', 'l', 't', 'i', 'n', 'g', '\0',
   /* "lep.gov", true */ 'l', 'e', 'p', '.', 'g', 'o', 'v', '\0',
@@ -9668,6 +9669,7 @@ static const char kSTSHostTable[] = {
   /* "li-ke.co.jp", true */ 'l', 'i', '-', 'k', 'e', '.', 'c', 'o', '.', 'j', 'p', '\0',
   /* "liangji.com.tw", false */ 'l', 'i', 'a', 'n', 'g', 'j', 'i', '.', 'c', 'o', 'm', '.', 't', 'w', '\0',
   /* "lianye.in", true */ 'l', 'i', 'a', 'n', 'y', 'e', '.', 'i', 'n', '\0',
+  /* "lianyexiuchang.in", true */ 'l', 'i', 'a', 'n', 'y', 'e', 'x', 'i', 'u', 'c', 'h', 'a', 'n', 'g', '.', 'i', 'n', '\0',
   /* "liaronce.win", true */ 'l', 'i', 'a', 'r', 'o', 'n', 'c', 'e', '.', 'w', 'i', 'n', '\0',
   /* "libbitcoin.org", true */ 'l', 'i', 'b', 'b', 'i', 't', 'c', 'o', 'i', 'n', '.', 'o', 'r', 'g', '\0',
   /* "libble.eu", true */ 'l', 'i', 'b', 'b', 'l', 'e', '.', 'e', 'u', '\0',
@@ -9891,7 +9893,6 @@ static const char kSTSHostTable[] = {
   /* "logentries.com", false */ 'l', 'o', 'g', 'e', 'n', 't', 'r', 'i', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "logfile.at", true */ 'l', 'o', 'g', 'f', 'i', 'l', 'e', '.', 'a', 't', '\0',
   /* "logfile.ch", true */ 'l', 'o', 'g', 'f', 'i', 'l', 'e', '.', 'c', 'h', '\0',
-  /* "logicaladvertising.com", true */ 'l', 'o', 'g', 'i', 'c', 'a', 'l', 'a', 'd', 'v', 'e', 'r', 't', 'i', 's', 'i', 'n', 'g', '.', 'c', 'o', 'm', '\0',
   /* "logicio.ch", false */ 'l', 'o', 'g', 'i', 'c', 'i', 'o', '.', 'c', 'h', '\0',
   /* "logicio.de", false */ 'l', 'o', 'g', 'i', 'c', 'i', 'o', '.', 'd', 'e', '\0',
   /* "logicio.net", false */ 'l', 'o', 'g', 'i', 'c', 'i', 'o', '.', 'n', 'e', 't', '\0',
@@ -10162,6 +10163,7 @@ static const char kSTSHostTable[] = {
   /* "magnoliasib.ru", false */ 'm', 'a', 'g', 'n', 'o', 'l', 'i', 'a', 's', 'i', 'b', '.', 'r', 'u', '\0',
   /* "mahfouzadedimeji.com", true */ 'm', 'a', 'h', 'f', 'o', 'u', 'z', 'a', 'd', 'e', 'd', 'i', 'm', 'e', 'j', 'i', '.', 'c', 'o', 'm', '\0',
   /* "mahrer.net", true */ 'm', 'a', 'h', 'r', 'e', 'r', '.', 'n', 'e', 't', '\0',
+  /* "maidofhonorcleaning.net", true */ 'm', 'a', 'i', 'd', 'o', 'f', 'h', 'o', 'n', 'o', 'r', 'c', 'l', 'e', 'a', 'n', 'i', 'n', 'g', '.', 'n', 'e', 't', '\0',
   /* "mail-rotter.de", true */ 'm', 'a', 'i', 'l', '-', 'r', 'o', 't', 't', 'e', 'r', '.', 'd', 'e', '\0',
   /* "mail-settings.google.com", true */ 'm', 'a', 'i', 'l', '-', 's', 'e', 't', 't', 'i', 'n', 'g', 's', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o', 'm', '\0',
   /* "mail.de", true */ 'm', 'a', 'i', 'l', '.', 'd', 'e', '\0',
@@ -10196,6 +10198,7 @@ static const char kSTSHostTable[] = {
   /* "makedin.net", true */ 'm', 'a', 'k', 'e', 'd', 'i', 'n', '.', 'n', 'e', 't', '\0',
   /* "makeit-so.de", true */ 'm', 'a', 'k', 'e', 'i', 't', '-', 's', 'o', '.', 'd', 'e', '\0',
   /* "makeuplove.nl", true */ 'm', 'a', 'k', 'e', 'u', 'p', 'l', 'o', 'v', 'e', '.', 'n', 'l', '\0',
+  /* "makeyourank.com", true */ 'm', 'a', 'k', 'e', 'y', 'o', 'u', 'r', 'a', 'n', 'k', '.', 'c', 'o', 'm', '\0',
   /* "makeyourlaws.org", true */ 'm', 'a', 'k', 'e', 'y', 'o', 'u', 'r', 'l', 'a', 'w', 's', '.', 'o', 'r', 'g', '\0',
   /* "makinen.ru", true */ 'm', 'a', 'k', 'i', 'n', 'e', 'n', '.', 'r', 'u', '\0',
   /* "makkusu.photo", true */ 'm', 'a', 'k', 'k', 'u', 's', 'u', '.', 'p', 'h', 'o', 't', 'o', '\0',
@@ -10228,6 +10231,7 @@ static const char kSTSHostTable[] = {
   /* "mammeitalianeavienna.com", true */ 'm', 'a', 'm', 'm', 'e', 'i', 't', 'a', 'l', 'i', 'a', 'n', 'e', 'a', 'v', 'i', 'e', 'n', 'n', 'a', '.', 'c', 'o', 'm', '\0',
   /* "mammooc.org", true */ 'm', 'a', 'm', 'm', 'o', 'o', 'c', '.', 'o', 'r', 'g', '\0',
   /* "man3s.jp", true */ 'm', 'a', 'n', '3', 's', '.', 'j', 'p', '\0',
+  /* "manaboutahor.se", false */ 'm', 'a', 'n', 'a', 'b', 'o', 'u', 't', 'a', 'h', 'o', 'r', '.', 's', 'e', '\0',
   /* "manage.cm", true */ 'm', 'a', 'n', 'a', 'g', 'e', '.', 'c', 'm', '\0',
   /* "manage4all.com", true */ 'm', 'a', 'n', 'a', 'g', 'e', '4', 'a', 'l', 'l', '.', 'c', 'o', 'm', '\0',
   /* "manage4all.de", true */ 'm', 'a', 'n', 'a', 'g', 'e', '4', 'a', 'l', 'l', '.', 'd', 'e', '\0',
@@ -10301,6 +10305,7 @@ static const char kSTSHostTable[] = {
   /* "marianatherapy.com", true */ 'm', 'a', 'r', 'i', 'a', 'n', 'a', 't', 'h', 'e', 'r', 'a', 'p', 'y', '.', 'c', 'o', 'm', '\0',
   /* "mariannenan.nl", true */ 'm', 'a', 'r', 'i', 'a', 'n', 'n', 'e', 'n', 'a', 'n', '.', 'n', 'l', '\0',
   /* "mariaolesen.dk", true */ 'm', 'a', 'r', 'i', 'a', 'o', 'l', 'e', 's', 'e', 'n', '.', 'd', 'k', '\0',
+  /* "marie.club", true */ 'm', 'a', 'r', 'i', 'e', '.', 'c', 'l', 'u', 'b', '\0',
   /* "mariehane.com", true */ 'm', 'a', 'r', 'i', 'e', 'h', 'a', 'n', 'e', '.', 'c', 'o', 'm', '\0',
   /* "mariemiramont.fr", true */ 'm', 'a', 'r', 'i', 'e', 'm', 'i', 'r', 'a', 'm', 'o', 'n', 't', '.', 'f', 'r', '\0',
   /* "marienschule-sundern.de", true */ 'm', 'a', 'r', 'i', 'e', 'n', 's', 'c', 'h', 'u', 'l', 'e', '-', 's', 'u', 'n', 'd', 'e', 'r', 'n', '.', 'd', 'e', '\0',
@@ -10413,7 +10418,6 @@ static const char kSTSHostTable[] = {
   /* "matthew-carson.info", true */ 'm', 'a', 't', 't', 'h', 'e', 'w', '-', 'c', 'a', 'r', 's', 'o', 'n', '.', 'i', 'n', 'f', 'o', '\0',
   /* "matthewemes.com", true */ 'm', 'a', 't', 't', 'h', 'e', 'w', 'e', 'm', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "matthewgrill.com", false */ 'm', 'a', 't', 't', 'h', 'e', 'w', 'g', 'r', 'i', 'l', 'l', '.', 'c', 'o', 'm', '\0',
-  /* "matthewkenny.co.uk", true */ 'm', 'a', 't', 't', 'h', 'e', 'w', 'k', 'e', 'n', 'n', 'y', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "matthewohare.com", true */ 'm', 'a', 't', 't', 'h', 'e', 'w', 'o', 'h', 'a', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "matthi.coffee", true */ 'm', 'a', 't', 't', 'h', 'i', '.', 'c', 'o', 'f', 'f', 'e', 'e', '\0',
   /* "matthias-muenzner.de", true */ 'm', 'a', 't', 't', 'h', 'i', 'a', 's', '-', 'm', 'u', 'e', 'n', 'z', 'n', 'e', 'r', '.', 'd', 'e', '\0',
@@ -10672,7 +10676,6 @@ static const char kSTSHostTable[] = {
   /* "mesvt.com", true */ 'm', 'e', 's', 'v', 't', '.', 'c', 'o', 'm', '\0',
   /* "meta-db.com", true */ 'm', 'e', 't', 'a', '-', 'd', 'b', '.', 'c', 'o', 'm', '\0',
   /* "meta.sc", true */ 'm', 'e', 't', 'a', '.', 's', 'c', '\0',
-  /* "metachris.com", true */ 'm', 'e', 't', 'a', 'c', 'h', 'r', 'i', 's', '.', 'c', 'o', 'm', '\0',
   /* "metadatawiki.com", true */ 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'w', 'i', 'k', 'i', '.', 'c', 'o', 'm', '\0',
   /* "metaether.net", true */ 'm', 'e', 't', 'a', 'e', 't', 'h', 'e', 'r', '.', 'n', 'e', 't', '\0',
   /* "metalsculpture.co.uk", true */ 'm', 'e', 't', 'a', 'l', 's', 'c', 'u', 'l', 'p', 't', 'u', 'r', 'e', '.', 'c', 'o', '.', 'u', 'k', '\0',
@@ -10773,6 +10776,7 @@ static const char kSTSHostTable[] = {
   /* "mike-bland.com", true */ 'm', 'i', 'k', 'e', '-', 'b', 'l', 'a', 'n', 'd', '.', 'c', 'o', 'm', '\0',
   /* "mikecb.org", true */ 'm', 'i', 'k', 'e', 'c', 'b', '.', 'o', 'r', 'g', '\0',
   /* "mikegerwitz.com", true */ 'm', 'i', 'k', 'e', 'g', 'e', 'r', 'w', 'i', 't', 'z', '.', 'c', 'o', 'm', '\0',
+  /* "mikepair.net", true */ 'm', 'i', 'k', 'e', 'p', 'a', 'i', 'r', '.', 'n', 'e', 't', '\0',
   /* "mikes.tk", true */ 'm', 'i', 'k', 'e', 's', '.', 't', 'k', '\0',
   /* "miketabor.com", true */ 'm', 'i', 'k', 'e', 't', 'a', 'b', 'o', 'r', '.', 'c', 'o', 'm', '\0',
   /* "mikewest.org", true */ 'm', 'i', 'k', 'e', 'w', 'e', 's', 't', '.', 'o', 'r', 'g', '\0',
@@ -10841,7 +10845,6 @@ static const char kSTSHostTable[] = {
   /* "minez-nightswatch.com", false */ 'm', 'i', 'n', 'e', 'z', '-', 'n', 'i', 'g', 'h', 't', 's', 'w', 'a', 't', 'c', 'h', '.', 'c', 'o', 'm', '\0',
   /* "minf3-games.de", true */ 'm', 'i', 'n', 'f', '3', '-', 'g', 'a', 'm', 'e', 's', '.', 'd', 'e', '\0',
   /* "mingram.net", true */ 'm', 'i', 'n', 'g', 'r', 'a', 'm', '.', 'n', 'e', 't', '\0',
-  /* "minh.at", true */ 'm', 'i', 'n', 'h', '.', 'a', 't', '\0',
   /* "minhanossasenhora.com.br", true */ 'm', 'i', 'n', 'h', 'a', 'n', 'o', 's', 's', 'a', 's', 'e', 'n', 'h', 'o', 'r', 'a', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "mini-piraten.de", true */ 'm', 'i', 'n', 'i', '-', 'p', 'i', 'r', 'a', 't', 'e', 'n', '.', 'd', 'e', '\0',
   /* "mini2.fi", true */ 'm', 'i', 'n', 'i', '2', '.', 'f', 'i', '\0',
@@ -10900,6 +10903,7 @@ static const char kSTSHostTable[] = {
   /* "mitnetz-strom.de", true */ 'm', 'i', 't', 'n', 'e', 't', 'z', '-', 's', 't', 'r', 'o', 'm', '.', 'd', 'e', '\0',
   /* "mitrecaasd.org", true */ 'm', 'i', 't', 'r', 'e', 'c', 'a', 'a', 's', 'd', '.', 'o', 'r', 'g', '\0',
   /* "mitremai.org", true */ 'm', 'i', 't', 'r', 'e', 'm', 'a', 'i', '.', 'o', 'r', 'g', '\0',
+  /* "mitsu-szene.de", true */ 'm', 'i', 't', 's', 'u', '-', 's', 'z', 'e', 'n', 'e', '.', 'd', 'e', '\0',
   /* "mitsukabose.com", true */ 'm', 'i', 't', 's', 'u', 'k', 'a', 'b', 'o', 's', 'e', '.', 'c', 'o', 'm', '\0',
   /* "mittelunsachlich.de", true */ 'm', 'i', 't', 't', 'e', 'l', 'u', 'n', 's', 'a', 'c', 'h', 'l', 'i', 'c', 'h', '.', 'd', 'e', '\0',
   /* "mitzpettel.com", true */ 'm', 'i', 't', 'z', 'p', 'e', 't', 't', 'e', 'l', '.', 'c', 'o', 'm', '\0',
@@ -11007,7 +11011,6 @@ static const char kSTSHostTable[] = {
   /* "moellers.systems", true */ 'm', 'o', 'e', 'l', 'l', 'e', 'r', 's', '.', 's', 'y', 's', 't', 'e', 'm', 's', '\0',
   /* "moeloli.pw", true */ 'm', 'o', 'e', 'l', 'o', 'l', 'i', '.', 'p', 'w', '\0',
   /* "moevenpick-cafe.com", true */ 'm', 'o', 'e', 'v', 'e', 'n', 'p', 'i', 'c', 'k', '-', 'c', 'a', 'f', 'e', '.', 'c', 'o', 'm', '\0',
-  /* "moeyi.xyz", true */ 'm', 'o', 'e', 'y', 'i', '.', 'x', 'y', 'z', '\0',
   /* "mofohome.dyndns.org", true */ 'm', 'o', 'f', 'o', 'h', 'o', 'm', 'e', '.', 'd', 'y', 'n', 'd', 'n', 's', '.', 'o', 'r', 'g', '\0',
   /* "moitur.com", true */ 'm', 'o', 'i', 't', 'u', 'r', '.', 'c', 'o', 'm', '\0',
   /* "mojaknjiznica.com", false */ 'm', 'o', 'j', 'a', 'k', 'n', 'j', 'i', 'z', 'n', 'i', 'c', 'a', '.', 'c', 'o', 'm', '\0',
@@ -11280,6 +11283,7 @@ static const char kSTSHostTable[] = {
   /* "mybusiness.cm", true */ 'm', 'y', 'b', 'u', 's', 'i', 'n', 'e', 's', 's', '.', 'c', 'm', '\0',
   /* "mycard.moe", true */ 'm', 'y', 'c', 'a', 'r', 'd', '.', 'm', 'o', 'e', '\0',
   /* "mycieokien.info", false */ 'm', 'y', 'c', 'i', 'e', 'o', 'k', 'i', 'e', 'n', '.', 'i', 'n', 'f', 'o', '\0',
+  /* "myclientsplus.com", true */ 'm', 'y', 'c', 'l', 'i', 'e', 'n', 't', 's', 'p', 'l', 'u', 's', '.', 'c', 'o', 'm', '\0',
   /* "mycompanion.cz", true */ 'm', 'y', 'c', 'o', 'm', 'p', 'a', 'n', 'i', 'o', 'n', '.', 'c', 'z', '\0',
   /* "myconan.net", true */ 'm', 'y', 'c', 'o', 'n', 'a', 'n', '.', 'n', 'e', 't', '\0',
   /* "mycr.eu", true */ 'm', 'y', 'c', 'r', '.', 'e', 'u', '\0',
@@ -11304,6 +11308,7 @@ static const char kSTSHostTable[] = {
   /* "mygrotto.org", true */ 'm', 'y', 'g', 'r', 'o', 't', 't', 'o', '.', 'o', 'r', 'g', '\0',
   /* "myhealthreviews.com", true */ 'm', 'y', 'h', 'e', 'a', 'l', 't', 'h', 'r', 'e', 'v', 'i', 'e', 'w', 's', '.', 'c', 'o', 'm', '\0',
   /* "myhostname.net", true */ 'm', 'y', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '.', 'n', 'e', 't', '\0',
+  /* "myimds.com", true */ 'm', 'y', 'i', 'm', 'd', 's', '.', 'c', 'o', 'm', '\0',
   /* "myimmitracker.com", true */ 'm', 'y', 'i', 'm', 'm', 'i', 't', 'r', 'a', 'c', 'k', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "myip.tech", true */ 'm', 'y', 'i', 'p', '.', 't', 'e', 'c', 'h', '\0',
   /* "mykeepsake.xyz", false */ 'm', 'y', 'k', 'e', 'e', 'p', 's', 'a', 'k', 'e', '.', 'x', 'y', 'z', '\0',
@@ -11597,6 +11602,7 @@ static const char kSTSHostTable[] = {
   /* "nethackwiki.com", true */ 'n', 'e', 't', 'h', 'a', 'c', 'k', 'w', 'i', 'k', 'i', '.', 'c', 'o', 'm', '\0',
   /* "nethruster.com", true */ 'n', 'e', 't', 'h', 'r', 'u', 's', 't', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "netica.fr", false */ 'n', 'e', 't', 'i', 'c', 'a', '.', 'f', 'r', '\0',
+  /* "netlocal.ru", true */ 'n', 'e', 't', 'l', 'o', 'c', 'a', 'l', '.', 'r', 'u', '\0',
   /* "netmazk.net", false */ 'n', 'e', 't', 'm', 'a', 'z', 'k', '.', 'n', 'e', 't', '\0',
   /* "netnodes.net", true */ 'n', 'e', 't', 'n', 'o', 'd', 'e', 's', '.', 'n', 'e', 't', '\0',
   /* "netprofile.com.au", true */ 'n', 'e', 't', 'p', 'r', 'o', 'f', 'i', 'l', 'e', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
@@ -11698,6 +11704,7 @@ static const char kSTSHostTable[] = {
   /* "ng-firewall.com", true */ 'n', 'g', '-', 'f', 'i', 'r', 'e', 'w', 'a', 'l', 'l', '.', 'c', 'o', 'm', '\0',
   /* "ngasembaru.com", true */ 'n', 'g', 'a', 's', 'e', 'm', 'b', 'a', 'r', 'u', '.', 'c', 'o', 'm', '\0',
   /* "nghe.net", true */ 'n', 'g', 'h', 'e', '.', 'n', 'e', 't', '\0',
+  /* "nginxyii.tk", true */ 'n', 'g', 'i', 'n', 'x', 'y', 'i', 'i', '.', 't', 'k', '\0',
   /* "ngvf.de", true */ 'n', 'g', 'v', 'f', '.', 'd', 'e', '\0',
   /* "nhome.ba", true */ 'n', 'h', 'o', 'm', 'e', '.', 'b', 'a', '\0',
   /* "ni-mate.com", true */ 'n', 'i', '-', 'm', 'a', 't', 'e', '.', 'c', 'o', 'm', '\0',
@@ -11761,7 +11768,6 @@ static const char kSTSHostTable[] = {
   /* "nikklassen.ca", true */ 'n', 'i', 'k', 'k', 'l', 'a', 's', 's', 'e', 'n', '.', 'c', 'a', '\0',
   /* "nikksno.io", true */ 'n', 'i', 'k', 'k', 's', 'n', 'o', '.', 'i', 'o', '\0',
   /* "niklas.pw", true */ 'n', 'i', 'k', 'l', 'a', 's', '.', 'p', 'w', '\0',
-  /* "nikobradshaw.com", true */ 'n', 'i', 'k', 'o', 'b', 'r', 'a', 'd', 's', 'h', 'a', 'w', '.', 'c', 'o', 'm', '\0',
   /* "nikolaichik.photo", true */ 'n', 'i', 'k', 'o', 'l', 'a', 'i', 'c', 'h', 'i', 'k', '.', 'p', 'h', 'o', 't', 'o', '\0',
   /* "nikolasbradshaw.com", true */ 'n', 'i', 'k', 'o', 'l', 'a', 's', 'b', 'r', 'a', 'd', 's', 'h', 'a', 'w', '.', 'c', 'o', 'm', '\0',
   /* "nikolasgrottendieck.com", true */ 'n', 'i', 'k', 'o', 'l', 'a', 's', 'g', 'r', 'o', 't', 't', 'e', 'n', 'd', 'i', 'e', 'c', 'k', '.', 'c', 'o', 'm', '\0',
@@ -11786,7 +11792,6 @@ static const char kSTSHostTable[] = {
   /* "nirudo.me", true */ 'n', 'i', 'r', 'u', 'd', 'o', '.', 'm', 'e', '\0',
   /* "nitrix.me", true */ 'n', 'i', 't', 'r', 'i', 'x', '.', 'm', 'e', '\0',
   /* "nitrokey.com", true */ 'n', 'i', 't', 'r', 'o', 'k', 'e', 'y', '.', 'c', 'o', 'm', '\0',
-  /* "nitropur.com", true */ 'n', 'i', 't', 'r', 'o', 'p', 'u', 'r', '.', 'c', 'o', 'm', '\0',
   /* "nitropur.de", true */ 'n', 'i', 't', 'r', 'o', 'p', 'u', 'r', '.', 'd', 'e', '\0',
   /* "nivi.ca", true */ 'n', 'i', 'v', 'i', '.', 'c', 'a', '\0',
   /* "nixmag.net", true */ 'n', 'i', 'x', 'm', 'a', 'g', '.', 'n', 'e', 't', '\0',
@@ -11934,6 +11939,7 @@ static const char kSTSHostTable[] = {
   /* "nspeaks.com", true */ 'n', 's', 'p', 'e', 'a', 'k', 's', '.', 'c', 'o', 'm', '\0',
   /* "nst-maroc.com", true */ 'n', 's', 't', '-', 'm', 'a', 'r', 'o', 'c', '.', 'c', 'o', 'm', '\0',
   /* "nstd.net", true */ 'n', 's', 't', 'd', '.', 'n', 'e', 't', '\0',
+  /* "nstremsdoerfer.ovh", true */ 'n', 's', 't', 'r', 'e', 'm', 's', 'd', 'o', 'e', 'r', 'f', 'e', 'r', '.', 'o', 'v', 'h', '\0',
   /* "nsure.us", true */ 'n', 's', 'u', 'r', 'e', '.', 'u', 's', '\0',
   /* "nsweb.solutions", true */ 'n', 's', 'w', 'e', 'b', '.', 's', 'o', 'l', 'u', 't', 'i', 'o', 'n', 's', '\0',
   /* "nsworks.com", true */ 'n', 's', 'w', 'o', 'r', 'k', 's', '.', 'c', 'o', 'm', '\0',
@@ -12110,7 +12116,6 @@ static const char kSTSHostTable[] = {
   /* "olightstore.com", true */ 'o', 'l', 'i', 'g', 'h', 't', 's', 't', 'o', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "olightstore.ro", true */ 'o', 'l', 'i', 'g', 'h', 't', 's', 't', 'o', 'r', 'e', '.', 'r', 'o', '\0',
   /* "oliver-pietsch.de", false */ 'o', 'l', 'i', 'v', 'e', 'r', '-', 'p', 'i', 'e', 't', 's', 'c', 'h', '.', 'd', 'e', '\0',
-  /* "oliverfaircliff.com", true */ 'o', 'l', 'i', 'v', 'e', 'r', 'f', 'a', 'i', 'r', 'c', 'l', 'i', 'f', 'f', '.', 'c', 'o', 'm', '\0',
   /* "olivernaraki.com", true */ 'o', 'l', 'i', 'v', 'e', 'r', 'n', 'a', 'r', 'a', 'k', 'i', '.', 'c', 'o', 'm', '\0',
   /* "olivierlemoal.fr", true */ 'o', 'l', 'i', 'v', 'i', 'e', 'r', 'l', 'e', 'm', 'o', 'a', 'l', '.', 'f', 'r', '\0',
   /* "olivierpieters.be", true */ 'o', 'l', 'i', 'v', 'i', 'e', 'r', 'p', 'i', 'e', 't', 'e', 'r', 's', '.', 'b', 'e', '\0',
@@ -12343,6 +12348,7 @@ static const char kSTSHostTable[] = {
   /* "outka.xyz", true */ 'o', 'u', 't', 'k', 'a', '.', 'x', 'y', 'z', '\0',
   /* "outline.ski", true */ 'o', 'u', 't', 'l', 'i', 'n', 'e', '.', 's', 'k', 'i', '\0',
   /* "outlookonthedesktop.com", true */ 'o', 'u', 't', 'l', 'o', 'o', 'k', 'o', 'n', 't', 'h', 'e', 'd', 'e', 's', 'k', 't', 'o', 'p', '.', 'c', 'o', 'm', '\0',
+  /* "outofcontrol.ca", true */ 'o', 'u', 't', 'o', 'f', 'c', 'o', 'n', 't', 'r', 'o', 'l', '.', 'c', 'a', '\0',
   /* "outsideconnections.com", true */ 'o', 'u', 't', 's', 'i', 'd', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '.', 'c', 'o', 'm', '\0',
   /* "overalglas.nl", true */ 'o', 'v', 'e', 'r', 'a', 'l', 'g', 'l', 'a', 's', '.', 'n', 'l', '\0',
   /* "overkillshop.com", true */ 'o', 'v', 'e', 'r', 'k', 'i', 'l', 'l', 's', 'h', 'o', 'p', '.', 'c', 'o', 'm', '\0',
@@ -12509,6 +12515,7 @@ static const char kSTSHostTable[] = {
   /* "patrickaudley.com", true */ 'p', 'a', 't', 'r', 'i', 'c', 'k', 'a', 'u', 'd', 'l', 'e', 'y', '.', 'c', 'o', 'm', '\0',
   /* "patrickschneider.me", true */ 'p', 'a', 't', 'r', 'i', 'c', 'k', 's', 'c', 'h', 'n', 'e', 'i', 'd', 'e', 'r', '.', 'm', 'e', '\0',
   /* "patriksimek.cz", true */ 'p', 'a', 't', 'r', 'i', 'k', 's', 'i', 'm', 'e', 'k', '.', 'c', 'z', '\0',
+  /* "patrz.eu", true */ 'p', 'a', 't', 'r', 'z', '.', 'e', 'u', '\0',
   /* "patterson.mp", true */ 'p', 'a', 't', 't', 'e', 'r', 's', 'o', 'n', '.', 'm', 'p', '\0',
   /* "pattuka.com", true */ 'p', 'a', 't', 't', 'u', 'k', 'a', '.', 'c', 'o', 'm', '\0',
   /* "paudley.ca", true */ 'p', 'a', 'u', 'd', 'l', 'e', 'y', '.', 'c', 'a', '\0',
@@ -12723,6 +12730,7 @@ static const char kSTSHostTable[] = {
   /* "pgmann.cf", true */ 'p', 'g', 'm', 'a', 'n', 'n', '.', 'c', 'f', '\0',
   /* "pgmsource.com", true */ 'p', 'g', 'm', 's', 'o', 'u', 'r', 'c', 'e', '.', 'c', 'o', 'm', '\0',
   /* "pgnetwork.net", true */ 'p', 'g', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'n', 'e', 't', '\0',
+  /* "pgpmail.cc", true */ 'p', 'g', 'p', 'm', 'a', 'i', 'l', '.', 'c', 'c', '\0',
   /* "pgregg.com", false */ 'p', 'g', 'r', 'e', 'g', 'g', '.', 'c', 'o', 'm', '\0',
   /* "pgtb.be", true */ 'p', 'g', 't', 'b', '.', 'b', 'e', '\0',
   /* "ph.search.yahoo.com", false */ 'p', 'h', '.', 's', 'e', 'a', 'r', 'c', 'h', '.', 'y', 'a', 'h', 'o', 'o', '.', 'c', 'o', 'm', '\0',
@@ -13065,12 +13073,11 @@ static const char kSTSHostTable[] = {
   /* "postbox.life", true */ 'p', 'o', 's', 't', 'b', 'o', 'x', '.', 'l', 'i', 'f', 'e', '\0',
   /* "postcodegarant.nl", true */ 'p', 'o', 's', 't', 'c', 'o', 'd', 'e', 'g', 'a', 'r', 'a', 'n', 't', '.', 'n', 'l', '\0',
   /* "posteo.de", false */ 'p', 'o', 's', 't', 'e', 'o', '.', 'd', 'e', '\0',
-  /* "posterspy.com", true */ 'p', 'o', 's', 't', 'e', 'r', 's', 'p', 'y', '.', 'c', 'o', 'm', '\0',
   /* "postfinance.ch", true */ 'p', 'o', 's', 't', 'f', 'i', 'n', 'a', 'n', 'c', 'e', '.', 'c', 'h', '\0',
   /* "postmatescode.com", true */ 'p', 'o', 's', 't', 'm', 'a', 't', 'e', 's', 'c', 'o', 'd', 'e', '.', 'c', 'o', 'm', '\0',
   /* "postn.eu", true */ 'p', 'o', 's', 't', 'n', '.', 'e', 'u', '\0',
   /* "posttigo.com", true */ 'p', 'o', 's', 't', 't', 'i', 'g', 'o', '.', 'c', 'o', 'm', '\0',
-  /* "potatofrom.space", false */ 'p', 'o', 't', 'a', 't', 'o', 'f', 'r', 'o', 'm', '.', 's', 'p', 'a', 'c', 'e', '\0',
+  /* "potatofrom.space", true */ 'p', 'o', 't', 'a', 't', 'o', 'f', 'r', 'o', 'm', '.', 's', 'p', 'a', 'c', 'e', '\0',
   /* "potbox.com", true */ 'p', 'o', 't', 'b', 'o', 'x', '.', 'c', 'o', 'm', '\0',
   /* "pothe.com", true */ 'p', 'o', 't', 'h', 'e', '.', 'c', 'o', 'm', '\0',
   /* "pothe.de", true */ 'p', 'o', 't', 'h', 'e', '.', 'd', 'e', '\0',
@@ -13244,7 +13251,6 @@ static const char kSTSHostTable[] = {
   /* "propershave.com", true */ 'p', 'r', 'o', 'p', 'e', 'r', 's', 'h', 'a', 'v', 'e', '.', 'c', 'o', 'm', '\0',
   /* "propertygroup.pl", true */ 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 'g', 'r', 'o', 'u', 'p', '.', 'p', 'l', '\0',
   /* "propipesystem.com", true */ 'p', 'r', 'o', 'p', 'i', 'p', 'e', 's', 'y', 's', 't', 'e', 'm', '.', 'c', 'o', 'm', '\0',
-  /* "proposalonline.com", true */ 'p', 'r', 'o', 'p', 'o', 's', 'a', 'l', 'o', 'n', 'l', 'i', 'n', 'e', '.', 'c', 'o', 'm', '\0',
   /* "proslimdiets.com", true */ 'p', 'r', 'o', 's', 'l', 'i', 'm', 'd', 'i', 'e', 't', 's', '.', 'c', 'o', 'm', '\0',
   /* "prospanek.cz", true */ 'p', 'r', 'o', 's', 'p', 'a', 'n', 'e', 'k', '.', 'c', 'z', '\0',
   /* "prospo.co", true */ 'p', 'r', 'o', 's', 'p', 'o', '.', 'c', 'o', '\0',
@@ -13413,6 +13419,7 @@ static const char kSTSHostTable[] = {
   /* "qingpei.me", false */ 'q', 'i', 'n', 'g', 'p', 'e', 'i', '.', 'm', 'e', '\0',
   /* "qionglu.pw", true */ 'q', 'i', 'o', 'n', 'g', 'l', 'u', '.', 'p', 'w', '\0',
   /* "qipp.com", true */ 'q', 'i', 'p', 'p', '.', 'c', 'o', 'm', '\0',
+  /* "qirinus.com", true */ 'q', 'i', 'r', 'i', 'n', 'u', 's', '.', 'c', 'o', 'm', '\0',
   /* "qits.de", true */ 'q', 'i', 't', 's', '.', 'd', 'e', '\0',
   /* "qivonline.pt", true */ 'q', 'i', 'v', 'o', 'n', 'l', 'i', 'n', 'e', '.', 'p', 't', '\0',
   /* "qiwi.be", true */ 'q', 'i', 'w', 'i', '.', 'b', 'e', '\0',
@@ -13564,6 +13571,7 @@ static const char kSTSHostTable[] = {
   /* "rationalism.com", true */ 'r', 'a', 't', 'i', 'o', 'n', 'a', 'l', 'i', 's', 'm', '.', 'c', 'o', 'm', '\0',
   /* "rationalops.com", true */ 'r', 'a', 't', 'i', 'o', 'n', 'a', 'l', 'o', 'p', 's', '.', 'c', 'o', 'm', '\0',
   /* "raulrivero.es", true */ 'r', 'a', 'u', 'l', 'r', 'i', 'v', 'e', 'r', 'o', '.', 'e', 's', '\0',
+  /* "raumzeitlabor.de", false */ 'r', 'a', 'u', 'm', 'z', 'e', 'i', 't', 'l', 'a', 'b', 'o', 'r', '.', 'd', 'e', '\0',
   /* "rauros.net", true */ 'r', 'a', 'u', 'r', 'o', 's', '.', 'n', 'e', 't', '\0',
   /* "rautermods.net", true */ 'r', 'a', 'u', 't', 'e', 'r', 'm', 'o', 'd', 's', '.', 'n', 'e', 't', '\0',
   /* "ravage.fm", true */ 'r', 'a', 'v', 'a', 'g', 'e', '.', 'f', 'm', '\0',
@@ -13860,7 +13868,6 @@ static const char kSTSHostTable[] = {
   /* "richonrails.com", true */ 'r', 'i', 'c', 'h', 'o', 'n', 'r', 'a', 'i', 'l', 's', '.', 'c', 'o', 'm', '\0',
   /* "richterphilipp.com", true */ 'r', 'i', 'c', 'h', 't', 'e', 'r', 'p', 'h', 'i', 'l', 'i', 'p', 'p', '.', 'c', 'o', 'm', '\0',
   /* "ricki-z.com", true */ 'r', 'i', 'c', 'k', 'i', '-', 'z', '.', 'c', 'o', 'm', '\0',
-  /* "rickrongen.nl", true */ 'r', 'i', 'c', 'k', 'r', 'o', 'n', 'g', 'e', 'n', '.', 'n', 'l', '\0',
   /* "rickweijers.nl", true */ 'r', 'i', 'c', 'k', 'w', 'e', 'i', 'j', 'e', 'r', 's', '.', 'n', 'l', '\0',
   /* "rickyromero.com", true */ 'r', 'i', 'c', 'k', 'y', 'r', 'o', 'm', 'e', 'r', 'o', '.', 'c', 'o', 'm', '\0',
   /* "rico-brase.de", true */ 'r', 'i', 'c', 'o', '-', 'b', 'r', 'a', 's', 'e', '.', 'd', 'e', '\0',
@@ -13953,6 +13960,7 @@ static const char kSTSHostTable[] = {
   /* "robotham.org", true */ 'r', 'o', 'b', 'o', 't', 'h', 'a', 'm', '.', 'o', 'r', 'g', '\0',
   /* "robototes.com", true */ 'r', 'o', 'b', 'o', 't', 'o', 't', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "robspc.repair", true */ 'r', 'o', 'b', 's', 'p', 'c', '.', 'r', 'e', 'p', 'a', 'i', 'r', '\0',
+  /* "robtex.com", true */ 'r', 'o', 'b', 't', 'e', 'x', '.', 'c', 'o', 'm', '\0',
   /* "robud.info", true */ 'r', 'o', 'b', 'u', 'd', '.', 'i', 'n', 'f', 'o', '\0',
   /* "robust.ga", true */ 'r', 'o', 'b', 'u', 's', 't', '.', 'g', 'a', '\0',
   /* "rockbankland.com.au", true */ 'r', 'o', 'c', 'k', 'b', 'a', 'n', 'k', 'l', 'a', 'n', 'd', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
@@ -14257,6 +14265,7 @@ static const char kSTSHostTable[] = {
   /* "samui-samui.de", true */ 's', 'a', 'm', 'u', 'i', '-', 's', 'a', 'm', 'u', 'i', '.', 'd', 'e', '\0',
   /* "samwilberforce.com", true */ 's', 'a', 'm', 'w', 'i', 'l', 'b', 'e', 'r', 'f', 'o', 'r', 'c', 'e', '.', 'c', 'o', 'm', '\0',
   /* "samwu.tw", false */ 's', 'a', 'm', 'w', 'u', '.', 't', 'w', '\0',
+  /* "sanael.net", true */ 's', 'a', 'n', 'a', 'e', 'l', '.', 'n', 'e', 't', '\0',
   /* "sanandreasstories.com", true */ 's', 'a', 'n', 'a', 'n', 'd', 'r', 'e', 'a', 's', 's', 't', 'o', 'r', 'i', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "sanasport.cz", true */ 's', 'a', 'n', 'a', 's', 'p', 'o', 'r', 't', '.', 'c', 'z', '\0',
   /* "sanatfilan.com", false */ 's', 'a', 'n', 'a', 't', 'f', 'i', 'l', 'a', 'n', '.', 'c', 'o', 'm', '\0',
@@ -14515,9 +14524,6 @@ static const char kSTSHostTable[] = {
   /* "secitem.at", true */ 's', 'e', 'c', 'i', 't', 'e', 'm', '.', 'a', 't', '\0',
   /* "secitem.de", true */ 's', 'e', 'c', 'i', 't', 'e', 'm', '.', 'd', 'e', '\0',
   /* "secnews.gr", true */ 's', 'e', 'c', 'n', 'e', 'w', 's', '.', 'g', 'r', '\0',
-  /* "secondary-survivor.help", true */ 's', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', '-', 's', 'u', 'r', 'v', 'i', 'v', 'o', 'r', '.', 'h', 'e', 'l', 'p', '\0',
-  /* "secondarysurvivor.help", true */ 's', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 's', 'u', 'r', 'v', 'i', 'v', 'o', 'r', '.', 'h', 'e', 'l', 'p', '\0',
-  /* "secondarysurvivorportal.help", true */ 's', 'e', 'c', 'o', 'n', 'd', 'a', 'r', 'y', 's', 'u', 'r', 'v', 'i', 'v', 'o', 'r', 'p', 'o', 'r', 't', 'a', 'l', '.', 'h', 'e', 'l', 'p', '\0',
   /* "secondpay.nl", true */ 's', 'e', 'c', 'o', 'n', 'd', 'p', 'a', 'y', '.', 'n', 'l', '\0',
   /* "seconfig.sytes.net", true */ 's', 'e', 'c', 'o', 'n', 'f', 'i', 'g', '.', 's', 'y', 't', 'e', 's', '.', 'n', 'e', 't', '\0',
   /* "secpatrol.de", true */ 's', 'e', 'c', 'p', 'a', 't', 'r', 'o', 'l', '.', 'd', 'e', '\0',
@@ -14565,7 +14571,6 @@ static const char kSTSHostTable[] = {
   /* "securitysnobs.com", false */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 's', 'n', 'o', 'b', 's', '.', 'c', 'o', 'm', '\0',
   /* "securitysoapbox.com", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 's', 'o', 'a', 'p', 'b', 'o', 'x', '.', 'c', 'o', 'm', '\0',
   /* "securitystrata.com", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 's', 't', 'r', 'a', 't', 'a', '.', 'c', 'o', 'm', '\0',
-  /* "securitystreak.com", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 's', 't', 'r', 'e', 'a', 'k', '.', 'c', 'o', 'm', '\0',
   /* "securitytalk.pl", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 't', 'a', 'l', 'k', '.', 'p', 'l', '\0',
   /* "securitywatch.co.nz", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'w', 'a', 't', 'c', 'h', '.', 'c', 'o', '.', 'n', 'z', '\0',
   /* "securitywithnick.com", true */ 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', 'w', 'i', 't', 'h', 'n', 'i', 'c', 'k', '.', 'c', 'o', 'm', '\0',
@@ -14788,6 +14793,7 @@ static const char kSTSHostTable[] = {
   /* "shaundanielz.com", true */ 's', 'h', 'a', 'u', 'n', 'd', 'a', 'n', 'i', 'e', 'l', 'z', '.', 'c', 'o', 'm', '\0',
   /* "shav.it", true */ 's', 'h', 'a', 'v', '.', 'i', 't', '\0',
   /* "shawcentral.ca", false */ 's', 'h', 'a', 'w', 'c', 'e', 'n', 't', 'r', 'a', 'l', '.', 'c', 'a', '\0',
+  /* "shawnh.net", true */ 's', 'h', 'a', 'w', 'n', 'h', '.', 'n', 'e', 't', '\0',
   /* "shazbots.org", true */ 's', 'h', 'a', 'z', 'b', 'o', 't', 's', '.', 'o', 'r', 'g', '\0',
   /* "shazzlepro.com", true */ 's', 'h', 'a', 'z', 'z', 'l', 'e', 'p', 'r', 'o', '.', 'c', 'o', 'm', '\0',
   /* "sheaf.site", true */ 's', 'h', 'e', 'a', 'f', '.', 's', 'i', 't', 'e', '\0',
@@ -14986,6 +14992,7 @@ static const char kSTSHostTable[] = {
   /* "sinatrafamily.com", true */ 's', 'i', 'n', 'a', 't', 'r', 'a', 'f', 'a', 'm', 'i', 'l', 'y', '.', 'c', 'o', 'm', '\0',
   /* "sinergy.ch", true */ 's', 'i', 'n', 'e', 'r', 'g', 'y', '.', 'c', 'h', '\0',
   /* "sinfield.com", false */ 's', 'i', 'n', 'f', 'i', 'e', 'l', 'd', '.', 'c', 'o', 'm', '\0',
+  /* "sinfulforums.net", true */ 's', 'i', 'n', 'f', 'u', 'l', 'f', 'o', 'r', 'u', 'm', 's', '.', 'n', 'e', 't', '\0',
   /* "singaporemint.com", true */ 's', 'i', 'n', 'g', 'a', 'p', 'o', 'r', 'e', 'm', 'i', 'n', 't', '.', 'c', 'o', 'm', '\0',
   /* "singleuse.link", true */ 's', 'i', 'n', 'g', 'l', 'e', 'u', 's', 'e', '.', 'l', 'i', 'n', 'k', '\0',
   /* "singlu10.org", false */ 's', 'i', 'n', 'g', 'l', 'u', '1', '0', '.', 'o', 'r', 'g', '\0',
@@ -15328,6 +15335,7 @@ static const char kSTSHostTable[] = {
   /* "sorex.photo", true */ 's', 'o', 'r', 'e', 'x', '.', 'p', 'h', 'o', 't', 'o', '\0',
   /* "sorincocorada.ro", true */ 's', 'o', 'r', 'i', 'n', 'c', 'o', 'c', 'o', 'r', 'a', 'd', 'a', '.', 'r', 'o', '\0',
   /* "sorn.service.gov.uk", true */ 's', 'o', 'r', 'n', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'g', 'o', 'v', '.', 'u', 'k', '\0',
+  /* "sortaweird.net", false */ 's', 'o', 'r', 't', 'a', 'w', 'e', 'i', 'r', 'd', '.', 'n', 'e', 't', '\0',
   /* "soruly.com", true */ 's', 'o', 'r', 'u', 'l', 'y', '.', 'c', 'o', 'm', '\0',
   /* "sorz.org", true */ 's', 'o', 'r', 'z', '.', 'o', 'r', 'g', '\0',
   /* "sos.sk", false */ 's', 'o', 's', '.', 's', 'k', '\0',
@@ -15337,7 +15345,6 @@ static const char kSTSHostTable[] = {
   /* "sotavasara.net", true */ 's', 'o', 't', 'a', 'v', 'a', 's', 'a', 'r', 'a', '.', 'n', 'e', 't', '\0',
   /* "sotoasobi.net", true */ 's', 'o', 't', 'o', 'a', 's', 'o', 'b', 'i', '.', 'n', 'e', 't', '\0',
   /* "sou-co.jp", true */ 's', 'o', 'u', '-', 'c', 'o', '.', 'j', 'p', '\0',
-  /* "soucorneteiro.com.br", true */ 's', 'o', 'u', 'c', 'o', 'r', 'n', 'e', 't', 'e', 'i', 'r', 'o', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "souki.cz", true */ 's', 'o', 'u', 'k', 'i', '.', 'c', 'z', '\0',
   /* "soul-source.co.uk", true */ 's', 'o', 'u', 'l', '-', 's', 'o', 'u', 'r', 'c', 'e', '.', 'c', 'o', '.', 'u', 'k', '\0',
   /* "soulboy.io", false */ 's', 'o', 'u', 'l', 'b', 'o', 'y', '.', 'i', 'o', '\0',
@@ -15546,7 +15553,6 @@ static const char kSTSHostTable[] = {
   /* "stacktile.io", true */ 's', 't', 'a', 'c', 'k', 't', 'i', 'l', 'e', '.', 'i', 'o', '\0',
   /* "stadionmanager.com", true */ 's', 't', 'a', 'd', 'i', 'o', 'n', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "stadt-apotheke-muensingen.de", true */ 's', 't', 'a', 'd', 't', '-', 'a', 'p', 'o', 't', 'h', 'e', 'k', 'e', '-', 'm', 'u', 'e', 'n', 's', 'i', 'n', 'g', 'e', 'n', '.', 'd', 'e', '\0',
-  /* "stadtbauwerk.at", true */ 's', 't', 'a', 'd', 't', 'b', 'a', 'u', 'w', 'e', 'r', 'k', '.', 'a', 't', '\0',
   /* "stadtplan-ilmenau.de", true */ 's', 't', 'a', 'd', 't', 'p', 'l', 'a', 'n', '-', 'i', 'l', 'm', 'e', 'n', 'a', 'u', '.', 'd', 'e', '\0',
   /* "stage-props-blank-guns.com", false */ 's', 't', 'a', 'g', 'e', '-', 'p', 'r', 'o', 'p', 's', '-', 'b', 'l', 'a', 'n', 'k', '-', 'g', 'u', 'n', 's', '.', 'c', 'o', 'm', '\0',
   /* "stage.wepay.com", false */ 's', 't', 'a', 'g', 'e', '.', 'w', 'e', 'p', 'a', 'y', '.', 'c', 'o', 'm', '\0',
@@ -15571,6 +15577,7 @@ static const char kSTSHostTable[] = {
   /* "standards.gov", true */ 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 's', '.', 'g', 'o', 'v', '\0',
   /* "standoutbooks.com", true */ 's', 't', 'a', 'n', 'd', 'o', 'u', 't', 'b', 'o', 'o', 'k', 's', '.', 'c', 'o', 'm', '\0',
   /* "star-citizen.wiki", true */ 's', 't', 'a', 'r', '-', 'c', 'i', 't', 'i', 'z', 'e', 'n', '.', 'w', 'i', 'k', 'i', '\0',
+  /* "star-killer.net", true */ 's', 't', 'a', 'r', '-', 'k', 'i', 'l', 'l', 'e', 'r', '.', 'n', 'e', 't', '\0',
   /* "starandshield.com", true */ 's', 't', 'a', 'r', 'a', 'n', 'd', 's', 'h', 'i', 'e', 'l', 'd', '.', 'c', 'o', 'm', '\0',
   /* "starapple.nl", true */ 's', 't', 'a', 'r', 'a', 'p', 'p', 'l', 'e', '.', 'n', 'l', '\0',
   /* "starcafe.me", true */ 's', 't', 'a', 'r', 'c', 'a', 'f', 'e', '.', 'm', 'e', '\0',
@@ -15819,7 +15826,6 @@ static const char kSTSHostTable[] = {
   /* "sunbritetv.com", true */ 's', 'u', 'n', 'b', 'r', 'i', 't', 'e', 't', 'v', '.', 'c', 'o', 'm', '\0',
   /* "sundayfundayjapan.com", true */ 's', 'u', 'n', 'd', 'a', 'y', 'f', 'u', 'n', 'd', 'a', 'y', 'j', 'a', 'p', 'a', 'n', '.', 'c', 'o', 'm', '\0',
   /* "suneilpatel.com", true */ 's', 'u', 'n', 'e', 'i', 'l', 'p', 'a', 't', 'e', 'l', '.', 'c', 'o', 'm', '\0',
-  /* "sunflyer.cn", false */ 's', 'u', 'n', 'f', 'l', 'y', 'e', 'r', '.', 'c', 'n', '\0',
   /* "sunfox.cz", true */ 's', 'u', 'n', 'f', 'o', 'x', '.', 'c', 'z', '\0',
   /* "sunfulong.me", true */ 's', 'u', 'n', 'f', 'u', 'l', 'o', 'n', 'g', '.', 'm', 'e', '\0',
   /* "sunjaydhama.com", true */ 's', 'u', 'n', 'j', 'a', 'y', 'd', 'h', 'a', 'm', 'a', '.', 'c', 'o', 'm', '\0',
@@ -16028,7 +16034,6 @@ static const char kSTSHostTable[] = {
   /* "talentos.pt", true */ 't', 'a', 'l', 'e', 'n', 't', 'o', 's', '.', 'p', 't', '\0',
   /* "talentuar.com", true */ 't', 'a', 'l', 'e', 'n', 't', 'u', 'a', 'r', '.', 'c', 'o', 'm', '\0',
   /* "taler.net", true */ 't', 'a', 'l', 'e', 'r', '.', 'n', 'e', 't', '\0',
-  /* "tales-of-interia.de", true */ 't', 'a', 'l', 'e', 's', '-', 'o', 'f', '-', 'i', 'n', 't', 'e', 'r', 'i', 'a', '.', 'd', 'e', '\0',
   /* "talheim-records.ca", true */ 't', 'a', 'l', 'h', 'e', 'i', 'm', '-', 'r', 'e', 'c', 'o', 'r', 'd', 's', '.', 'c', 'a', '\0',
   /* "talideon.com", false */ 't', 'a', 'l', 'i', 'd', 'e', 'o', 'n', '.', 'c', 'o', 'm', '\0',
   /* "talk.google.com", true */ 't', 'a', 'l', 'k', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'c', 'o', 'm', '\0',
@@ -16066,7 +16071,6 @@ static const char kSTSHostTable[] = {
   /* "tarik.io", true */ 't', 'a', 'r', 'i', 'k', '.', 'i', 'o', '\0',
   /* "tarsan.cz", true */ 't', 'a', 'r', 's', 'a', 'n', '.', 'c', 'z', '\0',
   /* "tarsashaz-biztositas.hu", true */ 't', 'a', 'r', 's', 'a', 's', 'h', 'a', 'z', '-', 'b', 'i', 'z', 't', 'o', 's', 'i', 't', 'a', 's', '.', 'h', 'u', '\0',
-  /* "tartaneagle.org.uk", true */ 't', 'a', 'r', 't', 'a', 'n', 'e', 'a', 'g', 'l', 'e', '.', 'o', 'r', 'g', '.', 'u', 'k', '\0',
   /* "tas2580.net", false */ 't', 'a', 's', '2', '5', '8', '0', '.', 'n', 'e', 't', '\0',
   /* "taskforce512.de", true */ 't', 'a', 's', 'k', 'f', 'o', 'r', 'c', 'e', '5', '1', '2', '.', 'd', 'e', '\0',
   /* "taskotron.fedoraproject.org", true */ 't', 'a', 's', 'k', 'o', 't', 'r', 'o', 'n', '.', 'f', 'e', 'd', 'o', 'r', 'a', 'p', 'r', 'o', 'j', 'e', 'c', 't', '.', 'o', 'r', 'g', '\0',
@@ -16403,7 +16407,6 @@ static const char kSTSHostTable[] = {
   /* "thepasteb.in", true */ 't', 'h', 'e', 'p', 'a', 's', 't', 'e', 'b', '.', 'i', 'n', '\0',
   /* "thepaymentscompany.com", true */ 't', 'h', 'e', 'p', 'a', 'y', 'm', 'e', 'n', 't', 's', 'c', 'o', 'm', 'p', 'a', 'n', 'y', '.', 'c', 'o', 'm', '\0',
   /* "thepb.in", true */ 't', 'h', 'e', 'p', 'b', '.', 'i', 'n', '\0',
-  /* "thepcweb.tk", true */ 't', 'h', 'e', 'p', 'c', 'w', 'e', 'b', '.', 't', 'k', '\0',
   /* "thephonecaseplace.com", true */ 't', 'h', 'e', 'p', 'h', 'o', 'n', 'e', 'c', 'a', 's', 'e', 'p', 'l', 'a', 'c', 'e', '.', 'c', 'o', 'm', '\0',
   /* "thephp.cc", true */ 't', 'h', 'e', 'p', 'h', 'p', '.', 'c', 'c', '\0',
   /* "thepiratesociety.org", true */ 't', 'h', 'e', 'p', 'i', 'r', 'a', 't', 'e', 's', 'o', 'c', 'i', 'e', 't', 'y', '.', 'o', 'r', 'g', '\0',
@@ -16431,6 +16434,7 @@ static const char kSTSHostTable[] = {
   /* "thesession.org", false */ 't', 'h', 'e', 's', 'e', 's', 's', 'i', 'o', 'n', '.', 'o', 'r', 'g', '\0',
   /* "theshadestore.com", true */ 't', 'h', 'e', 's', 'h', 'a', 'd', 'e', 's', 't', 'o', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "thesharepointfarm.com", true */ 't', 'h', 'e', 's', 'h', 'a', 'r', 'e', 'p', 'o', 'i', 'n', 't', 'f', 'a', 'r', 'm', '.', 'c', 'o', 'm', '\0',
+  /* "theshopally.com", true */ 't', 'h', 'e', 's', 'h', 'o', 'p', 'a', 'l', 'l', 'y', '.', 'c', 'o', 'm', '\0',
   /* "thesignalco.com.au", true */ 't', 'h', 'e', 's', 'i', 'g', 'n', 'a', 'l', 'c', 'o', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "thesled.net", true */ 't', 'h', 'e', 's', 'l', 'e', 'd', '.', 'n', 'e', 't', '\0',
   /* "thesocialmediacentral.com", true */ 't', 'h', 'e', 's', 'o', 'c', 'i', 'a', 'l', 'm', 'e', 'd', 'i', 'a', 'c', 'e', 'n', 't', 'r', 'a', 'l', '.', 'c', 'o', 'm', '\0',
@@ -16479,7 +16483,6 @@ static const char kSTSHostTable[] = {
   /* "thomas-gibertie.fr", true */ 't', 'h', 'o', 'm', 'a', 's', '-', 'g', 'i', 'b', 'e', 'r', 't', 'i', 'e', '.', 'f', 'r', '\0',
   /* "thomas-grobelny.de", true */ 't', 'h', 'o', 'm', 'a', 's', '-', 'g', 'r', 'o', 'b', 'e', 'l', 'n', 'y', '.', 'd', 'e', '\0',
   /* "thomasbreads.com", true */ 't', 'h', 'o', 'm', 'a', 's', 'b', 'r', 'e', 'a', 'd', 's', '.', 'c', 'o', 'm', '\0',
-  /* "thomascloud.ddns.net", true */ 't', 'h', 'o', 'm', 'a', 's', 'c', 'l', 'o', 'u', 'd', '.', 'd', 'd', 'n', 's', '.', 'n', 'e', 't', '\0',
   /* "thomasgriffin.io", true */ 't', 'h', 'o', 'm', 'a', 's', 'g', 'r', 'i', 'f', 'f', 'i', 'n', '.', 'i', 'o', '\0',
   /* "thomasharvey.me", true */ 't', 'h', 'o', 'm', 'a', 's', 'h', 'a', 'r', 'v', 'e', 'y', '.', 'm', 'e', '\0',
   /* "thomashunter.name", false */ 't', 'h', 'o', 'm', 'a', 's', 'h', 'u', 'n', 't', 'e', 'r', '.', 'n', 'a', 'm', 'e', '\0',
@@ -16541,7 +16544,6 @@ static const char kSTSHostTable[] = {
   /* "tigerdile.com", true */ 't', 'i', 'g', 'e', 'r', 'd', 'i', 'l', 'e', '.', 'c', 'o', 'm', '\0',
   /* "tijden.nu", true */ 't', 'i', 'j', 'd', 'e', 'n', '.', 'n', 'u', '\0',
   /* "tiki-god.co.uk", true */ 't', 'i', 'k', 'i', '-', 'g', 'o', 'd', '.', 'c', 'o', '.', 'u', 'k', '\0',
-  /* "tiledailyshop.com", true */ 't', 'i', 'l', 'e', 'd', 'a', 'i', 'l', 'y', 's', 'h', 'o', 'p', '.', 'c', 'o', 'm', '\0',
   /* "tiliaze.biz", true */ 't', 'i', 'l', 'i', 'a', 'z', 'e', '.', 'b', 'i', 'z', '\0',
   /* "tiliaze.info", true */ 't', 'i', 'l', 'i', 'a', 'z', 'e', '.', 'i', 'n', 'f', 'o', '\0',
   /* "tiliaze.net", true */ 't', 'i', 'l', 'i', 'a', 'z', 'e', '.', 'n', 'e', 't', '\0',
@@ -16812,7 +16814,6 @@ static const char kSTSHostTable[] = {
   /* "touray-enterprise.ch", true */ 't', 'o', 'u', 'r', 'a', 'y', '-', 'e', 'n', 't', 'e', 'r', 'p', 'r', 'i', 's', 'e', '.', 'c', 'h', '\0',
   /* "tourismwithme.com", true */ 't', 'o', 'u', 'r', 'i', 's', 'm', 'w', 'i', 't', 'h', 'm', 'e', '.', 'c', 'o', 'm', '\0',
   /* "tourispo.com", true */ 't', 'o', 'u', 'r', 'i', 's', 'p', 'o', '.', 'c', 'o', 'm', '\0',
-  /* "toursandtransfers.it", true */ 't', 'o', 'u', 'r', 's', 'a', 'n', 'd', 't', 'r', 'a', 'n', 's', 'f', 'e', 'r', 's', '.', 'i', 't', '\0',
   /* "tout-art.ch", true */ 't', 'o', 'u', 't', '-', 'a', 'r', 't', '.', 'c', 'h', '\0',
   /* "toutart.ch", true */ 't', 'o', 'u', 't', 'a', 'r', 't', '.', 'c', 'h', '\0',
   /* "toutenmusic.fr", true */ 't', 'o', 'u', 't', 'e', 'n', 'm', 'u', 's', 'i', 'c', '.', 'f', 'r', '\0',
@@ -17120,7 +17121,6 @@ static const char kSTSHostTable[] = {
   /* "u03.fr", true */ 'u', '0', '3', '.', 'f', 'r', '\0',
   /* "u5b.de", true */ 'u', '5', 'b', '.', 'd', 'e', '\0',
   /* "uae-company-service.com", true */ 'u', 'a', 'e', '-', 'c', 'o', 'm', 'p', 'a', 'n', 'y', '-', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'c', 'o', 'm', '\0',
-  /* "uangteman.com", true */ 'u', 'a', 'n', 'g', 't', 'e', 'm', 'a', 'n', '.', 'c', 'o', 'm', '\0',
   /* "uasmi.com", true */ 'u', 'a', 's', 'm', 'i', '.', 'c', 'o', 'm', '\0',
   /* "uat-activesg.com", true */ 'u', 'a', 't', '-', 'a', 'c', 't', 'i', 'v', 'e', 's', 'g', '.', 'c', 'o', 'm', '\0',
   /* "ub3rk1tten.com", false */ 'u', 'b', '3', 'r', 'k', '1', 't', 't', 'e', 'n', '.', 'c', 'o', 'm', '\0',
@@ -17132,7 +17132,6 @@ static const char kSTSHostTable[] = {
   /* "uberwald.ws", true */ 'u', 'b', 'e', 'r', 'w', 'a', 'l', 'd', '.', 'w', 's', '\0',
   /* "ubi.gg", true */ 'u', 'b', 'i', '.', 'g', 'g', '\0',
   /* "ublaboo.org", true */ 'u', 'b', 'l', 'a', 'b', 'o', 'o', '.', 'o', 'r', 'g', '\0',
-  /* "uborcare.com", true */ 'u', 'b', 'o', 'r', 'c', 'a', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "ubtce.com", true */ 'u', 'b', 't', 'c', 'e', '.', 'c', 'o', 'm', '\0',
   /* "ucangiller.com", true */ 'u', 'c', 'a', 'n', 'g', 'i', 'l', 'l', 'e', 'r', '.', 'c', 'o', 'm', '\0',
   /* "ucfirst.nl", true */ 'u', 'c', 'f', 'i', 'r', 's', 't', '.', 'n', 'l', '\0',
@@ -17203,6 +17202,7 @@ static const char kSTSHostTable[] = {
   /* "uncensoreddns.dk", true */ 'u', 'n', 'c', 'e', 'n', 's', 'o', 'r', 'e', 'd', 'd', 'n', 's', '.', 'd', 'k', '\0',
   /* "uncensoreddns.org", true */ 'u', 'n', 'c', 'e', 'n', 's', 'o', 'r', 'e', 'd', 'd', 'n', 's', '.', 'o', 'r', 'g', '\0',
   /* "undernet.uy", false */ 'u', 'n', 'd', 'e', 'r', 'n', 'e', 't', '.', 'u', 'y', '\0',
+  /* "underskatten.tk", true */ 'u', 'n', 'd', 'e', 'r', 's', 'k', 'a', 't', 't', 'e', 'n', '.', 't', 'k', '\0',
   /* "undo.co.il", true */ 'u', 'n', 'd', 'o', '.', 'c', 'o', '.', 'i', 'l', '\0',
   /* "undone.me", true */ 'u', 'n', 'd', 'o', 'n', 'e', '.', 'm', 'e', '\0',
   /* "unearaigneeauplafond.fr", false */ 'u', 'n', 'e', 'a', 'r', 'a', 'i', 'g', 'n', 'e', 'e', 'a', 'u', 'p', 'l', 'a', 'f', 'o', 'n', 'd', '.', 'f', 'r', '\0',
@@ -17663,7 +17663,6 @@ static const char kSTSHostTable[] = {
   /* "vokeapp.com", true */ 'v', 'o', 'k', 'e', 'a', 'p', 'p', '.', 'c', 'o', 'm', '\0',
   /* "volcain.io", true */ 'v', 'o', 'l', 'c', 'a', 'i', 'n', '.', 'i', 'o', '\0',
   /* "volgavibes.ru", true */ 'v', 'o', 'l', 'g', 'a', 'v', 'i', 'b', 'e', 's', '.', 'r', 'u', '\0',
-  /* "voliere-info.nl", false */ 'v', 'o', 'l', 'i', 'e', 'r', 'e', '-', 'i', 'n', 'f', 'o', '.', 'n', 'l', '\0',
   /* "volker-gropp.de", true */ 'v', 'o', 'l', 'k', 'e', 'r', '-', 'g', 'r', 'o', 'p', 'p', '.', 'd', 'e', '\0',
   /* "volkergropp.de", true */ 'v', 'o', 'l', 'k', 'e', 'r', 'g', 'r', 'o', 'p', 'p', '.', 'd', 'e', '\0',
   /* "volkswurst.de", true */ 'v', 'o', 'l', 'k', 's', 'w', 'u', 'r', 's', 't', '.', 'd', 'e', '\0',
@@ -17796,6 +17795,7 @@ static const char kSTSHostTable[] = {
   /* "warmestwishes.ca", true */ 'w', 'a', 'r', 'm', 'e', 's', 't', 'w', 'i', 's', 'h', 'e', 's', '.', 'c', 'a', '\0',
   /* "warmlyyours.com", false */ 'w', 'a', 'r', 'm', 'l', 'y', 'y', 'o', 'u', 'r', 's', '.', 'c', 'o', 'm', '\0',
   /* "warmservers.com", true */ 'w', 'a', 'r', 'm', 's', 'e', 'r', 'v', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
+  /* "warr.ath.cx", true */ 'w', 'a', 'r', 'r', '.', 'a', 't', 'h', '.', 'c', 'x', '\0',
   /* "warrencreative.com", false */ 'w', 'a', 'r', 'r', 'e', 'n', 'c', 'r', 'e', 'a', 't', 'i', 'v', 'e', '.', 'c', 'o', 'm', '\0',
   /* "warsh.moe", true */ 'w', 'a', 'r', 's', 'h', '.', 'm', 'o', 'e', '\0',
   /* "wartorngalaxy.com", true */ 'w', 'a', 'r', 't', 'o', 'r', 'n', 'g', 'a', 'l', 'a', 'x', 'y', '.', 'c', 'o', 'm', '\0',
@@ -17863,6 +17863,7 @@ static const char kSTSHostTable[] = {
   /* "webdesigneauclaire.com", true */ 'w', 'e', 'b', 'd', 'e', 's', 'i', 'g', 'n', 'e', 'a', 'u', 'c', 'l', 'a', 'i', 'r', 'e', '.', 'c', 'o', 'm', '\0',
   /* "webdesignplay.com", true */ 'w', 'e', 'b', 'd', 'e', 's', 'i', 'g', 'n', 'p', 'l', 'a', 'y', '.', 'c', 'o', 'm', '\0',
   /* "webdevops.io", true */ 'w', 'e', 'b', 'd', 'e', 'v', 'o', 'p', 's', '.', 'i', 'o', '\0',
+  /* "webdosh.com", true */ 'w', 'e', 'b', 'd', 'o', 's', 'h', '.', 'c', 'o', 'm', '\0',
   /* "webduck.nl", true */ 'w', 'e', 'b', 'd', 'u', 'c', 'k', '.', 'n', 'l', '\0',
   /* "webeau.com", true */ 'w', 'e', 'b', 'e', 'a', 'u', '.', 'c', 'o', 'm', '\0',
   /* "webelement.sk", true */ 'w', 'e', 'b', 'e', 'l', 'e', 'm', 'e', 'n', 't', '.', 's', 'k', '\0',
@@ -18229,6 +18230,7 @@ static const char kSTSHostTable[] = {
   /* "wonderbill.com", true */ 'w', 'o', 'n', 'd', 'e', 'r', 'b', 'i', 'l', 'l', '.', 'c', 'o', 'm', '\0',
   /* "wonderhowto.com", true */ 'w', 'o', 'n', 'd', 'e', 'r', 'h', 'o', 'w', 't', 'o', '.', 'c', 'o', 'm', '\0',
   /* "wonderlandmovies.de", true */ 'w', 'o', 'n', 'd', 'e', 'r', 'l', 'a', 'n', 'd', 'm', 'o', 'v', 'i', 'e', 's', '.', 'd', 'e', '\0',
+  /* "wondermags.com", true */ 'w', 'o', 'n', 'd', 'e', 'r', 'm', 'a', 'g', 's', '.', 'c', 'o', 'm', '\0',
   /* "wondershift.biz", true */ 'w', 'o', 'n', 'd', 'e', 'r', 's', 'h', 'i', 'f', 't', '.', 'b', 'i', 'z', '\0',
   /* "wondy.com", true */ 'w', 'o', 'n', 'd', 'y', '.', 'c', 'o', 'm', '\0',
   /* "woodbury.io", true */ 'w', 'o', 'o', 'd', 'b', 'u', 'r', 'y', '.', 'i', 'o', '\0',
@@ -18247,7 +18249,6 @@ static const char kSTSHostTable[] = {
   /* "workingclassmedia.com", true */ 'w', 'o', 'r', 'k', 'i', 'n', 'g', 'c', 'l', 'a', 's', 's', 'm', 'e', 'd', 'i', 'a', '.', 'c', 'o', 'm', '\0',
   /* "workray.com", true */ 'w', 'o', 'r', 'k', 'r', 'a', 'y', '.', 'c', 'o', 'm', '\0',
   /* "works-ginan.jp", true */ 'w', 'o', 'r', 'k', 's', '-', 'g', 'i', 'n', 'a', 'n', '.', 'j', 'p', '\0',
-  /* "workwithgo.com", true */ 'w', 'o', 'r', 'k', 'w', 'i', 't', 'h', 'g', 'o', '.', 'c', 'o', 'm', '\0',
   /* "world-in-my-eyes.com", true */ 'w', 'o', 'r', 'l', 'd', '-', 'i', 'n', '-', 'm', 'y', '-', 'e', 'y', 'e', 's', '.', 'c', 'o', 'm', '\0',
   /* "worldcubeassociation.org", true */ 'w', 'o', 'r', 'l', 'd', 'c', 'u', 'b', 'e', 'a', 's', 's', 'o', 'c', 'i', 'a', 't', 'i', 'o', 'n', '.', 'o', 'r', 'g', '\0',
   /* "worldeventscalendars.com", true */ 'w', 'o', 'r', 'l', 'd', 'e', 'v', 'e', 'n', 't', 's', 'c', 'a', 'l', 'e', 'n', 'd', 'a', 'r', 's', '.', 'c', 'o', 'm', '\0',
@@ -18334,6 +18335,7 @@ static const char kSTSHostTable[] = {
   /* "www.amazon.cn", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'n', '\0',
   /* "www.amazon.co.jp", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', '.', 'j', 'p', '\0',
   /* "www.amazon.co.uk", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', '.', 'u', 'k', '\0',
+  /* "www.amazon.com", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', 'm', '\0',
   /* "www.amazon.com.au", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', 'm', '.', 'a', 'u', '\0',
   /* "www.amazon.com.br", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', 'm', '.', 'b', 'r', '\0',
   /* "www.amazon.com.mx", true */ 'w', 'w', 'w', '.', 'a', 'm', 'a', 'z', 'o', 'n', '.', 'c', 'o', 'm', '.', 'm', 'x', '\0',
@@ -18564,6 +18566,7 @@ static const char kSTSHostTable[] = {
   /* "xroot.org", true */ 'x', 'r', 'o', 'o', 't', '.', 'o', 'r', 'g', '\0',
   /* "xscancun.com", true */ 'x', 's', 'c', 'a', 'n', 'c', 'u', 'n', '.', 'c', 'o', 'm', '\0',
   /* "xscapers.com", true */ 'x', 's', 'c', 'a', 'p', 'e', 'r', 's', '.', 'c', 'o', 'm', '\0',
+  /* "xss.ht", true */ 'x', 's', 's', '.', 'h', 't', '\0',
   /* "xss.sk", true */ 'x', 's', 's', '.', 's', 'k', '\0',
   /* "xsyds.cn", true */ 'x', 's', 'y', 'd', 's', '.', 'c', 'n', '\0',
   /* "xsz.jp", true */ 'x', 's', 'z', '.', 'j', 'p', '\0',
@@ -18576,6 +18579,7 @@ static const char kSTSHostTable[] = {
   /* "xuexb.com", true */ 'x', 'u', 'e', 'x', 'b', '.', 'c', 'o', 'm', '\0',
   /* "xunn.io", true */ 'x', 'u', 'n', 'n', '.', 'i', 'o', '\0',
   /* "xvt-blog.tk", true */ 'x', 'v', 't', '-', 'b', 'l', 'o', 'g', '.', 't', 'k', '\0',
+  /* "xwalck.se", true */ 'x', 'w', 'a', 'l', 'c', 'k', '.', 's', 'e', '\0',
   /* "xwaretech.info", true */ 'x', 'w', 'a', 'r', 'e', 't', 'e', 'c', 'h', '.', 'i', 'n', 'f', 'o', '\0',
   /* "xxiz.com", true */ 'x', 'x', 'i', 'z', '.', 'c', 'o', 'm', '\0',
   /* "xxx3dbdsm.com", true */ 'x', 'x', 'x', '3', 'd', 'b', 'd', 's', 'm', '.', 'c', 'o', 'm', '\0',
@@ -18685,6 +18689,7 @@ static const char kSTSHostTable[] = {
   /* "youran.me", true */ 'y', 'o', 'u', 'r', 'a', 'n', '.', 'm', 'e', '\0',
   /* "yourciso.com", true */ 'y', 'o', 'u', 'r', 'c', 'i', 's', 'o', '.', 'c', 'o', 'm', '\0',
   /* "yourcopywriter.it", true */ 'y', 'o', 'u', 'r', 'c', 'o', 'p', 'y', 'w', 'r', 'i', 't', 'e', 'r', '.', 'i', 't', '\0',
+  /* "yourdaddy.dk", true */ 'y', 'o', 'u', 'r', 'd', 'a', 'd', 'd', 'y', '.', 'd', 'k', '\0',
   /* "yourgame.co.il", true */ 'y', 'o', 'u', 'r', 'g', 'a', 'm', 'e', '.', 'c', 'o', '.', 'i', 'l', '\0',
   /* "yourgames.tv", true */ 'y', 'o', 'u', 'r', 'g', 'a', 'm', 'e', 's', '.', 't', 'v', '\0',
   /* "yourhair.net", true */ 'y', 'o', 'u', 'r', 'h', 'a', 'i', 'r', '.', 'n', 'e', 't', '\0',
@@ -18823,7 +18828,6 @@ static const char kSTSHostTable[] = {
   /* "zeronet.io", true */ 'z', 'e', 'r', 'o', 'n', 'e', 't', '.', 'i', 'o', '\0',
   /* "zeropush.com", true */ 'z', 'e', 'r', 'o', 'p', 'u', 's', 'h', '.', 'c', 'o', 'm', '\0',
   /* "zerossl.com", true */ 'z', 'e', 'r', 'o', 's', 's', 'l', '.', 'c', 'o', 'm', '\0',
-  /* "zertif.info", true */ 'z', 'e', 'r', 't', 'i', 'f', '.', 'i', 'n', 'f', 'o', '\0',
   /* "zespia.tw", false */ 'z', 'e', 's', 'p', 'i', 'a', '.', 't', 'w', '\0',
   /* "zeto365.pl", true */ 'z', 'e', 't', 'o', '3', '6', '5', '.', 'p', 'l', '\0',
   /* "zetorzeszow.pl", true */ 'z', 'e', 't', 'o', 'r', 'z', 'e', 's', 'z', 'o', 'w', '.', 'p', 'l', '\0',
@@ -19054,10063 +19058,10065 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { 1130, true },
   { 1142, true },
   { 1149, true },
-  { 1160, true },
-  { 1167, true },
+  { 1156, true },
+  { 1164, true },
   { 1175, true },
-  { 1186, true },
-  { 1197, false },
-  { 1203, true },
-  { 1216, true },
-  { 1226, true },
-  { 1233, true },
+  { 1186, false },
+  { 1192, true },
+  { 1205, true },
+  { 1215, true },
+  { 1222, true },
+  { 1229, true },
   { 1240, true },
-  { 1251, true },
-  { 1258, true },
-  { 1270, true },
-  { 1287, true },
-  { 1305, true },
-  { 1319, true },
+  { 1247, true },
+  { 1259, true },
+  { 1276, true },
+  { 1294, true },
+  { 1308, true },
+  { 1320, true },
   { 1331, true },
-  { 1342, true },
-  { 1352, true },
-  { 1361, true },
-  { 1367, true },
-  { 1381, true },
-  { 1396, true },
-  { 1404, true },
-  { 1413, true },
+  { 1341, true },
+  { 1350, true },
+  { 1356, true },
+  { 1370, true },
+  { 1385, true },
+  { 1393, true },
+  { 1402, true },
+  { 1410, true },
   { 1421, true },
-  { 1432, true },
-  { 1442, true },
-  { 1460, true },
-  { 1478, true },
-  { 1487, true },
-  { 1495, true },
-  { 1503, false },
-  { 1514, true },
+  { 1431, true },
+  { 1449, true },
+  { 1467, true },
+  { 1476, true },
+  { 1484, true },
+  { 1492, false },
+  { 1503, true },
+  { 1521, true },
   { 1532, true },
-  { 1543, true },
-  { 1552, true },
-  { 1562, true },
-  { 1574, true },
-  { 1588, true },
-  { 1596, true },
-  { 1609, true },
-  { 1619, true },
-  { 1628, false },
-  { 1641, true },
-  { 1650, true },
+  { 1541, true },
+  { 1551, true },
+  { 1563, true },
+  { 1577, true },
+  { 1585, true },
+  { 1598, true },
+  { 1608, true },
+  { 1617, false },
+  { 1630, true },
+  { 1639, true },
+  { 1653, true },
   { 1664, true },
-  { 1675, true },
-  { 1684, true },
-  { 1705, true },
-  { 1714, true },
-  { 1726, true },
-  { 1736, true },
-  { 1751, true },
-  { 1759, true },
-  { 1776, true },
-  { 1789, true },
+  { 1673, true },
+  { 1694, true },
+  { 1703, true },
+  { 1715, true },
+  { 1725, true },
+  { 1740, true },
+  { 1748, true },
+  { 1765, true },
+  { 1778, true },
+  { 1786, true },
   { 1797, true },
-  { 1808, true },
-  { 1815, true },
-  { 1824, true },
-  { 1833, true },
-  { 1846, true },
-  { 1855, true },
+  { 1804, true },
+  { 1813, true },
+  { 1822, true },
+  { 1835, true },
+  { 1844, true },
+  { 1863, true },
   { 1874, true },
-  { 1885, true },
-  { 1904, true },
-  { 1923, true },
-  { 1935, true },
-  { 1949, false },
-  { 1960, true },
-  { 1969, false },
-  { 1980, true },
-  { 1995, true },
-  { 2008, true },
-  { 2016, true },
-  { 2026, true },
-  { 2040, true },
-  { 2052, true },
-  { 2065, true },
-  { 2080, true },
-  { 2089, true },
-  { 2099, true },
-  { 2113, true },
-  { 2127, true },
-  { 2136, true },
-  { 2150, true },
-  { 2158, true },
-  { 2165, true },
-  { 2176, true },
-  { 2189, true },
-  { 2198, true },
-  { 2210, true },
-  { 2221, true },
-  { 2232, true },
-  { 2243, true },
-  { 2254, true },
-  { 2267, true },
-  { 2275, true },
-  { 2285, true },
-  { 2296, false },
-  { 2309, true },
-  { 2317, true },
-  { 2325, true },
-  { 2340, true },
-  { 2359, true },
-  { 2370, true },
+  { 1893, true },
+  { 1912, true },
+  { 1924, true },
+  { 1938, false },
+  { 1949, true },
+  { 1958, false },
+  { 1969, true },
+  { 1977, true },
+  { 1992, true },
+  { 2005, true },
+  { 2013, true },
+  { 2023, true },
+  { 2037, true },
+  { 2049, true },
+  { 2062, true },
+  { 2077, true },
+  { 2086, true },
+  { 2096, true },
+  { 2110, true },
+  { 2124, true },
+  { 2133, true },
+  { 2147, true },
+  { 2155, true },
+  { 2162, true },
+  { 2173, true },
+  { 2186, true },
+  { 2195, true },
+  { 2207, true },
+  { 2218, true },
+  { 2229, true },
+  { 2239, true },
+  { 2250, true },
+  { 2261, true },
+  { 2274, true },
+  { 2282, true },
+  { 2292, true },
+  { 2303, false },
+  { 2316, true },
+  { 2324, true },
+  { 2332, true },
+  { 2347, true },
+  { 2366, true },
   { 2377, true },
-  { 2387, true },
-  { 2393, true },
-  { 2402, true },
-  { 2415, true },
-  { 2424, true },
-  { 2438, true },
-  { 2450, true },
-  { 2459, true },
-  { 2472, true },
-  { 2482, true },
-  { 2492, false },
-  { 2499, true },
-  { 2510, true },
-  { 2522, true },
-  { 2530, true },
+  { 2384, true },
+  { 2394, true },
+  { 2400, true },
+  { 2409, true },
+  { 2422, true },
+  { 2431, true },
+  { 2445, true },
+  { 2457, true },
+  { 2466, true },
+  { 2479, true },
+  { 2489, true },
+  { 2499, false },
+  { 2506, true },
+  { 2517, true },
+  { 2529, true },
   { 2537, true },
-  { 2546, true },
-  { 2556, true },
-  { 2575, true },
+  { 2544, true },
+  { 2553, true },
+  { 2563, true },
   { 2582, true },
-  { 2594, true },
-  { 2603, true },
-  { 2624, true },
-  { 2648, true },
-  { 2663, true },
-  { 2671, true },
-  { 2682, true },
-  { 2688, true },
-  { 2701, true },
-  { 2713, true },
-  { 2725, true },
-  { 2741, true },
-  { 2751, false },
-  { 2758, true },
-  { 2775, true },
+  { 2589, true },
+  { 2601, true },
+  { 2610, true },
+  { 2631, true },
+  { 2655, true },
+  { 2670, true },
+  { 2678, true },
+  { 2689, true },
+  { 2695, true },
+  { 2708, true },
+  { 2720, true },
+  { 2732, true },
+  { 2748, true },
+  { 2758, false },
+  { 2765, true },
   { 2782, true },
-  { 2791, true },
-  { 2812, true },
-  { 2825, false },
-  { 2838, true },
-  { 2848, true },
-  { 2901, true },
-  { 2913, true },
-  { 2922, true },
-  { 2931, true },
-  { 2941, true },
-  { 2951, true },
-  { 2962, true },
-  { 2970, true },
+  { 2789, true },
+  { 2798, true },
+  { 2819, true },
+  { 2832, false },
+  { 2845, true },
+  { 2855, true },
+  { 2908, true },
+  { 2920, true },
+  { 2929, true },
+  { 2938, true },
+  { 2948, true },
+  { 2958, true },
+  { 2969, true },
   { 2977, true },
-  { 2989, true },
-  { 2998, true },
-  { 3020, true },
-  { 3025, true },
-  { 3049, true },
-  { 3059, true },
-  { 3070, true },
-  { 3089, true },
-  { 3106, true },
-  { 3117, true },
-  { 3131, true },
-  { 3145, true },
-  { 3155, true },
-  { 3166, true },
-  { 3179, true },
-  { 3194, true },
-  { 3209, true },
-  { 3217, true },
-  { 3234, true },
-  { 3249, true },
-  { 3264, true },
-  { 3279, true },
-  { 3291, true },
-  { 3307, true },
-  { 3317, true },
+  { 2984, true },
+  { 2996, true },
+  { 3005, true },
+  { 3027, true },
+  { 3032, true },
+  { 3056, true },
+  { 3066, true },
+  { 3077, true },
+  { 3096, true },
+  { 3113, true },
+  { 3124, true },
+  { 3138, true },
+  { 3152, true },
+  { 3162, true },
+  { 3173, true },
+  { 3186, true },
+  { 3201, true },
+  { 3216, true },
+  { 3224, true },
+  { 3241, true },
+  { 3256, true },
+  { 3271, true },
+  { 3286, true },
+  { 3298, true },
+  { 3314, true },
   { 3324, true },
-  { 3335, true },
-  { 3347, true },
-  { 3362, true },
-  { 3390, true },
-  { 3404, true },
-  { 3424, true },
-  { 3443, true },
-  { 3453, true },
-  { 3467, true },
-  { 3478, true },
-  { 3496, true },
-  { 3507, true },
-  { 3521, true },
-  { 3534, true },
-  { 3546, true },
-  { 3568, true },
-  { 3579, false },
-  { 3595, false },
-  { 3607, true },
-  { 3620, true },
-  { 3633, true },
-  { 3650, true },
-  { 3675, true },
-  { 3692, true },
-  { 3716, false },
-  { 3724, true },
-  { 3748, true },
-  { 3761, true },
-  { 3773, true },
-  { 3787, true },
-  { 3798, true },
-  { 3816, true },
-  { 3840, true },
-  { 3853, true },
-  { 3866, true },
-  { 3879, true },
-  { 3888, true },
-  { 3905, true },
-  { 3924, true },
-  { 3936, true },
-  { 3955, true },
-  { 3978, true },
-  { 4001, true },
-  { 4021, true },
-  { 4035, true },
-  { 4043, true },
-  { 4067, true },
-  { 4083, true },
-  { 4096, true },
-  { 4113, true },
-  { 4126, true },
-  { 4144, true },
-  { 4165, true },
-  { 4185, true },
-  { 4210, true },
-  { 4222, true },
-  { 4241, true },
-  { 4260, false },
-  { 4267, true },
-  { 4276, true },
-  { 4289, true },
-  { 4310, true },
-  { 4322, true },
-  { 4339, true },
+  { 3331, true },
+  { 3342, true },
+  { 3354, true },
+  { 3369, true },
+  { 3397, true },
+  { 3411, true },
+  { 3431, true },
+  { 3450, true },
+  { 3460, true },
+  { 3474, true },
+  { 3485, true },
+  { 3503, true },
+  { 3514, true },
+  { 3527, true },
+  { 3539, true },
+  { 3561, true },
+  { 3572, false },
+  { 3588, false },
+  { 3600, true },
+  { 3613, true },
+  { 3626, true },
+  { 3643, true },
+  { 3668, true },
+  { 3685, true },
+  { 3709, false },
+  { 3717, true },
+  { 3741, true },
+  { 3754, true },
+  { 3766, true },
+  { 3780, true },
+  { 3791, true },
+  { 3809, true },
+  { 3833, true },
+  { 3846, true },
+  { 3859, true },
+  { 3872, true },
+  { 3881, true },
+  { 3898, true },
+  { 3917, true },
+  { 3929, true },
+  { 3948, true },
+  { 3971, true },
+  { 3994, true },
+  { 4014, true },
+  { 4028, true },
+  { 4036, true },
+  { 4060, true },
+  { 4076, true },
+  { 4089, true },
+  { 4106, true },
+  { 4119, true },
+  { 4137, true },
+  { 4158, true },
+  { 4178, true },
+  { 4203, true },
+  { 4215, true },
+  { 4234, true },
+  { 4253, false },
+  { 4260, true },
+  { 4273, true },
+  { 4294, true },
+  { 4306, true },
+  { 4323, true },
+  { 4336, true },
   { 4352, true },
-  { 4368, true },
-  { 4389, true },
-  { 4401, true },
-  { 4412, true },
-  { 4425, false },
-  { 4434, true },
-  { 4450, false },
-  { 4460, true },
-  { 4475, true },
-  { 4492, true },
-  { 4503, false },
-  { 4517, true },
+  { 4373, true },
+  { 4385, true },
+  { 4396, true },
+  { 4409, false },
+  { 4418, true },
+  { 4434, false },
+  { 4444, true },
+  { 4459, true },
+  { 4476, true },
+  { 4487, false },
+  { 4501, true },
+  { 4514, true },
   { 4530, true },
-  { 4546, true },
-  { 4557, true },
-  { 4569, true },
-  { 4581, true },
-  { 4602, false },
-  { 4612, true },
-  { 4627, true },
-  { 4641, false },
-  { 4654, true },
-  { 4663, true },
+  { 4541, true },
+  { 4553, true },
+  { 4565, true },
+  { 4586, false },
+  { 4596, true },
+  { 4611, true },
+  { 4625, false },
+  { 4638, true },
+  { 4647, true },
+  { 4662, true },
   { 4678, true },
-  { 4694, true },
-  { 4708, true },
-  { 4720, true },
-  { 4735, true },
-  { 4748, true },
-  { 4760, true },
-  { 4772, true },
-  { 4784, true },
-  { 4796, true },
-  { 4808, true },
-  { 4816, true },
-  { 4827, true },
-  { 4844, true },
+  { 4692, true },
+  { 4704, true },
+  { 4719, true },
+  { 4732, true },
+  { 4744, true },
+  { 4756, true },
+  { 4768, true },
+  { 4780, true },
+  { 4792, true },
+  { 4800, true },
+  { 4811, true },
+  { 4828, true },
+  { 4842, true },
   { 4858, true },
-  { 4874, true },
-  { 4888, false },
-  { 4901, true },
+  { 4872, false },
+  { 4885, true },
+  { 4902, true },
   { 4918, true },
-  { 4934, true },
-  { 4949, true },
-  { 4964, true },
-  { 4982, true },
-  { 4991, true },
-  { 5004, true },
-  { 5019, true },
-  { 5040, true },
-  { 5049, true },
-  { 5059, true },
-  { 5084, true },
-  { 5095, true },
-  { 5107, true },
-  { 5126, true },
-  { 5138, true },
-  { 5157, true },
-  { 5176, true },
-  { 5195, true },
-  { 5206, true },
-  { 5218, true },
-  { 5233, true },
-  { 5244, true },
-  { 5257, true },
-  { 5269, true },
-  { 5282, true },
-  { 5296, true },
-  { 5311, true },
-  { 5333, true },
-  { 5343, true },
-  { 5365, true },
-  { 5374, true },
-  { 5387, true },
-  { 5401, true },
-  { 5413, true },
-  { 5440, true },
-  { 5466, true },
-  { 5477, true },
-  { 5490, true },
-  { 5501, true },
-  { 5525, true },
-  { 5542, true },
-  { 5570, true },
-  { 5582, true },
-  { 5593, true },
-  { 5602, true },
-  { 5612, true },
-  { 5621, true },
-  { 5635, true },
-  { 5654, true },
-  { 5664, true },
-  { 5681, true },
-  { 5693, true },
-  { 5707, true },
-  { 5715, false },
-  { 5736, true },
-  { 5754, true },
-  { 5772, true },
-  { 5789, true },
-  { 5810, true },
-  { 5821, true },
-  { 5834, true },
-  { 5845, true },
+  { 4933, true },
+  { 4948, true },
+  { 4966, true },
+  { 4975, true },
+  { 4988, true },
+  { 5003, true },
+  { 5024, true },
+  { 5033, true },
+  { 5043, true },
+  { 5068, true },
+  { 5079, true },
+  { 5091, true },
+  { 5110, true },
+  { 5122, true },
+  { 5141, true },
+  { 5160, true },
+  { 5179, true },
+  { 5190, true },
+  { 5202, true },
+  { 5217, true },
+  { 5228, true },
+  { 5241, true },
+  { 5253, true },
+  { 5266, true },
+  { 5280, true },
+  { 5295, true },
+  { 5317, true },
+  { 5327, true },
+  { 5349, true },
+  { 5358, true },
+  { 5371, true },
+  { 5385, true },
+  { 5397, true },
+  { 5424, true },
+  { 5450, true },
+  { 5461, true },
+  { 5474, true },
+  { 5485, true },
+  { 5509, true },
+  { 5526, true },
+  { 5554, true },
+  { 5566, true },
+  { 5577, true },
+  { 5586, true },
+  { 5596, true },
+  { 5605, true },
+  { 5619, true },
+  { 5638, true },
+  { 5648, true },
+  { 5665, true },
+  { 5677, true },
+  { 5691, true },
+  { 5699, false },
+  { 5720, true },
+  { 5738, true },
+  { 5756, true },
+  { 5773, true },
+  { 5794, true },
+  { 5805, true },
+  { 5818, true },
+  { 5829, true },
+  { 5838, true },
   { 5854, true },
   { 5870, true },
-  { 5886, true },
-  { 5905, true },
-  { 5926, true },
-  { 5940, true },
-  { 5959, true },
-  { 5972, true },
-  { 5983, true },
-  { 6003, true },
-  { 6021, true },
-  { 6039, false },
-  { 6058, true },
-  { 6072, true },
-  { 6093, true },
+  { 5889, true },
+  { 5910, true },
+  { 5924, true },
+  { 5943, true },
+  { 5956, true },
+  { 5967, true },
+  { 5987, true },
+  { 6005, true },
+  { 6023, false },
+  { 6042, true },
+  { 6056, true },
+  { 6077, true },
+  { 6097, true },
   { 6113, true },
-  { 6129, true },
-  { 6139, true },
-  { 6152, true },
-  { 6165, true },
-  { 6179, true },
-  { 6193, true },
-  { 6203, true },
-  { 6213, true },
-  { 6223, true },
-  { 6233, true },
-  { 6243, true },
-  { 6253, true },
-  { 6270, true },
-  { 6280, true },
-  { 6288, false },
-  { 6299, true },
-  { 6310, true },
-  { 6320, true },
-  { 6332, true },
-  { 6343, true },
-  { 6355, true },
-  { 6364, true },
-  { 6384, true },
-  { 6395, true },
-  { 6412, true },
-  { 6436, true },
-  { 6450, true },
-  { 6469, true },
-  { 6491, true },
-  { 6501, true },
+  { 6123, true },
+  { 6136, true },
+  { 6149, true },
+  { 6163, true },
+  { 6177, true },
+  { 6187, true },
+  { 6197, true },
+  { 6207, true },
+  { 6217, true },
+  { 6227, true },
+  { 6237, true },
+  { 6254, true },
+  { 6264, true },
+  { 6272, false },
+  { 6283, true },
+  { 6294, true },
+  { 6304, true },
+  { 6316, true },
+  { 6327, true },
+  { 6339, true },
+  { 6348, true },
+  { 6368, true },
+  { 6379, true },
+  { 6396, true },
+  { 6420, true },
+  { 6434, true },
+  { 6453, true },
+  { 6475, true },
+  { 6485, true },
+  { 6497, true },
   { 6513, true },
-  { 6529, true },
-  { 6540, true },
-  { 6548, true },
+  { 6524, true },
+  { 6532, true },
+  { 6546, true },
   { 6562, true },
-  { 6578, true },
-  { 6593, true },
-  { 6602, true },
-  { 6617, true },
-  { 6625, true },
-  { 6634, true },
-  { 6651, true },
-  { 6668, true },
-  { 6676, false },
-  { 6692, true },
-  { 6710, true },
-  { 6723, true },
-  { 6731, true },
-  { 6745, false },
-  { 6759, true },
-  { 6771, true },
-  { 6781, false },
-  { 6794, true },
-  { 6806, true },
-  { 6815, true },
-  { 6827, true },
-  { 6841, true },
-  { 6854, true },
+  { 6577, true },
+  { 6586, true },
+  { 6601, true },
+  { 6609, true },
+  { 6618, true },
+  { 6635, true },
+  { 6652, true },
+  { 6660, false },
+  { 6676, true },
+  { 6694, true },
+  { 6707, true },
+  { 6715, true },
+  { 6729, false },
+  { 6743, true },
+  { 6755, true },
+  { 6765, false },
+  { 6778, true },
+  { 6790, true },
+  { 6799, true },
+  { 6811, true },
+  { 6825, true },
+  { 6838, true },
+  { 6850, true },
   { 6866, true },
-  { 6882, true },
-  { 6892, false },
-  { 6902, true },
-  { 6910, true },
-  { 6920, true },
-  { 6934, true },
-  { 6947, true },
-  { 6955, true },
-  { 6967, true },
-  { 6979, true },
-  { 7003, true },
-  { 7022, true },
-  { 7041, false },
-  { 7050, false },
-  { 7064, true },
-  { 7074, true },
-  { 7107, true },
-  { 7117, true },
-  { 7131, true },
-  { 7138, true },
-  { 7150, true },
-  { 7163, true },
-  { 7174, true },
-  { 7191, true },
+  { 6876, false },
+  { 6886, true },
+  { 6894, true },
+  { 6904, true },
+  { 6918, true },
+  { 6931, true },
+  { 6939, true },
+  { 6951, true },
+  { 6963, true },
+  { 6987, true },
+  { 7006, true },
+  { 7025, false },
+  { 7034, false },
+  { 7048, true },
+  { 7058, true },
+  { 7091, true },
+  { 7101, true },
+  { 7115, true },
+  { 7122, true },
+  { 7134, true },
+  { 7147, true },
+  { 7158, true },
+  { 7175, true },
+  { 7186, true },
   { 7202, true },
+  { 7211, true },
   { 7218, true },
-  { 7227, true },
-  { 7234, true },
-  { 7248, true },
-  { 7256, true },
-  { 7267, true },
-  { 7285, true },
-  { 7300, true },
-  { 7315, true },
-  { 7332, true },
-  { 7345, true },
-  { 7355, true },
-  { 7366, true },
-  { 7381, true },
-  { 7404, true },
-  { 7415, true },
-  { 7427, true },
-  { 7447, true },
-  { 7458, true },
-  { 7469, true },
-  { 7480, true },
-  { 7491, true },
-  { 7502, true },
-  { 7515, true },
-  { 7533, true },
-  { 7545, true },
-  { 7562, true },
-  { 7571, true },
-  { 7585, true },
-  { 7596, true },
-  { 7607, true },
+  { 7232, true },
+  { 7240, true },
+  { 7251, true },
+  { 7269, true },
+  { 7284, true },
+  { 7299, true },
+  { 7316, true },
+  { 7329, true },
+  { 7339, true },
+  { 7350, true },
+  { 7365, true },
+  { 7388, true },
+  { 7399, true },
+  { 7411, true },
+  { 7431, true },
+  { 7442, true },
+  { 7453, true },
+  { 7464, true },
+  { 7475, true },
+  { 7486, true },
+  { 7499, true },
+  { 7517, true },
+  { 7529, true },
+  { 7546, true },
+  { 7555, true },
+  { 7569, true },
+  { 7580, true },
+  { 7591, true },
+  { 7608, true },
   { 7624, true },
-  { 7640, true },
-  { 7651, false },
-  { 7677, false },
-  { 7688, true },
-  { 7706, false },
-  { 7723, true },
-  { 7733, true },
-  { 7744, true },
-  { 7757, true },
-  { 7769, true },
-  { 7786, true },
-  { 7793, true },
+  { 7635, false },
+  { 7661, false },
+  { 7672, true },
+  { 7690, false },
+  { 7707, true },
+  { 7717, true },
+  { 7728, true },
+  { 7741, true },
+  { 7753, true },
+  { 7770, true },
+  { 7777, true },
+  { 7801, true },
   { 7817, true },
-  { 7833, true },
-  { 7853, true },
-  { 7878, true },
-  { 7903, true },
-  { 7928, true },
-  { 7940, true },
-  { 7962, true },
-  { 7974, true },
-  { 7984, true },
-  { 7996, true },
-  { 8005, true },
-  { 8017, true },
-  { 8044, true },
-  { 8072, true },
-  { 8085, false },
+  { 7837, true },
+  { 7862, true },
+  { 7887, true },
+  { 7912, true },
+  { 7924, true },
+  { 7946, true },
+  { 7958, true },
+  { 7968, true },
+  { 7980, true },
+  { 7989, true },
+  { 8001, true },
+  { 8028, true },
+  { 8056, true },
+  { 8069, false },
+  { 8078, true },
   { 8094, true },
   { 8110, true },
-  { 8126, true },
-  { 8138, true },
-  { 8153, true },
-  { 8167, true },
-  { 8187, true },
-  { 8202, true },
-  { 8223, true },
-  { 8235, true },
-  { 8246, true },
-  { 8256, true },
-  { 8267, true },
-  { 8279, true },
-  { 8291, true },
-  { 8300, true },
-  { 8312, true },
-  { 8331, true },
-  { 8344, false },
-  { 8360, true },
-  { 8371, true },
+  { 8122, true },
+  { 8137, true },
+  { 8151, true },
+  { 8171, true },
+  { 8186, true },
+  { 8207, true },
+  { 8219, true },
+  { 8230, true },
+  { 8240, true },
+  { 8251, true },
+  { 8263, true },
+  { 8275, true },
+  { 8284, true },
+  { 8296, true },
+  { 8315, true },
+  { 8328, true },
+  { 8339, true },
+  { 8348, true },
+  { 8366, true },
   { 8380, true },
-  { 8398, true },
-  { 8412, true },
+  { 8394, true },
+  { 8410, true },
   { 8426, true },
-  { 8442, true },
-  { 8458, true },
-  { 8478, true },
-  { 8499, true },
-  { 8513, true },
-  { 8526, true },
-  { 8541, true },
-  { 8551, true },
-  { 8569, true },
-  { 8584, true },
-  { 8602, true },
-  { 8612, true },
+  { 8446, true },
+  { 8467, true },
+  { 8481, true },
+  { 8494, true },
+  { 8509, true },
+  { 8519, true },
+  { 8537, true },
+  { 8552, true },
+  { 8570, true },
+  { 8580, true },
+  { 8595, true },
+  { 8613, true },
   { 8627, true },
-  { 8645, true },
-  { 8659, true },
-  { 8673, true },
-  { 8687, true },
-  { 8699, true },
-  { 8714, true },
-  { 8728, true },
-  { 8743, true },
-  { 8753, true },
-  { 8767, true },
+  { 8641, true },
+  { 8655, true },
+  { 8667, true },
+  { 8682, true },
+  { 8696, true },
+  { 8711, true },
+  { 8721, true },
+  { 8735, true },
+  { 8744, true },
+  { 8761, true },
   { 8776, true },
-  { 8793, true },
-  { 8808, true },
-  { 8822, true },
-  { 8836, true },
-  { 8852, true },
-  { 8864, true },
-  { 8877, false },
-  { 8892, true },
-  { 8919, true },
-  { 8940, true },
-  { 8952, true },
-  { 8966, true },
-  { 8976, true },
-  { 8991, true },
-  { 9005, true },
-  { 9019, true },
-  { 9041, true },
-  { 9064, true },
-  { 9085, true },
-  { 9099, true },
-  { 9111, true },
-  { 9124, true },
-  { 9135, true },
-  { 9150, true },
-  { 9161, false },
-  { 9177, true },
-  { 9195, true },
+  { 8790, true },
+  { 8804, true },
+  { 8820, true },
+  { 8832, true },
+  { 8845, false },
+  { 8860, true },
+  { 8887, true },
+  { 8908, true },
+  { 8920, true },
+  { 8934, true },
+  { 8944, true },
+  { 8959, true },
+  { 8973, true },
+  { 8987, true },
+  { 9009, true },
+  { 9032, true },
+  { 9053, true },
+  { 9067, true },
+  { 9079, true },
+  { 9092, true },
+  { 9103, true },
+  { 9118, true },
+  { 9129, false },
+  { 9145, true },
+  { 9163, true },
+  { 9174, true },
+  { 9186, true },
   { 9206, true },
-  { 9218, true },
-  { 9238, true },
+  { 9219, true },
+  { 9231, true },
   { 9251, true },
-  { 9263, true },
-  { 9283, true },
-  { 9296, true },
-  { 9309, true },
-  { 9333, true },
-  { 9351, true },
-  { 9368, true },
-  { 9392, true },
-  { 9416, true },
-  { 9435, true },
-  { 9451, true },
-  { 9465, true },
-  { 9474, true },
-  { 9487, true },
-  { 9504, true },
-  { 9525, true },
-  { 9541, true },
-  { 9562, true },
+  { 9264, true },
+  { 9277, true },
+  { 9301, true },
+  { 9319, true },
+  { 9336, true },
+  { 9360, true },
+  { 9384, true },
+  { 9403, true },
+  { 9419, true },
+  { 9433, true },
+  { 9442, true },
+  { 9455, true },
+  { 9472, true },
+  { 9493, true },
+  { 9509, true },
+  { 9530, true },
+  { 9546, true },
+  { 9565, true },
   { 9578, true },
-  { 9597, true },
-  { 9610, true },
-  { 9631, true },
-  { 9651, true },
-  { 9671, true },
-  { 9687, true },
-  { 9700, false },
-  { 9713, true },
-  { 9725, true },
-  { 9735, true },
-  { 9760, true },
-  { 9773, true },
-  { 9787, true },
-  { 9807, true },
-  { 9823, true },
-  { 9837, true },
-  { 9853, true },
-  { 9867, true },
-  { 9883, true },
-  { 9897, true },
-  { 9909, true },
-  { 9923, true },
-  { 9940, true },
+  { 9599, true },
+  { 9619, true },
+  { 9639, true },
+  { 9655, true },
+  { 9668, false },
+  { 9681, true },
+  { 9693, true },
+  { 9703, true },
+  { 9728, true },
+  { 9741, true },
+  { 9755, true },
+  { 9775, true },
+  { 9791, true },
+  { 9805, true },
+  { 9821, true },
+  { 9835, true },
+  { 9851, true },
+  { 9865, true },
+  { 9877, true },
+  { 9891, true },
+  { 9908, true },
+  { 9919, true },
+  { 9938, true },
   { 9951, true },
-  { 9970, true },
-  { 9983, true },
-  { 9997, true },
-  { 10005, true },
-  { 10018, true },
-  { 10030, true },
-  { 10043, true },
-  { 10058, true },
-  { 10071, true },
-  { 10085, true },
-  { 10102, true },
-  { 10121, true },
-  { 10133, true },
-  { 10147, true },
-  { 10169, true },
-  { 10183, true },
-  { 10195, true },
-  { 10207, true },
-  { 10221, true },
-  { 10249, true },
-  { 10264, true },
-  { 10276, true },
-  { 10287, true },
-  { 10298, true },
-  { 10312, true },
-  { 10324, true },
-  { 10334, true },
-  { 10347, true },
-  { 10359, true },
+  { 9965, true },
+  { 9973, true },
+  { 9986, true },
+  { 9998, true },
+  { 10011, true },
+  { 10026, true },
+  { 10039, true },
+  { 10053, true },
+  { 10070, true },
+  { 10089, true },
+  { 10101, true },
+  { 10115, true },
+  { 10137, true },
+  { 10151, true },
+  { 10163, true },
+  { 10175, true },
+  { 10189, true },
+  { 10217, true },
+  { 10232, true },
+  { 10244, true },
+  { 10255, true },
+  { 10266, true },
+  { 10280, true },
+  { 10292, true },
+  { 10302, true },
+  { 10315, true },
+  { 10327, true },
+  { 10340, true },
+  { 10360, true },
   { 10372, true },
-  { 10392, true },
-  { 10404, true },
-  { 10416, true },
-  { 10442, true },
-  { 10460, true },
-  { 10475, true },
-  { 10488, true },
-  { 10497, true },
-  { 10510, true },
-  { 10522, true },
-  { 10536, true },
+  { 10384, true },
+  { 10410, true },
+  { 10428, true },
+  { 10443, true },
+  { 10456, true },
+  { 10465, true },
+  { 10478, true },
+  { 10490, true },
+  { 10504, true },
+  { 10517, true },
+  { 10528, true },
+  { 10538, true },
   { 10549, true },
-  { 10560, true },
+  { 10559, true },
   { 10570, true },
-  { 10581, true },
-  { 10591, true },
-  { 10602, true },
-  { 10611, false },
+  { 10579, false },
+  { 10588, true },
+  { 10604, true },
   { 10620, true },
-  { 10636, true },
-  { 10652, true },
-  { 10680, true },
-  { 10699, true },
+  { 10648, true },
+  { 10667, true },
+  { 10682, true },
+  { 10702, true },
   { 10714, true },
   { 10734, true },
   { 10746, true },
-  { 10766, true },
-  { 10778, true },
-  { 10791, true },
-  { 10800, true },
-  { 10809, true },
-  { 10819, true },
-  { 10838, true },
-  { 10849, true },
-  { 10864, true },
-  { 10884, true },
-  { 10902, true },
-  { 10912, true },
-  { 10939, true },
-  { 10956, true },
-  { 10967, true },
-  { 10977, true },
-  { 10991, true },
-  { 11008, true },
-  { 11019, true },
-  { 11028, true },
-  { 11039, true },
-  { 11059, true },
-  { 11078, true },
-  { 11089, true },
-  { 11100, true },
-  { 11118, false },
-  { 11129, true },
-  { 11148, true },
-  { 11166, true },
-  { 11184, true },
-  { 11206, true },
-  { 11228, true },
-  { 11242, true },
-  { 11257, true },
-  { 11271, true },
-  { 11285, true },
-  { 11300, true },
-  { 11321, true },
-  { 11331, true },
-  { 11351, true },
-  { 11366, true },
-  { 11377, false },
-  { 11401, true },
-  { 11422, true },
-  { 11440, true },
-  { 11451, true },
-  { 11469, true },
-  { 11486, true },
-  { 11499, true },
-  { 11507, true },
-  { 11524, true },
-  { 11537, true },
-  { 11552, true },
-  { 11564, true },
-  { 11578, true },
-  { 11597, true },
-  { 11613, true },
-  { 11631, false },
+  { 10759, true },
+  { 10768, true },
+  { 10777, true },
+  { 10787, true },
+  { 10806, true },
+  { 10817, true },
+  { 10832, true },
+  { 10852, true },
+  { 10870, true },
+  { 10880, true },
+  { 10907, true },
+  { 10924, true },
+  { 10935, true },
+  { 10945, true },
+  { 10959, true },
+  { 10976, true },
+  { 10987, true },
+  { 10996, true },
+  { 11007, true },
+  { 11027, true },
+  { 11046, true },
+  { 11057, true },
+  { 11068, true },
+  { 11086, false },
+  { 11097, true },
+  { 11116, true },
+  { 11134, true },
+  { 11152, true },
+  { 11174, true },
+  { 11196, true },
+  { 11210, true },
+  { 11225, true },
+  { 11239, true },
+  { 11253, true },
+  { 11268, true },
+  { 11289, true },
+  { 11299, true },
+  { 11319, true },
+  { 11334, true },
+  { 11345, false },
+  { 11369, true },
+  { 11390, true },
+  { 11408, true },
+  { 11419, true },
+  { 11437, true },
+  { 11454, true },
+  { 11467, true },
+  { 11475, true },
+  { 11492, true },
+  { 11505, true },
+  { 11520, true },
+  { 11532, true },
+  { 11546, true },
+  { 11565, true },
+  { 11581, true },
+  { 11599, false },
+  { 11621, true },
+  { 11636, true },
   { 11653, true },
-  { 11668, true },
-  { 11685, true },
+  { 11675, true },
+  { 11690, true },
   { 11707, true },
-  { 11722, true },
-  { 11739, true },
+  { 11728, true },
+  { 11744, true },
   { 11760, true },
-  { 11776, true },
-  { 11792, true },
+  { 11777, true },
+  { 11794, true },
   { 11809, true },
-  { 11826, true },
-  { 11841, true },
-  { 11856, true },
-  { 11870, true },
-  { 11884, true },
-  { 11901, true },
-  { 11918, true },
-  { 11930, true },
-  { 11948, true },
-  { 11965, true },
-  { 11979, true },
-  { 11996, true },
-  { 12014, true },
-  { 12029, true },
-  { 12041, true },
-  { 12054, true },
-  { 12070, true },
-  { 12084, true },
-  { 12097, true },
-  { 12114, true },
-  { 12134, true },
-  { 12154, true },
-  { 12169, true },
-  { 12180, true },
-  { 12191, true },
-  { 12202, true },
-  { 12218, true },
-  { 12233, true },
-  { 12244, true },
-  { 12261, true },
-  { 12277, true },
-  { 12288, true },
-  { 12299, true },
-  { 12321, true },
-  { 12333, true },
+  { 11824, true },
+  { 11838, true },
+  { 11852, true },
+  { 11869, true },
+  { 11886, true },
+  { 11898, true },
+  { 11916, true },
+  { 11933, true },
+  { 11947, true },
+  { 11964, true },
+  { 11982, true },
+  { 11997, true },
+  { 12009, true },
+  { 12022, true },
+  { 12038, true },
+  { 12052, true },
+  { 12065, true },
+  { 12082, true },
+  { 12102, true },
+  { 12122, true },
+  { 12137, true },
+  { 12148, true },
+  { 12159, true },
+  { 12170, true },
+  { 12186, true },
+  { 12201, true },
+  { 12212, true },
+  { 12229, true },
+  { 12245, true },
+  { 12256, true },
+  { 12267, true },
+  { 12289, true },
+  { 12301, true },
+  { 12316, true },
+  { 12329, true },
   { 12348, true },
-  { 12361, true },
-  { 12380, true },
-  { 12391, true },
-  { 12404, true },
-  { 12418, true },
-  { 12436, false },
-  { 12449, true },
-  { 12471, true },
-  { 12488, true },
-  { 12505, true },
-  { 12525, true },
-  { 12536, true },
-  { 12547, true },
+  { 12359, true },
+  { 12372, true },
+  { 12386, true },
+  { 12404, false },
+  { 12417, true },
+  { 12439, true },
+  { 12456, true },
+  { 12473, true },
+  { 12493, true },
+  { 12504, true },
+  { 12515, true },
+  { 12533, true },
   { 12565, true },
-  { 12597, true },
-  { 12624, true },
-  { 12649, true },
-  { 12673, true },
-  { 12685, true },
-  { 12695, true },
-  { 12713, true },
-  { 12728, true },
-  { 12742, true },
+  { 12592, true },
+  { 12617, true },
+  { 12641, true },
+  { 12653, true },
+  { 12663, true },
+  { 12681, true },
+  { 12696, true },
+  { 12710, true },
+  { 12722, true },
+  { 12734, true },
   { 12754, true },
-  { 12766, true },
-  { 12786, true },
-  { 12805, true },
-  { 12825, true },
-  { 12848, false },
-  { 12872, true },
-  { 12884, true },
-  { 12895, true },
-  { 12907, true },
-  { 12919, true },
-  { 12935, true },
-  { 12952, true },
-  { 12971, true },
+  { 12773, true },
+  { 12793, true },
+  { 12816, false },
+  { 12840, true },
+  { 12852, true },
+  { 12863, true },
+  { 12875, true },
+  { 12887, true },
+  { 12903, true },
+  { 12920, true },
+  { 12939, true },
+  { 12955, true },
+  { 12974, true },
   { 12987, true },
+  { 12997, true },
   { 13006, true },
-  { 13019, true },
+  { 13016, true },
   { 13029, true },
-  { 13038, true },
-  { 13048, true },
-  { 13061, true },
-  { 13073, false },
-  { 13097, true },
-  { 13116, true },
-  { 13130, true },
-  { 13146, true },
-  { 13158, true },
-  { 13169, true },
-  { 13189, true },
-  { 13205, true },
-  { 13222, true },
-  { 13236, true },
-  { 13251, true },
-  { 13266, true },
-  { 13277, true },
-  { 13287, true },
-  { 13305, true },
-  { 13321, true },
-  { 13333, true },
-  { 13352, true },
-  { 13366, true },
-  { 13381, true },
-  { 13391, true },
-  { 13407, true },
-  { 13420, true },
-  { 13437, false },
-  { 13444, true },
-  { 13457, true },
-  { 13470, true },
-  { 13486, true },
-  { 13497, true },
-  { 13509, true },
-  { 13520, true },
+  { 13041, false },
+  { 13065, true },
+  { 13084, true },
+  { 13098, true },
+  { 13114, true },
+  { 13126, true },
+  { 13137, true },
+  { 13157, true },
+  { 13173, true },
+  { 13190, true },
+  { 13204, true },
+  { 13219, true },
+  { 13234, true },
+  { 13245, true },
+  { 13255, true },
+  { 13273, true },
+  { 13289, true },
+  { 13301, true },
+  { 13320, true },
+  { 13334, true },
+  { 13349, true },
+  { 13359, true },
+  { 13375, true },
+  { 13388, true },
+  { 13405, false },
+  { 13412, true },
+  { 13425, true },
+  { 13438, true },
+  { 13454, true },
+  { 13465, true },
+  { 13477, true },
+  { 13488, true },
+  { 13495, false },
+  { 13506, true },
+  { 13517, true },
   { 13527, true },
-  { 13535, false },
-  { 13546, true },
+  { 13540, true },
+  { 13550, true },
   { 13557, true },
-  { 13567, true },
-  { 13580, true },
-  { 13590, true },
-  { 13597, true },
-  { 13611, false },
-  { 13625, true },
-  { 13641, true },
-  { 13655, true },
-  { 13670, true },
-  { 13689, true },
-  { 13714, true },
-  { 13723, true },
-  { 13734, true },
-  { 13742, true },
-  { 13772, true },
-  { 13795, true },
-  { 13808, true },
-  { 13827, true },
-  { 13839, true },
-  { 13852, false },
-  { 13871, true },
-  { 13887, false },
-  { 13903, true },
-  { 13919, false },
-  { 13934, false },
-  { 13947, true },
-  { 13956, true },
-  { 13972, true },
+  { 13571, false },
+  { 13585, true },
+  { 13601, true },
+  { 13615, true },
+  { 13630, true },
+  { 13649, true },
+  { 13674, true },
+  { 13683, true },
+  { 13694, true },
+  { 13702, true },
+  { 13732, true },
+  { 13755, true },
+  { 13768, true },
+  { 13787, true },
+  { 13799, true },
+  { 13812, false },
+  { 13831, true },
+  { 13847, false },
+  { 13863, true },
+  { 13879, false },
+  { 13894, false },
+  { 13907, true },
+  { 13916, true },
+  { 13932, true },
+  { 13944, true },
+  { 13963, true },
   { 13984, true },
-  { 14003, true },
-  { 14024, true },
-  { 14037, true },
-  { 14046, true },
-  { 14059, true },
-  { 14069, true },
-  { 14080, true },
-  { 14091, true },
-  { 14102, true },
-  { 14113, true },
-  { 14125, true },
-  { 14141, true },
-  { 14158, false },
-  { 14175, true },
-  { 14197, true },
-  { 14223, true },
-  { 14236, true },
-  { 14245, true },
+  { 13997, true },
+  { 14006, true },
+  { 14019, true },
+  { 14029, true },
+  { 14040, true },
+  { 14051, true },
+  { 14062, true },
+  { 14073, true },
+  { 14085, true },
+  { 14101, true },
+  { 14118, false },
+  { 14135, true },
+  { 14157, true },
+  { 14183, true },
+  { 14196, true },
+  { 14205, true },
+  { 14219, true },
+  { 14238, true },
   { 14259, true },
-  { 14278, true },
-  { 14299, true },
-  { 14311, true },
-  { 14325, true },
-  { 14349, true },
+  { 14271, true },
+  { 14285, true },
+  { 14309, true },
+  { 14318, true },
+  { 14331, true },
+  { 14344, true },
   { 14358, true },
   { 14371, true },
-  { 14384, true },
-  { 14398, true },
-  { 14411, true },
-  { 14427, true },
-  { 14444, true },
-  { 14455, true },
-  { 14464, true },
-  { 14477, true },
-  { 14490, true },
-  { 14502, true },
-  { 14523, false },
-  { 14541, true },
-  { 14564, true },
-  { 14591, true },
-  { 14610, false },
-  { 14623, true },
-  { 14635, true },
+  { 14387, true },
+  { 14404, true },
+  { 14415, true },
+  { 14424, true },
+  { 14437, true },
+  { 14450, true },
+  { 14462, true },
+  { 14483, false },
+  { 14501, true },
+  { 14524, true },
+  { 14551, true },
+  { 14570, false },
+  { 14583, true },
+  { 14595, true },
+  { 14615, true },
+  { 14626, true },
+  { 14643, true },
   { 14655, true },
-  { 14666, true },
-  { 14683, true },
-  { 14695, true },
-  { 14709, true },
-  { 14717, true },
-  { 14734, true },
-  { 14747, true },
-  { 14759, true },
-  { 14772, true },
-  { 14788, true },
-  { 14800, true },
-  { 14818, true },
-  { 14830, true },
-  { 14853, true },
-  { 14866, true },
-  { 14882, true },
-  { 14888, true },
-  { 14900, true },
-  { 14910, true },
-  { 14926, true },
-  { 14938, true },
-  { 14949, true },
-  { 14959, true },
-  { 14976, true },
-  { 14995, true },
-  { 15007, false },
-  { 15019, true },
-  { 15032, true },
-  { 15058, true },
-  { 15074, true },
-  { 15087, true },
-  { 15101, true },
-  { 15111, true },
-  { 15121, true },
-  { 15137, true },
-  { 15156, true },
-  { 15180, true },
-  { 15208, true },
-  { 15221, true },
-  { 15235, true },
-  { 15247, true },
-  { 15258, true },
-  { 15271, true },
-  { 15280, true },
-  { 15293, true },
-  { 15305, true },
-  { 15321, true },
-  { 15335, true },
-  { 15351, true },
-  { 15367, true },
-  { 15387, true },
+  { 14669, true },
+  { 14677, true },
+  { 14694, true },
+  { 14707, true },
+  { 14719, true },
+  { 14732, true },
+  { 14748, true },
+  { 14760, true },
+  { 14778, true },
+  { 14790, true },
+  { 14813, true },
+  { 14826, true },
+  { 14842, true },
+  { 14848, true },
+  { 14860, true },
+  { 14870, true },
+  { 14886, true },
+  { 14898, true },
+  { 14909, true },
+  { 14919, true },
+  { 14936, true },
+  { 14955, true },
+  { 14967, false },
+  { 14979, true },
+  { 14992, true },
+  { 15018, true },
+  { 15034, true },
+  { 15047, true },
+  { 15061, true },
+  { 15071, true },
+  { 15081, true },
+  { 15097, true },
+  { 15116, true },
+  { 15140, true },
+  { 15168, true },
+  { 15181, true },
+  { 15195, true },
+  { 15207, true },
+  { 15218, true },
+  { 15231, true },
+  { 15240, true },
+  { 15253, true },
+  { 15265, true },
+  { 15281, true },
+  { 15295, true },
+  { 15311, true },
+  { 15327, true },
+  { 15347, true },
+  { 15361, true },
+  { 15369, true },
+  { 15383, true },
   { 15401, true },
-  { 15409, true },
-  { 15423, true },
-  { 15441, true },
-  { 15461, true },
-  { 15483, true },
-  { 15495, true },
-  { 15510, true },
+  { 15421, true },
+  { 15443, true },
+  { 15455, true },
+  { 15471, true },
+  { 15485, false },
+  { 15498, true },
+  { 15513, true },
   { 15526, true },
-  { 15540, false },
-  { 15553, true },
-  { 15568, true },
-  { 15581, true },
-  { 15599, true },
-  { 15613, true },
-  { 15622, true },
-  { 15634, true },
-  { 15652, true },
-  { 15672, false },
-  { 15687, true },
-  { 15700, true },
-  { 15713, true },
-  { 15723, true },
-  { 15737, true },
-  { 15763, true },
-  { 15773, true },
-  { 15787, true },
-  { 15799, true },
-  { 15817, true },
-  { 15835, false },
-  { 15851, true },
-  { 15861, true },
-  { 15869, true },
-  { 15880, true },
-  { 15893, true },
-  { 15909, true },
-  { 15922, true },
-  { 15944, true },
-  { 15959, true },
-  { 15970, true },
-  { 15980, true },
-  { 16002, true },
-  { 16017, true },
-  { 16036, true },
-  { 16049, false },
-  { 16064, true },
-  { 16084, true },
-  { 16095, true },
-  { 16107, true },
-  { 16120, true },
-  { 16140, true },
-  { 16152, false },
-  { 16166, true },
+  { 15544, true },
+  { 15558, true },
+  { 15567, true },
+  { 15579, true },
+  { 15597, true },
+  { 15617, false },
+  { 15632, true },
+  { 15645, true },
+  { 15658, true },
+  { 15668, true },
+  { 15682, true },
+  { 15708, true },
+  { 15718, true },
+  { 15732, true },
+  { 15744, true },
+  { 15762, true },
+  { 15780, false },
+  { 15796, true },
+  { 15806, true },
+  { 15814, true },
+  { 15825, true },
+  { 15838, true },
+  { 15854, true },
+  { 15867, true },
+  { 15889, true },
+  { 15904, true },
+  { 15915, true },
+  { 15925, true },
+  { 15947, true },
+  { 15962, true },
+  { 15981, true },
+  { 15994, false },
+  { 16009, true },
+  { 16029, true },
+  { 16040, true },
+  { 16052, true },
+  { 16065, true },
+  { 16085, true },
+  { 16097, false },
+  { 16111, true },
+  { 16123, true },
+  { 16133, true },
+  { 16146, true },
+  { 16164, true },
   { 16178, true },
-  { 16188, true },
-  { 16201, true },
-  { 16219, true },
-  { 16233, true },
-  { 16246, true },
-  { 16259, true },
-  { 16271, true },
-  { 16285, true },
-  { 16305, true },
-  { 16322, true },
-  { 16335, true },
+  { 16191, true },
+  { 16204, true },
+  { 16216, true },
+  { 16230, true },
+  { 16250, true },
+  { 16267, true },
+  { 16280, true },
+  { 16294, true },
+  { 16307, true },
+  { 16319, true },
+  { 16337, true },
   { 16349, true },
-  { 16362, true },
-  { 16374, true },
-  { 16392, true },
-  { 16404, true },
-  { 16415, true },
-  { 16426, true },
-  { 16439, true },
-  { 16452, true },
-  { 16467, true },
-  { 16478, true },
-  { 16489, true },
-  { 16504, true },
-  { 16518, true },
-  { 16529, true },
-  { 16539, true },
-  { 16551, true },
-  { 16572, true },
+  { 16360, true },
+  { 16371, true },
+  { 16384, true },
+  { 16397, true },
+  { 16412, true },
+  { 16423, true },
+  { 16434, true },
+  { 16449, true },
+  { 16463, true },
+  { 16474, true },
+  { 16484, true },
+  { 16496, true },
+  { 16517, true },
+  { 16528, true },
+  { 16537, true },
+  { 16557, true },
+  { 16576, true },
   { 16583, true },
-  { 16592, true },
-  { 16612, true },
-  { 16631, true },
-  { 16638, true },
-  { 16652, true },
+  { 16597, true },
+  { 16607, true },
+  { 16620, true },
+  { 16633, true },
+  { 16645, true },
   { 16662, true },
-  { 16675, true },
-  { 16688, true },
-  { 16700, true },
-  { 16717, true },
-  { 16728, true },
-  { 16742, true },
-  { 16752, true },
+  { 16673, true },
+  { 16687, true },
+  { 16697, true },
+  { 16715, true },
+  { 16725, true },
+  { 16739, true },
+  { 16756, true },
   { 16770, true },
   { 16780, true },
-  { 16794, true },
-  { 16811, true },
-  { 16825, true },
-  { 16835, true },
-  { 16851, true },
-  { 16862, true },
-  { 16873, true },
-  { 16897, true },
-  { 16914, true },
-  { 16931, true },
-  { 16943, true },
+  { 16796, true },
+  { 16807, true },
+  { 16818, true },
+  { 16842, true },
+  { 16859, true },
+  { 16876, true },
+  { 16888, true },
+  { 16904, true },
+  { 16926, true },
+  { 16933, true },
   { 16959, true },
-  { 16981, true },
-  { 16988, true },
-  { 17014, true },
-  { 17029, true },
-  { 17042, true },
-  { 17060, true },
-  { 17071, true },
-  { 17081, true },
-  { 17091, true },
-  { 17101, true },
-  { 17120, true },
-  { 17140, true },
-  { 17152, true },
+  { 16974, true },
+  { 16987, true },
+  { 17005, true },
+  { 17016, true },
+  { 17026, true },
+  { 17036, true },
+  { 17046, true },
+  { 17065, true },
+  { 17085, true },
+  { 17097, true },
+  { 17115, true },
+  { 17129, true },
+  { 17143, true },
+  { 17153, true },
+  { 17160, true },
   { 17170, true },
-  { 17184, true },
-  { 17198, true },
-  { 17208, true },
-  { 17215, true },
-  { 17225, true },
-  { 17235, true },
-  { 17260, true },
+  { 17180, true },
+  { 17205, true },
+  { 17227, true },
+  { 17239, true },
+  { 17257, false },
+  { 17269, true },
   { 17282, true },
-  { 17294, true },
-  { 17312, false },
-  { 17324, true },
-  { 17337, true },
-  { 17357, true },
-  { 17369, true },
-  { 17397, true },
-  { 17410, true },
-  { 17420, true },
-  { 17430, true },
-  { 17438, true },
-  { 17450, true },
-  { 17459, false },
-  { 17479, true },
-  { 17486, true },
-  { 17502, true },
-  { 17518, true },
-  { 17533, true },
-  { 17543, true },
-  { 17561, true },
-  { 17576, true },
-  { 17603, true },
-  { 17620, true },
-  { 17638, true },
-  { 17646, true },
+  { 17302, true },
+  { 17314, true },
+  { 17342, true },
+  { 17355, true },
+  { 17365, true },
+  { 17375, true },
+  { 17383, true },
+  { 17395, true },
+  { 17404, false },
+  { 17424, true },
+  { 17431, true },
+  { 17447, true },
+  { 17463, true },
+  { 17478, true },
+  { 17488, true },
+  { 17506, true },
+  { 17521, true },
+  { 17548, true },
+  { 17565, true },
+  { 17583, true },
+  { 17591, true },
+  { 17605, true },
+  { 17616, true },
+  { 17625, true },
+  { 17652, true },
   { 17660, true },
-  { 17671, true },
-  { 17680, true },
-  { 17707, true },
-  { 17715, true },
+  { 17670, true },
+  { 17686, true },
+  { 17698, true },
+  { 17713, true },
   { 17725, true },
-  { 17741, true },
-  { 17753, true },
-  { 17768, true },
-  { 17780, true },
-  { 17795, true },
-  { 17810, true },
-  { 17822, true },
-  { 17845, true },
-  { 17866, true },
-  { 17886, true },
-  { 17903, true },
-  { 17912, true },
-  { 17930, true },
-  { 17944, true },
-  { 17956, true },
-  { 17970, true },
-  { 17980, true },
-  { 17994, true },
-  { 18004, true },
-  { 18019, true },
-  { 18030, true },
-  { 18043, true },
-  { 18055, true },
-  { 18068, true },
-  { 18080, true },
-  { 18088, true },
-  { 18106, true },
-  { 18127, true },
-  { 18148, true },
-  { 18169, true },
-  { 18183, true },
-  { 18199, true },
-  { 18211, true },
-  { 18223, true },
-  { 18235, true },
-  { 18247, true },
+  { 17740, true },
+  { 17755, true },
+  { 17767, true },
+  { 17790, true },
+  { 17811, true },
+  { 17831, true },
+  { 17848, true },
+  { 17857, true },
+  { 17875, true },
+  { 17889, true },
+  { 17901, true },
+  { 17915, true },
+  { 17925, true },
+  { 17939, true },
+  { 17949, true },
+  { 17964, true },
+  { 17975, true },
+  { 17988, true },
+  { 18000, true },
+  { 18013, true },
+  { 18025, true },
+  { 18033, true },
+  { 18051, true },
+  { 18072, true },
+  { 18093, true },
+  { 18114, true },
+  { 18128, true },
+  { 18144, true },
+  { 18156, true },
+  { 18168, true },
+  { 18180, true },
+  { 18192, true },
+  { 18205, true },
+  { 18215, true },
+  { 18224, true },
+  { 18234, true },
+  { 18249, true },
   { 18260, true },
-  { 18270, true },
-  { 18279, true },
-  { 18289, true },
-  { 18304, true },
-  { 18315, true },
-  { 18330, true },
-  { 18343, true },
-  { 18362, true },
-  { 18374, true },
-  { 18390, true },
-  { 18402, true },
-  { 18418, true },
-  { 18437, true },
-  { 18456, true },
-  { 18482, true },
-  { 18494, true },
-  { 18507, true },
-  { 18518, true },
-  { 18529, true },
-  { 18547, true },
-  { 18577, true },
-  { 18600, true },
-  { 18613, false },
-  { 18621, true },
-  { 18633, true },
-  { 18650, true },
-  { 18660, true },
-  { 18670, true },
-  { 18684, true },
-  { 18700, true },
-  { 18711, true },
-  { 18728, true },
+  { 18275, true },
+  { 18288, true },
+  { 18307, true },
+  { 18319, true },
+  { 18335, true },
+  { 18347, true },
+  { 18363, true },
+  { 18382, true },
+  { 18401, true },
+  { 18427, true },
+  { 18439, true },
+  { 18452, true },
+  { 18463, true },
+  { 18474, true },
+  { 18492, true },
+  { 18522, true },
+  { 18545, true },
+  { 18558, false },
+  { 18566, true },
+  { 18578, true },
+  { 18595, true },
+  { 18605, true },
+  { 18615, true },
+  { 18629, true },
+  { 18645, true },
+  { 18656, true },
+  { 18673, true },
+  { 18702, true },
+  { 18718, true },
+  { 18736, true },
   { 18757, true },
-  { 18773, true },
-  { 18791, true },
-  { 18812, true },
-  { 18824, true },
-  { 18835, true },
-  { 18847, true },
-  { 18859, true },
-  { 18877, true },
-  { 18895, true },
-  { 18916, true },
-  { 18941, true },
-  { 18956, true },
-  { 18974, true },
-  { 18999, true },
-  { 19012, true },
-  { 19027, true },
-  { 19044, true },
-  { 19072, true },
-  { 19095, true },
-  { 19110, true },
-  { 19123, true },
-  { 19136, true },
-  { 19149, true },
-  { 19165, true },
-  { 19178, true },
+  { 18769, true },
+  { 18780, true },
+  { 18792, true },
+  { 18810, true },
+  { 18828, true },
+  { 18849, true },
+  { 18874, true },
+  { 18889, true },
+  { 18907, true },
+  { 18932, true },
+  { 18945, true },
+  { 18960, true },
+  { 18977, true },
+  { 19005, true },
+  { 19028, true },
+  { 19043, true },
+  { 19056, true },
+  { 19069, true },
+  { 19082, true },
+  { 19098, true },
+  { 19111, true },
+  { 19124, true },
+  { 19137, true },
+  { 19166, true },
   { 19191, true },
-  { 19204, true },
-  { 19233, true },
-  { 19258, true },
-  { 19269, true },
-  { 19275, true },
+  { 19202, true },
+  { 19208, true },
+  { 19224, true },
+  { 19234, true },
+  { 19246, true },
+  { 19262, true },
+  { 19279, true },
   { 19291, true },
-  { 19301, true },
-  { 19313, true },
-  { 19329, true },
-  { 19346, true },
-  { 19358, true },
-  { 19371, true },
+  { 19304, true },
+  { 19312, true },
+  { 19323, true },
+  { 19334, true },
+  { 19352, true },
+  { 19364, true },
   { 19379, true },
-  { 19390, true },
-  { 19401, true },
-  { 19419, true },
-  { 19431, true },
-  { 19446, true },
-  { 19455, true },
-  { 19473, true },
-  { 19482, true },
-  { 19496, true },
-  { 19518, true },
-  { 19532, true },
-  { 19543, true },
+  { 19388, true },
+  { 19406, true },
+  { 19415, true },
+  { 19429, true },
+  { 19451, true },
+  { 19465, true },
+  { 19476, true },
+  { 19484, true },
+  { 19494, true },
+  { 19506, true },
+  { 19514, true },
+  { 19524, true },
+  { 19536, true },
   { 19551, true },
-  { 19561, true },
-  { 19573, true },
-  { 19581, true },
-  { 19591, true },
-  { 19603, true },
-  { 19618, true },
-  { 19626, true },
-  { 19636, true },
-  { 19661, true },
-  { 19677, true },
+  { 19559, true },
+  { 19569, true },
+  { 19594, true },
+  { 19610, true },
+  { 19620, true },
+  { 19644, true },
+  { 19651, true },
+  { 19668, true },
+  { 19676, true },
   { 19687, true },
-  { 19711, true },
-  { 19718, true },
-  { 19735, true },
-  { 19743, true },
-  { 19754, true },
+  { 19694, true },
+  { 19706, true },
+  { 19717, true },
+  { 19728, true },
+  { 19740, true },
+  { 19752, false },
   { 19761, true },
-  { 19773, true },
-  { 19784, true },
-  { 19795, true },
-  { 19807, true },
-  { 19819, false },
-  { 19828, true },
-  { 19844, true },
-  { 19857, true },
-  { 19866, true },
-  { 19887, true },
-  { 19896, true },
-  { 19911, true },
-  { 19921, true },
-  { 19933, true },
-  { 19951, false },
-  { 19967, true },
-  { 19979, true },
+  { 19777, true },
+  { 19790, true },
+  { 19799, true },
+  { 19808, true },
+  { 19823, true },
+  { 19833, true },
+  { 19845, true },
+  { 19863, false },
+  { 19879, true },
+  { 19891, true },
+  { 19902, true },
+  { 19912, true },
+  { 19922, true },
+  { 19935, true },
+  { 19948, true },
+  { 19958, true },
+  { 19972, true },
+  { 19982, true },
   { 19990, true },
-  { 20000, true },
-  { 20010, true },
-  { 20020, true },
-  { 20033, true },
-  { 20046, true },
-  { 20056, true },
-  { 20070, true },
-  { 20080, true },
-  { 20088, true },
-  { 20100, true },
-  { 20112, true },
-  { 20125, true },
-  { 20141, true },
-  { 20152, false },
-  { 20162, true },
-  { 20179, true },
-  { 20187, true },
-  { 20199, true },
-  { 20208, true },
-  { 20222, true },
-  { 20252, true },
-  { 20267, false },
-  { 20276, true },
-  { 20290, true },
-  { 20311, true },
-  { 20322, true },
-  { 20334, false },
-  { 20347, true },
-  { 20371, true },
-  { 20384, true },
-  { 20396, true },
+  { 20002, true },
+  { 20014, true },
+  { 20027, true },
+  { 20043, true },
+  { 20054, false },
+  { 20064, true },
+  { 20081, true },
+  { 20089, true },
+  { 20101, true },
+  { 20110, true },
+  { 20124, true },
+  { 20154, true },
+  { 20169, false },
+  { 20178, true },
+  { 20192, true },
+  { 20213, true },
+  { 20224, true },
+  { 20236, false },
+  { 20249, true },
+  { 20273, true },
+  { 20286, true },
+  { 20298, true },
+  { 20321, true },
+  { 20332, true },
+  { 20343, true },
+  { 20367, true },
+  { 20399, true },
   { 20419, true },
-  { 20430, true },
-  { 20441, true },
-  { 20465, true },
-  { 20497, true },
-  { 20517, true },
-  { 20535, true },
-  { 20553, true },
-  { 20568, true },
-  { 20583, true },
-  { 20598, true },
-  { 20619, true },
-  { 20643, true },
+  { 20437, true },
+  { 20455, true },
+  { 20470, true },
+  { 20485, true },
+  { 20500, true },
+  { 20521, true },
+  { 20545, true },
+  { 20555, true },
+  { 20565, true },
+  { 20575, true },
+  { 20586, true },
+  { 20611, true },
+  { 20640, true },
   { 20653, true },
-  { 20663, true },
-  { 20673, true },
-  { 20684, true },
+  { 20665, true },
+  { 20675, true },
+  { 20692, false },
+  { 20700, false },
   { 20709, true },
-  { 20738, true },
-  { 20751, true },
-  { 20763, true },
-  { 20773, true },
-  { 20790, false },
-  { 20798, false },
-  { 20807, true },
-  { 20821, false },
+  { 20723, false },
+  { 20740, true },
+  { 20752, true },
+  { 20767, true },
+  { 20782, true },
+  { 20789, true },
+  { 20802, true },
+  { 20814, true },
   { 20838, true },
-  { 20850, true },
-  { 20865, true },
-  { 20880, true },
-  { 20887, true },
-  { 20900, true },
-  { 20912, true },
-  { 20936, true },
-  { 20950, true },
-  { 20958, true },
-  { 20982, true },
-  { 20997, true },
-  { 21006, true },
-  { 21019, true },
-  { 21031, true },
-  { 21042, true },
-  { 21061, true },
-  { 21071, true },
-  { 21081, true },
-  { 21098, true },
-  { 21111, true },
+  { 20852, true },
+  { 20860, true },
+  { 20884, true },
+  { 20899, true },
+  { 20908, true },
+  { 20921, true },
+  { 20933, true },
+  { 20944, true },
+  { 20963, true },
+  { 20973, true },
+  { 20983, true },
+  { 21000, true },
+  { 21013, true },
+  { 21029, true },
+  { 21039, true },
+  { 21052, true },
+  { 21066, true },
+  { 21080, true },
+  { 21092, true },
+  { 21112, true },
   { 21127, true },
-  { 21137, true },
-  { 21150, true },
-  { 21164, true },
-  { 21178, true },
-  { 21190, true },
-  { 21210, true },
-  { 21225, true },
+  { 21143, true },
+  { 21157, true },
+  { 21172, true },
+  { 21184, true },
+  { 21196, true },
+  { 21208, true },
+  { 21219, true },
+  { 21230, true },
   { 21241, true },
-  { 21255, true },
-  { 21270, true },
-  { 21282, true },
-  { 21294, true },
-  { 21306, true },
-  { 21317, true },
-  { 21328, true },
-  { 21339, true },
-  { 21362, true },
-  { 21377, true },
-  { 21392, false },
-  { 21407, false },
-  { 21423, true },
-  { 21445, true },
-  { 21463, true },
-  { 21480, true },
-  { 21498, true },
-  { 21509, true },
-  { 21522, true },
-  { 21539, true },
-  { 21566, true },
-  { 21582, true },
-  { 21602, true },
-  { 21617, true },
-  { 21632, true },
-  { 21643, true },
-  { 21666, true },
-  { 21678, true },
-  { 21691, true },
+  { 21264, true },
+  { 21279, true },
+  { 21294, false },
+  { 21309, false },
+  { 21325, true },
+  { 21347, true },
+  { 21365, true },
+  { 21382, true },
+  { 21400, true },
+  { 21411, true },
+  { 21424, true },
+  { 21441, true },
+  { 21468, true },
+  { 21484, true },
+  { 21504, true },
+  { 21519, true },
+  { 21534, true },
+  { 21545, true },
+  { 21568, true },
+  { 21580, true },
+  { 21593, true },
+  { 21606, true },
+  { 21620, true },
+  { 21633, true },
+  { 21651, true },
+  { 21669, true },
+  { 21687, true },
   { 21704, true },
-  { 21718, true },
-  { 21731, true },
-  { 21749, true },
-  { 21767, true },
-  { 21785, true },
-  { 21802, true },
-  { 21812, true },
-  { 21825, true },
-  { 21841, true },
-  { 21850, true },
-  { 21861, false },
-  { 21871, true },
-  { 21882, true },
-  { 21896, true },
-  { 21909, true },
-  { 21919, true },
+  { 21714, true },
+  { 21727, true },
+  { 21743, true },
+  { 21752, true },
+  { 21763, false },
+  { 21773, true },
+  { 21784, true },
+  { 21798, true },
+  { 21811, true },
+  { 21821, true },
+  { 21834, true },
+  { 21848, true },
+  { 21859, true },
+  { 21869, true },
+  { 21889, true },
+  { 21902, true },
+  { 21911, true },
   { 21932, true },
-  { 21946, true },
-  { 21957, true },
-  { 21967, true },
-  { 21987, true },
-  { 22000, true },
-  { 22009, true },
-  { 22030, true },
-  { 22047, true },
-  { 22067, true },
-  { 22086, true },
-  { 22101, true },
-  { 22114, true },
-  { 22134, true },
+  { 21949, true },
+  { 21969, true },
+  { 21988, true },
+  { 22003, true },
+  { 22016, true },
+  { 22036, true },
+  { 22054, true },
+  { 22065, true },
+  { 22078, true },
+  { 22093, true },
+  { 22103, true },
+  { 22116, true },
+  { 22127, true },
+  { 22138, true },
   { 22152, true },
-  { 22163, true },
-  { 22176, true },
-  { 22191, true },
-  { 22201, true },
-  { 22214, true },
-  { 22225, true },
-  { 22236, true },
-  { 22250, true },
+  { 22168, true },
+  { 22192, true },
+  { 22218, true },
+  { 22234, true },
+  { 22244, true },
   { 22266, true },
-  { 22290, true },
-  { 22316, true },
-  { 22332, true },
-  { 22342, true },
-  { 22364, true },
-  { 22375, true },
-  { 22386, true },
-  { 22402, true },
-  { 22417, true },
-  { 22429, true },
-  { 22456, true },
-  { 22468, false },
-  { 22480, true },
-  { 22489, true },
-  { 22498, true },
-  { 22507, true },
-  { 22526, true },
+  { 22277, true },
+  { 22288, true },
+  { 22304, true },
+  { 22319, true },
+  { 22331, true },
+  { 22358, true },
+  { 22370, false },
+  { 22382, true },
+  { 22391, true },
+  { 22400, true },
+  { 22409, true },
+  { 22428, true },
+  { 22443, true },
+  { 22452, false },
+  { 22462, true },
+  { 22471, true },
+  { 22481, true },
+  { 22499, true },
+  { 22510, true },
+  { 22522, true },
+  { 22533, true },
   { 22541, true },
-  { 22550, false },
-  { 22560, true },
-  { 22569, true },
-  { 22579, true },
-  { 22597, true },
-  { 22608, true },
-  { 22620, true },
-  { 22631, true },
-  { 22639, true },
-  { 22657, true },
-  { 22676, true },
+  { 22559, true },
+  { 22578, true },
+  { 22591, true },
+  { 22604, true },
+  { 22614, true },
+  { 22628, true },
+  { 22638, true },
+  { 22648, true },
+  { 22655, true },
+  { 22668, true },
+  { 22678, false },
   { 22689, true },
-  { 22702, true },
-  { 22712, true },
-  { 22726, true },
+  { 22707, true },
+  { 22717, true },
+  { 22724, true },
   { 22736, true },
-  { 22746, true },
-  { 22753, true },
-  { 22766, true },
-  { 22776, false },
-  { 22787, true },
-  { 22805, true },
-  { 22815, true },
-  { 22822, true },
-  { 22834, true },
-  { 22855, true },
-  { 22871, true },
-  { 22884, true },
-  { 22897, true },
-  { 22914, true },
-  { 22926, true },
-  { 22940, false },
-  { 22954, true },
-  { 22967, true },
-  { 22978, true },
-  { 22989, true },
-  { 23001, true },
-  { 23015, true },
-  { 23033, true },
-  { 23049, true },
-  { 23061, true },
+  { 22757, true },
+  { 22773, true },
+  { 22782, true },
+  { 22795, true },
+  { 22808, true },
+  { 22825, true },
+  { 22837, true },
+  { 22851, true },
+  { 22864, false },
+  { 22878, true },
+  { 22891, true },
+  { 22902, true },
+  { 22913, true },
+  { 22925, true },
+  { 22939, true },
+  { 22957, true },
+  { 22973, true },
+  { 22985, true },
+  { 22998, true },
+  { 23009, true },
+  { 23018, true },
+  { 23036, true },
+  { 23053, true },
   { 23074, true },
   { 23085, true },
-  { 23094, true },
-  { 23112, true },
-  { 23129, true },
-  { 23150, true },
-  { 23161, true },
-  { 23172, true },
-  { 23197, true },
-  { 23211, true },
-  { 23224, true },
-  { 23238, true },
-  { 23251, true },
-  { 23265, true },
-  { 23280, true },
-  { 23296, true },
-  { 23306, false },
-  { 23317, true },
-  { 23332, true },
-  { 23350, true },
-  { 23363, true },
-  { 23376, true },
-  { 23392, true },
+  { 23096, true },
+  { 23121, true },
+  { 23135, true },
+  { 23148, true },
+  { 23162, true },
+  { 23175, true },
+  { 23189, true },
+  { 23204, true },
+  { 23220, true },
+  { 23230, false },
+  { 23241, true },
+  { 23256, true },
+  { 23274, true },
+  { 23287, true },
+  { 23300, true },
+  { 23316, true },
+  { 23330, true },
+  { 23344, true },
+  { 23366, true },
+  { 23378, true },
+  { 23391, true },
   { 23406, true },
-  { 23420, true },
-  { 23442, true },
-  { 23454, true },
-  { 23467, true },
-  { 23482, true },
-  { 23494, true },
-  { 23510, true },
-  { 23523, true },
-  { 23548, true },
-  { 23560, true },
+  { 23418, true },
+  { 23434, true },
+  { 23447, true },
+  { 23472, true },
+  { 23484, true },
+  { 23512, true },
+  { 23527, true },
+  { 23543, true },
+  { 23554, true },
+  { 23565, true },
+  { 23575, true },
   { 23588, true },
-  { 23603, true },
-  { 23619, true },
-  { 23630, true },
-  { 23641, true },
-  { 23651, true },
+  { 23598, true },
+  { 23609, true },
+  { 23620, true },
+  { 23631, true },
+  { 23642, true },
+  { 23653, true },
   { 23664, true },
-  { 23674, true },
-  { 23685, true },
-  { 23696, true },
-  { 23707, true },
-  { 23718, true },
-  { 23729, true },
-  { 23740, true },
-  { 23751, false },
-  { 23765, true },
-  { 23774, true },
-  { 23786, true },
-  { 23800, false },
+  { 23675, false },
+  { 23689, true },
+  { 23701, true },
+  { 23710, true },
+  { 23722, true },
+  { 23736, false },
+  { 23755, true },
+  { 23771, true },
+  { 23798, true },
   { 23819, true },
   { 23835, true },
-  { 23862, true },
-  { 23883, true },
-  { 23899, true },
-  { 23910, true },
-  { 23920, true },
+  { 23846, true },
+  { 23856, true },
+  { 23874, true },
+  { 23889, true },
+  { 23900, false },
+  { 23915, true },
+  { 23925, true },
   { 23938, true },
-  { 23953, true },
-  { 23964, false },
-  { 23979, true },
-  { 23989, true },
-  { 24002, true },
+  { 23949, true },
+  { 23963, true },
+  { 23985, true },
+  { 23998, true },
   { 24013, true },
-  { 24027, true },
-  { 24049, true },
-  { 24062, true },
-  { 24077, true },
+  { 24028, true },
+  { 24047, true },
+  { 24068, true },
+  { 24078, true },
   { 24092, true },
-  { 24111, true },
-  { 24132, true },
-  { 24142, true },
-  { 24156, true },
-  { 24169, true },
-  { 24184, true },
-  { 24205, true },
-  { 24225, true },
-  { 24246, true },
-  { 24264, true },
-  { 24276, true },
-  { 24294, true },
-  { 24315, true },
-  { 24335, true },
-  { 24353, true },
+  { 24105, true },
+  { 24120, true },
+  { 24141, true },
+  { 24161, true },
+  { 24182, true },
+  { 24200, true },
+  { 24212, true },
+  { 24230, true },
+  { 24251, true },
+  { 24271, true },
+  { 24289, true },
+  { 24303, true },
+  { 24322, false },
+  { 24336, true },
+  { 24346, true },
+  { 24357, true },
   { 24367, true },
-  { 24386, false },
-  { 24400, true },
-  { 24410, true },
-  { 24421, true },
-  { 24431, true },
-  { 24446, true },
-  { 24461, true },
-  { 24475, true },
-  { 24488, true },
-  { 24501, true },
-  { 24515, true },
-  { 24532, true },
-  { 24549, true },
-  { 24559, true },
-  { 24572, true },
-  { 24589, true },
-  { 24598, true },
-  { 24612, true },
-  { 24632, true },
-  { 24650, true },
-  { 24670, true },
+  { 24382, true },
+  { 24397, true },
+  { 24411, true },
+  { 24424, true },
+  { 24437, true },
+  { 24451, true },
+  { 24468, true },
+  { 24485, true },
+  { 24495, true },
+  { 24508, true },
+  { 24525, true },
+  { 24534, true },
+  { 24548, true },
+  { 24568, true },
+  { 24586, true },
+  { 24606, true },
+  { 24620, true },
+  { 24636, true },
+  { 24645, true },
+  { 24655, true },
   { 24684, true },
-  { 24700, true },
-  { 24709, true },
-  { 24719, true },
-  { 24748, true },
-  { 24776, true },
-  { 24793, true },
-  { 24801, true },
-  { 24810, true },
-  { 24819, true },
-  { 24836, true },
-  { 24849, true },
-  { 24859, true },
-  { 24869, true },
-  { 24887, true },
-  { 24911, true },
-  { 24931, true },
-  { 24946, true },
-  { 24961, true },
-  { 24994, true },
-  { 25012, true },
-  { 25040, true },
-  { 25056, true },
+  { 24712, true },
+  { 24729, true },
+  { 24737, true },
+  { 24746, true },
+  { 24755, true },
+  { 24772, true },
+  { 24785, true },
+  { 24795, true },
+  { 24805, true },
+  { 24823, true },
+  { 24842, true },
+  { 24866, true },
+  { 24886, true },
+  { 24901, true },
+  { 24916, true },
+  { 24949, true },
+  { 24967, true },
+  { 24995, true },
+  { 25011, true },
+  { 25029, true },
+  { 25052, true },
   { 25074, true },
-  { 25097, true },
-  { 25119, true },
-  { 25136, true },
-  { 25162, true },
-  { 25180, true },
-  { 25202, true },
-  { 25216, true },
-  { 25236, true },
-  { 25249, true },
-  { 25262, true },
-  { 25274, true },
-  { 25286, true },
-  { 25302, true },
+  { 25091, true },
+  { 25117, true },
+  { 25135, true },
+  { 25157, true },
+  { 25171, true },
+  { 25191, true },
+  { 25204, true },
+  { 25217, true },
+  { 25229, true },
+  { 25241, true },
+  { 25257, true },
+  { 25271, true },
+  { 25289, true },
+  { 25304, true },
   { 25316, true },
-  { 25334, true },
-  { 25349, true },
+  { 25324, true },
+  { 25343, true },
   { 25361, true },
-  { 25369, true },
-  { 25388, true },
-  { 25406, true },
-  { 25428, true },
-  { 25445, true },
-  { 25460, true },
-  { 25478, true },
-  { 25492, true },
-  { 25508, true },
-  { 25527, true },
-  { 25548, true },
-  { 25565, true },
-  { 25579, true },
-  { 25593, true },
-  { 25614, true },
-  { 25627, true },
-  { 25643, true },
-  { 25656, true },
-  { 25675, true },
-  { 25692, true },
-  { 25710, true },
-  { 25728, true },
-  { 25737, true },
-  { 25753, true },
-  { 25760, true },
-  { 25779, true },
-  { 25797, true },
-  { 25813, true },
-  { 25827, true },
-  { 25839, true },
+  { 25383, true },
+  { 25400, true },
+  { 25415, true },
+  { 25436, true },
+  { 25454, true },
+  { 25468, true },
+  { 25484, true },
+  { 25503, true },
+  { 25524, true },
+  { 25541, true },
+  { 25555, true },
+  { 25569, true },
+  { 25590, true },
+  { 25603, true },
+  { 25619, true },
+  { 25632, true },
+  { 25651, true },
+  { 25668, true },
+  { 25686, true },
+  { 25704, true },
+  { 25713, true },
+  { 25729, true },
+  { 25736, true },
+  { 25755, true },
+  { 25773, true },
+  { 25789, true },
+  { 25803, true },
+  { 25815, true },
+  { 25826, true },
+  { 25840, true },
   { 25850, true },
-  { 25864, true },
-  { 25874, true },
-  { 25884, false },
-  { 25893, true },
-  { 25907, true },
-  { 25921, true },
-  { 25933, true },
-  { 25948, true },
-  { 25956, true },
-  { 25968, true },
-  { 25983, true },
+  { 25860, false },
+  { 25869, true },
+  { 25883, true },
+  { 25897, true },
+  { 25909, true },
+  { 25924, true },
+  { 25932, true },
+  { 25944, true },
+  { 25959, true },
+  { 25973, true },
+  { 25986, true },
   { 25997, true },
-  { 26010, true },
-  { 26021, true },
-  { 26029, true },
-  { 26052, true },
-  { 26064, true },
-  { 26079, true },
+  { 26005, true },
+  { 26028, true },
+  { 26040, true },
+  { 26055, true },
+  { 26071, true },
+  { 26080, true },
   { 26095, true },
-  { 26104, true },
-  { 26119, true },
-  { 26135, true },
-  { 26148, true },
+  { 26111, true },
+  { 26124, true },
+  { 26139, true },
+  { 26152, true },
   { 26163, true },
-  { 26176, true },
-  { 26187, true },
-  { 26197, true },
-  { 26209, true },
-  { 26229, true },
-  { 26242, true },
-  { 26261, true },
-  { 26271, true },
-  { 26279, true },
-  { 26289, true },
-  { 26310, true },
-  { 26322, true },
-  { 26337, true },
-  { 26352, true },
-  { 26367, true },
-  { 26382, true },
-  { 26392, true },
-  { 26404, true },
-  { 26419, true },
-  { 26435, true },
-  { 26454, true },
-  { 26475, true },
-  { 26484, true },
-  { 26495, true },
-  { 26524, true },
-  { 26537, true },
-  { 26547, true },
-  { 26567, true },
+  { 26173, true },
+  { 26185, true },
+  { 26205, true },
+  { 26218, true },
+  { 26237, true },
+  { 26247, true },
+  { 26255, true },
+  { 26265, true },
+  { 26286, true },
+  { 26298, true },
+  { 26313, true },
+  { 26328, true },
+  { 26343, true },
+  { 26358, true },
+  { 26368, true },
+  { 26380, true },
+  { 26395, true },
+  { 26411, true },
+  { 26430, true },
+  { 26451, true },
+  { 26460, true },
+  { 26471, true },
+  { 26500, true },
+  { 26513, true },
+  { 26523, true },
+  { 26543, true },
+  { 26558, true },
+  { 26569, true },
   { 26582, true },
-  { 26593, true },
-  { 26606, true },
-  { 26621, true },
-  { 26640, true },
-  { 26655, true },
-  { 26670, true },
-  { 26680, true },
-  { 26690, true },
-  { 26705, true },
-  { 26727, true },
-  { 26742, true },
-  { 26755, true },
-  { 26782, true },
-  { 26796, true },
-  { 26808, true },
+  { 26597, true },
+  { 26616, true },
+  { 26631, true },
+  { 26646, true },
+  { 26656, true },
+  { 26666, true },
+  { 26681, true },
+  { 26703, true },
+  { 26718, true },
+  { 26731, true },
+  { 26758, true },
+  { 26772, true },
+  { 26784, true },
+  { 26799, true },
+  { 26813, true },
   { 26823, true },
-  { 26837, true },
-  { 26847, true },
-  { 26868, true },
-  { 26876, true },
-  { 26893, true },
-  { 26915, true },
-  { 26933, false },
-  { 26952, true },
-  { 26966, true },
-  { 26978, true },
-  { 26995, true },
-  { 27010, true },
-  { 27021, true },
-  { 27031, true },
-  { 27047, true },
+  { 26844, true },
+  { 26852, true },
+  { 26869, true },
+  { 26891, true },
+  { 26909, false },
+  { 26928, true },
+  { 26942, true },
+  { 26954, true },
+  { 26971, true },
+  { 26986, true },
+  { 26997, true },
+  { 27007, true },
+  { 27023, true },
+  { 27041, true },
+  { 27053, true },
   { 27065, true },
-  { 27077, true },
-  { 27089, true },
-  { 27119, false },
-  { 27132, true },
-  { 27149, true },
-  { 27167, true },
-  { 27180, true },
-  { 27192, true },
-  { 27215, true },
-  { 27234, true },
-  { 27247, true },
-  { 27255, true },
-  { 27267, false },
-  { 27278, true },
+  { 27095, false },
+  { 27108, true },
+  { 27125, true },
+  { 27143, true },
+  { 27156, true },
+  { 27168, true },
+  { 27191, true },
+  { 27210, true },
+  { 27223, true },
+  { 27231, true },
+  { 27243, false },
+  { 27254, true },
+  { 27272, true },
   { 27296, true },
-  { 27320, true },
-  { 27340, true },
-  { 27352, true },
-  { 27373, true },
-  { 27384, true },
-  { 27396, true },
-  { 27413, true },
-  { 27431, true },
+  { 27316, true },
+  { 27328, true },
+  { 27349, true },
+  { 27360, true },
+  { 27372, true },
+  { 27389, true },
+  { 27407, true },
+  { 27420, true },
+  { 27430, false },
   { 27444, true },
-  { 27454, false },
-  { 27468, true },
-  { 27485, true },
-  { 27496, true },
-  { 27505, true },
-  { 27517, true },
+  { 27461, true },
+  { 27472, true },
+  { 27481, true },
+  { 27493, true },
+  { 27504, true },
+  { 27514, true },
   { 27528, true },
-  { 27538, true },
-  { 27552, true },
-  { 27565, true },
-  { 27579, true },
-  { 27597, true },
-  { 27616, true },
-  { 27634, true },
+  { 27541, true },
+  { 27555, true },
+  { 27573, true },
+  { 27592, true },
+  { 27610, true },
+  { 27628, true },
+  { 27641, true },
   { 27652, true },
-  { 27665, true },
-  { 27676, true },
-  { 27690, true },
-  { 27702, true },
+  { 27666, true },
+  { 27678, true },
+  { 27689, true },
+  { 27700, true },
   { 27713, true },
-  { 27724, true },
-  { 27737, true },
-  { 27749, true },
-  { 27760, true },
-  { 27779, true },
-  { 27795, true },
-  { 27809, true },
-  { 27826, true },
-  { 27841, true },
-  { 27866, true },
-  { 27878, true },
-  { 27893, true },
-  { 27902, true },
-  { 27917, true },
-  { 27931, true },
-  { 27944, true },
-  { 27956, true },
-  { 27966, true },
-  { 27978, true },
-  { 27998, true },
-  { 28012, true },
-  { 28023, true },
-  { 28037, true },
-  { 28048, true },
-  { 28059, true },
-  { 28069, true },
-  { 28083, true },
-  { 28093, true },
-  { 28106, true },
-  { 28117, true },
-  { 28132, true },
-  { 28145, true },
-  { 28159, true },
-  { 28171, true },
-  { 28185, true },
-  { 28197, true },
-  { 28210, true },
-  { 28235, true },
-  { 28247, true },
+  { 27725, true },
+  { 27736, true },
+  { 27755, true },
+  { 27771, true },
+  { 27785, true },
+  { 27800, true },
+  { 27825, true },
+  { 27837, true },
+  { 27852, true },
+  { 27861, true },
+  { 27876, true },
+  { 27890, true },
+  { 27903, true },
+  { 27915, true },
+  { 27925, true },
+  { 27937, true },
+  { 27957, true },
+  { 27971, true },
+  { 27982, true },
+  { 27996, true },
+  { 28007, true },
+  { 28018, true },
+  { 28028, true },
+  { 28042, true },
+  { 28052, true },
+  { 28065, true },
+  { 28076, true },
+  { 28091, true },
+  { 28104, true },
+  { 28118, true },
+  { 28130, true },
+  { 28144, true },
+  { 28156, true },
+  { 28169, true },
+  { 28194, true },
+  { 28206, true },
+  { 28223, true },
+  { 28234, true },
+  { 28245, true },
   { 28264, true },
-  { 28275, true },
-  { 28286, true },
-  { 28305, true },
-  { 28321, true },
-  { 28331, true },
-  { 28345, true },
-  { 28356, true },
-  { 28368, true },
-  { 28383, true },
-  { 28402, true },
-  { 28419, true },
-  { 28427, true },
-  { 28445, false },
-  { 28453, true },
-  { 28466, true },
-  { 28478, true },
-  { 28490, true },
-  { 28504, true },
-  { 28517, true },
-  { 28530, true },
-  { 28546, true },
-  { 28560, true },
-  { 28577, true },
-  { 28594, true },
-  { 28607, true },
-  { 28620, true },
-  { 28633, true },
-  { 28646, true },
-  { 28659, true },
-  { 28672, true },
-  { 28685, true },
-  { 28698, true },
-  { 28711, true },
-  { 28724, true },
-  { 28737, true },
-  { 28750, true },
-  { 28763, true },
-  { 28776, true },
-  { 28793, true },
-  { 28812, true },
+  { 28280, true },
+  { 28290, true },
+  { 28304, true },
+  { 28315, true },
+  { 28327, true },
+  { 28342, true },
+  { 28361, true },
+  { 28378, true },
+  { 28386, true },
+  { 28404, false },
+  { 28412, true },
+  { 28425, true },
+  { 28437, true },
+  { 28449, true },
+  { 28463, true },
+  { 28476, true },
+  { 28489, true },
+  { 28505, true },
+  { 28519, true },
+  { 28536, true },
+  { 28553, true },
+  { 28566, true },
+  { 28579, true },
+  { 28592, true },
+  { 28605, true },
+  { 28618, true },
+  { 28631, true },
+  { 28644, true },
+  { 28657, true },
+  { 28670, true },
+  { 28683, true },
+  { 28696, true },
+  { 28709, true },
+  { 28722, true },
+  { 28735, true },
+  { 28752, true },
+  { 28771, true },
+  { 28786, true },
+  { 28803, true },
+  { 28816, true },
   { 28827, true },
-  { 28844, true },
-  { 28857, true },
-  { 28868, true },
-  { 28880, true },
-  { 28902, true },
-  { 28914, true },
-  { 28937, true },
-  { 28961, true },
-  { 28979, true },
-  { 28992, true },
-  { 29011, true },
-  { 29027, true },
-  { 29048, true },
-  { 29059, true },
-  { 29078, true },
-  { 29094, true },
-  { 29107, true },
-  { 29122, true },
-  { 29140, true },
-  { 29156, true },
-  { 29172, true },
-  { 29182, true },
-  { 29196, true },
-  { 29211, true },
-  { 29230, true },
-  { 29242, true },
-  { 29259, true },
-  { 29270, true },
-  { 29286, true },
-  { 29298, true },
-  { 29308, true },
-  { 29324, true },
-  { 29334, true },
-  { 29355, true },
-  { 29369, true },
-  { 29385, true },
-  { 29407, true },
+  { 28839, true },
+  { 28861, true },
+  { 28873, true },
+  { 28896, true },
+  { 28920, true },
+  { 28938, true },
+  { 28951, true },
+  { 28970, true },
+  { 28986, true },
+  { 29007, true },
+  { 29018, true },
+  { 29037, true },
+  { 29053, true },
+  { 29066, true },
+  { 29081, true },
+  { 29099, true },
+  { 29115, true },
+  { 29131, true },
+  { 29141, true },
+  { 29155, true },
+  { 29170, true },
+  { 29189, true },
+  { 29201, true },
+  { 29218, true },
+  { 29229, true },
+  { 29245, true },
+  { 29257, true },
+  { 29267, true },
+  { 29283, true },
+  { 29293, true },
+  { 29314, true },
+  { 29328, true },
+  { 29344, true },
+  { 29366, true },
+  { 29378, true },
+  { 29389, true },
+  { 29404, true },
   { 29419, true },
-  { 29430, true },
-  { 29445, true },
-  { 29460, true },
-  { 29472, true },
-  { 29491, true },
-  { 29504, true },
+  { 29431, true },
+  { 29450, true },
+  { 29463, true },
+  { 29477, true },
+  { 29499, true },
   { 29518, true },
-  { 29540, true },
-  { 29559, true },
-  { 29579, true },
-  { 29593, true },
-  { 29601, true },
-  { 29614, true },
-  { 29628, true },
-  { 29639, true },
-  { 29652, true },
-  { 29667, true },
+  { 29538, true },
+  { 29552, true },
+  { 29560, true },
+  { 29573, true },
+  { 29587, true },
+  { 29598, true },
+  { 29611, true },
+  { 29626, true },
+  { 29642, true },
+  { 29657, true },
+  { 29669, true },
   { 29683, true },
-  { 29698, true },
-  { 29710, true },
-  { 29724, true },
-  { 29736, true },
-  { 29748, true },
-  { 29765, false },
-  { 29781, false },
-  { 29801, true },
-  { 29814, true },
-  { 29826, true },
-  { 29839, true },
+  { 29695, true },
+  { 29707, true },
+  { 29724, false },
+  { 29740, false },
+  { 29760, true },
+  { 29773, true },
+  { 29785, true },
+  { 29798, true },
+  { 29815, true },
+  { 29831, true },
   { 29856, true },
-  { 29872, true },
-  { 29897, true },
-  { 29910, true },
-  { 29923, true },
-  { 29936, true },
-  { 29950, true },
-  { 29961, true },
-  { 29970, true },
-  { 29979, true },
-  { 29988, true },
+  { 29869, true },
+  { 29882, true },
+  { 29895, true },
+  { 29909, true },
+  { 29920, true },
+  { 29929, true },
+  { 29938, true },
+  { 29947, true },
+  { 29963, true },
+  { 29977, true },
+  { 29993, true },
   { 30004, true },
-  { 30018, true },
-  { 30034, true },
-  { 30045, true },
+  { 30017, true },
+  { 30032, true },
+  { 30046, true },
   { 30058, true },
-  { 30072, true },
-  { 30084, true },
-  { 30096, true },
-  { 30120, true },
-  { 30133, true },
-  { 30147, true },
-  { 30160, true },
-  { 30181, true },
-  { 30201, true },
-  { 30215, true },
-  { 30230, true },
-  { 30239, true },
-  { 30250, true },
-  { 30260, true },
-  { 30270, true },
-  { 30284, true },
-  { 30301, true },
-  { 30319, true },
-  { 30344, true },
+  { 30070, true },
+  { 30094, true },
+  { 30107, true },
+  { 30121, true },
+  { 30134, true },
+  { 30155, true },
+  { 30175, true },
+  { 30189, true },
+  { 30204, true },
+  { 30213, true },
+  { 30224, true },
+  { 30234, true },
+  { 30244, true },
+  { 30258, true },
+  { 30275, true },
+  { 30293, true },
+  { 30318, true },
+  { 30340, true },
+  { 30353, true },
   { 30366, true },
-  { 30379, true },
-  { 30392, true },
-  { 30403, true },
-  { 30411, true },
-  { 30430, true },
-  { 30440, true },
-  { 30453, true },
+  { 30377, true },
+  { 30385, true },
+  { 30404, true },
+  { 30414, true },
+  { 30427, true },
+  { 30444, true },
+  { 30457, true },
   { 30470, true },
-  { 30483, true },
-  { 30496, true },
-  { 30514, true },
-  { 30524, true },
-  { 30541, true },
-  { 30557, true },
-  { 30569, true },
-  { 30581, true },
-  { 30591, true },
-  { 30602, true },
-  { 30616, true },
-  { 30640, true },
-  { 30655, true },
-  { 30673, true },
-  { 30688, true },
+  { 30488, true },
+  { 30498, true },
+  { 30515, true },
+  { 30531, true },
+  { 30543, true },
+  { 30555, true },
+  { 30565, true },
+  { 30576, true },
+  { 30590, true },
+  { 30614, true },
+  { 30629, true },
+  { 30647, true },
+  { 30662, true },
+  { 30684, true },
+  { 30694, true },
   { 30710, true },
-  { 30720, true },
-  { 30736, true },
-  { 30747, true },
-  { 30768, true },
-  { 30788, true },
-  { 30799, true },
-  { 30818, true },
-  { 30830, true },
-  { 30838, false },
-  { 30850, true },
-  { 30867, true },
-  { 30879, true },
-  { 30898, true },
-  { 30912, true },
-  { 30940, true },
-  { 30955, true },
-  { 30970, true },
-  { 30985, true },
-  { 31000, true },
-  { 31012, false },
-  { 31021, true },
-  { 31035, true },
-  { 31047, true },
-  { 31059, true },
-  { 31067, true },
-  { 31082, true },
-  { 31094, true },
-  { 31103, true },
-  { 31115, true },
-  { 31129, true },
-  { 31145, true },
-  { 31157, true },
-  { 31175, true },
-  { 31187, true },
-  { 31201, true },
-  { 31221, true },
-  { 31233, true },
-  { 31247, true },
-  { 31255, true },
-  { 31272, true },
-  { 31281, true },
-  { 31300, true },
-  { 31326, true },
-  { 31336, true },
-  { 31348, true },
-  { 31370, false },
-  { 31384, true },
-  { 31400, true },
-  { 31417, true },
-  { 31429, true },
-  { 31447, false },
-  { 31469, false },
-  { 31494, false },
-  { 31518, true },
-  { 31530, true },
+  { 30721, true },
+  { 30742, true },
+  { 30755, true },
+  { 30775, true },
+  { 30786, true },
+  { 30805, true },
+  { 30817, true },
+  { 30825, false },
+  { 30837, true },
+  { 30854, true },
+  { 30866, true },
+  { 30885, true },
+  { 30899, true },
+  { 30927, true },
+  { 30942, true },
+  { 30957, true },
+  { 30972, true },
+  { 30987, true },
+  { 30999, false },
+  { 31008, true },
+  { 31022, true },
+  { 31034, true },
+  { 31046, true },
+  { 31054, true },
+  { 31069, true },
+  { 31081, true },
+  { 31090, true },
+  { 31102, true },
+  { 31116, true },
+  { 31132, true },
+  { 31144, true },
+  { 31162, true },
+  { 31174, true },
+  { 31188, true },
+  { 31208, true },
+  { 31220, true },
+  { 31234, true },
+  { 31242, true },
+  { 31259, true },
+  { 31268, true },
+  { 31287, true },
+  { 31313, true },
+  { 31323, true },
+  { 31335, true },
+  { 31357, false },
+  { 31371, true },
+  { 31387, true },
+  { 31404, true },
+  { 31416, true },
+  { 31434, false },
+  { 31456, false },
+  { 31481, false },
+  { 31505, true },
+  { 31517, true },
+  { 31527, true },
   { 31540, true },
-  { 31553, true },
-  { 31563, true },
-  { 31573, true },
-  { 31583, true },
-  { 31593, true },
-  { 31603, true },
-  { 31613, true },
-  { 31623, true },
-  { 31637, true },
-  { 31655, true },
-  { 31670, true },
-  { 31684, true },
-  { 31702, true },
-  { 31714, true },
-  { 31726, true },
-  { 31737, true },
-  { 31751, true },
-  { 31766, true },
-  { 31780, true },
-  { 31787, true },
-  { 31801, false },
-  { 31821, true },
-  { 31832, true },
-  { 31853, true },
-  { 31872, true },
-  { 31887, true },
-  { 31899, true },
-  { 31924, true },
-  { 31941, true },
-  { 31956, true },
-  { 31967, true },
-  { 31981, true },
-  { 31993, true },
-  { 32006, false },
-  { 32019, true },
-  { 32036, true },
+  { 31550, true },
+  { 31560, true },
+  { 31570, true },
+  { 31580, true },
+  { 31590, true },
+  { 31600, true },
+  { 31610, true },
+  { 31624, true },
+  { 31642, true },
+  { 31657, true },
+  { 31671, true },
+  { 31689, true },
+  { 31701, true },
+  { 31713, true },
+  { 31724, true },
+  { 31738, true },
+  { 31753, true },
+  { 31767, true },
+  { 31774, true },
+  { 31788, false },
+  { 31808, true },
+  { 31819, true },
+  { 31840, true },
+  { 31859, true },
+  { 31874, true },
+  { 31886, true },
+  { 31911, true },
+  { 31928, true },
+  { 31943, true },
+  { 31954, true },
+  { 31968, true },
+  { 31980, true },
+  { 31993, false },
+  { 32006, true },
+  { 32023, true },
+  { 32039, true },
   { 32052, true },
-  { 32065, true },
-  { 32077, true },
-  { 32093, true },
-  { 32108, true },
-  { 32118, true },
-  { 32132, true },
-  { 32148, true },
-  { 32167, true },
-  { 32181, true },
-  { 32198, true },
-  { 32217, true },
-  { 32227, true },
-  { 32247, true },
-  { 32259, true },
-  { 32275, true },
-  { 32303, false },
+  { 32064, true },
+  { 32080, true },
+  { 32095, true },
+  { 32105, true },
+  { 32119, true },
+  { 32135, true },
+  { 32154, true },
+  { 32168, true },
+  { 32185, true },
+  { 32204, true },
+  { 32214, true },
+  { 32234, true },
+  { 32246, true },
+  { 32262, true },
+  { 32290, false },
+  { 32302, true },
   { 32315, true },
-  { 32328, true },
-  { 32342, true },
-  { 32359, true },
-  { 32376, true },
-  { 32385, true },
-  { 32395, true },
-  { 32412, true },
-  { 32421, true },
-  { 32428, true },
-  { 32438, true },
-  { 32453, true },
-  { 32464, false },
-  { 32480, true },
-  { 32497, true },
-  { 32511, true },
-  { 32521, true },
-  { 32531, true },
-  { 32551, true },
-  { 32571, true },
-  { 32582, true },
-  { 32597, true },
-  { 32616, true },
-  { 32634, true },
+  { 32329, true },
+  { 32346, true },
+  { 32363, true },
+  { 32372, true },
+  { 32382, true },
+  { 32399, true },
+  { 32408, true },
+  { 32415, true },
+  { 32425, true },
+  { 32440, true },
+  { 32451, false },
+  { 32467, true },
+  { 32484, true },
+  { 32498, true },
+  { 32508, true },
+  { 32518, true },
+  { 32538, true },
+  { 32558, true },
+  { 32569, true },
+  { 32584, true },
+  { 32603, true },
+  { 32621, true },
+  { 32636, true },
   { 32649, true },
-  { 32662, true },
-  { 32677, true },
-  { 32693, true },
-  { 32719, true },
-  { 32736, true },
+  { 32664, true },
+  { 32680, true },
+  { 32706, true },
+  { 32723, true },
+  { 32740, true },
   { 32753, true },
-  { 32766, true },
-  { 32774, true },
-  { 32797, true },
-  { 32811, true },
-  { 32821, true },
-  { 32846, true },
-  { 32863, false },
-  { 32884, false },
-  { 32906, false },
-  { 32925, false },
-  { 32943, true },
-  { 32959, true },
-  { 32983, true },
-  { 33011, true },
+  { 32761, true },
+  { 32784, true },
+  { 32798, true },
+  { 32808, true },
+  { 32833, true },
+  { 32850, false },
+  { 32871, false },
+  { 32893, false },
+  { 32912, false },
+  { 32930, true },
+  { 32946, true },
+  { 32970, true },
+  { 32998, true },
+  { 33009, true },
   { 33022, true },
-  { 33035, true },
-  { 33050, true },
-  { 33074, true },
-  { 33093, true },
-  { 33116, true },
-  { 33134, true },
-  { 33158, true },
-  { 33172, true },
-  { 33183, true },
-  { 33205, true },
-  { 33212, true },
-  { 33230, true },
-  { 33245, true },
+  { 33037, true },
+  { 33061, true },
+  { 33080, true },
+  { 33103, true },
+  { 33121, true },
+  { 33145, true },
+  { 33159, true },
+  { 33170, true },
+  { 33192, true },
+  { 33199, true },
+  { 33217, true },
+  { 33232, true },
+  { 33247, true },
   { 33260, true },
   { 33273, true },
-  { 33286, true },
-  { 33301, true },
-  { 33316, true },
-  { 33335, true },
-  { 33362, true },
-  { 33374, true },
-  { 33389, true },
-  { 33408, true },
-  { 33426, true },
-  { 33434, true },
-  { 33442, true },
-  { 33451, true },
-  { 33463, true },
-  { 33475, true },
-  { 33489, true },
-  { 33507, true },
-  { 33525, true },
-  { 33540, true },
-  { 33555, true },
-  { 33564, true },
-  { 33580, true },
-  { 33597, true },
-  { 33606, true },
+  { 33288, true },
+  { 33303, true },
+  { 33322, true },
+  { 33349, true },
+  { 33361, true },
+  { 33376, true },
+  { 33395, true },
+  { 33413, true },
+  { 33421, true },
+  { 33429, true },
+  { 33438, true },
+  { 33450, true },
+  { 33462, true },
+  { 33476, true },
+  { 33494, true },
+  { 33512, true },
+  { 33527, true },
+  { 33542, true },
+  { 33551, true },
+  { 33567, true },
+  { 33584, true },
+  { 33593, true },
+  { 33604, true },
   { 33617, true },
-  { 33630, true },
-  { 33642, true },
-  { 33652, true },
-  { 33672, true },
-  { 33685, false },
-  { 33699, true },
-  { 33715, true },
-  { 33727, true },
-  { 33737, true },
-  { 33753, false },
-  { 33760, true },
-  { 33770, true },
-  { 33784, true },
-  { 33799, true },
+  { 33629, true },
+  { 33639, true },
+  { 33659, true },
+  { 33672, false },
+  { 33686, true },
+  { 33702, true },
+  { 33714, true },
+  { 33724, true },
+  { 33740, false },
+  { 33747, true },
+  { 33757, true },
+  { 33771, true },
+  { 33786, true },
+  { 33794, true },
   { 33807, true },
-  { 33820, true },
-  { 33828, true },
-  { 33838, true },
-  { 33856, true },
-  { 33874, true },
+  { 33815, true },
+  { 33825, true },
+  { 33843, true },
+  { 33861, true },
+  { 33872, true },
   { 33885, true },
   { 33898, true },
-  { 33911, true },
-  { 33928, true },
-  { 33942, true },
-  { 33951, true },
-  { 33966, true },
-  { 33995, true },
-  { 34012, true },
-  { 34030, true },
-  { 34040, true },
-  { 34054, true },
-  { 34066, true },
-  { 34077, true },
-  { 34088, true },
-  { 34115, true },
-  { 34135, true },
-  { 34152, true },
-  { 34166, true },
-  { 34188, true },
+  { 33915, true },
+  { 33929, true },
+  { 33938, true },
+  { 33953, true },
+  { 33982, true },
+  { 33999, true },
+  { 34017, true },
+  { 34027, true },
+  { 34041, true },
+  { 34053, true },
+  { 34064, true },
+  { 34075, true },
+  { 34102, true },
+  { 34122, true },
+  { 34139, true },
+  { 34153, true },
+  { 34175, true },
+  { 34200, true },
   { 34213, true },
   { 34226, true },
-  { 34239, true },
-  { 34256, true },
-  { 34274, true },
-  { 34289, true },
-  { 34304, true },
-  { 34315, true },
-  { 34325, true },
-  { 34346, true },
-  { 34356, false },
-  { 34375, true },
-  { 34387, true },
-  { 34402, true },
-  { 34431, true },
-  { 34449, true },
-  { 34467, true },
-  { 34485, true },
-  { 34503, true },
-  { 34521, true },
-  { 34539, true },
-  { 34560, true },
-  { 34574, true },
-  { 34588, true },
-  { 34596, true },
+  { 34243, true },
+  { 34261, true },
+  { 34276, true },
+  { 34291, true },
+  { 34302, true },
+  { 34312, true },
+  { 34333, true },
+  { 34343, false },
+  { 34362, true },
+  { 34374, true },
+  { 34389, true },
+  { 34418, true },
+  { 34436, true },
+  { 34454, true },
+  { 34472, true },
+  { 34490, true },
+  { 34508, true },
+  { 34526, true },
+  { 34547, true },
+  { 34561, true },
+  { 34575, true },
+  { 34583, true },
+  { 34593, true },
   { 34606, true },
-  { 34619, true },
-  { 34631, true },
-  { 34643, true },
-  { 34659, true },
-  { 34673, true },
-  { 34695, true },
+  { 34618, true },
+  { 34630, true },
+  { 34646, true },
+  { 34660, true },
+  { 34682, true },
+  { 34701, true },
   { 34714, true },
-  { 34727, true },
-  { 34746, true },
-  { 34761, true },
-  { 34779, true },
-  { 34790, true },
-  { 34803, false },
-  { 34813, true },
-  { 34835, true },
-  { 34849, true },
-  { 34872, true },
-  { 34888, true },
-  { 34903, true },
+  { 34733, true },
+  { 34748, true },
+  { 34766, true },
+  { 34777, true },
+  { 34790, false },
+  { 34800, true },
+  { 34822, true },
+  { 34836, true },
+  { 34859, true },
+  { 34875, true },
+  { 34890, true },
+  { 34906, true },
   { 34919, true },
-  { 34932, true },
-  { 34949, true },
-  { 34960, false },
+  { 34936, true },
+  { 34947, false },
+  { 34955, true },
   { 34968, true },
-  { 34981, true },
-  { 34996, true },
-  { 35012, true },
-  { 35032, true },
-  { 35046, true },
-  { 35054, true },
+  { 34983, true },
+  { 34999, true },
+  { 35019, true },
+  { 35033, true },
+  { 35041, true },
+  { 35056, true },
   { 35069, true },
-  { 35082, true },
+  { 35081, true },
   { 35094, true },
-  { 35107, true },
+  { 35105, true },
   { 35118, true },
-  { 35131, true },
-  { 35151, false },
-  { 35173, true },
-  { 35197, true },
-  { 35217, true },
-  { 35240, true },
-  { 35258, true },
-  { 35273, true },
-  { 35300, true },
-  { 35316, true },
-  { 35334, true },
-  { 35363, true },
-  { 35375, true },
-  { 35391, true },
-  { 35402, true },
+  { 35138, false },
+  { 35160, true },
+  { 35184, true },
+  { 35204, true },
+  { 35227, true },
+  { 35245, true },
+  { 35260, true },
+  { 35287, true },
+  { 35303, true },
+  { 35321, true },
+  { 35350, true },
+  { 35362, true },
+  { 35378, true },
+  { 35389, true },
+  { 35401, true },
   { 35414, true },
   { 35427, true },
-  { 35440, true },
-  { 35457, true },
-  { 35468, true },
+  { 35444, true },
+  { 35455, true },
+  { 35473, true },
   { 35486, true },
-  { 35499, true },
-  { 35508, true },
-  { 35525, true },
-  { 35534, true },
-  { 35551, true },
-  { 35559, true },
-  { 35567, true },
-  { 35576, true },
-  { 35585, true },
-  { 35594, true },
-  { 35604, true },
-  { 35628, true },
-  { 35638, true },
-  { 35648, true },
-  { 35661, true },
-  { 35671, true },
-  { 35684, true },
-  { 35696, true },
-  { 35710, true },
-  { 35724, true },
-  { 35742, true },
-  { 35757, true },
-  { 35771, true },
-  { 35783, true },
-  { 35799, true },
-  { 35812, true },
-  { 35827, true },
-  { 35839, true },
-  { 35854, true },
-  { 35868, true },
-  { 35877, true },
-  { 35886, true },
-  { 35900, true },
-  { 35909, true },
-  { 35923, true },
-  { 35933, true },
-  { 35946, true },
-  { 35961, true },
-  { 35974, true },
-  { 35984, true },
-  { 35997, true },
-  { 36012, true },
-  { 36027, true },
-  { 36041, true },
-  { 36056, true },
-  { 36075, true },
-  { 36091, true },
-  { 36105, true },
-  { 36121, true },
-  { 36136, true },
-  { 36147, true },
-  { 36161, true },
-  { 36171, true },
-  { 36182, true },
-  { 36194, true },
-  { 36210, true },
-  { 36224, true },
-  { 36229, true },
-  { 36240, true },
-  { 36248, true },
-  { 36256, true },
-  { 36263, true },
-  { 36269, true },
-  { 36279, true },
-  { 36288, true },
-  { 36298, true },
-  { 36327, true },
-  { 36342, false },
-  { 36362, true },
-  { 36372, true },
-  { 36385, true },
-  { 36403, true },
-  { 36423, true },
-  { 36439, true },
-  { 36451, true },
-  { 36463, true },
-  { 36476, true },
-  { 36487, true },
-  { 36498, true },
-  { 36510, true },
-  { 36521, true },
-  { 36535, true },
-  { 36553, false },
-  { 36569, true },
-  { 36584, true },
-  { 36599, true },
-  { 36619, true },
-  { 36629, true },
-  { 36649, true },
-  { 36657, true },
-  { 36668, false },
-  { 36678, true },
-  { 36690, true },
+  { 35495, true },
+  { 35512, true },
+  { 35521, true },
+  { 35538, true },
+  { 35546, true },
+  { 35554, true },
+  { 35563, true },
+  { 35572, true },
+  { 35581, true },
+  { 35591, true },
+  { 35615, true },
+  { 35625, true },
+  { 35635, true },
+  { 35644, true },
+  { 35657, true },
+  { 35667, true },
+  { 35680, true },
+  { 35692, true },
+  { 35706, true },
+  { 35720, true },
+  { 35738, true },
+  { 35753, true },
+  { 35767, true },
+  { 35779, true },
+  { 35795, true },
+  { 35808, true },
+  { 35823, true },
+  { 35835, true },
+  { 35850, true },
+  { 35864, true },
+  { 35873, true },
+  { 35882, true },
+  { 35896, true },
+  { 35905, true },
+  { 35919, true },
+  { 35929, true },
+  { 35942, true },
+  { 35957, true },
+  { 35970, true },
+  { 35980, true },
+  { 35993, true },
+  { 36008, true },
+  { 36023, true },
+  { 36037, true },
+  { 36052, true },
+  { 36071, true },
+  { 36087, true },
+  { 36101, true },
+  { 36117, true },
+  { 36132, true },
+  { 36143, true },
+  { 36157, true },
+  { 36167, true },
+  { 36178, true },
+  { 36190, true },
+  { 36206, true },
+  { 36220, true },
+  { 36225, true },
+  { 36236, true },
+  { 36244, true },
+  { 36252, true },
+  { 36259, true },
+  { 36265, true },
+  { 36275, true },
+  { 36284, true },
+  { 36294, true },
+  { 36323, true },
+  { 36338, false },
+  { 36358, true },
+  { 36368, true },
+  { 36381, true },
+  { 36399, true },
+  { 36419, true },
+  { 36435, true },
+  { 36447, true },
+  { 36459, true },
+  { 36472, true },
+  { 36483, true },
+  { 36494, true },
+  { 36506, true },
+  { 36517, true },
+  { 36531, true },
+  { 36549, false },
+  { 36565, true },
+  { 36580, true },
+  { 36595, true },
+  { 36615, true },
+  { 36625, true },
+  { 36645, true },
+  { 36653, true },
+  { 36664, true },
+  { 36676, true },
+  { 36685, true },
   { 36699, true },
   { 36713, true },
-  { 36727, true },
-  { 36743, true },
-  { 36754, true },
-  { 36773, true },
-  { 36781, true },
-  { 36805, true },
+  { 36729, true },
+  { 36740, true },
+  { 36759, true },
+  { 36767, true },
+  { 36791, true },
+  { 36810, true },
   { 36824, true },
-  { 36838, true },
-  { 36855, false },
-  { 36871, true },
-  { 36888, true },
-  { 36899, true },
-  { 36911, false },
-  { 36926, true },
-  { 36938, true },
-  { 36957, true },
-  { 36965, true },
+  { 36841, false },
+  { 36857, true },
+  { 36874, true },
+  { 36885, true },
+  { 36897, false },
+  { 36912, true },
+  { 36924, true },
+  { 36943, true },
+  { 36951, true },
+  { 36963, true },
   { 36977, true },
-  { 36991, true },
-  { 37003, true },
+  { 36989, true },
+  { 37000, true },
   { 37014, true },
-  { 37028, true },
-  { 37041, true },
-  { 37053, true },
-  { 37066, true },
-  { 37086, true },
-  { 37096, true },
-  { 37115, true },
-  { 37133, true },
-  { 37144, true },
-  { 37156, true },
-  { 37173, true },
-  { 37196, true },
-  { 37219, true },
-  { 37230, true },
-  { 37242, true },
-  { 37253, true },
-  { 37269, true },
-  { 37285, false },
-  { 37308, true },
-  { 37328, true },
+  { 37027, true },
+  { 37039, true },
+  { 37052, true },
+  { 37072, true },
+  { 37082, true },
+  { 37101, true },
+  { 37119, true },
+  { 37130, true },
+  { 37142, true },
+  { 37159, true },
+  { 37182, true },
+  { 37205, true },
+  { 37216, true },
+  { 37228, true },
+  { 37239, true },
+  { 37255, true },
+  { 37271, false },
+  { 37294, true },
+  { 37314, true },
+  { 37329, true },
   { 37343, true },
-  { 37357, true },
-  { 37372, true },
-  { 37395, true },
-  { 37423, true },
-  { 37442, true },
-  { 37460, true },
-  { 37477, true },
-  { 37503, true },
-  { 37522, true },
-  { 37540, true },
+  { 37358, true },
+  { 37381, true },
+  { 37409, true },
+  { 37428, true },
+  { 37446, true },
+  { 37463, true },
+  { 37489, true },
+  { 37508, true },
+  { 37526, true },
+  { 37542, true },
   { 37556, true },
-  { 37570, true },
-  { 37591, true },
-  { 37607, true },
-  { 37632, true },
-  { 37650, true },
-  { 37669, true },
-  { 37695, false },
-  { 37709, true },
-  { 37727, true },
-  { 37736, true },
-  { 37748, true },
-  { 37761, true },
-  { 37774, true },
-  { 37786, true },
-  { 37806, true },
-  { 37821, true },
-  { 37844, true },
-  { 37857, true },
-  { 37869, true },
-  { 37881, true },
-  { 37896, true },
+  { 37577, true },
+  { 37593, true },
+  { 37618, true },
+  { 37636, true },
+  { 37655, true },
+  { 37681, false },
+  { 37695, true },
+  { 37713, true },
+  { 37722, true },
+  { 37734, true },
+  { 37747, true },
+  { 37760, true },
+  { 37772, true },
+  { 37792, true },
+  { 37807, true },
+  { 37830, true },
+  { 37843, true },
+  { 37855, true },
+  { 37867, true },
+  { 37882, true },
+  { 37895, true },
   { 37909, true },
-  { 37923, true },
-  { 37933, true },
-  { 37946, true },
-  { 37954, true },
-  { 37961, true },
-  { 37986, true },
-  { 38012, true },
-  { 38024, true },
-  { 38045, true },
-  { 38057, true },
-  { 38072, true },
-  { 38088, true },
-  { 38114, true },
-  { 38126, true },
-  { 38148, true },
-  { 38168, true },
-  { 38180, true },
-  { 38190, true },
-  { 38203, true },
+  { 37919, true },
+  { 37932, true },
+  { 37940, true },
+  { 37947, true },
+  { 37972, true },
+  { 37998, true },
+  { 38010, true },
+  { 38031, true },
+  { 38043, true },
+  { 38058, true },
+  { 38074, true },
+  { 38100, true },
+  { 38112, true },
+  { 38134, true },
+  { 38154, true },
+  { 38166, true },
+  { 38176, true },
+  { 38189, true },
+  { 38197, true },
   { 38211, true },
   { 38225, true },
-  { 38239, true },
-  { 38263, true },
-  { 38274, true },
-  { 38291, true },
-  { 38304, true },
-  { 38313, true },
-  { 38328, true },
-  { 38350, true },
-  { 38373, true },
-  { 38397, true },
-  { 38420, true },
-  { 38433, true },
-  { 38451, false },
-  { 38466, true },
+  { 38249, true },
+  { 38260, true },
+  { 38277, true },
+  { 38290, true },
+  { 38299, true },
+  { 38314, true },
+  { 38336, true },
+  { 38359, true },
+  { 38383, true },
+  { 38406, true },
+  { 38419, true },
+  { 38437, false },
+  { 38452, true },
+  { 38465, true },
   { 38479, true },
   { 38493, true },
   { 38507, true },
   { 38521, true },
-  { 38535, true },
-  { 38555, true },
-  { 38570, true },
-  { 38586, true },
-  { 38597, true },
-  { 38607, true },
-  { 38617, true },
-  { 38627, true },
-  { 38637, true },
-  { 38660, true },
-  { 38676, true },
+  { 38541, true },
+  { 38556, true },
+  { 38572, true },
+  { 38583, true },
+  { 38593, true },
+  { 38603, true },
+  { 38613, true },
+  { 38623, true },
+  { 38646, true },
+  { 38662, true },
+  { 38673, true },
   { 38687, true },
-  { 38701, true },
-  { 38711, true },
-  { 38720, false },
-  { 38733, true },
-  { 38750, true },
+  { 38697, true },
+  { 38706, false },
+  { 38719, true },
+  { 38736, true },
+  { 38755, true },
   { 38769, true },
   { 38783, true },
-  { 38797, true },
-  { 38809, true },
-  { 38828, true },
-  { 38845, true },
-  { 38858, true },
-  { 38875, true },
-  { 38884, true },
-  { 38904, true },
-  { 38926, true },
-  { 38939, true },
-  { 38960, true },
-  { 38971, true },
-  { 38982, true },
-  { 38994, true },
-  { 39006, true },
-  { 39017, true },
+  { 38795, true },
+  { 38814, true },
+  { 38831, true },
+  { 38844, true },
+  { 38861, true },
+  { 38870, true },
+  { 38890, true },
+  { 38912, true },
+  { 38925, true },
+  { 38946, true },
+  { 38957, true },
+  { 38968, true },
+  { 38980, true },
+  { 38992, true },
+  { 39003, true },
+  { 39021, true },
   { 39035, true },
-  { 39049, true },
-  { 39060, true },
-  { 39076, true },
-  { 39093, true },
-  { 39121, true },
-  { 39137, true },
-  { 39146, true },
+  { 39046, true },
+  { 39062, true },
+  { 39079, true },
+  { 39107, true },
+  { 39123, true },
+  { 39132, true },
+  { 39147, true },
   { 39161, true },
-  { 39175, true },
-  { 39196, true },
-  { 39213, true },
-  { 39230, true },
-  { 39246, true },
-  { 39259, true },
-  { 39272, true },
-  { 39284, true },
-  { 39297, true },
-  { 39310, true },
-  { 39323, true },
-  { 39346, true },
-  { 39358, true },
-  { 39370, true },
-  { 39389, true },
-  { 39404, true },
-  { 39420, true },
-  { 39441, true },
-  { 39459, true },
-  { 39470, true },
-  { 39478, false },
-  { 39501, true },
-  { 39518, true },
-  { 39535, true },
-  { 39548, true },
-  { 39565, true },
-  { 39576, true },
-  { 39587, true },
-  { 39599, false },
-  { 39609, true },
-  { 39625, false },
-  { 39636, true },
-  { 39667, true },
-  { 39704, true },
-  { 39719, true },
-  { 39728, true },
-  { 39741, true },
-  { 39775, true },
-  { 39785, true },
+  { 39182, true },
+  { 39199, true },
+  { 39216, true },
+  { 39232, true },
+  { 39245, true },
+  { 39258, true },
+  { 39270, true },
+  { 39283, true },
+  { 39296, true },
+  { 39309, true },
+  { 39332, true },
+  { 39344, true },
+  { 39356, true },
+  { 39375, true },
+  { 39390, true },
+  { 39406, true },
+  { 39427, true },
+  { 39445, true },
+  { 39456, true },
+  { 39464, false },
+  { 39487, true },
+  { 39504, true },
+  { 39521, true },
+  { 39534, true },
+  { 39551, true },
+  { 39562, true },
+  { 39573, true },
+  { 39585, false },
+  { 39595, true },
+  { 39611, false },
+  { 39622, true },
+  { 39653, true },
+  { 39690, true },
+  { 39699, true },
+  { 39712, true },
+  { 39746, true },
+  { 39756, true },
+  { 39774, true },
+  { 39792, true },
   { 39803, true },
-  { 39821, true },
-  { 39832, true },
-  { 39842, true },
-  { 39853, true },
-  { 39862, true },
-  { 39874, true },
-  { 39900, true },
-  { 39909, true },
-  { 39925, true },
-  { 39933, false },
-  { 39941, true },
-  { 39952, true },
-  { 39962, true },
-  { 39976, true },
-  { 39989, true },
-  { 40006, true },
-  { 40020, true },
+  { 39813, true },
+  { 39824, true },
+  { 39833, true },
+  { 39845, true },
+  { 39871, true },
+  { 39880, true },
+  { 39896, true },
+  { 39904, false },
+  { 39912, true },
+  { 39923, true },
+  { 39933, true },
+  { 39947, true },
+  { 39960, true },
+  { 39977, true },
+  { 39991, true },
+  { 40001, true },
+  { 40016, true },
   { 40030, true },
-  { 40045, true },
-  { 40059, true },
-  { 40073, true },
+  { 40044, true },
+  { 40057, true },
+  { 40068, true },
+  { 40078, true },
   { 40086, true },
-  { 40097, true },
-  { 40107, true },
-  { 40115, true },
-  { 40129, true },
-  { 40150, true },
-  { 40164, true },
-  { 40180, true },
-  { 40187, true },
-  { 40197, true },
-  { 40212, false },
+  { 40100, true },
+  { 40121, true },
+  { 40137, true },
+  { 40144, true },
+  { 40154, true },
+  { 40169, false },
+  { 40179, true },
+  { 40190, true },
+  { 40209, false },
   { 40222, true },
-  { 40233, true },
-  { 40252, false },
-  { 40265, true },
-  { 40285, true },
-  { 40303, true },
-  { 40319, true },
-  { 40330, true },
-  { 40348, true },
-  { 40356, true },
-  { 40372, true },
-  { 40388, true },
-  { 40398, true },
-  { 40420, true },
-  { 40440, false },
-  { 40457, true },
-  { 40468, true },
-  { 40480, true },
-  { 40492, true },
-  { 40506, true },
-  { 40522, true },
-  { 40538, true },
-  { 40554, true },
-  { 40573, true },
-  { 40590, true },
-  { 40605, true },
-  { 40624, true },
-  { 40639, true },
-  { 40654, true },
-  { 40675, true },
-  { 40693, true },
-  { 40712, true },
-  { 40724, true },
-  { 40737, true },
-  { 40750, true },
-  { 40764, true },
+  { 40242, true },
+  { 40260, true },
+  { 40276, true },
+  { 40287, true },
+  { 40305, true },
+  { 40313, true },
+  { 40329, true },
+  { 40345, true },
+  { 40355, true },
+  { 40377, true },
+  { 40397, false },
+  { 40414, true },
+  { 40425, true },
+  { 40437, true },
+  { 40449, true },
+  { 40463, true },
+  { 40479, true },
+  { 40495, true },
+  { 40511, true },
+  { 40530, true },
+  { 40547, true },
+  { 40562, true },
+  { 40581, true },
+  { 40596, true },
+  { 40611, true },
+  { 40632, true },
+  { 40650, true },
+  { 40669, true },
+  { 40681, true },
+  { 40694, true },
+  { 40707, true },
+  { 40721, true },
+  { 40735, true },
+  { 40746, true },
+  { 40759, true },
   { 40778, true },
-  { 40789, true },
-  { 40808, true },
-  { 40826, true },
-  { 40840, true },
-  { 40857, true },
-  { 40872, true },
-  { 40886, true },
-  { 40900, true },
-  { 40913, true },
-  { 40936, true },
-  { 40946, true },
-  { 40963, true },
-  { 40979, true },
-  { 40995, true },
-  { 41010, true },
-  { 41020, true },
-  { 41035, true },
-  { 41047, true },
-  { 41058, true },
-  { 41070, false },
-  { 41078, true },
-  { 41099, true },
-  { 41109, true },
-  { 41117, true },
-  { 41128, true },
+  { 40796, true },
+  { 40810, true },
+  { 40827, true },
+  { 40842, true },
+  { 40856, true },
+  { 40870, true },
+  { 40883, true },
+  { 40906, true },
+  { 40916, true },
+  { 40933, true },
+  { 40949, true },
+  { 40965, true },
+  { 40980, true },
+  { 40990, true },
+  { 41005, true },
+  { 41017, true },
+  { 41028, true },
+  { 41040, false },
+  { 41048, true },
+  { 41069, true },
+  { 41079, true },
+  { 41087, true },
+  { 41098, true },
+  { 41111, true },
+  { 41119, true },
+  { 41127, true },
   { 41141, true },
-  { 41149, true },
-  { 41157, true },
+  { 41155, true },
+  { 41163, true },
   { 41171, true },
   { 41185, true },
-  { 41193, true },
-  { 41201, true },
-  { 41215, true },
-  { 41235, true },
-  { 41243, true },
-  { 41252, false },
-  { 41272, true },
-  { 41290, true },
-  { 41317, true },
-  { 41335, false },
-  { 41353, true },
-  { 41373, true },
-  { 41385, true },
-  { 41397, true },
-  { 41413, true },
-  { 41428, true },
-  { 41441, true },
-  { 41455, true },
-  { 41472, true },
-  { 41489, true },
-  { 41507, true },
-  { 41526, true },
-  { 41547, true },
+  { 41205, true },
+  { 41213, true },
+  { 41222, false },
+  { 41242, true },
+  { 41260, true },
+  { 41287, true },
+  { 41305, false },
+  { 41323, true },
+  { 41343, true },
+  { 41355, true },
+  { 41367, true },
+  { 41383, true },
+  { 41398, true },
+  { 41411, true },
+  { 41425, true },
+  { 41442, true },
+  { 41459, true },
+  { 41477, true },
+  { 41496, true },
+  { 41517, true },
+  { 41527, true },
+  { 41540, true },
   { 41557, true },
   { 41570, true },
-  { 41587, true },
-  { 41600, true },
-  { 41614, true },
-  { 41627, true },
-  { 41641, true },
+  { 41584, true },
+  { 41597, true },
+  { 41611, true },
+  { 41630, true },
+  { 41640, true },
   { 41660, true },
-  { 41670, true },
-  { 41690, true },
-  { 41707, true },
-  { 41727, true },
-  { 41741, true },
-  { 41761, true },
-  { 41779, true },
-  { 41799, true },
-  { 41834, true },
-  { 41848, true },
-  { 41866, true },
+  { 41677, true },
+  { 41697, true },
+  { 41711, true },
+  { 41731, true },
+  { 41749, true },
+  { 41769, true },
+  { 41804, true },
+  { 41818, true },
+  { 41836, true },
+  { 41846, true },
   { 41876, true },
-  { 41906, true },
-  { 41921, true },
-  { 41932, true },
-  { 41944, true },
-  { 41957, true },
-  { 41973, true },
-  { 41986, true },
-  { 42015, true },
-  { 42026, true },
-  { 42040, true },
-  { 42055, true },
-  { 42075, true },
-  { 42090, true },
-  { 42104, true },
-  { 42118, true },
-  { 42135, true },
-  { 42152, true },
-  { 42169, true },
-  { 42180, true },
-  { 42196, true },
-  { 42211, true },
-  { 42221, false },
-  { 42232, true },
-  { 42240, true },
-  { 42248, true },
-  { 42269, true },
-  { 42290, true },
-  { 42311, false },
-  { 42327, true },
-  { 42340, true },
-  { 42355, true },
-  { 42367, false },
-  { 42388, true },
-  { 42408, true },
-  { 42430, true },
-  { 42444, true },
-  { 42462, true },
+  { 41891, true },
+  { 41902, true },
+  { 41914, true },
+  { 41927, true },
+  { 41943, true },
+  { 41956, true },
+  { 41985, true },
+  { 41996, true },
+  { 42010, true },
+  { 42025, true },
+  { 42045, true },
+  { 42060, true },
+  { 42074, true },
+  { 42088, true },
+  { 42105, true },
+  { 42122, true },
+  { 42139, true },
+  { 42150, true },
+  { 42166, true },
+  { 42181, true },
+  { 42191, false },
+  { 42202, true },
+  { 42210, true },
+  { 42218, true },
+  { 42239, true },
+  { 42260, true },
+  { 42281, false },
+  { 42297, true },
+  { 42310, true },
+  { 42325, true },
+  { 42337, false },
+  { 42358, true },
+  { 42378, true },
+  { 42400, true },
+  { 42414, true },
+  { 42432, true },
+  { 42452, true },
+  { 42468, true },
   { 42482, true },
   { 42498, true },
-  { 42512, true },
-  { 42528, true },
-  { 42546, true },
-  { 42561, true },
-  { 42572, true },
-  { 42583, true },
-  { 42596, true },
-  { 42609, true },
-  { 42623, true },
-  { 42638, true },
-  { 42655, true },
-  { 42672, true },
-  { 42687, true },
-  { 42706, true },
-  { 42722, true },
-  { 42734, true },
-  { 42744, true },
-  { 42755, false },
-  { 42777, true },
-  { 42785, true },
-  { 42801, true },
-  { 42816, true },
-  { 42832, true },
-  { 42842, true },
-  { 42859, true },
-  { 42873, true },
+  { 42516, true },
+  { 42531, true },
+  { 42542, true },
+  { 42553, true },
+  { 42566, true },
+  { 42579, true },
+  { 42593, true },
+  { 42608, true },
+  { 42625, true },
+  { 42642, true },
+  { 42657, true },
+  { 42676, true },
+  { 42692, true },
+  { 42704, true },
+  { 42714, true },
+  { 42725, false },
+  { 42747, true },
+  { 42755, true },
+  { 42771, true },
+  { 42786, true },
+  { 42802, true },
+  { 42812, true },
+  { 42829, true },
+  { 42843, true },
+  { 42858, true },
+  { 42876, true },
   { 42888, true },
-  { 42906, true },
-  { 42918, true },
-  { 42929, true },
-  { 42955, true },
-  { 42979, true },
-  { 42995, true },
-  { 43004, true },
-  { 43020, true },
+  { 42899, true },
+  { 42925, true },
+  { 42949, true },
+  { 42965, true },
+  { 42974, true },
+  { 42990, true },
+  { 43005, true },
+  { 43026, true },
   { 43035, true },
-  { 43056, true },
-  { 43065, true },
-  { 43080, true },
-  { 43093, false },
-  { 43103, true },
-  { 43122, true },
-  { 43136, true },
-  { 43156, true },
-  { 43171, true },
-  { 43180, true },
-  { 43198, true },
-  { 43220, false },
-  { 43242, true },
-  { 43251, true },
-  { 43270, true },
-  { 43282, false },
-  { 43298, true },
-  { 43322, false },
-  { 43336, true },
-  { 43352, true },
-  { 43371, true },
-  { 43383, true },
-  { 43398, true },
-  { 43416, true },
-  { 43431, true },
-  { 43444, true },
+  { 43050, true },
+  { 43063, false },
+  { 43073, true },
+  { 43092, true },
+  { 43106, true },
+  { 43126, true },
+  { 43141, true },
+  { 43150, true },
+  { 43168, true },
+  { 43190, false },
+  { 43212, true },
+  { 43221, true },
+  { 43240, true },
+  { 43252, false },
+  { 43268, true },
+  { 43292, false },
+  { 43306, true },
+  { 43322, true },
+  { 43341, true },
+  { 43353, true },
+  { 43368, true },
+  { 43386, true },
+  { 43401, true },
+  { 43414, true },
+  { 43426, true },
+  { 43438, true },
   { 43456, true },
-  { 43468, true },
-  { 43486, true },
-  { 43508, true },
-  { 43526, true },
-  { 43536, true },
-  { 43547, true },
-  { 43564, true },
-  { 43579, true },
-  { 43596, true },
-  { 43611, true },
-  { 43628, true },
-  { 43642, true },
-  { 43656, true },
-  { 43673, true },
-  { 43692, true },
-  { 43709, true },
-  { 43726, true },
-  { 43745, true },
-  { 43760, true },
-  { 43787, true },
-  { 43807, true },
-  { 43829, true },
-  { 43848, true },
-  { 43868, true },
-  { 43889, true },
-  { 43912, true },
-  { 43938, true },
-  { 43958, true },
-  { 43976, true },
-  { 43994, true },
-  { 44013, true },
-  { 44035, true },
-  { 44054, true },
-  { 44071, true },
-  { 44094, true },
-  { 44114, true },
-  { 44131, true },
-  { 44158, true },
-  { 44178, true },
-  { 44201, true },
-  { 44224, true },
+  { 43478, true },
+  { 43496, true },
+  { 43506, true },
+  { 43517, true },
+  { 43534, true },
+  { 43549, true },
+  { 43566, true },
+  { 43581, true },
+  { 43598, true },
+  { 43612, true },
+  { 43626, true },
+  { 43643, true },
+  { 43662, true },
+  { 43679, true },
+  { 43696, true },
+  { 43715, true },
+  { 43730, true },
+  { 43757, true },
+  { 43777, true },
+  { 43799, true },
+  { 43818, true },
+  { 43838, true },
+  { 43859, true },
+  { 43882, true },
+  { 43908, true },
+  { 43928, true },
+  { 43946, true },
+  { 43964, true },
+  { 43983, true },
+  { 44005, true },
+  { 44024, true },
+  { 44041, true },
+  { 44064, true },
+  { 44084, true },
+  { 44101, true },
+  { 44128, true },
+  { 44148, true },
+  { 44171, true },
+  { 44194, true },
+  { 44211, true },
+  { 44227, true },
   { 44241, true },
-  { 44257, true },
-  { 44271, true },
-  { 44285, true },
-  { 44298, true },
-  { 44335, false },
-  { 44346, true },
-  { 44364, true },
-  { 44384, true },
-  { 44407, true },
-  { 44432, false },
-  { 44463, true },
-  { 44477, true },
-  { 44491, true },
-  { 44502, true },
-  { 44511, true },
-  { 44522, true },
-  { 44534, true },
-  { 44550, true },
-  { 44562, true },
-  { 44571, true },
-  { 44583, true },
-  { 44600, true },
-  { 44612, true },
-  { 44633, true },
-  { 44647, true },
-  { 44665, false },
-  { 44673, true },
-  { 44684, true },
+  { 44255, true },
+  { 44268, true },
+  { 44305, false },
+  { 44316, true },
+  { 44334, true },
+  { 44354, true },
+  { 44377, true },
+  { 44402, false },
+  { 44433, true },
+  { 44447, true },
+  { 44461, true },
+  { 44472, true },
+  { 44481, true },
+  { 44492, true },
+  { 44504, true },
+  { 44520, true },
+  { 44532, true },
+  { 44541, true },
+  { 44553, true },
+  { 44570, true },
+  { 44582, true },
+  { 44603, true },
+  { 44617, true },
+  { 44635, false },
+  { 44643, true },
+  { 44654, true },
+  { 44668, true },
+  { 44687, true },
   { 44698, true },
-  { 44717, true },
+  { 44710, false },
   { 44728, true },
-  { 44740, false },
-  { 44758, true },
+  { 44741, true },
+  { 44754, true },
   { 44771, true },
-  { 44784, true },
-  { 44801, true },
-  { 44817, true },
-  { 44828, true },
-  { 44842, true },
-  { 44855, true },
-  { 44873, true },
+  { 44787, true },
+  { 44798, true },
+  { 44812, true },
+  { 44825, true },
+  { 44843, true },
+  { 44860, true },
+  { 44878, true },
   { 44890, true },
-  { 44908, true },
-  { 44920, true },
-  { 44935, true },
-  { 44943, true },
-  { 44963, true },
-  { 44977, true },
-  { 44989, true },
-  { 45001, true },
+  { 44905, true },
+  { 44913, true },
+  { 44933, true },
+  { 44947, true },
+  { 44959, true },
+  { 44971, true },
+  { 44983, true },
+  { 44992, true },
+  { 45002, true },
   { 45013, true },
-  { 45022, true },
-  { 45032, true },
-  { 45043, true },
-  { 45057, true },
-  { 45068, true },
-  { 45082, true },
-  { 45105, true },
-  { 45113, true },
-  { 45131, true },
-  { 45146, true },
-  { 45165, true },
-  { 45184, true },
-  { 45203, true },
-  { 45216, true },
-  { 45228, true },
-  { 45244, true },
-  { 45254, true },
-  { 45273, true },
-  { 45287, true },
-  { 45301, true },
-  { 45314, true },
-  { 45328, true },
-  { 45343, true },
-  { 45355, true },
-  { 45363, true },
-  { 45369, true },
-  { 45383, true },
-  { 45396, true },
-  { 45405, true },
-  { 45419, true },
-  { 45433, true },
-  { 45446, false },
-  { 45466, true },
-  { 45477, true },
-  { 45489, true },
-  { 45505, true },
-  { 45518, true },
+  { 45027, true },
+  { 45038, true },
+  { 45052, true },
+  { 45075, true },
+  { 45083, true },
+  { 45101, true },
+  { 45116, true },
+  { 45135, true },
+  { 45154, true },
+  { 45173, true },
+  { 45186, true },
+  { 45198, true },
+  { 45214, true },
+  { 45224, true },
+  { 45243, true },
+  { 45257, true },
+  { 45271, true },
+  { 45284, true },
+  { 45298, true },
+  { 45313, true },
+  { 45325, true },
+  { 45333, true },
+  { 45339, true },
+  { 45353, true },
+  { 45366, true },
+  { 45375, true },
+  { 45389, true },
+  { 45403, true },
+  { 45416, false },
+  { 45436, true },
+  { 45447, true },
+  { 45459, true },
+  { 45475, true },
+  { 45488, true },
+  { 45508, true },
+  { 45522, true },
   { 45538, true },
   { 45552, true },
-  { 45568, true },
-  { 45582, true },
-  { 45602, true },
-  { 45616, true },
-  { 45628, true },
-  { 45643, true },
-  { 45657, true },
-  { 45670, true },
-  { 45679, true },
-  { 45689, true },
-  { 45705, true },
-  { 45727, true },
-  { 45759, true },
-  { 45767, true },
-  { 45785, true },
-  { 45806, true },
-  { 45826, true },
-  { 45839, true },
-  { 45854, true },
-  { 45869, false },
+  { 45572, true },
+  { 45586, true },
+  { 45598, true },
+  { 45613, true },
+  { 45627, true },
+  { 45640, true },
+  { 45649, true },
+  { 45659, true },
+  { 45675, true },
+  { 45697, true },
+  { 45729, true },
+  { 45737, true },
+  { 45755, true },
+  { 45771, true },
+  { 45792, true },
+  { 45812, true },
+  { 45825, true },
+  { 45840, true },
+  { 45855, false },
+  { 45875, true },
   { 45889, true },
-  { 45903, true },
-  { 45922, true },
-  { 45941, true },
-  { 45956, true },
-  { 45969, true },
-  { 45984, true },
-  { 45996, true },
-  { 46011, true },
-  { 46034, true },
-  { 46050, true },
-  { 46073, true },
-  { 46092, true },
-  { 46104, false },
-  { 46125, true },
-  { 46144, false },
-  { 46152, true },
-  { 46161, true },
+  { 45908, true },
+  { 45927, true },
+  { 45942, true },
+  { 45955, true },
+  { 45970, true },
+  { 45982, true },
+  { 45997, true },
+  { 46020, true },
+  { 46036, true },
+  { 46059, true },
+  { 46078, true },
+  { 46090, false },
+  { 46111, true },
+  { 46130, false },
+  { 46138, true },
+  { 46147, true },
+  { 46160, true },
   { 46174, true },
-  { 46188, true },
-  { 46197, true },
-  { 46209, true },
-  { 46225, true },
-  { 46242, false },
-  { 46252, true },
-  { 46263, true },
-  { 46275, true },
-  { 46291, true },
-  { 46304, true },
-  { 46323, true },
-  { 46342, true },
-  { 46359, true },
-  { 46376, false },
-  { 46386, true },
-  { 46404, true },
-  { 46420, true },
-  { 46439, true },
+  { 46183, true },
+  { 46195, true },
+  { 46211, true },
+  { 46228, false },
+  { 46238, true },
+  { 46249, true },
+  { 46261, true },
+  { 46277, true },
+  { 46290, true },
+  { 46309, true },
+  { 46328, true },
+  { 46345, true },
+  { 46362, false },
+  { 46372, true },
+  { 46390, true },
+  { 46406, true },
+  { 46425, true },
+  { 46441, true },
   { 46455, true },
-  { 46469, true },
-  { 46486, true },
-  { 46508, true },
-  { 46520, true },
-  { 46533, true },
-  { 46554, true },
-  { 46576, true },
-  { 46593, true },
-  { 46615, true },
-  { 46631, true },
+  { 46472, true },
+  { 46494, true },
+  { 46506, true },
+  { 46519, true },
+  { 46540, true },
+  { 46562, true },
+  { 46579, true },
+  { 46601, true },
+  { 46617, true },
+  { 46632, true },
   { 46646, true },
-  { 46660, true },
-  { 46686, true },
-  { 46702, true },
-  { 46727, true },
-  { 46742, true },
-  { 46755, true },
-  { 46767, true },
-  { 46784, true },
-  { 46794, true },
-  { 46809, true },
-  { 46819, true },
+  { 46672, true },
+  { 46688, true },
+  { 46713, true },
+  { 46728, true },
+  { 46741, true },
+  { 46753, true },
+  { 46770, true },
+  { 46780, true },
+  { 46795, true },
+  { 46805, true },
+  { 46814, true },
   { 46828, true },
-  { 46842, true },
-  { 46853, true },
-  { 46864, true },
-  { 46880, true },
-  { 46895, true },
-  { 46910, true },
-  { 46922, true },
-  { 46935, true },
-  { 46945, true },
-  { 46958, true },
-  { 46967, true },
-  { 46979, true },
-  { 46995, true },
-  { 47006, true },
-  { 47018, true },
-  { 47035, true },
-  { 47048, true },
-  { 47061, true },
-  { 47072, true },
-  { 47081, true },
-  { 47089, true },
-  { 47105, true },
-  { 47115, true },
-  { 47129, false },
-  { 47149, true },
-  { 47169, true },
-  { 47193, true },
-  { 47214, true },
-  { 47222, true },
-  { 47243, true },
-  { 47253, true },
+  { 46839, true },
+  { 46850, true },
+  { 46866, true },
+  { 46881, true },
+  { 46896, true },
+  { 46908, true },
+  { 46921, true },
+  { 46931, true },
+  { 46944, true },
+  { 46953, true },
+  { 46965, true },
+  { 46981, true },
+  { 46992, true },
+  { 47004, true },
+  { 47021, true },
+  { 47034, true },
+  { 47047, true },
+  { 47058, true },
+  { 47067, true },
+  { 47075, true },
+  { 47091, true },
+  { 47101, true },
+  { 47115, false },
+  { 47135, true },
+  { 47155, true },
+  { 47179, true },
+  { 47200, true },
+  { 47208, true },
+  { 47229, true },
+  { 47239, true },
+  { 47261, true },
   { 47275, true },
-  { 47289, true },
-  { 47309, true },
-  { 47322, true },
-  { 47330, true },
-  { 47342, false },
-  { 47352, true },
-  { 47382, true },
-  { 47409, false },
-  { 47423, true },
-  { 47439, true },
-  { 47452, true },
-  { 47469, true },
-  { 47486, true },
-  { 47500, false },
-  { 47518, true },
-  { 47526, true },
-  { 47542, true },
-  { 47552, true },
-  { 47563, false },
-  { 47577, true },
-  { 47592, true },
-  { 47605, true },
-  { 47618, true },
-  { 47633, true },
-  { 47653, false },
-  { 47668, true },
-  { 47680, true },
-  { 47692, true },
-  { 47704, true },
-  { 47717, true },
-  { 47732, true },
-  { 47745, true },
-  { 47758, true },
-  { 47773, false },
-  { 47796, false },
-  { 47820, true },
-  { 47837, true },
-  { 47850, true },
-  { 47861, true },
-  { 47873, true },
-  { 47893, true },
-  { 47905, true },
-  { 47919, true },
-  { 47937, true },
-  { 47947, true },
-  { 47958, true },
-  { 47977, true },
-  { 47994, true },
-  { 48008, true },
-  { 48021, true },
-  { 48040, true },
-  { 48050, true },
-  { 48064, true },
-  { 48097, true },
-  { 48118, true },
-  { 48130, true },
-  { 48145, true },
-  { 48159, true },
-  { 48170, true },
-  { 48184, true },
-  { 48197, true },
-  { 48213, true },
-  { 48226, true },
-  { 48246, true },
-  { 48263, true },
-  { 48274, true },
-  { 48282, true },
-  { 48298, true },
-  { 48311, true },
-  { 48323, false },
-  { 48335, true },
-  { 48346, true },
-  { 48368, true },
-  { 48381, true },
-  { 48401, true },
-  { 48413, true },
-  { 48425, true },
-  { 48438, true },
-  { 48455, true },
-  { 48473, true },
-  { 48487, true },
-  { 48502, false },
-  { 48517, true },
-  { 48536, true },
-  { 48551, true },
-  { 48565, true },
-  { 48577, true },
-  { 48588, true },
-  { 48604, true },
-  { 48620, true },
-  { 48641, true },
-  { 48660, true },
-  { 48687, true },
-  { 48706, true },
-  { 48726, true },
-  { 48743, true },
-  { 48763, true },
-  { 48776, true },
-  { 48790, true },
-  { 48811, true },
-  { 48832, true },
-  { 48839, true },
-  { 48851, true },
-  { 48873, true },
-  { 48889, true },
-  { 48905, true },
-  { 48920, true },
-  { 48933, true },
-  { 48953, true },
-  { 48967, true },
-  { 48981, true },
-  { 48996, true },
+  { 47295, true },
+  { 47308, true },
+  { 47316, true },
+  { 47328, false },
+  { 47338, true },
+  { 47368, true },
+  { 47395, false },
+  { 47409, true },
+  { 47425, true },
+  { 47438, true },
+  { 47455, true },
+  { 47472, true },
+  { 47486, false },
+  { 47504, true },
+  { 47512, true },
+  { 47528, true },
+  { 47538, true },
+  { 47549, false },
+  { 47563, true },
+  { 47578, true },
+  { 47591, true },
+  { 47604, true },
+  { 47619, true },
+  { 47639, false },
+  { 47654, true },
+  { 47666, true },
+  { 47678, true },
+  { 47690, true },
+  { 47703, true },
+  { 47718, true },
+  { 47731, true },
+  { 47744, true },
+  { 47757, true },
+  { 47772, false },
+  { 47795, false },
+  { 47819, true },
+  { 47836, true },
+  { 47849, true },
+  { 47860, true },
+  { 47872, true },
+  { 47892, true },
+  { 47904, true },
+  { 47918, true },
+  { 47936, true },
+  { 47946, true },
+  { 47957, true },
+  { 47976, true },
+  { 47993, true },
+  { 48007, true },
+  { 48020, true },
+  { 48039, true },
+  { 48049, true },
+  { 48063, true },
+  { 48096, true },
+  { 48117, true },
+  { 48129, true },
+  { 48144, true },
+  { 48158, true },
+  { 48169, true },
+  { 48183, true },
+  { 48196, true },
+  { 48212, true },
+  { 48225, true },
+  { 48245, true },
+  { 48262, true },
+  { 48273, true },
+  { 48281, true },
+  { 48297, true },
+  { 48310, true },
+  { 48322, false },
+  { 48334, true },
+  { 48345, true },
+  { 48367, true },
+  { 48380, true },
+  { 48400, true },
+  { 48412, true },
+  { 48424, true },
+  { 48437, true },
+  { 48454, true },
+  { 48472, true },
+  { 48486, true },
+  { 48501, false },
+  { 48516, true },
+  { 48535, true },
+  { 48550, true },
+  { 48564, true },
+  { 48576, true },
+  { 48587, true },
+  { 48603, true },
+  { 48619, true },
+  { 48640, true },
+  { 48659, true },
+  { 48686, true },
+  { 48705, true },
+  { 48725, true },
+  { 48742, true },
+  { 48762, true },
+  { 48775, true },
+  { 48789, true },
+  { 48810, true },
+  { 48831, true },
+  { 48838, true },
+  { 48850, true },
+  { 48872, true },
+  { 48888, true },
+  { 48899, true },
+  { 48915, true },
+  { 48930, true },
+  { 48943, true },
+  { 48963, true },
+  { 48977, true },
+  { 48991, true },
   { 49006, true },
-  { 49022, true },
-  { 49033, true },
+  { 49016, true },
+  { 49032, true },
   { 49043, true },
-  { 49055, true },
-  { 49067, true },
-  { 49079, true },
-  { 49097, true },
-  { 49116, true },
-  { 49131, true },
-  { 49152, false },
-  { 49173, true },
+  { 49053, true },
+  { 49065, true },
+  { 49077, true },
+  { 49089, true },
+  { 49107, true },
+  { 49126, true },
+  { 49141, true },
+  { 49162, false },
   { 49183, true },
-  { 49201, true },
-  { 49215, true },
-  { 49235, true },
-  { 49255, true },
-  { 49287, true },
+  { 49193, true },
+  { 49211, true },
+  { 49225, true },
+  { 49245, true },
+  { 49265, true },
   { 49297, true },
-  { 49316, true },
-  { 49333, false },
-  { 49357, false },
-  { 49379, true },
-  { 49403, true },
-  { 49433, true },
-  { 49457, true },
-  { 49473, true },
-  { 49490, true },
-  { 49502, true },
-  { 49520, true },
-  { 49535, true },
-  { 49564, true },
-  { 49581, true },
-  { 49595, true },
-  { 49617, true },
-  { 49642, true },
-  { 49655, true },
-  { 49668, true },
-  { 49683, true },
-  { 49705, true },
-  { 49721, true },
-  { 49745, true },
-  { 49769, true },
-  { 49783, true },
-  { 49798, true },
-  { 49817, true },
-  { 49833, true },
-  { 49852, true },
-  { 49869, true },
-  { 49892, true },
-  { 49910, true },
-  { 49934, false },
-  { 49956, true },
-  { 49969, true },
-  { 49980, true },
-  { 49992, true },
-  { 50014, true },
+  { 49307, true },
+  { 49326, true },
+  { 49343, false },
+  { 49367, false },
+  { 49389, true },
+  { 49413, true },
+  { 49443, true },
+  { 49467, true },
+  { 49483, true },
+  { 49500, true },
+  { 49512, true },
+  { 49530, true },
+  { 49545, true },
+  { 49574, true },
+  { 49591, true },
+  { 49605, true },
+  { 49627, true },
+  { 49652, true },
+  { 49665, true },
+  { 49678, true },
+  { 49693, true },
+  { 49715, true },
+  { 49731, true },
+  { 49755, true },
+  { 49779, true },
+  { 49793, true },
+  { 49808, true },
+  { 49827, true },
+  { 49843, true },
+  { 49862, true },
+  { 49879, true },
+  { 49902, true },
+  { 49920, true },
+  { 49944, false },
+  { 49966, true },
+  { 49979, true },
+  { 49990, true },
+  { 50002, true },
   { 50024, true },
-  { 50038, true },
-  { 50056, true },
-  { 50069, true },
-  { 50088, true },
-  { 50103, true },
-  { 50126, true },
-  { 50139, true },
-  { 50150, true },
-  { 50163, true },
-  { 50174, true },
-  { 50193, true },
-  { 50211, true },
-  { 50233, true },
-  { 50258, true },
-  { 50281, true },
-  { 50301, true },
-  { 50315, true },
-  { 50328, true },
-  { 50341, true },
-  { 50359, true },
+  { 50034, true },
+  { 50048, true },
+  { 50066, true },
+  { 50079, true },
+  { 50098, true },
+  { 50113, true },
+  { 50136, true },
+  { 50149, true },
+  { 50160, true },
+  { 50173, true },
+  { 50184, true },
+  { 50203, true },
+  { 50221, true },
+  { 50243, true },
+  { 50268, true },
+  { 50291, true },
+  { 50311, true },
+  { 50325, true },
+  { 50338, true },
+  { 50351, true },
   { 50369, true },
-  { 50382, true },
-  { 50409, true },
-  { 50427, true },
-  { 50448, true },
-  { 50463, true },
-  { 50481, true },
-  { 50506, true },
-  { 50521, false },
-  { 50544, true },
-  { 50561, false },
-  { 50570, true },
-  { 50591, true },
-  { 50608, true },
-  { 50619, true },
-  { 50632, false },
-  { 50671, true },
-  { 50682, true },
+  { 50379, true },
+  { 50392, true },
+  { 50419, true },
+  { 50437, true },
+  { 50458, true },
+  { 50473, true },
+  { 50491, true },
+  { 50516, true },
+  { 50531, false },
+  { 50554, true },
+  { 50571, false },
+  { 50580, true },
+  { 50601, true },
+  { 50618, true },
+  { 50629, true },
+  { 50642, false },
+  { 50681, true },
   { 50692, true },
-  { 50705, true },
-  { 50717, true },
-  { 50733, true },
-  { 50747, false },
-  { 50762, false },
-  { 50778, true },
-  { 50787, true },
-  { 50806, true },
-  { 50817, true },
-  { 50830, true },
-  { 50842, true },
-  { 50859, true },
-  { 50871, true },
+  { 50702, true },
+  { 50715, true },
+  { 50727, true },
+  { 50743, true },
+  { 50757, false },
+  { 50772, false },
+  { 50788, true },
+  { 50797, true },
+  { 50816, true },
+  { 50827, true },
+  { 50840, true },
+  { 50852, true },
+  { 50869, true },
   { 50881, true },
-  { 50904, true },
-  { 50916, true },
-  { 50925, true },
-  { 50939, true },
-  { 50954, true },
-  { 50974, true },
-  { 50988, true },
-  { 51007, true },
-  { 51018, true },
-  { 51034, true },
-  { 51055, true },
-  { 51071, true },
-  { 51088, true },
-  { 51100, true },
-  { 51114, true },
-  { 51126, true },
-  { 51149, true },
-  { 51174, true },
-  { 51194, true },
-  { 51211, true },
+  { 50891, true },
+  { 50914, true },
+  { 50926, true },
+  { 50935, true },
+  { 50949, true },
+  { 50964, true },
+  { 50984, true },
+  { 50998, true },
+  { 51017, true },
+  { 51028, true },
+  { 51044, true },
+  { 51065, true },
+  { 51081, true },
+  { 51098, true },
+  { 51110, true },
+  { 51124, true },
+  { 51136, true },
+  { 51159, true },
+  { 51184, true },
+  { 51204, true },
   { 51221, true },
-  { 51230, true },
-  { 51247, true },
-  { 51259, true },
-  { 51274, true },
-  { 51293, true },
-  { 51306, true },
-  { 51324, true },
-  { 51336, true },
-  { 51355, true },
-  { 51367, true },
-  { 51391, true },
-  { 51416, true },
-  { 51446, true },
-  { 51460, true },
-  { 51484, true },
-  { 51507, true },
-  { 51521, true },
-  { 51534, true },
-  { 51546, true },
-  { 51568, true },
-  { 51588, true },
-  { 51613, true },
-  { 51625, true },
-  { 51648, true },
-  { 51667, true },
-  { 51678, true },
-  { 51690, true },
-  { 51704, true },
-  { 51716, true },
-  { 51727, true },
-  { 51745, true },
-  { 51761, true },
-  { 51779, true },
-  { 51797, true },
-  { 51815, true },
-  { 51831, true },
-  { 51848, true },
-  { 51861, true },
-  { 51872, true },
-  { 51890, true },
-  { 51908, true },
-  { 51931, true },
-  { 51948, false },
-  { 51963, true },
-  { 51975, true },
-  { 51987, true },
-  { 52000, true },
-  { 52009, true },
-  { 52024, true },
-  { 52032, true },
-  { 52045, true },
-  { 52064, true },
-  { 52079, true },
-  { 52090, true },
-  { 52104, true },
-  { 52116, true },
-  { 52123, true },
-  { 52135, true },
-  { 52149, false },
-  { 52166, true },
-  { 52177, true },
-  { 52190, true },
-  { 52203, true },
-  { 52220, true },
-  { 52239, false },
-  { 52252, true },
-  { 52270, true },
-  { 52296, true },
-  { 52310, true },
-  { 52327, true },
-  { 52346, true },
-  { 52361, true },
-  { 52375, true },
-  { 52386, true },
-  { 52400, true },
-  { 52417, true },
-  { 52430, true },
-  { 52443, true },
-  { 52455, true },
-  { 52473, true },
-  { 52492, true },
-  { 52508, true },
-  { 52527, true },
-  { 52546, true },
-  { 52566, true },
-  { 52582, true },
-  { 52598, true },
-  { 52612, true },
+  { 51231, true },
+  { 51240, true },
+  { 51257, true },
+  { 51269, true },
+  { 51284, true },
+  { 51303, true },
+  { 51316, true },
+  { 51334, true },
+  { 51346, true },
+  { 51365, true },
+  { 51377, true },
+  { 51401, true },
+  { 51426, true },
+  { 51456, true },
+  { 51470, true },
+  { 51494, true },
+  { 51517, true },
+  { 51531, true },
+  { 51544, true },
+  { 51556, true },
+  { 51578, true },
+  { 51598, true },
+  { 51623, true },
+  { 51635, true },
+  { 51658, true },
+  { 51677, true },
+  { 51688, true },
+  { 51700, true },
+  { 51714, true },
+  { 51726, true },
+  { 51737, true },
+  { 51755, true },
+  { 51771, true },
+  { 51789, true },
+  { 51807, true },
+  { 51825, true },
+  { 51841, true },
+  { 51858, true },
+  { 51871, true },
+  { 51882, true },
+  { 51900, true },
+  { 51918, true },
+  { 51941, true },
+  { 51958, false },
+  { 51973, true },
+  { 51985, true },
+  { 51997, true },
+  { 52010, true },
+  { 52019, true },
+  { 52034, true },
+  { 52042, true },
+  { 52055, true },
+  { 52074, true },
+  { 52089, true },
+  { 52100, true },
+  { 52114, true },
+  { 52126, true },
+  { 52133, true },
+  { 52145, true },
+  { 52159, false },
+  { 52176, true },
+  { 52187, true },
+  { 52200, true },
+  { 52213, true },
+  { 52230, true },
+  { 52249, false },
+  { 52262, true },
+  { 52280, true },
+  { 52306, true },
+  { 52320, true },
+  { 52337, true },
+  { 52356, true },
+  { 52371, true },
+  { 52385, true },
+  { 52396, true },
+  { 52410, true },
+  { 52427, true },
+  { 52440, true },
+  { 52453, true },
+  { 52465, true },
+  { 52483, true },
+  { 52502, true },
+  { 52518, true },
+  { 52537, true },
+  { 52556, true },
+  { 52576, true },
+  { 52592, true },
+  { 52608, true },
   { 52622, true },
-  { 52630, true },
-  { 52647, true },
-  { 52668, true },
-  { 52685, true },
-  { 52703, true },
-  { 52722, true },
-  { 52742, true },
-  { 52773, true },
-  { 52788, true },
-  { 52807, true },
-  { 52823, true },
-  { 52843, true },
-  { 52854, true },
-  { 52868, true },
-  { 52887, true },
-  { 52899, true },
-  { 52915, true },
-  { 52936, false },
-  { 52955, true },
-  { 52969, true },
-  { 52978, true },
-  { 52995, true },
-  { 53014, true },
-  { 53028, true },
-  { 53037, true },
-  { 53052, true },
-  { 53067, true },
-  { 53084, true },
-  { 53098, true },
-  { 53106, false },
-  { 53117, true },
-  { 53138, true },
-  { 53159, true },
-  { 53170, true },
-  { 53179, true },
-  { 53193, true },
-  { 53212, true },
-  { 53225, false },
-  { 53240, true },
-  { 53256, true },
-  { 53278, true },
-  { 53292, false },
-  { 53306, true },
-  { 53322, true },
-  { 53347, true },
-  { 53359, true },
-  { 53374, true },
-  { 53386, true },
-  { 53409, true },
-  { 53432, true },
-  { 53451, true },
-  { 53459, true },
-  { 53475, true },
-  { 53490, true },
-  { 53515, true },
-  { 53525, true },
+  { 52632, true },
+  { 52640, true },
+  { 52657, true },
+  { 52678, true },
+  { 52695, true },
+  { 52713, true },
+  { 52732, true },
+  { 52752, true },
+  { 52783, true },
+  { 52798, true },
+  { 52817, true },
+  { 52833, true },
+  { 52853, true },
+  { 52864, true },
+  { 52878, true },
+  { 52897, true },
+  { 52909, true },
+  { 52925, true },
+  { 52946, false },
+  { 52965, true },
+  { 52979, true },
+  { 52988, true },
+  { 53005, true },
+  { 53024, true },
+  { 53038, true },
+  { 53047, true },
+  { 53062, true },
+  { 53077, true },
+  { 53091, true },
+  { 53099, false },
+  { 53110, true },
+  { 53131, true },
+  { 53152, true },
+  { 53163, true },
+  { 53172, true },
+  { 53186, true },
+  { 53205, true },
+  { 53218, false },
+  { 53233, true },
+  { 53249, true },
+  { 53271, true },
+  { 53285, false },
+  { 53299, true },
+  { 53315, true },
+  { 53340, true },
+  { 53352, true },
+  { 53367, true },
+  { 53379, true },
+  { 53402, true },
+  { 53425, true },
+  { 53444, true },
+  { 53452, true },
+  { 53468, true },
+  { 53483, true },
+  { 53508, true },
+  { 53518, true },
+  { 53528, true },
   { 53535, true },
-  { 53542, true },
-  { 53559, true },
-  { 53573, true },
-  { 53594, true },
-  { 53603, true },
-  { 53611, true },
-  { 53622, true },
-  { 53636, false },
-  { 53647, true },
-  { 53663, false },
-  { 53673, false },
-  { 53689, true },
-  { 53702, true },
-  { 53716, true },
-  { 53731, true },
-  { 53747, true },
-  { 53769, true },
-  { 53787, true },
-  { 53799, true },
-  { 53813, true },
-  { 53828, true },
-  { 53843, true },
-  { 53868, true },
-  { 53888, true },
-  { 53904, true },
-  { 53917, true },
-  { 53931, true },
-  { 53944, true },
-  { 53974, true },
-  { 53986, true },
-  { 54001, true },
-  { 54011, true },
-  { 54027, true },
-  { 54035, false },
-  { 54047, true },
-  { 54058, true },
-  { 54067, true },
-  { 54085, true },
-  { 54100, true },
-  { 54117, true },
-  { 54133, true },
-  { 54149, true },
+  { 53552, true },
+  { 53566, true },
+  { 53587, true },
+  { 53596, true },
+  { 53604, true },
+  { 53615, true },
+  { 53629, false },
+  { 53640, true },
+  { 53656, false },
+  { 53666, false },
+  { 53682, true },
+  { 53695, true },
+  { 53709, true },
+  { 53724, true },
+  { 53740, true },
+  { 53762, true },
+  { 53780, true },
+  { 53792, true },
+  { 53806, true },
+  { 53821, true },
+  { 53836, true },
+  { 53861, true },
+  { 53881, true },
+  { 53897, true },
+  { 53910, true },
+  { 53924, true },
+  { 53937, true },
+  { 53967, true },
+  { 53979, true },
+  { 53994, true },
+  { 54004, true },
+  { 54020, true },
+  { 54028, false },
+  { 54040, true },
+  { 54051, true },
+  { 54060, true },
+  { 54078, true },
+  { 54093, true },
+  { 54110, true },
+  { 54126, true },
+  { 54142, true },
+  { 54155, true },
   { 54162, true },
-  { 54169, true },
-  { 54186, true },
-  { 54194, true },
-  { 54208, true },
-  { 54216, false },
-  { 54227, true },
-  { 54236, true },
-  { 54248, true },
-  { 54261, true },
-  { 54269, true },
-  { 54287, true },
-  { 54296, true },
-  { 54306, true },
-  { 54315, true },
-  { 54323, true },
-  { 54338, true },
-  { 54346, true },
-  { 54366, true },
-  { 54389, true },
-  { 54402, true },
-  { 54416, true },
-  { 54435, true },
-  { 54454, true },
-  { 54468, true },
-  { 54477, true },
-  { 54497, true },
-  { 54520, true },
-  { 54530, true },
-  { 54548, true },
-  { 54568, true },
-  { 54581, true },
-  { 54597, true },
-  { 54607, true },
+  { 54179, true },
+  { 54187, true },
+  { 54201, true },
+  { 54209, false },
+  { 54220, true },
+  { 54229, true },
+  { 54241, true },
+  { 54254, true },
+  { 54262, true },
+  { 54280, true },
+  { 54289, true },
+  { 54299, true },
+  { 54308, true },
+  { 54316, true },
+  { 54331, true },
+  { 54339, true },
+  { 54359, true },
+  { 54382, true },
+  { 54395, true },
+  { 54409, true },
+  { 54428, true },
+  { 54447, true },
+  { 54461, true },
+  { 54470, true },
+  { 54493, true },
+  { 54503, true },
+  { 54521, true },
+  { 54541, true },
+  { 54554, true },
+  { 54570, true },
+  { 54580, true },
+  { 54591, true },
+  { 54601, true },
   { 54618, true },
-  { 54628, true },
-  { 54645, true },
-  { 54661, true },
-  { 54668, true },
-  { 54687, true },
-  { 54700, true },
-  { 54711, true },
-  { 54718, true },
-  { 54729, true },
-  { 54740, true },
-  { 54748, true },
-  { 54758, true },
-  { 54772, true },
-  { 54792, true },
-  { 54808, true },
-  { 54824, true },
-  { 54845, true },
-  { 54864, true },
-  { 54886, true },
-  { 54898, true },
-  { 54909, false },
-  { 54931, true },
-  { 54950, true },
-  { 54966, true },
-  { 54984, true },
-  { 54999, true },
-  { 55016, true },
+  { 54634, true },
+  { 54641, true },
+  { 54660, true },
+  { 54673, true },
+  { 54684, true },
+  { 54691, true },
+  { 54702, true },
+  { 54713, true },
+  { 54721, true },
+  { 54731, true },
+  { 54745, true },
+  { 54765, true },
+  { 54781, true },
+  { 54797, true },
+  { 54818, true },
+  { 54837, true },
+  { 54859, true },
+  { 54871, true },
+  { 54882, false },
+  { 54904, true },
+  { 54923, true },
+  { 54939, true },
+  { 54957, true },
+  { 54972, true },
+  { 54989, true },
+  { 55008, true },
+  { 55020, true },
   { 55035, true },
-  { 55047, true },
-  { 55062, true },
+  { 55055, true },
+  { 55072, true },
   { 55082, true },
-  { 55099, true },
-  { 55109, true },
-  { 55118, true },
-  { 55130, true },
+  { 55091, true },
+  { 55103, true },
+  { 55113, true },
+  { 55122, true },
+  { 55131, true },
   { 55140, true },
   { 55149, true },
-  { 55158, true },
-  { 55167, true },
-  { 55176, true },
-  { 55186, true },
+  { 55159, true },
+  { 55169, true },
+  { 55178, true },
+  { 55187, true },
   { 55196, true },
-  { 55205, true },
-  { 55214, true },
-  { 55223, true },
-  { 55233, true },
-  { 55251, true },
-  { 55267, true },
-  { 55275, true },
-  { 55282, true },
-  { 55295, true },
-  { 55312, true },
-  { 55326, true },
-  { 55333, true },
-  { 55344, true },
-  { 55356, true },
-  { 55373, true },
-  { 55385, true },
-  { 55402, true },
-  { 55422, true },
-  { 55441, false },
-  { 55455, true },
-  { 55473, true },
-  { 55486, true },
-  { 55503, true },
-  { 55517, true },
-  { 55531, true },
-  { 55548, true },
-  { 55574, true },
-  { 55588, true },
-  { 55603, true },
-  { 55617, true },
-  { 55632, true },
-  { 55647, true },
+  { 55206, true },
+  { 55224, true },
+  { 55240, true },
+  { 55248, true },
+  { 55255, true },
+  { 55268, true },
+  { 55285, true },
+  { 55299, true },
+  { 55306, true },
+  { 55317, true },
+  { 55329, true },
+  { 55346, true },
+  { 55358, true },
+  { 55375, true },
+  { 55395, true },
+  { 55414, false },
+  { 55428, true },
+  { 55446, true },
+  { 55459, true },
+  { 55476, true },
+  { 55490, true },
+  { 55504, true },
+  { 55521, true },
+  { 55547, true },
+  { 55561, true },
+  { 55576, true },
+  { 55590, true },
+  { 55605, true },
+  { 55620, true },
+  { 55631, true },
+  { 55644, true },
   { 55658, true },
-  { 55671, true },
-  { 55685, true },
-  { 55695, true },
-  { 55706, true },
-  { 55725, true },
-  { 55740, true },
+  { 55668, true },
+  { 55679, true },
+  { 55698, true },
+  { 55713, true },
+  { 55728, true },
   { 55755, true },
-  { 55782, true },
-  { 55792, true },
-  { 55804, true },
-  { 55815, true },
-  { 55827, true },
-  { 55835, true },
-  { 55846, true },
-  { 55855, true },
-  { 55863, true },
-  { 55874, true },
+  { 55765, true },
+  { 55777, true },
+  { 55788, true },
+  { 55800, true },
+  { 55808, true },
+  { 55819, true },
+  { 55828, true },
+  { 55836, true },
+  { 55847, true },
+  { 55862, true },
   { 55889, true },
-  { 55916, true },
-  { 55926, true },
-  { 55937, true },
-  { 55948, true },
-  { 55959, true },
-  { 55969, true },
-  { 55983, true },
-  { 55997, true },
-  { 56008, true },
-  { 56015, false },
-  { 56023, true },
-  { 56031, true },
-  { 56047, true },
-  { 56061, true },
-  { 56075, true },
-  { 56089, true },
-  { 56096, true },
-  { 56105, true },
-  { 56112, true },
-  { 56124, true },
+  { 55899, true },
+  { 55910, true },
+  { 55921, true },
+  { 55932, true },
+  { 55942, true },
+  { 55956, true },
+  { 55970, true },
+  { 55981, true },
+  { 55988, false },
+  { 55996, true },
+  { 56004, true },
+  { 56020, true },
+  { 56034, true },
+  { 56048, true },
+  { 56062, true },
+  { 56069, true },
+  { 56078, true },
+  { 56085, true },
+  { 56097, true },
+  { 56104, true },
+  { 56118, true },
+  { 56125, true },
   { 56131, true },
-  { 56145, true },
-  { 56152, true },
-  { 56158, true },
-  { 56174, true },
-  { 56186, true },
+  { 56147, true },
+  { 56159, true },
+  { 56173, true },
   { 56200, true },
-  { 56227, true },
-  { 56259, true },
-  { 56281, true },
-  { 56292, true },
-  { 56303, true },
+  { 56232, true },
+  { 56254, true },
+  { 56265, true },
+  { 56276, true },
+  { 56287, true },
+  { 56298, true },
   { 56314, true },
-  { 56325, true },
-  { 56341, true },
-  { 56354, true },
-  { 56380, false },
-  { 56403, true },
+  { 56327, true },
+  { 56344, true },
+  { 56370, false },
+  { 56393, true },
+  { 56409, true },
   { 56419, true },
-  { 56429, true },
-  { 56442, true },
-  { 56461, true },
-  { 56474, true },
-  { 56485, true },
-  { 56500, true },
-  { 56518, true },
-  { 56530, true },
-  { 56544, true },
-  { 56556, true },
-  { 56570, true },
-  { 56587, true },
-  { 56605, true },
-  { 56618, true },
-  { 56637, true },
-  { 56647, true },
-  { 56658, true },
-  { 56671, true },
-  { 56688, true },
-  { 56706, true },
-  { 56737, true },
-  { 56750, true },
-  { 56759, true },
-  { 56777, true },
-  { 56797, true },
-  { 56811, true },
-  { 56830, true },
-  { 56848, true },
-  { 56864, true },
-  { 56884, true },
-  { 56905, true },
-  { 56926, true },
-  { 56942, true },
-  { 56958, true },
-  { 56977, true },
-  { 56992, true },
-  { 57013, true },
-  { 57033, true },
-  { 57053, true },
-  { 57069, true },
-  { 57084, true },
-  { 57104, true },
-  { 57120, true },
-  { 57137, true },
-  { 57156, true },
-  { 57174, true },
-  { 57194, true },
-  { 57210, true },
-  { 57221, false },
-  { 57231, true },
-  { 57240, true },
-  { 57252, true },
-  { 57270, true },
-  { 57279, true },
-  { 57297, true },
-  { 57311, true },
-  { 57329, true },
-  { 57339, false },
-  { 57351, true },
-  { 57364, true },
-  { 57379, true },
-  { 57394, true },
-  { 57409, true },
-  { 57417, true },
-  { 57435, true },
-  { 57469, true },
-  { 57480, true },
-  { 57497, true },
-  { 57510, false },
-  { 57524, true },
-  { 57542, true },
-  { 57553, true },
-  { 57571, true },
-  { 57582, true },
-  { 57597, true },
-  { 57608, true },
-  { 57622, true },
-  { 57637, true },
-  { 57653, true },
-  { 57673, true },
-  { 57690, true },
-  { 57702, true },
-  { 57731, true },
-  { 57764, true },
-  { 57776, true },
-  { 57788, true },
-  { 57805, true },
-  { 57820, true },
-  { 57832, true },
-  { 57844, true },
-  { 57859, false },
-  { 57871, true },
-  { 57880, true },
-  { 57892, true },
-  { 57904, true },
-  { 57921, true },
-  { 57936, true },
-  { 57950, true },
-  { 57965, false },
-  { 57979, true },
-  { 57989, true },
-  { 58009, true },
-  { 58027, true },
-  { 58040, false },
-  { 58054, true },
-  { 58065, true },
-  { 58078, true },
-  { 58087, true },
-  { 58097, false },
-  { 58113, true },
-  { 58125, true },
+  { 56432, true },
+  { 56451, true },
+  { 56464, true },
+  { 56475, true },
+  { 56490, true },
+  { 56502, true },
+  { 56516, true },
+  { 56528, true },
+  { 56542, true },
+  { 56559, true },
+  { 56577, true },
+  { 56590, true },
+  { 56609, true },
+  { 56619, true },
+  { 56630, true },
+  { 56643, true },
+  { 56660, true },
+  { 56678, true },
+  { 56709, true },
+  { 56722, true },
+  { 56731, true },
+  { 56749, true },
+  { 56769, true },
+  { 56783, true },
+  { 56802, true },
+  { 56820, true },
+  { 56836, true },
+  { 56856, true },
+  { 56877, true },
+  { 56898, true },
+  { 56914, true },
+  { 56930, true },
+  { 56949, true },
+  { 56964, true },
+  { 56985, true },
+  { 57005, true },
+  { 57025, true },
+  { 57041, true },
+  { 57056, true },
+  { 57076, true },
+  { 57092, true },
+  { 57109, true },
+  { 57128, true },
+  { 57146, true },
+  { 57166, true },
+  { 57182, true },
+  { 57193, false },
+  { 57203, true },
+  { 57212, true },
+  { 57224, true },
+  { 57242, true },
+  { 57251, true },
+  { 57269, true },
+  { 57287, true },
+  { 57297, false },
+  { 57309, true },
+  { 57322, true },
+  { 57337, true },
+  { 57352, true },
+  { 57367, true },
+  { 57375, true },
+  { 57393, true },
+  { 57427, true },
+  { 57438, true },
+  { 57455, true },
+  { 57468, false },
+  { 57482, true },
+  { 57500, true },
+  { 57511, true },
+  { 57529, true },
+  { 57540, true },
+  { 57555, true },
+  { 57566, true },
+  { 57580, true },
+  { 57595, true },
+  { 57611, true },
+  { 57631, true },
+  { 57648, true },
+  { 57660, true },
+  { 57689, true },
+  { 57722, true },
+  { 57734, true },
+  { 57746, true },
+  { 57763, true },
+  { 57778, true },
+  { 57790, true },
+  { 57802, true },
+  { 57817, false },
+  { 57829, true },
+  { 57838, true },
+  { 57850, true },
+  { 57862, true },
+  { 57879, true },
+  { 57894, true },
+  { 57908, true },
+  { 57923, false },
+  { 57937, true },
+  { 57947, true },
+  { 57967, true },
+  { 57985, true },
+  { 57998, false },
+  { 58012, true },
+  { 58023, true },
+  { 58036, true },
+  { 58045, true },
+  { 58055, false },
+  { 58071, true },
+  { 58083, true },
+  { 58098, true },
+  { 58112, true },
+  { 58126, true },
   { 58140, true },
   { 58154, true },
-  { 58168, true },
-  { 58182, true },
-  { 58196, true },
-  { 58216, true },
-  { 58237, true },
-  { 58255, true },
-  { 58266, true },
-  { 58286, true },
-  { 58299, true },
-  { 58312, true },
-  { 58339, true },
-  { 58350, true },
-  { 58367, true },
-  { 58393, true },
-  { 58413, true },
-  { 58427, true },
-  { 58444, false },
-  { 58458, true },
-  { 58472, false },
-  { 58489, true },
+  { 58174, true },
+  { 58195, true },
+  { 58213, true },
+  { 58224, true },
+  { 58244, true },
+  { 58257, true },
+  { 58270, true },
+  { 58297, true },
+  { 58308, true },
+  { 58325, true },
+  { 58351, true },
+  { 58371, true },
+  { 58385, true },
+  { 58402, false },
+  { 58416, true },
+  { 58430, false },
+  { 58447, true },
+  { 58472, true },
+  { 58488, true },
+  { 58501, true },
   { 58514, true },
   { 58530, true },
-  { 58543, true },
-  { 58556, true },
-  { 58572, true },
-  { 58599, true },
-  { 58618, true },
-  { 58637, true },
+  { 58557, true },
+  { 58576, true },
+  { 58595, true },
+  { 58606, true },
+  { 58621, true },
+  { 58633, true },
   { 58648, true },
   { 58663, true },
-  { 58675, true },
-  { 58690, true },
-  { 58705, true },
-  { 58720, true },
-  { 58742, true },
-  { 58760, true },
-  { 58776, true },
-  { 58793, true },
-  { 58813, true },
-  { 58827, true },
-  { 58843, true },
-  { 58861, true },
-  { 58880, true },
-  { 58893, true },
+  { 58678, true },
+  { 58700, true },
+  { 58718, true },
+  { 58734, true },
+  { 58751, true },
+  { 58771, true },
+  { 58785, true },
+  { 58801, true },
+  { 58819, true },
+  { 58838, true },
+  { 58851, true },
+  { 58868, true },
+  { 58881, true },
+  { 58895, true },
   { 58910, true },
-  { 58923, true },
-  { 58937, true },
-  { 58952, true },
-  { 58968, true },
-  { 58987, true },
-  { 59008, true },
-  { 59025, true },
-  { 59041, true },
-  { 59060, true },
-  { 59077, true },
-  { 59097, true },
-  { 59109, true },
-  { 59122, true },
-  { 59133, true },
-  { 59159, true },
-  { 59179, false },
-  { 59190, true },
-  { 59208, true },
-  { 59222, true },
-  { 59234, true },
+  { 58926, true },
+  { 58945, true },
+  { 58966, true },
+  { 58983, true },
+  { 58999, true },
+  { 59018, true },
+  { 59035, true },
+  { 59055, true },
+  { 59067, true },
+  { 59080, true },
+  { 59091, true },
+  { 59117, true },
+  { 59137, false },
+  { 59148, true },
+  { 59166, true },
+  { 59180, true },
+  { 59192, true },
+  { 59203, true },
+  { 59211, true },
+  { 59220, true },
+  { 59228, true },
   { 59245, true },
-  { 59253, true },
-  { 59262, true },
-  { 59270, true },
-  { 59287, true },
-  { 59298, true },
-  { 59310, true },
+  { 59256, true },
+  { 59268, true },
+  { 59276, true },
+  { 59286, true },
+  { 59297, true },
   { 59318, true },
-  { 59328, true },
-  { 59339, true },
-  { 59360, true },
-  { 59372, true },
-  { 59383, true },
+  { 59330, true },
+  { 59341, true },
+  { 59349, true },
+  { 59361, true },
+  { 59369, true },
+  { 59380, true },
   { 59391, true },
-  { 59403, true },
-  { 59411, true },
-  { 59422, true },
-  { 59433, true },
-  { 59443, false },
-  { 59459, true },
-  { 59472, true },
-  { 59487, true },
-  { 59504, true },
+  { 59401, false },
+  { 59417, true },
+  { 59430, true },
+  { 59445, true },
+  { 59462, true },
+  { 59484, true },
+  { 59505, true },
+  { 59513, true },
   { 59526, true },
-  { 59547, true },
-  { 59555, true },
-  { 59568, true },
-  { 59578, true },
-  { 59589, false },
-  { 59609, true },
-  { 59624, true },
-  { 59636, true },
-  { 59649, true },
-  { 59662, true },
-  { 59674, true },
-  { 59686, true },
-  { 59707, true },
-  { 59721, true },
-  { 59735, true },
-  { 59752, true },
+  { 59536, true },
+  { 59547, false },
+  { 59567, true },
+  { 59582, true },
+  { 59594, true },
+  { 59607, true },
+  { 59620, true },
+  { 59632, true },
+  { 59644, true },
+  { 59665, true },
+  { 59679, true },
+  { 59693, true },
+  { 59710, true },
+  { 59725, true },
+  { 59739, true },
+  { 59753, true },
   { 59767, true },
   { 59781, true },
   { 59795, true },
-  { 59809, true },
-  { 59823, true },
-  { 59837, true },
-  { 59852, true },
-  { 59864, true },
-  { 59878, true },
+  { 59810, true },
+  { 59822, true },
+  { 59836, true },
+  { 59854, true },
+  { 59869, true },
+  { 59884, true },
   { 59896, true },
-  { 59911, true },
-  { 59926, true },
-  { 59938, true },
-  { 59950, true },
-  { 59962, true },
-  { 59972, true },
-  { 59985, true },
-  { 59998, true },
-  { 60019, true },
-  { 60034, true },
-  { 60051, true },
-  { 60064, true },
-  { 60079, true },
-  { 60091, true },
-  { 60104, true },
-  { 60119, true },
-  { 60136, true },
-  { 60153, true },
-  { 60165, true },
-  { 60173, true },
-  { 60185, true },
-  { 60194, true },
+  { 59908, true },
+  { 59920, true },
+  { 59930, true },
+  { 59943, true },
+  { 59956, true },
+  { 59977, true },
+  { 59992, true },
+  { 60009, true },
+  { 60022, true },
+  { 60037, true },
+  { 60049, true },
+  { 60062, true },
+  { 60077, true },
+  { 60094, true },
+  { 60111, true },
+  { 60123, true },
+  { 60131, true },
+  { 60143, true },
+  { 60152, true },
+  { 60172, true },
+  { 60183, true },
+  { 60198, true },
   { 60214, true },
-  { 60225, true },
-  { 60240, true },
-  { 60256, true },
-  { 60263, true },
-  { 60270, true },
-  { 60293, true },
-  { 60307, true },
-  { 60322, true },
-  { 60337, true },
+  { 60221, true },
+  { 60228, true },
+  { 60251, true },
+  { 60265, true },
+  { 60280, true },
+  { 60295, true },
+  { 60310, true },
+  { 60321, true },
+  { 60331, true },
+  { 60340, true },
   { 60352, true },
   { 60363, true },
-  { 60373, true },
-  { 60382, true },
-  { 60394, true },
-  { 60405, true },
-  { 60416, true },
-  { 60429, true },
-  { 60450, true },
-  { 60460, true },
-  { 60476, true },
-  { 60491, true },
-  { 60507, true },
-  { 60524, true },
-  { 60540, true },
-  { 60557, true },
-  { 60571, true },
-  { 60586, true },
-  { 60602, true },
-  { 60617, true },
-  { 60627, true },
-  { 60640, true },
-  { 60652, true },
-  { 60680, true },
-  { 60692, true },
-  { 60706, true },
-  { 60716, true },
-  { 60730, true },
-  { 60741, true },
-  { 60757, true },
-  { 60768, true },
-  { 60781, true },
-  { 60801, true },
+  { 60374, true },
+  { 60387, true },
+  { 60408, true },
+  { 60418, true },
+  { 60434, true },
+  { 60449, true },
+  { 60465, true },
+  { 60482, true },
+  { 60498, true },
+  { 60515, true },
+  { 60529, true },
+  { 60544, true },
+  { 60560, true },
+  { 60575, true },
+  { 60585, true },
+  { 60598, true },
+  { 60610, true },
+  { 60638, true },
+  { 60650, true },
+  { 60664, true },
+  { 60674, true },
+  { 60688, true },
+  { 60699, true },
+  { 60715, true },
+  { 60726, true },
+  { 60739, true },
+  { 60759, true },
+  { 60770, true },
+  { 60792, true },
   { 60812, true },
-  { 60834, true },
-  { 60854, true },
-  { 60875, true },
-  { 60890, true },
-  { 60904, true },
+  { 60833, true },
+  { 60848, true },
+  { 60862, true },
+  { 60877, true },
+  { 60889, true },
+  { 60900, true },
   { 60919, true },
   { 60931, true },
-  { 60942, true },
-  { 60961, true },
-  { 60973, true },
-  { 60986, true },
-  { 61000, true },
+  { 60944, true },
+  { 60958, true },
+  { 60971, true },
+  { 60988, true },
+  { 61001, true },
   { 61013, true },
-  { 61030, true },
-  { 61043, true },
-  { 61055, true },
-  { 61068, true },
-  { 61080, true },
+  { 61026, true },
+  { 61038, true },
+  { 61051, true },
+  { 61064, true },
+  { 61075, true },
   { 61093, true },
-  { 61106, true },
-  { 61117, true },
-  { 61135, true },
+  { 61111, true },
+  { 61123, true },
+  { 61138, true },
   { 61153, true },
-  { 61165, true },
-  { 61180, true },
-  { 61195, true },
-  { 61209, true },
-  { 61225, true },
-  { 61239, true },
-  { 61247, true },
-  { 61276, true },
-  { 61295, true },
+  { 61167, true },
+  { 61183, true },
+  { 61197, true },
+  { 61205, true },
+  { 61234, true },
+  { 61253, true },
+  { 61266, true },
+  { 61291, true },
   { 61308, true },
-  { 61333, true },
-  { 61350, true },
+  { 61329, true },
+  { 61341, true },
+  { 61354, true },
   { 61371, true },
-  { 61383, true },
-  { 61396, true },
-  { 61413, true },
-  { 61433, true },
-  { 61445, true },
-  { 61469, true },
-  { 61502, true },
-  { 61525, true },
-  { 61537, true },
-  { 61559, true },
-  { 61576, true },
-  { 61591, true },
-  { 61605, true },
+  { 61391, true },
+  { 61403, true },
+  { 61427, true },
+  { 61460, true },
+  { 61483, true },
+  { 61495, true },
+  { 61517, true },
+  { 61534, true },
+  { 61549, true },
+  { 61563, true },
+  { 61589, true },
+  { 61608, true },
+  { 61621, true },
   { 61631, true },
-  { 61650, true },
-  { 61663, true },
-  { 61673, true },
-  { 61683, true },
-  { 61704, true },
-  { 61713, true },
-  { 61731, true },
-  { 61749, true },
-  { 61762, true },
-  { 61780, true },
-  { 61797, true },
-  { 61819, true },
-  { 61836, true },
-  { 61848, true },
-  { 61866, true },
-  { 61883, true },
-  { 61910, true },
-  { 61935, true },
-  { 61955, true },
-  { 61970, true },
-  { 61985, true },
-  { 61998, true },
-  { 62019, true },
-  { 62044, true },
-  { 62060, true },
-  { 62073, true },
-  { 62104, true },
-  { 62133, true },
-  { 62143, true },
-  { 62154, false },
-  { 62168, true },
-  { 62182, true },
-  { 62201, true },
-  { 62215, true },
-  { 62230, false },
-  { 62245, true },
-  { 62262, true },
-  { 62271, true },
-  { 62281, true },
-  { 62319, true },
-  { 62334, true },
-  { 62345, true },
-  { 62357, true },
-  { 62375, true },
-  { 62386, true },
-  { 62394, true },
-  { 62403, true },
-  { 62416, true },
-  { 62426, true },
-  { 62440, true },
-  { 62449, true },
-  { 62465, false },
+  { 61641, true },
+  { 61662, true },
+  { 61671, true },
+  { 61689, true },
+  { 61707, true },
+  { 61720, true },
+  { 61738, true },
+  { 61755, true },
+  { 61777, true },
+  { 61794, true },
+  { 61806, true },
+  { 61824, true },
+  { 61841, true },
+  { 61868, true },
+  { 61893, true },
+  { 61913, true },
+  { 61928, true },
+  { 61943, true },
+  { 61956, true },
+  { 61977, true },
+  { 62002, true },
+  { 62018, true },
+  { 62031, true },
+  { 62062, true },
+  { 62091, true },
+  { 62101, true },
+  { 62112, false },
+  { 62126, true },
+  { 62140, true },
+  { 62159, true },
+  { 62173, true },
+  { 62188, false },
+  { 62203, true },
+  { 62220, true },
+  { 62229, true },
+  { 62239, true },
+  { 62277, true },
+  { 62292, true },
+  { 62303, true },
+  { 62315, true },
+  { 62333, true },
+  { 62344, true },
+  { 62352, true },
+  { 62361, true },
+  { 62374, true },
+  { 62384, true },
+  { 62398, true },
+  { 62407, true },
+  { 62423, false },
+  { 62448, true },
+  { 62466, false },
   { 62490, true },
-  { 62508, false },
-  { 62532, true },
-  { 62546, true },
-  { 62565, true },
-  { 62592, true },
-  { 62604, true },
-  { 62616, true },
-  { 62624, true },
-  { 62633, true },
-  { 62647, true },
-  { 62664, true },
-  { 62680, true },
-  { 62695, false },
-  { 62707, true },
-  { 62719, true },
-  { 62736, true },
-  { 62746, true },
-  { 62758, true },
-  { 62770, true },
-  { 62780, true },
-  { 62794, true },
-  { 62811, true },
-  { 62829, false },
-  { 62849, true },
-  { 62861, true },
-  { 62873, true },
-  { 62885, true },
-  { 62894, true },
-  { 62905, true },
-  { 62917, true },
-  { 62930, true },
-  { 62939, true },
-  { 62949, true },
-  { 62962, true },
+  { 62504, true },
+  { 62523, true },
+  { 62550, true },
+  { 62562, true },
+  { 62574, true },
+  { 62582, true },
+  { 62591, true },
+  { 62605, true },
+  { 62622, true },
+  { 62638, true },
+  { 62653, false },
+  { 62665, true },
+  { 62677, true },
+  { 62694, true },
+  { 62704, true },
+  { 62716, true },
+  { 62728, true },
+  { 62738, true },
+  { 62752, true },
+  { 62769, true },
+  { 62787, false },
+  { 62807, true },
+  { 62819, true },
+  { 62831, true },
+  { 62843, true },
+  { 62852, true },
+  { 62863, true },
+  { 62875, true },
+  { 62888, true },
+  { 62897, true },
+  { 62907, true },
+  { 62920, true },
+  { 62942, true },
+  { 62956, true },
+  { 62965, true },
+  { 62977, true },
   { 62984, true },
-  { 62998, true },
-  { 63007, true },
-  { 63019, true },
-  { 63026, true },
-  { 63039, true },
-  { 63051, false },
+  { 62997, true },
+  { 63009, false },
+  { 63024, true },
+  { 63033, true },
+  { 63042, true },
+  { 63052, true },
   { 63066, true },
-  { 63075, true },
-  { 63084, true },
+  { 63083, true },
   { 63094, true },
-  { 63108, true },
-  { 63125, true },
-  { 63136, true },
-  { 63149, true },
-  { 63163, true },
-  { 63172, true },
-  { 63181, true },
-  { 63196, true },
-  { 63208, true },
-  { 63224, true },
-  { 63240, true },
-  { 63257, true },
-  { 63274, true },
-  { 63284, true },
-  { 63306, true },
-  { 63315, true },
-  { 63327, true },
-  { 63350, true },
-  { 63364, true },
-  { 63378, true },
-  { 63393, true },
-  { 63426, true },
-  { 63454, true },
-  { 63479, true },
-  { 63488, true },
-  { 63504, true },
-  { 63516, true },
-  { 63527, true },
-  { 63538, true },
-  { 63563, true },
-  { 63578, true },
-  { 63600, true },
+  { 63107, true },
+  { 63121, true },
+  { 63130, true },
+  { 63139, true },
+  { 63154, true },
+  { 63166, true },
+  { 63182, true },
+  { 63198, true },
+  { 63215, true },
+  { 63232, true },
+  { 63242, true },
+  { 63264, true },
+  { 63273, true },
+  { 63285, true },
+  { 63308, true },
+  { 63322, true },
+  { 63336, true },
+  { 63351, true },
+  { 63384, true },
+  { 63412, true },
+  { 63437, true },
+  { 63446, true },
+  { 63462, true },
+  { 63474, true },
+  { 63485, true },
+  { 63496, true },
+  { 63521, true },
+  { 63536, true },
+  { 63558, true },
+  { 63574, true },
+  { 63605, true },
   { 63616, true },
-  { 63647, true },
+  { 63628, true },
+  { 63644, true },
   { 63658, true },
-  { 63670, true },
-  { 63686, true },
+  { 63673, true },
+  { 63691, true },
   { 63700, true },
-  { 63715, true },
-  { 63733, true },
-  { 63742, true },
-  { 63756, true },
-  { 63774, true },
-  { 63788, true },
-  { 63803, true },
-  { 63821, true },
-  { 63831, true },
-  { 63844, true },
-  { 63854, true },
+  { 63714, true },
+  { 63732, true },
+  { 63746, true },
+  { 63761, true },
+  { 63779, true },
+  { 63789, true },
+  { 63802, true },
+  { 63812, true },
+  { 63835, true },
+  { 63847, true },
+  { 63862, true },
   { 63877, true },
-  { 63889, true },
-  { 63904, true },
-  { 63919, true },
-  { 63933, true },
-  { 63947, true },
-  { 63960, true },
-  { 63972, true },
-  { 63986, true },
-  { 63997, true },
-  { 64008, true },
-  { 64020, true },
-  { 64032, true },
-  { 64045, true },
-  { 64056, true },
-  { 64068, true },
-  { 64084, false },
-  { 64097, true },
-  { 64108, true },
-  { 64120, false },
-  { 64137, true },
-  { 64157, true },
+  { 63891, true },
+  { 63905, true },
+  { 63918, true },
+  { 63930, true },
+  { 63944, true },
+  { 63955, true },
+  { 63966, true },
+  { 63978, true },
+  { 63990, true },
+  { 64003, true },
+  { 64014, true },
+  { 64026, true },
+  { 64042, false },
+  { 64055, true },
+  { 64066, true },
+  { 64078, false },
+  { 64095, true },
+  { 64115, true },
+  { 64132, true },
+  { 64156, true },
   { 64174, true },
-  { 64198, true },
-  { 64216, true },
-  { 64232, true },
-  { 64248, true },
-  { 64263, true },
-  { 64278, true },
-  { 64301, true },
-  { 64327, true },
-  { 64347, true },
-  { 64362, true },
-  { 64382, true },
-  { 64404, false },
-  { 64422, true },
-  { 64441, true },
-  { 64458, true },
-  { 64477, true },
-  { 64490, true },
-  { 64507, true },
-  { 64517, false },
-  { 64534, true },
-  { 64553, true },
-  { 64561, true },
-  { 64578, true },
-  { 64592, true },
-  { 64609, true },
-  { 64617, true },
-  { 64628, true },
-  { 64646, true },
+  { 64190, true },
+  { 64206, true },
+  { 64221, true },
+  { 64236, true },
+  { 64259, true },
+  { 64285, true },
+  { 64305, true },
+  { 64320, true },
+  { 64340, true },
+  { 64362, false },
+  { 64380, true },
+  { 64399, true },
+  { 64416, true },
+  { 64435, true },
+  { 64448, true },
+  { 64465, true },
+  { 64475, false },
+  { 64492, true },
+  { 64511, true },
+  { 64519, true },
+  { 64536, true },
+  { 64550, true },
+  { 64567, true },
+  { 64575, true },
+  { 64586, true },
+  { 64604, true },
+  { 64616, true },
+  { 64627, true },
+  { 64637, true },
+  { 64648, true },
   { 64658, true },
-  { 64669, true },
-  { 64679, true },
-  { 64690, true },
-  { 64700, true },
-  { 64710, true },
-  { 64723, true },
-  { 64737, true },
-  { 64748, true },
-  { 64761, true },
-  { 64780, false },
-  { 64788, true },
-  { 64799, true },
-  { 64810, true },
-  { 64823, true },
-  { 64836, true },
-  { 64855, true },
-  { 64871, true },
-  { 64895, true },
-  { 64907, true },
-  { 64921, true },
-  { 64935, true },
-  { 64946, true },
-  { 64957, true },
-  { 64971, true },
-  { 64983, true },
+  { 64668, true },
+  { 64681, true },
+  { 64695, true },
+  { 64706, true },
+  { 64719, true },
+  { 64738, false },
+  { 64746, true },
+  { 64757, true },
+  { 64768, true },
+  { 64781, true },
+  { 64794, true },
+  { 64813, true },
+  { 64829, true },
+  { 64853, true },
+  { 64865, true },
+  { 64879, true },
+  { 64893, true },
+  { 64904, true },
+  { 64915, true },
+  { 64929, true },
+  { 64941, true },
+  { 64956, true },
+  { 64972, true },
+  { 64984, true },
   { 64998, true },
-  { 65014, true },
-  { 65026, true },
-  { 65040, true },
-  { 65061, true },
-  { 65076, true },
-  { 65094, true },
-  { 65109, true },
-  { 65123, true },
-  { 65145, true },
-  { 65167, true },
-  { 65188, true },
-  { 65205, true },
-  { 65221, true },
-  { 65235, true },
-  { 65256, true },
-  { 65272, true },
-  { 65289, false },
-  { 65309, true },
-  { 65339, true },
+  { 65019, true },
+  { 65034, true },
+  { 65052, true },
+  { 65067, true },
+  { 65081, true },
+  { 65103, true },
+  { 65125, true },
+  { 65146, true },
+  { 65163, true },
+  { 65179, true },
+  { 65193, true },
+  { 65214, true },
+  { 65230, true },
+  { 65247, false },
+  { 65267, true },
+  { 65297, true },
+  { 65323, true },
+  { 65345, true },
   { 65365, true },
-  { 65387, true },
-  { 65407, true },
-  { 65421, true },
+  { 65379, true },
+  { 65402, true },
+  { 65425, true },
   { 65444, true },
-  { 65467, true },
-  { 65486, true },
-  { 65508, true },
-  { 65526, true },
-  { 65544, true },
-  { 65555, true },
-  { 65566, true },
-  { 65576, true },
-  { 65593, true },
-  { 65612, true },
-  { 65622, true },
-  { 65640, true },
-  { 65659, true },
-  { 65669, true },
-  { 65687, true },
-  { 65696, false },
-  { 65716, true },
-  { 65724, true },
-  { 65734, false },
+  { 65466, true },
+  { 65484, true },
+  { 65502, true },
+  { 65513, true },
+  { 65524, true },
+  { 65534, true },
+  { 65551, true },
+  { 65570, true },
+  { 65580, true },
+  { 65598, true },
+  { 65617, true },
+  { 65627, true },
+  { 65645, true },
+  { 65654, false },
+  { 65674, true },
+  { 65682, true },
+  { 65692, false },
+  { 65707, true },
+  { 65721, true },
+  { 65734, true },
+  { 65742, true },
   { 65749, true },
-  { 65763, true },
-  { 65776, true },
-  { 65784, true },
-  { 65791, true },
-  { 65804, true },
-  { 65813, false },
-  { 65828, true },
-  { 65837, false },
+  { 65758, true },
+  { 65771, true },
+  { 65780, false },
+  { 65795, true },
+  { 65804, false },
+  { 65813, true },
+  { 65830, true },
+  { 65839, true },
   { 65846, true },
-  { 65863, true },
-  { 65872, true },
-  { 65879, true },
-  { 65887, true },
+  { 65854, true },
+  { 65866, true },
+  { 65883, true },
+  { 65891, false },
   { 65899, true },
-  { 65916, true },
-  { 65924, false },
-  { 65932, true },
-  { 65940, true },
-  { 65947, true },
-  { 65958, true },
-  { 65971, true },
-  { 65978, true },
-  { 65989, true },
-  { 65999, true },
-  { 66014, true },
-  { 66031, true },
-  { 66046, true },
-  { 66059, true },
-  { 66071, true },
-  { 66086, true },
+  { 65907, true },
+  { 65914, true },
+  { 65925, true },
+  { 65938, true },
+  { 65945, true },
+  { 65956, true },
+  { 65966, true },
+  { 65981, true },
+  { 65998, true },
+  { 66013, true },
+  { 66026, true },
+  { 66038, true },
+  { 66053, true },
+  { 66064, true },
+  { 66074, true },
+  { 66080, true },
+  { 66088, true },
   { 66097, true },
-  { 66107, true },
-  { 66113, true },
-  { 66121, true },
-  { 66130, true },
-  { 66138, true },
-  { 66152, true },
-  { 66164, true },
-  { 66179, true },
-  { 66186, true },
-  { 66196, true },
-  { 66213, true },
-  { 66231, true },
-  { 66248, false },
-  { 66260, true },
-  { 66270, true },
-  { 66284, true },
-  { 66297, false },
-  { 66313, true },
+  { 66105, true },
+  { 66119, true },
+  { 66131, true },
+  { 66146, true },
+  { 66153, true },
+  { 66163, true },
+  { 66180, true },
+  { 66198, true },
+  { 66215, false },
+  { 66227, true },
+  { 66237, true },
+  { 66251, true },
+  { 66264, false },
+  { 66280, true },
+  { 66296, true },
+  { 66315, true },
   { 66329, true },
-  { 66348, true },
-  { 66362, true },
-  { 66378, true },
-  { 66391, true },
-  { 66406, true },
-  { 66417, true },
-  { 66429, true },
-  { 66438, true },
-  { 66463, false },
-  { 66472, true },
-  { 66492, true },
-  { 66501, true },
-  { 66523, true },
-  { 66533, true },
-  { 66546, true },
-  { 66558, true },
-  { 66573, true },
-  { 66587, true },
+  { 66345, true },
+  { 66358, true },
+  { 66373, true },
+  { 66384, true },
+  { 66396, true },
+  { 66405, true },
+  { 66430, false },
+  { 66439, true },
+  { 66459, true },
+  { 66468, true },
+  { 66490, true },
+  { 66500, true },
+  { 66513, true },
+  { 66525, true },
+  { 66540, true },
+  { 66554, true },
+  { 66566, true },
+  { 66588, true },
   { 66599, true },
-  { 66621, true },
+  { 66607, true },
+  { 66618, true },
   { 66632, true },
-  { 66640, true },
-  { 66651, true },
-  { 66665, true },
-  { 66685, true },
-  { 66699, true },
-  { 66722, true },
-  { 66738, true },
-  { 66746, true },
-  { 66760, true },
-  { 66775, true },
-  { 66804, true },
-  { 66823, false },
+  { 66652, true },
+  { 66666, true },
+  { 66689, true },
+  { 66705, true },
+  { 66713, true },
+  { 66727, true },
+  { 66742, true },
+  { 66771, true },
+  { 66790, false },
+  { 66807, true },
+  { 66821, true },
   { 66840, true },
-  { 66854, true },
-  { 66873, true },
-  { 66889, true },
-  { 66904, true },
-  { 66915, true },
+  { 66856, true },
+  { 66871, true },
+  { 66882, true },
+  { 66893, true },
+  { 66905, true },
   { 66926, true },
-  { 66938, true },
-  { 66959, true },
-  { 66976, true },
-  { 66994, true },
-  { 67015, true },
-  { 67030, true },
-  { 67047, true },
-  { 67065, true },
-  { 67081, true },
-  { 67096, true },
-  { 67124, true },
-  { 67134, true },
-  { 67153, false },
-  { 67165, true },
-  { 67179, true },
-  { 67192, true },
-  { 67211, true },
-  { 67227, true },
-  { 67241, true },
-  { 67256, true },
-  { 67279, true },
-  { 67288, true },
-  { 67301, true },
-  { 67318, true },
-  { 67333, true },
-  { 67354, true },
-  { 67369, true },
-  { 67382, true },
-  { 67395, true },
-  { 67407, true },
-  { 67432, false },
-  { 67442, true },
-  { 67456, true },
-  { 67467, true },
-  { 67486, true },
-  { 67499, true },
-  { 67516, true },
-  { 67533, true },
-  { 67544, true },
-  { 67558, true },
-  { 67580, true },
-  { 67593, true },
-  { 67602, true },
-  { 67611, true },
-  { 67620, true },
+  { 66943, true },
+  { 66961, true },
+  { 66982, true },
+  { 66997, true },
+  { 67014, true },
+  { 67032, true },
+  { 67048, true },
+  { 67063, true },
+  { 67091, true },
+  { 67101, true },
+  { 67120, false },
+  { 67132, true },
+  { 67146, true },
+  { 67159, true },
+  { 67178, true },
+  { 67194, true },
+  { 67208, true },
+  { 67223, true },
+  { 67246, true },
+  { 67255, true },
+  { 67268, true },
+  { 67285, true },
+  { 67300, true },
+  { 67321, true },
+  { 67336, true },
+  { 67349, true },
+  { 67362, true },
+  { 67374, true },
+  { 67399, false },
+  { 67409, true },
+  { 67423, true },
+  { 67434, true },
+  { 67453, true },
+  { 67466, true },
+  { 67483, true },
+  { 67500, true },
+  { 67511, true },
+  { 67525, true },
+  { 67547, true },
+  { 67560, true },
+  { 67569, true },
+  { 67578, true },
+  { 67587, true },
+  { 67606, true },
+  { 67613, true },
+  { 67628, true },
   { 67639, true },
-  { 67646, true },
-  { 67661, true },
-  { 67672, true },
-  { 67696, true },
-  { 67707, true },
-  { 67717, true },
-  { 67730, true },
-  { 67742, true },
-  { 67753, true },
-  { 67764, true },
-  { 67776, true },
-  { 67792, true },
+  { 67663, true },
+  { 67674, true },
+  { 67684, true },
+  { 67697, true },
+  { 67709, true },
+  { 67720, true },
+  { 67731, true },
+  { 67743, true },
+  { 67759, true },
+  { 67780, true },
+  { 67794, true },
   { 67813, true },
-  { 67827, true },
-  { 67846, true },
-  { 67861, true },
-  { 67873, true },
-  { 67888, true },
-  { 67900, true },
-  { 67910, true },
-  { 67926, true },
-  { 67947, true },
-  { 67964, true },
-  { 67993, true },
-  { 68009, true },
-  { 68023, true },
-  { 68034, true },
-  { 68043, false },
-  { 68066, false },
-  { 68080, true },
-  { 68089, true },
-  { 68100, true },
-  { 68112, true },
-  { 68125, true },
-  { 68137, true },
+  { 67828, true },
+  { 67840, true },
+  { 67855, true },
+  { 67867, true },
+  { 67877, true },
+  { 67893, true },
+  { 67914, true },
+  { 67931, true },
+  { 67960, true },
+  { 67976, true },
+  { 67990, true },
+  { 68001, true },
+  { 68010, false },
+  { 68033, false },
+  { 68047, true },
+  { 68056, true },
+  { 68067, true },
+  { 68079, true },
+  { 68092, true },
+  { 68104, true },
+  { 68118, true },
+  { 68136, true },
   { 68151, true },
-  { 68169, true },
-  { 68184, true },
-  { 68204, true },
-  { 68220, false },
-  { 68232, true },
-  { 68249, true },
-  { 68267, true },
-  { 68284, true },
-  { 68295, true },
+  { 68171, true },
+  { 68187, false },
+  { 68199, true },
+  { 68216, true },
+  { 68234, true },
+  { 68251, true },
+  { 68262, true },
+  { 68280, true },
+  { 68294, true },
   { 68313, true },
-  { 68327, true },
+  { 68332, true },
   { 68346, true },
-  { 68365, true },
-  { 68379, true },
-  { 68390, true },
-  { 68400, true },
-  { 68413, true },
-  { 68429, true },
-  { 68443, true },
-  { 68463, true },
-  { 68472, true },
-  { 68489, true },
-  { 68509, true },
-  { 68528, true },
-  { 68547, false },
-  { 68565, true },
-  { 68594, true },
-  { 68610, true },
-  { 68626, true },
-  { 68640, true },
-  { 68656, true },
-  { 68671, true },
-  { 68685, true },
+  { 68357, true },
+  { 68367, true },
+  { 68380, true },
+  { 68396, true },
+  { 68410, true },
+  { 68430, true },
+  { 68439, true },
+  { 68456, true },
+  { 68476, true },
+  { 68495, true },
+  { 68514, false },
+  { 68532, true },
+  { 68561, true },
+  { 68577, true },
+  { 68593, true },
+  { 68607, true },
+  { 68623, true },
+  { 68638, true },
+  { 68652, true },
+  { 68661, true },
+  { 68676, true },
   { 68694, true },
-  { 68709, true },
-  { 68727, true },
-  { 68735, true },
-  { 68748, true },
-  { 68763, true },
-  { 68776, true },
-  { 68788, true },
-  { 68803, true },
-  { 68819, false },
-  { 68829, false },
-  { 68846, true },
-  { 68859, true },
-  { 68877, true },
-  { 68891, true },
-  { 68913, true },
-  { 68935, true },
-  { 68953, true },
-  { 68964, true },
-  { 68983, true },
-  { 68992, true },
-  { 69013, false },
+  { 68702, true },
+  { 68715, true },
+  { 68730, true },
+  { 68743, true },
+  { 68755, true },
+  { 68770, true },
+  { 68786, false },
+  { 68796, false },
+  { 68813, true },
+  { 68826, true },
+  { 68844, true },
+  { 68858, true },
+  { 68880, true },
+  { 68902, true },
+  { 68920, true },
+  { 68931, true },
+  { 68950, true },
+  { 68959, true },
+  { 68980, false },
+  { 68993, true },
+  { 69014, true },
   { 69026, true },
-  { 69047, true },
-  { 69059, true },
-  { 69072, true },
-  { 69087, true },
-  { 69100, true },
-  { 69117, true },
-  { 69129, true },
-  { 69146, true },
-  { 69155, true },
-  { 69170, true },
-  { 69200, true },
-  { 69238, true },
-  { 69269, true },
-  { 69301, true },
-  { 69329, true },
-  { 69358, true },
-  { 69392, true },
-  { 69430, true },
-  { 69460, true },
-  { 69490, true },
-  { 69519, true },
-  { 69555, true },
-  { 69567, true },
-  { 69581, true },
-  { 69602, true },
-  { 69618, true },
-  { 69628, true },
-  { 69638, true },
-  { 69653, true },
+  { 69039, true },
+  { 69054, true },
+  { 69067, true },
+  { 69084, true },
+  { 69096, true },
+  { 69113, true },
+  { 69122, true },
+  { 69137, true },
+  { 69167, true },
+  { 69205, true },
+  { 69236, true },
+  { 69268, true },
+  { 69296, true },
+  { 69325, true },
+  { 69359, true },
+  { 69397, true },
+  { 69427, true },
+  { 69457, true },
+  { 69486, true },
+  { 69522, true },
+  { 69534, true },
+  { 69548, true },
+  { 69569, true },
+  { 69585, true },
+  { 69595, true },
+  { 69605, true },
+  { 69620, true },
+  { 69642, true },
+  { 69651, true },
+  { 69665, true },
   { 69675, true },
-  { 69684, true },
-  { 69698, true },
-  { 69708, true },
-  { 69728, true },
-  { 69745, true },
-  { 69756, true },
-  { 69772, true },
-  { 69790, true },
-  { 69798, true },
-  { 69812, true },
-  { 69827, true },
-  { 69841, true },
-  { 69849, true },
-  { 69858, true },
-  { 69866, true },
-  { 69889, true },
-  { 69905, true },
-  { 69916, true },
-  { 69931, true },
-  { 69944, true },
-  { 69962, true },
-  { 69974, true },
-  { 69990, true },
-  { 70005, true },
-  { 70018, true },
-  { 70034, true },
-  { 70045, true },
-  { 70060, true },
-  { 70077, true },
-  { 70088, true },
-  { 70097, true },
-  { 70106, true },
-  { 70122, true },
-  { 70132, false },
-  { 70151, true },
-  { 70165, true },
-  { 70183, true },
-  { 70191, true },
+  { 69695, true },
+  { 69712, true },
+  { 69723, true },
+  { 69739, true },
+  { 69757, true },
+  { 69765, true },
+  { 69779, true },
+  { 69794, true },
+  { 69808, true },
+  { 69816, true },
+  { 69825, true },
+  { 69833, true },
+  { 69856, true },
+  { 69872, true },
+  { 69883, true },
+  { 69898, true },
+  { 69911, true },
+  { 69929, true },
+  { 69941, true },
+  { 69957, true },
+  { 69972, true },
+  { 69985, true },
+  { 70001, true },
+  { 70012, true },
+  { 70027, true },
+  { 70044, true },
+  { 70055, true },
+  { 70064, true },
+  { 70073, true },
+  { 70089, true },
+  { 70099, false },
+  { 70118, true },
+  { 70132, true },
+  { 70150, true },
+  { 70158, true },
+  { 70167, true },
+  { 70182, true },
+  { 70192, true },
   { 70200, true },
-  { 70215, true },
+  { 70210, true },
   { 70225, true },
-  { 70233, true },
-  { 70243, true },
-  { 70258, true },
-  { 70271, true },
-  { 70281, true },
-  { 70302, true },
-  { 70311, true },
-  { 70320, true },
-  { 70331, true },
-  { 70347, true },
-  { 70357, true },
-  { 70370, true },
-  { 70388, true },
+  { 70238, true },
+  { 70248, true },
+  { 70269, true },
+  { 70278, true },
+  { 70287, true },
+  { 70298, true },
+  { 70314, true },
+  { 70324, true },
+  { 70337, true },
+  { 70355, true },
+  { 70375, true },
+  { 70395, true },
   { 70408, true },
-  { 70428, true },
-  { 70441, true },
-  { 70452, true },
-  { 70462, true },
-  { 70471, true },
-  { 70480, true },
-  { 70488, false },
+  { 70419, true },
+  { 70429, true },
+  { 70438, true },
+  { 70447, true },
+  { 70458, true },
+  { 70466, false },
+  { 70473, true },
+  { 70483, true },
   { 70495, true },
   { 70505, true },
-  { 70517, true },
-  { 70527, true },
-  { 70541, true },
+  { 70519, true },
+  { 70533, true },
+  { 70548, true },
   { 70555, true },
-  { 70570, true },
-  { 70577, true },
-  { 70590, false },
-  { 70605, true },
-  { 70625, true },
-  { 70645, true },
-  { 70664, true },
-  { 70681, true },
-  { 70692, true },
-  { 70702, true },
-  { 70717, true },
-  { 70728, true },
-  { 70738, true },
-  { 70752, true },
-  { 70769, true },
-  { 70790, true },
-  { 70799, true },
-  { 70819, true },
+  { 70568, false },
+  { 70583, true },
+  { 70603, true },
+  { 70623, true },
+  { 70642, true },
+  { 70659, true },
+  { 70670, true },
+  { 70680, true },
+  { 70695, true },
+  { 70706, true },
+  { 70716, true },
+  { 70730, true },
+  { 70747, true },
+  { 70768, true },
+  { 70777, true },
+  { 70797, true },
+  { 70810, true },
+  { 70820, true },
   { 70832, true },
-  { 70842, true },
-  { 70854, true },
-  { 70863, true },
-  { 70873, true },
-  { 70887, true },
-  { 70898, true },
-  { 70906, true },
-  { 70913, true },
-  { 70927, true },
-  { 70946, true },
-  { 70960, true },
-  { 70985, true },
-  { 71003, true },
-  { 71021, true },
+  { 70841, true },
+  { 70851, true },
+  { 70865, true },
+  { 70876, true },
+  { 70884, true },
+  { 70891, true },
+  { 70905, true },
+  { 70924, true },
+  { 70938, true },
+  { 70963, true },
+  { 70981, true },
+  { 70999, true },
+  { 71013, true },
+  { 71022, true },
   { 71035, true },
-  { 71044, true },
-  { 71057, true },
-  { 71074, true },
-  { 71092, true },
-  { 71105, true },
-  { 71122, true },
-  { 71139, true },
-  { 71157, true },
-  { 71172, true },
-  { 71201, true },
-  { 71219, false },
-  { 71232, true },
-  { 71248, true },
-  { 71264, true },
-  { 71277, true },
-  { 71290, true },
-  { 71303, true },
-  { 71314, true },
-  { 71324, false },
-  { 71342, true },
-  { 71355, true },
-  { 71372, true },
-  { 71385, true },
-  { 71401, true },
-  { 71420, true },
+  { 71052, true },
+  { 71070, true },
+  { 71083, true },
+  { 71100, true },
+  { 71117, true },
+  { 71135, true },
+  { 71150, true },
+  { 71179, true },
+  { 71197, false },
+  { 71210, true },
+  { 71226, true },
+  { 71242, true },
+  { 71255, true },
+  { 71268, true },
+  { 71281, true },
+  { 71292, true },
+  { 71302, false },
+  { 71320, true },
+  { 71333, true },
+  { 71350, true },
+  { 71363, true },
+  { 71379, true },
+  { 71398, true },
+  { 71412, true },
+  { 71427, true },
   { 71434, true },
-  { 71449, true },
-  { 71456, true },
+  { 71463, true },
   { 71485, true },
-  { 71507, true },
-  { 71528, true },
-  { 71555, true },
-  { 71575, true },
-  { 71583, true },
-  { 71594, true },
-  { 71614, true },
-  { 71633, false },
-  { 71650, true },
-  { 71666, true },
-  { 71680, true },
-  { 71691, true },
-  { 71703, true },
-  { 71717, true },
-  { 71735, true },
-  { 71751, false },
-  { 71766, true },
-  { 71787, true },
-  { 71799, true },
-  { 71811, true },
-  { 71828, true },
-  { 71843, true },
-  { 71862, true },
-  { 71876, true },
-  { 71894, true },
-  { 71908, true },
-  { 71917, true },
-  { 71927, true },
-  { 71938, true },
-  { 71954, true },
-  { 71968, true },
-  { 71986, true },
-  { 71999, true },
-  { 72013, true },
-  { 72027, true },
-  { 72041, true },
-  { 72050, true },
-  { 72061, true },
-  { 72085, true },
-  { 72097, true },
-  { 72108, false },
-  { 72121, true },
-  { 72127, true },
-  { 72137, true },
-  { 72146, true },
+  { 71506, true },
+  { 71533, true },
+  { 71553, true },
+  { 71561, true },
+  { 71572, true },
+  { 71592, true },
+  { 71611, false },
+  { 71628, true },
+  { 71644, true },
+  { 71658, true },
+  { 71669, true },
+  { 71681, true },
+  { 71695, true },
+  { 71713, true },
+  { 71729, false },
+  { 71744, true },
+  { 71765, true },
+  { 71777, true },
+  { 71789, true },
+  { 71806, true },
+  { 71821, true },
+  { 71840, true },
+  { 71854, true },
+  { 71872, true },
+  { 71886, true },
+  { 71895, true },
+  { 71905, true },
+  { 71916, true },
+  { 71932, true },
+  { 71946, true },
+  { 71964, true },
+  { 71977, true },
+  { 71991, true },
+  { 72005, true },
+  { 72019, true },
+  { 72028, true },
+  { 72039, true },
+  { 72063, true },
+  { 72075, true },
+  { 72086, false },
+  { 72099, true },
+  { 72105, true },
+  { 72115, true },
+  { 72124, true },
+  { 72138, true },
+  { 72150, true },
   { 72160, true },
-  { 72172, true },
-  { 72182, true },
-  { 72198, true },
-  { 72210, true },
-  { 72226, true },
-  { 72237, true },
-  { 72249, true },
-  { 72264, true },
-  { 72281, true },
-  { 72292, true },
-  { 72308, true },
-  { 72330, false },
-  { 72345, true },
-  { 72355, true },
-  { 72374, true },
-  { 72390, true },
-  { 72402, true },
-  { 72413, true },
-  { 72430, true },
+  { 72176, true },
+  { 72188, true },
+  { 72204, true },
+  { 72215, true },
+  { 72227, true },
+  { 72242, true },
+  { 72259, true },
+  { 72270, true },
+  { 72286, true },
+  { 72308, false },
+  { 72323, true },
+  { 72333, true },
+  { 72352, true },
+  { 72368, true },
+  { 72380, true },
+  { 72391, true },
+  { 72408, true },
+  { 72427, true },
   { 72449, true },
-  { 72471, true },
-  { 72494, true },
-  { 72511, true },
-  { 72527, true },
-  { 72540, true },
-  { 72549, false },
-  { 72558, true },
-  { 72569, true },
-  { 72586, true },
-  { 72602, true },
-  { 72616, true },
-  { 72630, true },
-  { 72648, false },
+  { 72472, true },
+  { 72489, true },
+  { 72505, true },
+  { 72518, true },
+  { 72527, false },
+  { 72536, true },
+  { 72547, true },
+  { 72564, true },
+  { 72580, true },
+  { 72594, true },
+  { 72608, true },
+  { 72626, false },
+  { 72634, true },
+  { 72643, true },
   { 72656, true },
-  { 72665, true },
-  { 72678, true },
+  { 72673, true },
+  { 72683, true },
   { 72695, true },
   { 72705, true },
-  { 72717, true },
-  { 72727, true },
-  { 72775, true },
-  { 72819, true },
-  { 72857, true },
-  { 72896, true },
-  { 72931, true },
-  { 72971, true },
-  { 73015, true },
-  { 73051, true },
-  { 73092, true },
-  { 73129, true },
-  { 73173, true },
-  { 73200, true },
+  { 72753, true },
+  { 72797, true },
+  { 72835, true },
+  { 72874, true },
+  { 72909, true },
+  { 72949, true },
+  { 72993, true },
+  { 73029, true },
+  { 73070, true },
+  { 73107, true },
+  { 73151, true },
+  { 73178, true },
+  { 73190, true },
+  { 73198, true },
+  { 73204, true },
   { 73212, true },
-  { 73220, true },
-  { 73226, true },
-  { 73234, true },
+  { 73224, true },
+  { 73233, true },
   { 73246, true },
   { 73255, true },
-  { 73268, true },
   { 73277, true },
-  { 73299, true },
-  { 73306, true },
+  { 73284, true },
+  { 73296, true },
+  { 73309, true },
   { 73318, true },
-  { 73331, true },
-  { 73340, true },
-  { 73355, true },
-  { 73369, true },
-  { 73379, true },
-  { 73388, true },
-  { 73399, true },
-  { 73411, true },
-  { 73424, true },
-  { 73440, true },
-  { 73449, true },
-  { 73458, true },
-  { 73479, true },
-  { 73490, true },
-  { 73504, true },
-  { 73521, true },
+  { 73333, true },
+  { 73347, true },
+  { 73357, true },
+  { 73366, true },
+  { 73377, true },
+  { 73389, true },
+  { 73402, true },
+  { 73418, true },
+  { 73427, true },
+  { 73436, true },
+  { 73457, true },
+  { 73468, true },
+  { 73482, true },
+  { 73499, true },
+  { 73516, true },
+  { 73528, true },
   { 73538, true },
-  { 73550, true },
-  { 73560, true },
-  { 73583, true },
+  { 73561, true },
+  { 73575, true },
   { 73597, true },
-  { 73619, true },
-  { 73634, true },
-  { 73649, true },
+  { 73612, true },
+  { 73627, true },
+  { 73653, true },
+  { 73664, true },
   { 73675, true },
-  { 73686, true },
-  { 73697, true },
-  { 73713, true },
-  { 73722, true },
-  { 73733, true },
-  { 73762, true },
-  { 73775, true },
-  { 73791, true },
-  { 73819, true },
-  { 73839, true },
-  { 73855, true },
-  { 73867, false },
-  { 73885, false },
-  { 73893, false },
-  { 73904, true },
-  { 73914, true },
-  { 73935, true },
-  { 73953, true },
-  { 73963, true },
-  { 73973, true },
-  { 73983, true },
-  { 73998, true },
-  { 74012, true },
-  { 74025, true },
-  { 74040, true },
-  { 74055, true },
-  { 74066, true },
-  { 74078, true },
-  { 74090, true },
-  { 74099, true },
-  { 74108, false },
-  { 74120, true },
-  { 74136, true },
-  { 74147, true },
-  { 74163, true },
+  { 73691, true },
+  { 73700, true },
+  { 73711, true },
+  { 73740, true },
+  { 73753, true },
+  { 73769, true },
+  { 73797, true },
+  { 73817, true },
+  { 73833, true },
+  { 73845, false },
+  { 73863, false },
+  { 73871, false },
+  { 73882, true },
+  { 73892, true },
+  { 73913, true },
+  { 73931, true },
+  { 73941, true },
+  { 73951, true },
+  { 73961, true },
+  { 73976, true },
+  { 73990, true },
+  { 74003, true },
+  { 74018, true },
+  { 74033, true },
+  { 74044, true },
+  { 74056, true },
+  { 74068, true },
+  { 74077, true },
+  { 74086, false },
+  { 74098, true },
+  { 74114, true },
+  { 74125, true },
+  { 74141, true },
+  { 74160, true },
   { 74182, true },
-  { 74204, true },
-  { 74220, true },
-  { 74235, true },
-  { 74256, true },
-  { 74287, true },
-  { 74311, true },
-  { 74330, true },
-  { 74350, true },
-  { 74370, true },
-  { 74388, true },
-  { 74405, true },
-  { 74424, true },
-  { 74448, true },
-  { 74467, true },
-  { 74485, true },
+  { 74198, true },
+  { 74213, true },
+  { 74234, true },
+  { 74265, true },
+  { 74289, true },
+  { 74308, true },
+  { 74328, true },
+  { 74348, true },
+  { 74366, true },
+  { 74383, true },
+  { 74402, true },
+  { 74426, true },
+  { 74445, true },
+  { 74463, true },
+  { 74480, true },
   { 74502, true },
-  { 74524, true },
-  { 74544, true },
-  { 74564, true },
+  { 74522, true },
+  { 74542, true },
+  { 74559, true },
   { 74581, true },
-  { 74603, true },
-  { 74619, true },
-  { 74636, true },
-  { 74651, true },
-  { 74667, true },
+  { 74597, true },
+  { 74614, true },
+  { 74629, true },
+  { 74645, true },
+  { 74664, true },
   { 74686, true },
   { 74708, true },
   { 74730, true },
-  { 74752, true },
-  { 74769, true },
-  { 74784, true },
-  { 74803, true },
-  { 74816, true },
-  { 74829, true },
-  { 74844, true },
-  { 74859, true },
-  { 74870, true },
-  { 74880, true },
-  { 74893, true },
-  { 74909, true },
-  { 74921, true },
-  { 74934, false },
-  { 74944, false },
+  { 74747, true },
+  { 74762, true },
+  { 74781, true },
+  { 74794, true },
+  { 74807, true },
+  { 74822, true },
+  { 74837, true },
+  { 74848, true },
+  { 74858, true },
+  { 74871, true },
+  { 74887, true },
+  { 74899, true },
+  { 74912, false },
+  { 74922, false },
+  { 74931, true },
   { 74953, true },
-  { 74975, true },
-  { 74995, true },
-  { 75016, true },
-  { 75031, true },
-  { 75042, true },
-  { 75063, true },
+  { 74973, true },
+  { 74994, true },
+  { 75009, true },
+  { 75020, true },
+  { 75041, true },
+  { 75057, true },
   { 75079, true },
-  { 75101, true },
-  { 75125, false },
-  { 75142, true },
-  { 75155, true },
-  { 75169, true },
-  { 75185, true },
-  { 75198, true },
-  { 75211, true },
-  { 75224, true },
-  { 75243, true },
-  { 75254, true },
-  { 75263, true },
-  { 75272, true },
-  { 75282, true },
-  { 75295, true },
-  { 75305, true },
-  { 75314, true },
-  { 75330, true },
-  { 75346, true },
-  { 75373, true },
-  { 75384, true },
-  { 75401, true },
-  { 75414, true },
-  { 75428, true },
-  { 75445, true },
-  { 75460, true },
-  { 75483, true },
-  { 75493, true },
-  { 75503, true },
-  { 75518, true },
-  { 75539, true },
-  { 75549, true },
-  { 75568, true },
-  { 75588, true },
-  { 75602, true },
-  { 75627, true },
-  { 75651, true },
-  { 75660, true },
-  { 75677, true },
-  { 75698, true },
-  { 75718, true },
-  { 75730, true },
-  { 75743, true },
-  { 75757, true },
-  { 75774, true },
-  { 75791, false },
-  { 75804, true },
-  { 75821, true },
-  { 75830, true },
-  { 75848, true },
-  { 75864, true },
-  { 75875, true },
-  { 75888, true },
-  { 75906, true },
-  { 75922, true },
-  { 75936, true },
-  { 75947, true },
-  { 75961, true },
-  { 75978, true },
-  { 75987, true },
-  { 76001, false },
-  { 76029, true },
-  { 76038, true },
-  { 76047, true },
-  { 76057, true },
-  { 76073, true },
-  { 76083, true },
-  { 76096, true },
-  { 76110, false },
-  { 76124, false },
-  { 76139, true },
-  { 76163, true },
+  { 75103, false },
+  { 75120, true },
+  { 75133, true },
+  { 75147, true },
+  { 75163, true },
+  { 75176, true },
+  { 75189, true },
+  { 75202, true },
+  { 75221, true },
+  { 75232, true },
+  { 75241, true },
+  { 75250, true },
+  { 75260, true },
+  { 75273, true },
+  { 75283, true },
+  { 75292, true },
+  { 75308, true },
+  { 75324, true },
+  { 75351, true },
+  { 75362, true },
+  { 75379, true },
+  { 75392, true },
+  { 75406, true },
+  { 75423, true },
+  { 75438, true },
+  { 75461, true },
+  { 75471, true },
+  { 75481, true },
+  { 75496, true },
+  { 75517, true },
+  { 75527, true },
+  { 75546, true },
+  { 75566, true },
+  { 75580, true },
+  { 75605, true },
+  { 75629, true },
+  { 75638, true },
+  { 75655, true },
+  { 75676, true },
+  { 75696, true },
+  { 75708, true },
+  { 75721, true },
+  { 75735, true },
+  { 75752, true },
+  { 75769, false },
+  { 75782, true },
+  { 75799, true },
+  { 75808, true },
+  { 75826, true },
+  { 75842, true },
+  { 75853, true },
+  { 75866, true },
+  { 75884, true },
+  { 75900, true },
+  { 75914, true },
+  { 75925, true },
+  { 75939, true },
+  { 75956, true },
+  { 75965, true },
+  { 75979, false },
+  { 76007, true },
+  { 76016, true },
+  { 76025, true },
+  { 76035, true },
+  { 76051, true },
+  { 76061, true },
+  { 76074, true },
+  { 76088, false },
+  { 76102, false },
+  { 76117, true },
+  { 76141, true },
+  { 76162, true },
   { 76184, true },
+  { 76194, true },
   { 76206, true },
-  { 76216, true },
-  { 76228, true },
-  { 76254, true },
-  { 76271, true },
-  { 76284, true },
-  { 76296, true },
-  { 76309, true },
-  { 76321, true },
-  { 76333, false },
-  { 76357, true },
-  { 76370, true },
-  { 76389, true },
-  { 76413, true },
-  { 76429, true },
-  { 76439, true },
-  { 76455, true },
-  { 76471, true },
-  { 76490, true },
-  { 76507, true },
-  { 76521, true },
-  { 76539, true },
-  { 76556, true },
-  { 76573, false },
-  { 76599, true },
-  { 76616, true },
-  { 76630, true },
-  { 76641, true },
-  { 76653, true },
-  { 76673, true },
-  { 76689, true },
-  { 76707, true },
-  { 76725, true },
-  { 76741, true },
-  { 76751, true },
-  { 76769, true },
-  { 76781, true },
-  { 76796, true },
-  { 76814, true },
-  { 76832, true },
-  { 76851, true },
-  { 76861, true },
-  { 76875, true },
-  { 76885, true },
-  { 76896, true },
-  { 76906, true },
-  { 76922, true },
+  { 76232, true },
+  { 76249, true },
+  { 76262, true },
+  { 76274, true },
+  { 76287, true },
+  { 76299, true },
+  { 76311, false },
+  { 76335, true },
+  { 76348, true },
+  { 76367, true },
+  { 76391, true },
+  { 76407, true },
+  { 76417, true },
+  { 76433, true },
+  { 76449, true },
+  { 76468, true },
+  { 76485, true },
+  { 76499, true },
+  { 76517, true },
+  { 76534, true },
+  { 76551, false },
+  { 76577, true },
+  { 76594, true },
+  { 76608, true },
+  { 76619, true },
+  { 76631, true },
+  { 76651, true },
+  { 76667, true },
+  { 76685, true },
+  { 76703, true },
+  { 76719, true },
+  { 76729, true },
+  { 76747, true },
+  { 76759, true },
+  { 76774, true },
+  { 76792, true },
+  { 76810, true },
+  { 76829, true },
+  { 76839, true },
+  { 76853, true },
+  { 76863, true },
+  { 76874, true },
+  { 76884, true },
+  { 76900, true },
+  { 76919, true },
+  { 76929, true },
   { 76941, true },
-  { 76951, true },
-  { 76963, true },
-  { 76974, true },
-  { 76984, true },
-  { 77000, true },
-  { 77013, true },
-  { 77036, true },
-  { 77060, true },
-  { 77075, true },
-  { 77095, true },
-  { 77108, false },
-  { 77120, true },
-  { 77130, true },
-  { 77143, true },
-  { 77158, true },
-  { 77178, true },
-  { 77188, true },
-  { 77198, false },
-  { 77215, true },
-  { 77223, true },
-  { 77239, true },
-  { 77254, true },
-  { 77270, true },
-  { 77286, true },
-  { 77300, true },
-  { 77316, true },
-  { 77330, true },
-  { 77344, true },
-  { 77356, true },
-  { 77376, true },
-  { 77392, true },
-  { 77409, true },
-  { 77419, true },
-  { 77432, true },
-  { 77451, true },
-  { 77462, true },
-  { 77475, true },
-  { 77489, true },
-  { 77502, true },
-  { 77510, true },
-  { 77520, true },
-  { 77534, true },
-  { 77546, true },
-  { 77562, true },
-  { 77573, true },
-  { 77581, true },
-  { 77602, true },
-  { 77626, true },
-  { 77651, true },
-  { 77663, true },
-  { 77676, true },
-  { 77689, true },
-  { 77701, true },
-  { 77720, true },
-  { 77735, true },
-  { 77748, true },
-  { 77761, true },
-  { 77781, true },
-  { 77796, true },
-  { 77812, true },
-  { 77823, true },
-  { 77841, true },
+  { 76952, true },
+  { 76962, true },
+  { 76978, true },
+  { 76991, true },
+  { 77014, true },
+  { 77038, true },
+  { 77053, true },
+  { 77073, true },
+  { 77086, false },
+  { 77098, true },
+  { 77108, true },
+  { 77121, true },
+  { 77136, true },
+  { 77156, true },
+  { 77166, true },
+  { 77176, false },
+  { 77193, true },
+  { 77201, true },
+  { 77217, true },
+  { 77232, true },
+  { 77248, true },
+  { 77264, true },
+  { 77278, true },
+  { 77294, true },
+  { 77308, true },
+  { 77322, true },
+  { 77334, true },
+  { 77354, true },
+  { 77370, true },
+  { 77387, true },
+  { 77397, true },
+  { 77410, true },
+  { 77429, true },
+  { 77440, true },
+  { 77453, true },
+  { 77467, true },
+  { 77480, true },
+  { 77488, true },
+  { 77498, true },
+  { 77512, true },
+  { 77524, true },
+  { 77540, true },
+  { 77551, true },
+  { 77559, true },
+  { 77580, true },
+  { 77604, true },
+  { 77629, true },
+  { 77641, true },
+  { 77654, true },
+  { 77667, true },
+  { 77679, true },
+  { 77698, true },
+  { 77713, true },
+  { 77726, true },
+  { 77739, true },
+  { 77759, true },
+  { 77774, true },
+  { 77790, true },
+  { 77801, true },
+  { 77819, true },
+  { 77828, true },
+  { 77839, true },
   { 77850, true },
   { 77861, true },
   { 77872, true },
-  { 77883, true },
-  { 77894, true },
-  { 77904, true },
+  { 77882, true },
+  { 77896, true },
+  { 77908, true },
   { 77918, true },
-  { 77930, true },
-  { 77940, true },
-  { 77949, true },
+  { 77927, true },
+  { 77941, true },
+  { 77951, true },
   { 77963, true },
-  { 77973, true },
-  { 77985, true },
-  { 77994, true },
-  { 78005, false },
-  { 78018, true },
-  { 78032, true },
+  { 77972, true },
+  { 77983, false },
+  { 77996, true },
+  { 78010, true },
+  { 78022, true },
   { 78044, true },
-  { 78066, true },
-  { 78079, true },
-  { 78091, true },
-  { 78103, true },
-  { 78115, true },
-  { 78127, true },
-  { 78139, true },
-  { 78151, true },
-  { 78163, true },
-  { 78175, true },
-  { 78191, true },
-  { 78206, true },
-  { 78225, true },
+  { 78057, true },
+  { 78069, true },
+  { 78081, true },
+  { 78093, true },
+  { 78105, true },
+  { 78117, true },
+  { 78129, true },
+  { 78141, true },
+  { 78153, true },
+  { 78169, true },
+  { 78184, true },
+  { 78203, true },
+  { 78220, true },
   { 78242, true },
-  { 78264, true },
-  { 78277, false },
-  { 78297, true },
-  { 78315, true },
+  { 78255, false },
+  { 78275, true },
+  { 78293, true },
+  { 78303, true },
+  { 78316, true },
   { 78325, true },
-  { 78338, true },
-  { 78347, true },
-  { 78358, true },
-  { 78371, true },
-  { 78386, true },
-  { 78400, true },
-  { 78411, true },
-  { 78435, false },
-  { 78456, true },
-  { 78468, true },
-  { 78478, true },
-  { 78487, true },
-  { 78502, true },
-  { 78515, true },
-  { 78526, true },
-  { 78537, true },
-  { 78550, true },
-  { 78559, true },
-  { 78571, true },
-  { 78580, true },
-  { 78589, true },
-  { 78603, true },
-  { 78617, true },
-  { 78639, true },
-  { 78659, false },
-  { 78684, true },
-  { 78697, true },
-  { 78706, true },
-  { 78727, true },
-  { 78737, true },
-  { 78752, true },
-  { 78764, true },
-  { 78776, true },
-  { 78801, true },
-  { 78817, true },
-  { 78828, true },
-  { 78841, true },
-  { 78856, true },
-  { 78871, true },
-  { 78885, true },
-  { 78894, true },
-  { 78928, true },
-  { 78938, true },
-  { 78949, true },
-  { 78975, false },
-  { 78990, true },
-  { 79000, true },
-  { 79009, true },
-  { 79021, true },
-  { 79031, true },
-  { 79040, true },
-  { 79054, false },
-  { 79065, true },
-  { 79073, true },
-  { 79081, true },
-  { 79092, true },
-  { 79101, true },
-  { 79116, true },
-  { 79128, true },
-  { 79142, true },
-  { 79156, true },
-  { 79176, true },
-  { 79188, true },
-  { 79206, true },
-  { 79222, true },
-  { 79239, true },
-  { 79252, true },
-  { 79262, true },
-  { 79276, true },
-  { 79288, true },
-  { 79300, true },
-  { 79314, true },
-  { 79325, true },
-  { 79335, true },
-  { 79342, true },
-  { 79351, true },
-  { 79370, true },
-  { 79384, true },
-  { 79397, true },
-  { 79411, true },
-  { 79422, true },
-  { 79431, true },
-  { 79439, true },
-  { 79452, true },
-  { 79468, true },
-  { 79491, true },
-  { 79500, true },
-  { 79518, true },
-  { 79532, true },
-  { 79546, true },
-  { 79560, true },
-  { 79575, true },
-  { 79589, true },
-  { 79603, true },
-  { 79617, true },
-  { 79632, true },
-  { 79646, true },
-  { 79660, true },
-  { 79674, true },
-  { 79688, true },
-  { 79705, true },
-  { 79725, true },
-  { 79746, true },
-  { 79778, true },
-  { 79790, true },
-  { 79800, true },
-  { 79812, true },
-  { 79827, true },
-  { 79849, true },
-  { 79868, true },
-  { 79880, true },
-  { 79894, true },
-  { 79912, true },
-  { 79923, true },
-  { 79941, true },
-  { 79948, true },
-  { 79958, true },
-  { 79970, true },
-  { 79985, true },
-  { 80002, true },
-  { 80020, true },
-  { 80033, true },
-  { 80052, true },
-  { 80062, true },
-  { 80082, true },
-  { 80095, true },
-  { 80105, true },
-  { 80119, true },
-  { 80132, true },
-  { 80145, true },
-  { 80158, true },
-  { 80168, true },
-  { 80184, true },
-  { 80210, true },
-  { 80222, true },
-  { 80234, true },
-  { 80247, false },
-  { 80262, true },
-  { 80275, true },
-  { 80289, true },
-  { 80306, true },
-  { 80318, true },
-  { 80337, true },
-  { 80344, true },
-  { 80356, true },
-  { 80368, true },
-  { 80380, true },
-  { 80389, true },
-  { 80400, true },
-  { 80414, true },
-  { 80427, true },
-  { 80452, true },
-  { 80475, false },
-  { 80485, true },
-  { 80496, true },
-  { 80509, true },
-  { 80524, true },
-  { 80538, true },
-  { 80550, true },
-  { 80561, true },
-  { 80572, true },
-  { 80582, true },
-  { 80591, true },
-  { 80599, true },
-  { 80610, true },
-  { 80630, true },
-  { 80650, false },
-  { 80668, true },
-  { 80687, true },
-  { 80705, true },
-  { 80722, true },
-  { 80734, true },
-  { 80748, true },
-  { 80771, true },
-  { 80781, true },
-  { 80796, true },
-  { 80810, true },
-  { 80826, true },
-  { 80839, true },
-  { 80862, true },
-  { 80874, true },
-  { 80888, true },
-  { 80909, true },
-  { 80916, true },
-  { 80929, true },
-  { 80942, true },
-  { 80962, true },
-  { 80980, true },
-  { 81002, true },
-  { 81015, true },
-  { 81035, true },
-  { 81050, true },
-  { 81061, true },
-  { 81075, true },
-  { 81088, true },
-  { 81101, true },
-  { 81120, true },
-  { 81135, true },
-  { 81155, true },
-  { 81171, true },
-  { 81190, true },
-  { 81209, true },
-  { 81224, true },
-  { 81236, true },
-  { 81243, true },
-  { 81259, true },
-  { 81286, true },
-  { 81314, true },
-  { 81338, true },
-  { 81357, true },
-  { 81374, true },
-  { 81393, true },
-  { 81411, true },
-  { 81429, true },
-  { 81447, true },
-  { 81459, true },
-  { 81482, true },
-  { 81496, true },
-  { 81508, true },
-  { 81521, true },
-  { 81535, true },
-  { 81545, true },
-  { 81556, false },
-  { 81566, true },
-  { 81586, true },
-  { 81596, true },
-  { 81609, true },
-  { 81624, true },
-  { 81633, true },
-  { 81645, true },
-  { 81655, true },
-  { 81672, true },
-  { 81685, true },
-  { 81694, true },
-  { 81701, true },
-  { 81714, true },
-  { 81727, true },
-  { 81736, true },
-  { 81749, true },
-  { 81767, true },
-  { 81782, true },
-  { 81798, true },
-  { 81814, true },
-  { 81825, true },
-  { 81839, true },
-  { 81856, true },
-  { 81873, true },
-  { 81883, true },
-  { 81910, true },
-  { 81945, true },
-  { 81971, true },
-  { 81983, false },
-  { 81996, true },
-  { 82017, true },
-  { 82030, true },
-  { 82049, true },
-  { 82074, true },
-  { 82096, true },
-  { 82117, true },
-  { 82132, true },
-  { 82152, false },
-  { 82162, true },
-  { 82181, true },
-  { 82198, true },
-  { 82215, true },
-  { 82225, true },
-  { 82235, true },
-  { 82248, true },
-  { 82260, true },
-  { 82271, true },
-  { 82286, true },
-  { 82299, true },
-  { 82314, true },
-  { 82327, true },
-  { 82340, true },
-  { 82354, true },
-  { 82377, true },
-  { 82392, true },
-  { 82404, true },
-  { 82417, true },
-  { 82431, true },
-  { 82450, true },
-  { 82462, true },
-  { 82486, true },
-  { 82508, true },
-  { 82529, true },
-  { 82554, true },
-  { 82577, true },
-  { 82597, true },
-  { 82608, true },
-  { 82620, true },
-  { 82632, true },
-  { 82652, true },
-  { 82669, true },
-  { 82686, true },
-  { 82707, true },
-  { 82730, true },
-  { 82746, true },
-  { 82766, true },
-  { 82779, true },
-  { 82795, true },
-  { 82810, true },
-  { 82820, true },
-  { 82837, true },
-  { 82848, true },
-  { 82867, true },
-  { 82877, true },
-  { 82887, true },
-  { 82895, true },
-  { 82921, true },
-  { 82941, true },
-  { 82955, true },
-  { 82968, true },
-  { 82981, true },
-  { 82990, true },
-  { 82997, true },
-  { 83004, false },
-  { 83020, true },
-  { 83029, true },
-  { 83044, true },
-  { 83058, true },
-  { 83070, true },
-  { 83082, true },
-  { 83105, true },
-  { 83119, true },
-  { 83134, true },
-  { 83144, true },
-  { 83160, true },
-  { 83172, true },
-  { 83187, true },
-  { 83203, true },
-  { 83220, true },
-  { 83238, true },
-  { 83259, true },
-  { 83276, true },
-  { 83293, true },
-  { 83310, true },
-  { 83327, true },
-  { 83344, true },
-  { 83361, true },
-  { 83378, true },
-  { 83395, true },
-  { 83414, true },
-  { 83430, true },
-  { 83444, true },
-  { 83469, true },
-  { 83480, true },
-  { 83496, true },
-  { 83512, true },
-  { 83534, false },
-  { 83547, true },
-  { 83567, true },
-  { 83580, true },
-  { 83589, false },
-  { 83605, true },
-  { 83619, true },
-  { 83632, true },
-  { 83642, true },
-  { 83653, true },
-  { 83667, true },
-  { 83683, true },
-  { 83695, true },
-  { 83709, true },
-  { 83724, true },
-  { 83734, true },
-  { 83743, true },
-  { 83753, false },
-  { 83763, true },
-  { 83772, true },
-  { 83782, true },
-  { 83795, true },
-  { 83814, true },
-  { 83824, true },
-  { 83833, true },
-  { 83843, true },
-  { 83866, true },
-  { 83882, false },
-  { 83902, true },
-  { 83925, true },
-  { 83939, true },
-  { 83951, true },
-  { 83960, true },
-  { 83977, true },
-  { 83996, true },
-  { 84013, true },
-  { 84025, true },
-  { 84036, true },
-  { 84049, false },
-  { 84061, true },
-  { 84072, true },
-  { 84086, true },
-  { 84103, true },
-  { 84118, true },
-  { 84136, true },
+  { 78336, true },
+  { 78349, true },
+  { 78364, true },
+  { 78383, true },
+  { 78397, true },
+  { 78408, true },
+  { 78432, false },
+  { 78453, true },
+  { 78465, true },
+  { 78475, true },
+  { 78484, true },
+  { 78499, true },
+  { 78512, true },
+  { 78523, true },
+  { 78534, true },
+  { 78547, true },
+  { 78556, true },
+  { 78568, true },
+  { 78577, true },
+  { 78586, true },
+  { 78600, true },
+  { 78614, true },
+  { 78636, true },
+  { 78656, false },
+  { 78681, true },
+  { 78694, true },
+  { 78703, true },
+  { 78724, true },
+  { 78734, true },
+  { 78749, true },
+  { 78761, true },
+  { 78773, true },
+  { 78798, true },
+  { 78814, true },
+  { 78825, true },
+  { 78838, true },
+  { 78853, true },
+  { 78868, true },
+  { 78882, true },
+  { 78891, true },
+  { 78925, true },
+  { 78935, true },
+  { 78946, true },
+  { 78972, false },
+  { 78987, true },
+  { 78997, true },
+  { 79006, true },
+  { 79018, true },
+  { 79028, true },
+  { 79037, true },
+  { 79051, false },
+  { 79062, true },
+  { 79070, true },
+  { 79078, true },
+  { 79089, true },
+  { 79098, true },
+  { 79113, true },
+  { 79125, true },
+  { 79139, true },
+  { 79153, true },
+  { 79173, true },
+  { 79185, true },
+  { 79203, true },
+  { 79219, true },
+  { 79236, true },
+  { 79249, true },
+  { 79259, true },
+  { 79273, true },
+  { 79285, true },
+  { 79297, true },
+  { 79311, true },
+  { 79322, true },
+  { 79332, true },
+  { 79339, true },
+  { 79348, true },
+  { 79367, true },
+  { 79381, true },
+  { 79394, true },
+  { 79408, true },
+  { 79419, true },
+  { 79428, true },
+  { 79436, true },
+  { 79449, true },
+  { 79465, true },
+  { 79488, true },
+  { 79497, true },
+  { 79515, true },
+  { 79529, true },
+  { 79543, true },
+  { 79557, true },
+  { 79572, true },
+  { 79586, true },
+  { 79600, true },
+  { 79614, true },
+  { 79629, true },
+  { 79643, true },
+  { 79657, true },
+  { 79671, true },
+  { 79685, true },
+  { 79702, true },
+  { 79722, true },
+  { 79743, true },
+  { 79775, true },
+  { 79787, true },
+  { 79797, true },
+  { 79809, true },
+  { 79824, true },
+  { 79846, true },
+  { 79865, true },
+  { 79877, true },
+  { 79891, true },
+  { 79909, true },
+  { 79920, true },
+  { 79938, true },
+  { 79945, true },
+  { 79955, true },
+  { 79967, true },
+  { 79982, true },
+  { 79999, true },
+  { 80017, true },
+  { 80030, true },
+  { 80049, true },
+  { 80059, true },
+  { 80079, true },
+  { 80092, true },
+  { 80102, true },
+  { 80116, true },
+  { 80129, true },
+  { 80142, true },
+  { 80155, true },
+  { 80165, true },
+  { 80181, true },
+  { 80207, true },
+  { 80219, true },
+  { 80231, true },
+  { 80244, false },
+  { 80259, true },
+  { 80272, true },
+  { 80286, true },
+  { 80303, true },
+  { 80315, true },
+  { 80334, true },
+  { 80341, true },
+  { 80353, true },
+  { 80365, true },
+  { 80377, true },
+  { 80386, true },
+  { 80397, true },
+  { 80411, true },
+  { 80424, true },
+  { 80449, true },
+  { 80472, false },
+  { 80482, true },
+  { 80493, true },
+  { 80506, true },
+  { 80521, true },
+  { 80535, true },
+  { 80547, true },
+  { 80558, true },
+  { 80569, true },
+  { 80579, true },
+  { 80588, true },
+  { 80596, true },
+  { 80607, true },
+  { 80627, true },
+  { 80647, false },
+  { 80665, true },
+  { 80684, true },
+  { 80702, true },
+  { 80719, true },
+  { 80731, true },
+  { 80745, true },
+  { 80768, true },
+  { 80778, true },
+  { 80793, true },
+  { 80807, true },
+  { 80823, true },
+  { 80836, true },
+  { 80859, true },
+  { 80871, true },
+  { 80885, true },
+  { 80906, true },
+  { 80913, true },
+  { 80926, true },
+  { 80939, true },
+  { 80959, true },
+  { 80977, true },
+  { 80999, true },
+  { 81012, true },
+  { 81032, true },
+  { 81047, true },
+  { 81058, true },
+  { 81072, true },
+  { 81085, true },
+  { 81098, true },
+  { 81117, true },
+  { 81132, true },
+  { 81152, true },
+  { 81168, true },
+  { 81187, true },
+  { 81206, true },
+  { 81221, true },
+  { 81233, true },
+  { 81240, true },
+  { 81256, true },
+  { 81283, true },
+  { 81311, true },
+  { 81335, true },
+  { 81354, true },
+  { 81371, true },
+  { 81390, true },
+  { 81408, true },
+  { 81426, true },
+  { 81444, true },
+  { 81456, true },
+  { 81465, true },
+  { 81488, true },
+  { 81502, true },
+  { 81514, true },
+  { 81527, true },
+  { 81541, true },
+  { 81551, true },
+  { 81562, false },
+  { 81572, true },
+  { 81592, true },
+  { 81602, true },
+  { 81615, true },
+  { 81630, true },
+  { 81639, true },
+  { 81651, true },
+  { 81661, true },
+  { 81678, true },
+  { 81691, true },
+  { 81700, true },
+  { 81707, true },
+  { 81720, true },
+  { 81733, true },
+  { 81742, true },
+  { 81755, true },
+  { 81773, true },
+  { 81788, true },
+  { 81804, true },
+  { 81820, true },
+  { 81831, true },
+  { 81845, true },
+  { 81862, true },
+  { 81879, true },
+  { 81889, true },
+  { 81916, true },
+  { 81951, true },
+  { 81977, true },
+  { 81989, false },
+  { 82002, true },
+  { 82023, true },
+  { 82036, true },
+  { 82055, true },
+  { 82080, true },
+  { 82102, true },
+  { 82123, true },
+  { 82138, true },
+  { 82158, false },
+  { 82168, true },
+  { 82187, true },
+  { 82204, true },
+  { 82221, true },
+  { 82231, true },
+  { 82241, true },
+  { 82254, true },
+  { 82266, true },
+  { 82277, true },
+  { 82292, true },
+  { 82305, true },
+  { 82320, true },
+  { 82333, true },
+  { 82346, true },
+  { 82360, true },
+  { 82383, true },
+  { 82398, true },
+  { 82410, true },
+  { 82423, true },
+  { 82437, true },
+  { 82456, true },
+  { 82468, true },
+  { 82492, true },
+  { 82514, true },
+  { 82535, true },
+  { 82560, true },
+  { 82583, true },
+  { 82603, true },
+  { 82614, true },
+  { 82626, true },
+  { 82638, true },
+  { 82658, true },
+  { 82675, true },
+  { 82692, true },
+  { 82713, true },
+  { 82736, true },
+  { 82752, true },
+  { 82772, true },
+  { 82785, true },
+  { 82801, true },
+  { 82816, true },
+  { 82826, true },
+  { 82843, true },
+  { 82854, true },
+  { 82873, true },
+  { 82883, true },
+  { 82893, true },
+  { 82901, true },
+  { 82927, true },
+  { 82947, true },
+  { 82961, true },
+  { 82974, true },
+  { 82987, true },
+  { 82996, true },
+  { 83003, true },
+  { 83010, false },
+  { 83026, true },
+  { 83035, true },
+  { 83050, true },
+  { 83064, true },
+  { 83076, true },
+  { 83088, true },
+  { 83111, true },
+  { 83125, true },
+  { 83140, true },
+  { 83150, true },
+  { 83166, true },
+  { 83178, true },
+  { 83193, true },
+  { 83209, true },
+  { 83226, true },
+  { 83244, true },
+  { 83265, true },
+  { 83282, true },
+  { 83299, true },
+  { 83316, true },
+  { 83333, true },
+  { 83350, true },
+  { 83367, true },
+  { 83384, true },
+  { 83401, true },
+  { 83420, true },
+  { 83436, true },
+  { 83450, true },
+  { 83475, true },
+  { 83486, true },
+  { 83502, true },
+  { 83518, true },
+  { 83540, false },
+  { 83553, true },
+  { 83573, true },
+  { 83586, true },
+  { 83595, false },
+  { 83611, true },
+  { 83624, true },
+  { 83634, true },
+  { 83645, true },
+  { 83659, true },
+  { 83675, true },
+  { 83687, true },
+  { 83701, true },
+  { 83716, true },
+  { 83726, true },
+  { 83735, true },
+  { 83745, false },
+  { 83755, true },
+  { 83764, true },
+  { 83774, true },
+  { 83787, true },
+  { 83806, true },
+  { 83816, true },
+  { 83825, true },
+  { 83835, true },
+  { 83858, true },
+  { 83874, false },
+  { 83894, true },
+  { 83917, true },
+  { 83931, true },
+  { 83943, true },
+  { 83952, true },
+  { 83969, true },
+  { 83988, true },
+  { 84005, true },
+  { 84017, true },
+  { 84028, true },
+  { 84041, false },
+  { 84053, true },
+  { 84064, true },
+  { 84078, true },
+  { 84095, true },
+  { 84110, true },
+  { 84128, true },
+  { 84138, true },
   { 84146, true },
-  { 84154, true },
-  { 84165, true },
-  { 84179, true },
-  { 84193, true },
-  { 84206, false },
-  { 84219, true },
-  { 84231, true },
-  { 84246, true },
-  { 84275, true },
-  { 84289, true },
-  { 84303, true },
-  { 84318, true },
-  { 84332, true },
-  { 84344, true },
-  { 84358, true },
-  { 84372, true },
-  { 84384, true },
-  { 84398, true },
-  { 84412, true },
+  { 84157, true },
+  { 84171, true },
+  { 84185, true },
+  { 84198, false },
+  { 84211, true },
+  { 84223, true },
+  { 84238, true },
+  { 84267, true },
+  { 84281, true },
+  { 84295, true },
+  { 84310, true },
+  { 84324, true },
+  { 84336, true },
+  { 84350, true },
+  { 84364, true },
+  { 84376, true },
+  { 84390, true },
+  { 84404, true },
+  { 84416, true },
   { 84424, true },
-  { 84432, true },
-  { 84442, true },
-  { 84458, true },
-  { 84474, true },
-  { 84486, true },
-  { 84500, true },
-  { 84519, false },
-  { 84548, true },
-  { 84562, true },
-  { 84576, true },
-  { 84594, true },
-  { 84615, true },
-  { 84630, true },
-  { 84643, true },
-  { 84661, true },
-  { 84681, true },
-  { 84693, true },
-  { 84705, true },
-  { 84720, true },
-  { 84743, true },
-  { 84767, true },
-  { 84791, true },
-  { 84815, true },
-  { 84825, true },
-  { 84839, true },
-  { 84861, true },
-  { 84893, true },
+  { 84434, true },
+  { 84450, true },
+  { 84466, true },
+  { 84478, true },
+  { 84492, true },
+  { 84511, false },
+  { 84540, true },
+  { 84554, true },
+  { 84568, true },
+  { 84586, true },
+  { 84607, true },
+  { 84622, true },
+  { 84635, true },
+  { 84653, true },
+  { 84673, true },
+  { 84685, true },
+  { 84697, true },
+  { 84712, true },
+  { 84735, true },
+  { 84759, true },
+  { 84783, true },
+  { 84807, true },
+  { 84817, true },
+  { 84831, true },
+  { 84853, true },
+  { 84885, true },
+  { 84896, true },
   { 84904, true },
-  { 84912, true },
-  { 84926, true },
-  { 84935, true },
-  { 84945, true },
-  { 84956, true },
-  { 84968, true },
-  { 84980, true },
-  { 84995, true },
-  { 85009, false },
-  { 85029, true },
-  { 85042, true },
-  { 85053, true },
-  { 85062, true },
-  { 85069, true },
-  { 85080, true },
-  { 85089, true },
-  { 85102, true },
-  { 85119, true },
-  { 85133, true },
-  { 85151, true },
-  { 85174, true },
-  { 85189, false },
-  { 85200, false },
-  { 85212, false },
-  { 85223, true },
-  { 85239, true },
-  { 85252, true },
-  { 85265, true },
-  { 85275, true },
-  { 85301, false },
-  { 85317, true },
+  { 84918, true },
+  { 84927, true },
+  { 84937, true },
+  { 84948, true },
+  { 84960, true },
+  { 84972, true },
+  { 84987, true },
+  { 85001, false },
+  { 85021, true },
+  { 85034, true },
+  { 85045, true },
+  { 85054, true },
+  { 85061, true },
+  { 85072, true },
+  { 85081, true },
+  { 85094, true },
+  { 85111, true },
+  { 85125, true },
+  { 85143, true },
+  { 85166, true },
+  { 85181, false },
+  { 85192, false },
+  { 85204, false },
+  { 85215, true },
+  { 85231, true },
+  { 85244, true },
+  { 85257, true },
+  { 85267, true },
+  { 85293, false },
+  { 85309, true },
+  { 85319, true },
   { 85327, true },
-  { 85335, true },
-  { 85344, true },
-  { 85356, true },
-  { 85368, false },
-  { 85380, true },
-  { 85394, true },
-  { 85406, true },
-  { 85423, true },
-  { 85435, true },
-  { 85455, true },
-  { 85466, true },
-  { 85482, true },
-  { 85500, true },
-  { 85512, true },
-  { 85529, true },
-  { 85549, true },
-  { 85558, true },
-  { 85574, true },
-  { 85587, true },
-  { 85606, true },
-  { 85632, true },
-  { 85645, true },
-  { 85663, true },
-  { 85676, true },
-  { 85700, true },
-  { 85714, true },
-  { 85731, true },
-  { 85746, true },
-  { 85757, true },
-  { 85769, true },
-  { 85781, true },
-  { 85796, true },
+  { 85336, true },
+  { 85348, true },
+  { 85360, false },
+  { 85372, true },
+  { 85386, true },
+  { 85398, true },
+  { 85415, true },
+  { 85427, true },
+  { 85447, true },
+  { 85458, true },
+  { 85474, true },
+  { 85492, true },
+  { 85504, true },
+  { 85521, true },
+  { 85541, true },
+  { 85550, true },
+  { 85566, true },
+  { 85579, true },
+  { 85598, true },
+  { 85624, true },
+  { 85637, true },
+  { 85655, true },
+  { 85668, true },
+  { 85692, true },
+  { 85706, true },
+  { 85723, true },
+  { 85738, true },
+  { 85749, true },
+  { 85761, true },
+  { 85773, true },
+  { 85788, true },
+  { 85805, true },
   { 85813, true },
-  { 85821, true },
-  { 85833, true },
-  { 85852, true },
-  { 85869, true },
-  { 85886, true },
-  { 85901, true },
-  { 85926, true },
-  { 85941, true },
-  { 85954, true },
-  { 85966, true },
-  { 85986, true },
-  { 85998, true },
-  { 86010, true },
-  { 86024, true },
-  { 86042, true },
-  { 86054, true },
-  { 86078, true },
-  { 86091, true },
-  { 86110, true },
-  { 86122, true },
-  { 86134, true },
-  { 86158, true },
-  { 86168, true },
-  { 86189, true },
-  { 86203, true },
-  { 86217, true },
-  { 86230, false },
-  { 86246, true },
-  { 86270, true },
-  { 86282, true },
-  { 86295, true },
-  { 86328, true },
-  { 86360, true },
-  { 86369, true },
-  { 86379, true },
-  { 86390, true },
-  { 86402, true },
-  { 86412, true },
-  { 86423, true },
-  { 86435, true },
-  { 86444, true },
-  { 86453, true },
-  { 86474, true },
-  { 86495, true },
-  { 86505, true },
-  { 86519, true },
-  { 86531, true },
-  { 86547, true },
-  { 86569, true },
-  { 86588, true },
-  { 86607, true },
-  { 86617, false },
-  { 86631, true },
-  { 86644, true },
-  { 86665, true },
-  { 86677, true },
-  { 86690, true },
-  { 86699, true },
-  { 86712, true },
-  { 86720, false },
-  { 86737, true },
-  { 86751, true },
-  { 86767, true },
-  { 86786, true },
-  { 86805, true },
-  { 86815, true },
+  { 85825, true },
+  { 85844, true },
+  { 85861, true },
+  { 85878, true },
+  { 85893, true },
+  { 85918, true },
+  { 85933, true },
+  { 85946, true },
+  { 85958, true },
+  { 85978, true },
+  { 85990, true },
+  { 86002, true },
+  { 86016, true },
+  { 86034, true },
+  { 86046, true },
+  { 86070, true },
+  { 86083, true },
+  { 86102, true },
+  { 86114, true },
+  { 86126, true },
+  { 86150, true },
+  { 86160, true },
+  { 86181, true },
+  { 86195, true },
+  { 86209, true },
+  { 86222, false },
+  { 86238, true },
+  { 86262, true },
+  { 86274, true },
+  { 86287, true },
+  { 86320, true },
+  { 86352, true },
+  { 86361, true },
+  { 86371, true },
+  { 86382, true },
+  { 86394, true },
+  { 86404, true },
+  { 86415, true },
+  { 86427, true },
+  { 86436, true },
+  { 86445, true },
+  { 86466, true },
+  { 86487, true },
+  { 86497, true },
+  { 86511, true },
+  { 86523, true },
+  { 86539, true },
+  { 86561, true },
+  { 86580, true },
+  { 86599, true },
+  { 86609, false },
+  { 86623, true },
+  { 86636, true },
+  { 86657, true },
+  { 86669, true },
+  { 86682, true },
+  { 86691, true },
+  { 86704, true },
+  { 86712, false },
+  { 86729, true },
+  { 86743, true },
+  { 86759, true },
+  { 86778, true },
+  { 86797, true },
+  { 86807, true },
+  { 86821, true },
   { 86829, true },
-  { 86837, true },
-  { 86851, true },
-  { 86860, true },
-  { 86879, false },
-  { 86897, true },
-  { 86906, true },
-  { 86919, true },
-  { 86932, true },
-  { 86947, true },
-  { 86967, false },
-  { 86980, true },
-  { 86997, true },
-  { 87010, true },
-  { 87023, true },
-  { 87047, true },
-  { 87074, true },
-  { 87084, true },
-  { 87097, false },
-  { 87111, true },
-  { 87123, true },
-  { 87136, true },
-  { 87150, true },
-  { 87162, true },
-  { 87177, true },
-  { 87195, true },
-  { 87208, true },
-  { 87221, true },
-  { 87244, true },
-  { 87267, false },
-  { 87278, true },
-  { 87296, true },
-  { 87312, true },
-  { 87330, true },
-  { 87350, true },
-  { 87372, true },
-  { 87388, true },
-  { 87405, true },
-  { 87422, true },
-  { 87439, true },
-  { 87457, true },
-  { 87471, true },
-  { 87484, true },
-  { 87501, true },
-  { 87516, true },
-  { 87530, true },
-  { 87546, true },
-  { 87555, true },
-  { 87574, true },
-  { 87589, true },
-  { 87597, true },
-  { 87606, true },
-  { 87617, true },
-  { 87632, true },
-  { 87649, false },
-  { 87660, true },
-  { 87676, true },
-  { 87690, true },
-  { 87702, true },
-  { 87716, true },
-  { 87724, true },
-  { 87744, true },
-  { 87765, true },
-  { 87775, true },
-  { 87784, true },
-  { 87800, true },
-  { 87810, true },
-  { 87816, true },
-  { 87828, true },
-  { 87836, true },
-  { 87858, true },
-  { 87872, true },
-  { 87880, true },
-  { 87895, true },
-  { 87906, true },
-  { 87919, true },
-  { 87935, true },
-  { 87953, false },
-  { 87966, true },
-  { 87980, true },
-  { 87989, true },
-  { 87998, true },
-  { 88009, true },
-  { 88029, true },
-  { 88041, true },
-  { 88053, true },
-  { 88072, true },
-  { 88091, true },
-  { 88099, true },
-  { 88116, true },
-  { 88135, true },
-  { 88144, true },
-  { 88153, true },
-  { 88172, true },
-  { 88183, true },
-  { 88199, true },
-  { 88206, true },
-  { 88218, true },
-  { 88239, true },
-  { 88256, true },
-  { 88269, true },
-  { 88279, true },
-  { 88292, true },
-  { 88303, true },
-  { 88328, true },
-  { 88343, true },
-  { 88362, true },
-  { 88389, true },
-  { 88408, false },
-  { 88422, true },
-  { 88433, true },
-  { 88448, true },
-  { 88460, true },
-  { 88471, true },
-  { 88486, true },
-  { 88495, true },
-  { 88509, true },
-  { 88523, true },
-  { 88540, true },
-  { 88551, true },
-  { 88567, true },
-  { 88587, true },
-  { 88596, true },
-  { 88609, false },
-  { 88623, true },
-  { 88643, false },
-  { 88667, true },
-  { 88678, false },
-  { 88686, true },
-  { 88704, true },
-  { 88728, true },
-  { 88746, true },
-  { 88768, true },
-  { 88790, true },
-  { 88815, true },
-  { 88832, true },
-  { 88848, true },
-  { 88860, true },
-  { 88872, true },
-  { 88893, true },
-  { 88907, true },
-  { 88920, true },
-  { 88933, false },
-  { 88950, true },
-  { 88973, true },
-  { 88982, true },
-  { 89004, true },
+  { 86843, true },
+  { 86852, true },
+  { 86871, false },
+  { 86889, true },
+  { 86898, true },
+  { 86911, true },
+  { 86924, true },
+  { 86939, true },
+  { 86952, true },
+  { 86972, false },
+  { 86985, true },
+  { 87002, true },
+  { 87015, true },
+  { 87028, true },
+  { 87052, true },
+  { 87079, true },
+  { 87089, true },
+  { 87102, false },
+  { 87116, true },
+  { 87128, true },
+  { 87141, true },
+  { 87155, true },
+  { 87167, true },
+  { 87182, true },
+  { 87200, true },
+  { 87213, true },
+  { 87226, true },
+  { 87249, true },
+  { 87272, false },
+  { 87283, true },
+  { 87301, true },
+  { 87317, true },
+  { 87335, true },
+  { 87355, true },
+  { 87377, true },
+  { 87393, true },
+  { 87410, true },
+  { 87427, true },
+  { 87444, true },
+  { 87462, true },
+  { 87476, true },
+  { 87489, true },
+  { 87506, true },
+  { 87521, true },
+  { 87535, true },
+  { 87551, true },
+  { 87560, true },
+  { 87579, true },
+  { 87594, true },
+  { 87602, true },
+  { 87611, true },
+  { 87622, true },
+  { 87637, true },
+  { 87654, false },
+  { 87665, true },
+  { 87681, true },
+  { 87695, true },
+  { 87707, true },
+  { 87721, true },
+  { 87729, true },
+  { 87749, true },
+  { 87770, true },
+  { 87780, true },
+  { 87789, true },
+  { 87805, true },
+  { 87815, true },
+  { 87821, true },
+  { 87833, true },
+  { 87841, true },
+  { 87863, true },
+  { 87877, true },
+  { 87885, true },
+  { 87900, true },
+  { 87911, true },
+  { 87924, true },
+  { 87940, true },
+  { 87958, false },
+  { 87971, true },
+  { 87985, true },
+  { 87994, true },
+  { 88003, true },
+  { 88014, true },
+  { 88034, true },
+  { 88046, true },
+  { 88058, true },
+  { 88077, true },
+  { 88096, true },
+  { 88104, true },
+  { 88121, true },
+  { 88140, true },
+  { 88149, true },
+  { 88158, true },
+  { 88177, true },
+  { 88188, true },
+  { 88204, true },
+  { 88211, true },
+  { 88223, true },
+  { 88244, true },
+  { 88261, true },
+  { 88274, true },
+  { 88284, true },
+  { 88297, true },
+  { 88308, true },
+  { 88333, true },
+  { 88348, true },
+  { 88367, true },
+  { 88394, true },
+  { 88413, false },
+  { 88427, true },
+  { 88438, true },
+  { 88453, true },
+  { 88465, true },
+  { 88476, true },
+  { 88491, true },
+  { 88500, true },
+  { 88514, true },
+  { 88528, true },
+  { 88545, true },
+  { 88556, true },
+  { 88572, true },
+  { 88592, true },
+  { 88601, true },
+  { 88614, false },
+  { 88628, true },
+  { 88648, false },
+  { 88672, true },
+  { 88687, true },
+  { 88698, false },
+  { 88706, true },
+  { 88724, true },
+  { 88748, true },
+  { 88766, true },
+  { 88788, true },
+  { 88810, true },
+  { 88835, true },
+  { 88852, true },
+  { 88868, true },
+  { 88880, true },
+  { 88892, true },
+  { 88913, true },
+  { 88927, true },
+  { 88940, true },
+  { 88953, false },
+  { 88970, true },
+  { 88993, true },
+  { 89002, true },
   { 89024, true },
-  { 89051, true },
-  { 89070, true },
-  { 89082, true },
+  { 89044, true },
+  { 89071, true },
+  { 89090, true },
   { 89102, true },
-  { 89119, true },
-  { 89135, true },
-  { 89143, true },
-  { 89152, true },
-  { 89169, true },
-  { 89184, true },
-  { 89199, true },
-  { 89228, true },
-  { 89244, true },
-  { 89259, true },
-  { 89282, true },
-  { 89304, true },
-  { 89326, true },
-  { 89344, true },
-  { 89358, true },
-  { 89371, true },
-  { 89385, true },
-  { 89400, true },
-  { 89413, true },
-  { 89423, true },
-  { 89436, true },
-  { 89452, true },
-  { 89470, true },
-  { 89488, true },
-  { 89496, true },
-  { 89509, true },
-  { 89516, false },
-  { 89536, true },
-  { 89545, true },
-  { 89560, true },
-  { 89578, true },
-  { 89590, true },
-  { 89604, true },
-  { 89613, false },
-  { 89623, true },
-  { 89631, true },
-  { 89652, true },
-  { 89666, true },
-  { 89683, true },
-  { 89696, true },
-  { 89707, true },
-  { 89717, true },
-  { 89734, true },
-  { 89756, true },
-  { 89777, true },
-  { 89792, true },
-  { 89809, true },
-  { 89819, true },
-  { 89834, true },
-  { 89850, true },
-  { 89861, true },
-  { 89873, true },
-  { 89892, true },
-  { 89914, true },
-  { 89927, true },
-  { 89942, true },
+  { 89122, true },
+  { 89139, true },
+  { 89155, true },
+  { 89163, true },
+  { 89172, true },
+  { 89189, true },
+  { 89204, true },
+  { 89219, true },
+  { 89248, true },
+  { 89264, true },
+  { 89279, true },
+  { 89302, true },
+  { 89324, true },
+  { 89346, true },
+  { 89364, true },
+  { 89378, true },
+  { 89391, true },
+  { 89405, true },
+  { 89420, true },
+  { 89433, true },
+  { 89443, true },
+  { 89456, true },
+  { 89472, true },
+  { 89490, true },
+  { 89508, true },
+  { 89516, true },
+  { 89529, true },
+  { 89536, false },
+  { 89556, true },
+  { 89565, true },
+  { 89580, true },
+  { 89598, true },
+  { 89610, true },
+  { 89624, true },
+  { 89633, false },
+  { 89643, true },
+  { 89651, true },
+  { 89672, true },
+  { 89686, true },
+  { 89703, true },
+  { 89716, true },
+  { 89727, true },
+  { 89737, true },
+  { 89754, true },
+  { 89776, true },
+  { 89797, true },
+  { 89812, true },
+  { 89829, true },
+  { 89839, true },
+  { 89854, true },
+  { 89870, true },
+  { 89881, true },
+  { 89893, true },
+  { 89912, true },
+  { 89934, true },
+  { 89947, true },
   { 89962, true },
-  { 89978, true },
-  { 89994, true },
-  { 90004, true },
-  { 90016, true },
+  { 89982, true },
+  { 89998, true },
+  { 90014, true },
   { 90024, true },
-  { 90042, true },
-  { 90061, false },
-  { 90080, true },
-  { 90093, true },
-  { 90110, true },
-  { 90122, true },
-  { 90136, true },
+  { 90036, true },
+  { 90044, true },
+  { 90062, true },
+  { 90081, false },
+  { 90100, true },
+  { 90113, true },
+  { 90130, true },
+  { 90142, true },
   { 90156, true },
-  { 90170, true },
-  { 90182, true },
-  { 90195, true },
-  { 90209, true },
-  { 90234, true },
-  { 90249, true },
-  { 90263, true },
-  { 90282, true },
-  { 90304, true },
-  { 90320, true },
-  { 90339, true },
-  { 90352, true },
-  { 90370, true },
-  { 90383, true },
-  { 90393, true },
-  { 90408, true },
-  { 90425, true },
-  { 90440, true },
-  { 90450, true },
-  { 90463, true },
-  { 90488, true },
-  { 90503, true },
-  { 90521, true },
-  { 90539, true },
-  { 90556, true },
-  { 90572, true },
-  { 90585, true },
-  { 90597, true },
-  { 90608, true },
-  { 90622, true },
-  { 90635, true },
-  { 90653, true },
-  { 90672, true },
-  { 90686, true },
-  { 90702, true },
-  { 90721, true },
-  { 90733, true },
-  { 90746, true },
-  { 90758, true },
-  { 90774, true },
-  { 90787, true },
-  { 90803, true },
-  { 90814, true },
-  { 90829, true },
-  { 90844, true },
-  { 90858, true },
-  { 90876, true },
+  { 90176, true },
+  { 90190, true },
+  { 90202, true },
+  { 90215, true },
+  { 90229, true },
+  { 90254, true },
+  { 90269, true },
+  { 90283, true },
+  { 90302, true },
+  { 90324, true },
+  { 90340, true },
+  { 90359, true },
+  { 90372, true },
+  { 90390, true },
+  { 90403, true },
+  { 90413, true },
+  { 90428, true },
+  { 90445, true },
+  { 90460, true },
+  { 90470, true },
+  { 90483, true },
+  { 90508, true },
+  { 90523, true },
+  { 90541, true },
+  { 90559, true },
+  { 90576, true },
+  { 90592, true },
+  { 90605, true },
+  { 90617, true },
+  { 90628, true },
+  { 90642, true },
+  { 90655, true },
+  { 90673, true },
+  { 90692, true },
+  { 90706, true },
+  { 90722, true },
+  { 90741, true },
+  { 90753, true },
+  { 90766, true },
+  { 90778, true },
+  { 90794, true },
+  { 90807, true },
+  { 90823, true },
+  { 90834, true },
+  { 90849, true },
+  { 90864, true },
+  { 90878, true },
   { 90896, true },
-  { 90915, true },
-  { 90928, true },
-  { 90952, true },
-  { 90962, true },
-  { 90975, true },
-  { 90987, true },
-  { 90999, true },
-  { 91009, true },
-  { 91021, true },
-  { 91037, true },
-  { 91045, true },
-  { 91053, true },
-  { 91068, true },
-  { 91081, true },
-  { 91092, true },
-  { 91105, false },
-  { 91116, true },
-  { 91132, true },
-  { 91143, true },
-  { 91155, true },
-  { 91165, true },
-  { 91182, true },
-  { 91200, false },
-  { 91213, true },
-  { 91228, true },
-  { 91245, true },
-  { 91263, true },
-  { 91277, false },
-  { 91295, true },
-  { 91311, true },
-  { 91327, true },
-  { 91336, true },
-  { 91345, true },
-  { 91360, true },
-  { 91375, true },
-  { 91385, true },
-  { 91400, true },
-  { 91410, true },
-  { 91421, true },
-  { 91435, true },
-  { 91447, true },
-  { 91464, true },
-  { 91478, true },
-  { 91486, true },
-  { 91494, true },
-  { 91503, true },
-  { 91515, true },
-  { 91526, true },
-  { 91535, false },
-  { 91543, true },
-  { 91569, true },
-  { 91582, true },
-  { 91595, true },
-  { 91609, true },
-  { 91620, true },
-  { 91630, true },
-  { 91647, true },
-  { 91657, true },
-  { 91669, true },
-  { 91684, true },
-  { 91693, true },
+  { 90916, true },
+  { 90935, true },
+  { 90948, true },
+  { 90972, true },
+  { 90982, true },
+  { 90995, true },
+  { 91007, true },
+  { 91019, true },
+  { 91029, true },
+  { 91041, true },
+  { 91057, true },
+  { 91065, true },
+  { 91073, true },
+  { 91088, true },
+  { 91101, true },
+  { 91112, true },
+  { 91125, false },
+  { 91136, true },
+  { 91152, true },
+  { 91163, true },
+  { 91175, true },
+  { 91185, true },
+  { 91202, true },
+  { 91220, false },
+  { 91233, true },
+  { 91248, true },
+  { 91265, true },
+  { 91283, true },
+  { 91297, false },
+  { 91315, true },
+  { 91331, true },
+  { 91347, true },
+  { 91356, true },
+  { 91365, true },
+  { 91380, true },
+  { 91395, true },
+  { 91405, true },
+  { 91420, true },
+  { 91430, true },
+  { 91441, true },
+  { 91455, true },
+  { 91467, true },
+  { 91484, true },
+  { 91498, true },
+  { 91506, true },
+  { 91514, true },
+  { 91523, true },
+  { 91535, true },
+  { 91546, true },
+  { 91555, false },
+  { 91563, true },
+  { 91589, true },
+  { 91602, true },
+  { 91615, true },
+  { 91629, true },
+  { 91640, true },
+  { 91650, true },
+  { 91667, true },
+  { 91677, true },
+  { 91689, true },
   { 91704, true },
-  { 91715, true },
-  { 91726, true },
-  { 91741, true },
-  { 91754, true },
-  { 91766, true },
-  { 91779, true },
-  { 91787, true },
-  { 91801, true },
-  { 91816, true },
-  { 91827, false },
-  { 91841, true },
-  { 91862, true },
-  { 91873, true },
-  { 91886, true },
-  { 91900, true },
-  { 91918, true },
-  { 91929, true },
-  { 91942, true },
-  { 91961, true },
-  { 91975, true },
-  { 91991, true },
-  { 92004, true },
-  { 92019, true },
-  { 92032, true },
-  { 92046, false },
-  { 92062, true },
+  { 91713, true },
+  { 91724, true },
+  { 91735, true },
+  { 91746, true },
+  { 91761, true },
+  { 91774, true },
+  { 91786, true },
+  { 91799, true },
+  { 91807, true },
+  { 91821, true },
+  { 91836, true },
+  { 91847, false },
+  { 91861, true },
+  { 91882, true },
+  { 91893, true },
+  { 91906, true },
+  { 91920, true },
+  { 91938, true },
+  { 91949, true },
+  { 91962, true },
+  { 91981, true },
+  { 91995, true },
+  { 92011, true },
+  { 92024, true },
+  { 92039, true },
+  { 92052, true },
+  { 92066, false },
   { 92082, true },
-  { 92093, true },
-  { 92112, true },
-  { 92125, true },
-  { 92148, true },
-  { 92157, true },
+  { 92102, true },
+  { 92113, true },
+  { 92132, true },
+  { 92145, true },
   { 92168, true },
-  { 92179, true },
+  { 92177, true },
   { 92188, true },
-  { 92206, true },
-  { 92220, true },
-  { 92237, true },
-  { 92255, true },
-  { 92274, true },
-  { 92287, true },
-  { 92297, true },
-  { 92310, true },
-  { 92321, true },
+  { 92199, true },
+  { 92208, true },
+  { 92226, true },
+  { 92240, true },
+  { 92257, true },
+  { 92275, true },
+  { 92294, true },
+  { 92307, true },
+  { 92317, true },
   { 92330, true },
-  { 92347, true },
+  { 92341, true },
+  { 92350, true },
   { 92367, true },
-  { 92381, true },
-  { 92389, true },
-  { 92399, true },
-  { 92407, true },
-  { 92417, true },
-  { 92425, true },
-  { 92432, true },
+  { 92387, true },
+  { 92401, true },
+  { 92409, true },
+  { 92419, true },
+  { 92427, true },
+  { 92437, true },
   { 92445, true },
-  { 92456, true },
-  { 92470, true },
-  { 92484, true },
-  { 92498, true },
-  { 92508, true },
+  { 92452, true },
+  { 92465, true },
+  { 92476, true },
+  { 92490, true },
+  { 92504, true },
   { 92518, true },
-  { 92531, true },
-  { 92541, true },
-  { 92553, true },
-  { 92560, true },
-  { 92583, true },
-  { 92592, true },
-  { 92607, true },
-  { 92614, true },
-  { 92620, true },
-  { 92628, true },
+  { 92528, true },
+  { 92538, true },
+  { 92551, true },
+  { 92561, true },
+  { 92573, true },
+  { 92580, true },
+  { 92603, true },
+  { 92612, true },
+  { 92627, true },
+  { 92634, true },
   { 92640, true },
-  { 92650, true },
-  { 92661, true },
-  { 92671, true },
-  { 92678, true },
+  { 92648, true },
+  { 92660, true },
+  { 92670, true },
+  { 92681, true },
   { 92691, true },
-  { 92700, true },
-  { 92709, true },
-  { 92723, true },
-  { 92741, true },
-  { 92757, true },
-  { 92779, true },
-  { 92792, true },
-  { 92801, true },
-  { 92815, true },
-  { 92828, true },
-  { 92840, true },
-  { 92850, true },
-  { 92863, true },
-  { 92872, true },
-  { 92894, true },
-  { 92909, true },
-  { 92924, true },
-  { 92943, true },
-  { 92961, true },
-  { 92971, true },
-  { 92990, true },
-  { 93009, true },
-  { 93027, true },
-  { 93043, true },
+  { 92698, true },
+  { 92711, true },
+  { 92720, true },
+  { 92729, true },
+  { 92743, true },
+  { 92761, true },
+  { 92777, true },
+  { 92799, true },
+  { 92812, true },
+  { 92821, true },
+  { 92835, true },
+  { 92848, true },
+  { 92860, true },
+  { 92870, true },
+  { 92883, true },
+  { 92892, true },
+  { 92914, true },
+  { 92929, true },
+  { 92944, true },
+  { 92963, true },
+  { 92981, true },
+  { 92991, true },
+  { 93010, true },
+  { 93029, true },
+  { 93047, true },
   { 93063, true },
-  { 93073, true },
-  { 93084, true },
-  { 93102, true },
-  { 93114, true },
-  { 93125, true },
-  { 93141, true },
-  { 93158, true },
-  { 93173, true },
-  { 93189, true },
-  { 93205, true },
-  { 93214, true },
-  { 93231, true },
-  { 93243, true },
-  { 93260, true },
-  { 93278, true },
-  { 93290, true },
-  { 93307, true },
-  { 93321, true },
-  { 93335, true },
-  { 93350, true },
-  { 93365, true },
-  { 93380, true },
-  { 93398, true },
-  { 93411, true },
-  { 93423, true },
-  { 93440, true },
-  { 93464, true },
-  { 93486, true },
-  { 93498, true },
-  { 93511, true },
-  { 93526, true },
-  { 93543, true },
-  { 93559, true },
-  { 93573, true },
-  { 93586, true },
-  { 93606, true },
-  { 93624, true },
-  { 93645, true },
-  { 93658, false },
-  { 93679, true },
-  { 93697, true },
+  { 93083, true },
+  { 93093, true },
+  { 93104, true },
+  { 93122, true },
+  { 93134, true },
+  { 93145, true },
+  { 93161, true },
+  { 93178, true },
+  { 93193, true },
+  { 93209, true },
+  { 93225, true },
+  { 93234, true },
+  { 93251, true },
+  { 93263, true },
+  { 93280, true },
+  { 93298, true },
+  { 93310, true },
+  { 93327, true },
+  { 93341, true },
+  { 93355, true },
+  { 93370, true },
+  { 93385, true },
+  { 93400, true },
+  { 93418, true },
+  { 93431, true },
+  { 93443, true },
+  { 93460, true },
+  { 93481, true },
+  { 93505, true },
+  { 93527, true },
+  { 93539, true },
+  { 93552, true },
+  { 93567, true },
+  { 93584, true },
+  { 93600, true },
+  { 93614, true },
+  { 93627, true },
+  { 93647, true },
+  { 93665, true },
+  { 93686, true },
+  { 93699, false },
   { 93720, true },
-  { 93735, true },
-  { 93751, true },
-  { 93766, true },
-  { 93783, true },
-  { 93797, true },
-  { 93818, true },
-  { 93831, true },
-  { 93842, true },
-  { 93867, true },
+  { 93738, true },
+  { 93761, true },
+  { 93776, true },
+  { 93792, true },
+  { 93807, true },
+  { 93824, true },
+  { 93838, true },
+  { 93859, true },
+  { 93872, true },
   { 93883, true },
-  { 93900, true },
-  { 93917, true },
-  { 93929, false },
-  { 93946, true },
-  { 93960, true },
-  { 93973, true },
-  { 93991, true },
-  { 94006, true },
-  { 94018, false },
-  { 94029, true },
-  { 94045, true },
-  { 94061, true },
-  { 94073, true },
-  { 94089, true },
-  { 94103, true },
-  { 94116, true },
-  { 94126, true },
-  { 94143, true },
-  { 94162, true },
-  { 94177, true },
-  { 94186, true },
-  { 94193, true },
-  { 94204, true },
-  { 94213, true },
-  { 94230, true },
-  { 94242, true },
-  { 94251, true },
-  { 94264, true },
-  { 94276, true },
+  { 93908, true },
+  { 93924, true },
+  { 93941, true },
+  { 93958, true },
+  { 93970, false },
+  { 93987, true },
+  { 94001, true },
+  { 94014, true },
+  { 94032, true },
+  { 94047, true },
+  { 94059, false },
+  { 94070, true },
+  { 94086, true },
+  { 94102, true },
+  { 94114, true },
+  { 94130, true },
+  { 94144, true },
+  { 94157, true },
+  { 94167, true },
+  { 94184, true },
+  { 94203, true },
+  { 94218, true },
+  { 94227, true },
+  { 94234, true },
+  { 94245, true },
+  { 94254, true },
+  { 94271, true },
   { 94283, true },
-  { 94298, true },
-  { 94313, false },
-  { 94320, false },
-  { 94329, true },
-  { 94365, true },
-  { 94376, true },
-  { 94388, true },
-  { 94400, true },
-  { 94411, true },
-  { 94432, true },
+  { 94292, true },
+  { 94305, true },
+  { 94317, true },
+  { 94324, true },
+  { 94339, false },
+  { 94346, false },
+  { 94355, true },
+  { 94391, true },
+  { 94402, true },
+  { 94414, true },
+  { 94426, true },
+  { 94437, true },
   { 94458, true },
-  { 94468, true },
-  { 94477, true },
-  { 94486, true },
-  { 94493, true },
-  { 94505, false },
-  { 94517, false },
-  { 94525, true },
-  { 94537, true },
-  { 94550, true },
-  { 94564, false },
-  { 94579, true },
-  { 94593, true },
-  { 94606, true },
-  { 94618, true },
-  { 94630, true },
-  { 94641, true },
-  { 94655, true },
-  { 94675, true },
-  { 94686, true },
-  { 94698, true },
-  { 94708, true },
-  { 94716, true },
-  { 94729, true },
-  { 94741, true },
-  { 94752, true },
-  { 94764, true },
-  { 94781, true },
-  { 94791, true },
-  { 94808, true },
-  { 94818, false },
-  { 94836, true },
-  { 94854, true },
-  { 94876, true },
-  { 94898, true },
-  { 94909, true },
-  { 94921, true },
-  { 94936, true },
-  { 94952, true },
-  { 94963, true },
-  { 94979, true },
-  { 95003, true },
-  { 95026, true },
-  { 95044, true },
-  { 95055, true },
-  { 95076, true },
-  { 95094, true },
-  { 95107, true },
-  { 95134, true },
-  { 95154, true },
-  { 95166, true },
-  { 95184, true },
-  { 95198, true },
-  { 95214, true },
-  { 95230, true },
-  { 95244, true },
-  { 95257, true },
-  { 95271, true },
-  { 95285, true },
-  { 95309, true },
-  { 95337, false },
-  { 95348, true },
-  { 95359, true },
-  { 95377, true },
-  { 95395, true },
-  { 95419, true },
-  { 95440, true },
-  { 95461, true },
-  { 95482, true },
-  { 95496, true },
-  { 95509, true },
-  { 95531, true },
-  { 95542, true },
-  { 95561, true },
-  { 95579, true },
-  { 95589, true },
-  { 95607, true },
-  { 95626, true },
-  { 95644, true },
-  { 95665, true },
-  { 95686, true },
-  { 95706, true },
-  { 95716, true },
-  { 95730, true },
-  { 95752, true },
-  { 95768, true },
-  { 95784, true },
-  { 95795, true },
-  { 95806, true },
-  { 95816, true },
-  { 95826, true },
-  { 95843, false },
-  { 95856, true },
-  { 95868, true },
-  { 95879, true },
-  { 95896, true },
-  { 95906, true },
-  { 95920, true },
-  { 95939, true },
-  { 95957, true },
-  { 95977, true },
-  { 95988, true },
-  { 96001, true },
-  { 96017, true },
-  { 96030, true },
-  { 96040, true },
-  { 96055, true },
-  { 96069, true },
-  { 96083, true },
+  { 94484, true },
+  { 94494, true },
+  { 94503, true },
+  { 94512, true },
+  { 94519, true },
+  { 94531, false },
+  { 94543, false },
+  { 94551, true },
+  { 94563, true },
+  { 94576, true },
+  { 94590, false },
+  { 94605, true },
+  { 94619, true },
+  { 94632, true },
+  { 94644, true },
+  { 94656, true },
+  { 94667, true },
+  { 94681, true },
+  { 94701, true },
+  { 94712, true },
+  { 94724, true },
+  { 94734, true },
+  { 94742, true },
+  { 94755, true },
+  { 94767, true },
+  { 94778, true },
+  { 94790, true },
+  { 94807, true },
+  { 94817, true },
+  { 94834, true },
+  { 94844, false },
+  { 94862, true },
+  { 94880, true },
+  { 94902, true },
+  { 94924, true },
+  { 94935, true },
+  { 94947, true },
+  { 94962, true },
+  { 94978, true },
+  { 94989, true },
+  { 95005, true },
+  { 95029, true },
+  { 95052, true },
+  { 95070, true },
+  { 95081, true },
+  { 95102, true },
+  { 95120, true },
+  { 95133, true },
+  { 95160, true },
+  { 95180, true },
+  { 95192, true },
+  { 95210, true },
+  { 95224, true },
+  { 95240, true },
+  { 95256, true },
+  { 95270, true },
+  { 95283, true },
+  { 95297, true },
+  { 95311, true },
+  { 95335, true },
+  { 95363, false },
+  { 95374, true },
+  { 95385, true },
+  { 95403, true },
+  { 95421, true },
+  { 95445, true },
+  { 95466, true },
+  { 95487, true },
+  { 95508, true },
+  { 95522, true },
+  { 95535, true },
+  { 95557, true },
+  { 95568, true },
+  { 95587, true },
+  { 95605, true },
+  { 95615, true },
+  { 95633, true },
+  { 95652, true },
+  { 95670, true },
+  { 95691, true },
+  { 95712, true },
+  { 95732, true },
+  { 95742, true },
+  { 95756, true },
+  { 95778, true },
+  { 95794, true },
+  { 95810, true },
+  { 95821, true },
+  { 95832, true },
+  { 95842, true },
+  { 95852, true },
+  { 95869, false },
+  { 95882, true },
+  { 95894, true },
+  { 95905, true },
+  { 95922, true },
+  { 95932, true },
+  { 95946, true },
+  { 95965, true },
+  { 95983, true },
+  { 96003, true },
+  { 96014, true },
+  { 96027, true },
+  { 96043, true },
+  { 96056, true },
+  { 96066, true },
+  { 96081, true },
   { 96095, true },
-  { 96113, true },
-  { 96128, true },
-  { 96141, true },
-  { 96158, true },
-  { 96175, true },
-  { 96189, true },
-  { 96202, true },
-  { 96216, true },
+  { 96109, true },
+  { 96121, true },
+  { 96139, true },
+  { 96154, true },
+  { 96167, true },
+  { 96184, true },
+  { 96201, true },
+  { 96215, true },
   { 96228, true },
-  { 96237, true },
-  { 96256, true },
-  { 96267, false },
-  { 96278, true },
+  { 96242, true },
+  { 96254, true },
+  { 96263, true },
+  { 96282, true },
+  { 96293, false },
   { 96304, true },
-  { 96314, true },
-  { 96325, true },
-  { 96338, true },
-  { 96352, true },
-  { 96362, true },
-  { 96379, true },
-  { 96388, true },
-  { 96402, true },
-  { 96410, true },
-  { 96417, true },
-  { 96429, true },
-  { 96436, true },
-  { 96445, true },
-  { 96464, true },
-  { 96479, true },
-  { 96494, true },
+  { 96330, true },
+  { 96340, true },
+  { 96351, true },
+  { 96365, true },
+  { 96375, true },
+  { 96392, true },
+  { 96401, true },
+  { 96415, true },
+  { 96423, true },
+  { 96430, true },
+  { 96442, true },
+  { 96449, true },
+  { 96458, true },
+  { 96477, true },
+  { 96492, true },
   { 96507, true },
-  { 96528, true },
-  { 96548, true },
-  { 96567, true },
-  { 96584, true },
-  { 96600, true },
-  { 96620, true },
-  { 96630, true },
-  { 96659, true },
-  { 96678, true },
-  { 96699, true },
-  { 96716, true },
+  { 96520, true },
+  { 96541, true },
+  { 96561, true },
+  { 96580, true },
+  { 96597, true },
+  { 96613, true },
+  { 96633, true },
+  { 96643, true },
+  { 96672, true },
+  { 96691, true },
+  { 96712, true },
   { 96729, true },
   { 96742, true },
-  { 96756, true },
-  { 96766, true },
-  { 96776, true },
-  { 96791, true },
-  { 96803, false },
-  { 96817, false },
+  { 96755, true },
+  { 96769, true },
+  { 96779, true },
+  { 96789, true },
+  { 96804, true },
+  { 96816, false },
   { 96830, false },
-  { 96837, true },
-  { 96845, true },
-  { 96857, true },
-  { 96867, true },
-  { 96882, true },
-  { 96897, true },
-  { 96919, true },
-  { 96938, true },
-  { 96950, true },
-  { 96962, true },
-  { 96973, true },
-  { 96988, true },
-  { 97004, true },
-  { 97021, true },
-  { 97039, true },
-  { 97057, true },
-  { 97065, true },
-  { 97076, true },
-  { 97096, true },
-  { 97110, true },
-  { 97120, true },
+  { 96843, false },
+  { 96850, true },
+  { 96858, true },
+  { 96870, true },
+  { 96880, true },
+  { 96895, true },
+  { 96910, true },
+  { 96932, true },
+  { 96951, true },
+  { 96963, true },
+  { 96975, true },
+  { 96986, true },
+  { 97001, true },
+  { 97017, true },
+  { 97034, true },
+  { 97052, true },
+  { 97070, true },
+  { 97078, true },
+  { 97089, true },
+  { 97109, true },
+  { 97123, true },
   { 97133, true },
-  { 97140, true },
-  { 97151, false },
-  { 97164, true },
-  { 97173, true },
-  { 97185, false },
-  { 97205, false },
-  { 97221, true },
-  { 97232, true },
-  { 97247, true },
+  { 97146, true },
+  { 97153, true },
+  { 97164, false },
+  { 97177, true },
+  { 97186, true },
+  { 97198, false },
+  { 97218, false },
+  { 97234, true },
+  { 97245, true },
   { 97260, true },
   { 97273, true },
-  { 97285, true },
+  { 97286, true },
   { 97298, true },
-  { 97315, false },
-  { 97326, false },
-  { 97336, true },
-  { 97351, true },
-  { 97366, true },
-  { 97381, true },
-  { 97397, true },
-  { 97426, true },
-  { 97445, true },
-  { 97459, true },
-  { 97476, true },
-  { 97502, true },
+  { 97311, true },
+  { 97328, false },
+  { 97339, false },
+  { 97349, true },
+  { 97364, true },
+  { 97379, true },
+  { 97394, true },
+  { 97410, true },
+  { 97439, true },
+  { 97458, true },
+  { 97472, true },
+  { 97489, true },
   { 97515, true },
-  { 97530, true },
-  { 97545, true },
-  { 97560, true },
-  { 97574, true },
-  { 97593, true },
-  { 97603, true },
-  { 97620, true },
-  { 97636, true },
-  { 97657, true },
-  { 97674, true },
-  { 97690, true },
-  { 97709, true },
-  { 97743, true },
-  { 97767, true },
-  { 97796, true },
-  { 97820, true },
-  { 97836, true },
-  { 97856, true },
-  { 97881, true },
-  { 97893, true },
-  { 97920, true },
-  { 97934, true },
-  { 97952, true },
-  { 97961, false },
-  { 97971, true },
-  { 97983, true },
-  { 97998, true },
-  { 98006, true },
-  { 98015, true },
-  { 98023, true },
-  { 98037, true },
-  { 98045, true },
-  { 98061, true },
-  { 98083, true },
-  { 98095, true },
-  { 98107, true },
-  { 98115, true },
-  { 98126, true },
-  { 98134, true },
-  { 98144, true },
-  { 98154, false },
-  { 98166, true },
-  { 98182, true },
-  { 98198, true },
-  { 98214, true },
+  { 97528, true },
+  { 97543, true },
+  { 97558, true },
+  { 97573, true },
+  { 97587, true },
+  { 97606, true },
+  { 97616, true },
+  { 97633, true },
+  { 97649, true },
+  { 97670, true },
+  { 97687, true },
+  { 97703, true },
+  { 97722, true },
+  { 97756, true },
+  { 97780, true },
+  { 97809, true },
+  { 97833, true },
+  { 97849, true },
+  { 97869, true },
+  { 97894, true },
+  { 97906, true },
+  { 97933, true },
+  { 97947, true },
+  { 97965, true },
+  { 97974, false },
+  { 97984, true },
+  { 97996, true },
+  { 98011, true },
+  { 98019, true },
+  { 98028, true },
+  { 98036, true },
+  { 98050, true },
+  { 98058, true },
+  { 98074, true },
+  { 98096, true },
+  { 98108, true },
+  { 98120, true },
+  { 98128, true },
+  { 98139, true },
+  { 98147, true },
+  { 98157, true },
+  { 98167, false },
+  { 98179, true },
+  { 98195, true },
+  { 98211, true },
   { 98227, true },
-  { 98242, true },
-  { 98256, true },
-  { 98267, true },
-  { 98282, true },
-  { 98307, true },
-  { 98325, true },
-  { 98340, true },
-  { 98351, false },
-  { 98363, true },
-  { 98377, true },
-  { 98388, true },
-  { 98399, true },
-  { 98410, true },
-  { 98420, true },
-  { 98441, true },
-  { 98458, true },
-  { 98475, true },
-  { 98493, true },
-  { 98503, true },
-  { 98526, true },
-  { 98540, true },
-  { 98556, true },
-  { 98575, true },
+  { 98240, true },
+  { 98255, true },
+  { 98269, true },
+  { 98280, true },
+  { 98295, true },
+  { 98320, true },
+  { 98338, true },
+  { 98353, true },
+  { 98364, false },
+  { 98376, true },
+  { 98390, true },
+  { 98401, true },
+  { 98412, true },
+  { 98423, true },
+  { 98433, true },
+  { 98454, true },
+  { 98471, true },
+  { 98488, true },
+  { 98506, true },
+  { 98516, true },
+  { 98539, true },
+  { 98553, true },
+  { 98569, true },
   { 98588, true },
-  { 98605, true },
-  { 98623, false },
-  { 98636, true },
-  { 98657, true },
-  { 98671, true },
-  { 98681, true },
-  { 98692, true },
-  { 98699, true },
-  { 98715, true },
-  { 98722, true },
-  { 98743, true },
-  { 98753, false },
-  { 98768, true },
-  { 98783, true },
-  { 98800, true },
-  { 98810, true },
-  { 98829, true },
-  { 98841, true },
-  { 98860, true },
-  { 98878, true },
-  { 98888, true },
-  { 98898, true },
+  { 98601, true },
+  { 98618, true },
+  { 98636, false },
+  { 98649, true },
+  { 98670, true },
+  { 98684, true },
+  { 98694, true },
+  { 98705, true },
+  { 98712, true },
+  { 98728, true },
+  { 98735, true },
+  { 98756, true },
+  { 98766, false },
+  { 98781, true },
+  { 98796, true },
+  { 98813, true },
+  { 98823, true },
+  { 98842, true },
+  { 98854, true },
+  { 98873, true },
+  { 98891, true },
+  { 98901, true },
   { 98911, true },
-  { 98919, true },
-  { 98930, true },
-  { 98945, true },
-  { 98956, true },
-  { 98972, true },
+  { 98924, true },
+  { 98932, true },
+  { 98943, true },
+  { 98958, true },
+  { 98969, true },
   { 98985, true },
-  { 98995, true },
-  { 99014, true },
-  { 99030, true },
-  { 99052, true },
-  { 99064, true },
-  { 99077, false },
-  { 99091, true },
+  { 98998, true },
+  { 99008, true },
+  { 99027, true },
+  { 99043, true },
+  { 99065, true },
+  { 99077, true },
+  { 99090, false },
   { 99104, true },
-  { 99118, true },
-  { 99133, true },
-  { 99149, true },
-  { 99161, true },
-  { 99172, true },
+  { 99117, true },
+  { 99131, true },
+  { 99146, true },
+  { 99162, true },
+  { 99174, true },
   { 99185, true },
-  { 99197, true },
-  { 99207, true },
-  { 99224, true },
-  { 99243, true },
-  { 99259, true },
-  { 99271, false },
-  { 99281, true },
-  { 99297, true },
-  { 99308, true },
-  { 99328, false },
-  { 99336, true },
-  { 99348, true },
-  { 99359, true },
-  { 99371, true },
-  { 99390, false },
-  { 99410, true },
-  { 99419, true },
-  { 99430, true },
-  { 99461, true },
-  { 99475, true },
-  { 99491, true },
-  { 99505, true },
-  { 99525, true },
-  { 99544, true },
-  { 99558, true },
-  { 99582, true },
-  { 99598, true },
-  { 99613, true },
-  { 99627, true },
-  { 99641, true },
-  { 99655, true },
-  { 99663, true },
+  { 99198, true },
+  { 99210, true },
+  { 99220, true },
+  { 99237, true },
+  { 99256, true },
+  { 99272, true },
+  { 99284, false },
+  { 99294, true },
+  { 99310, true },
+  { 99321, true },
+  { 99341, false },
+  { 99349, true },
+  { 99361, true },
+  { 99372, true },
+  { 99384, true },
+  { 99403, false },
+  { 99423, true },
+  { 99432, true },
+  { 99443, true },
+  { 99474, true },
+  { 99488, true },
+  { 99504, true },
+  { 99518, true },
+  { 99538, true },
+  { 99557, true },
+  { 99571, true },
+  { 99595, true },
+  { 99611, true },
+  { 99626, true },
+  { 99640, true },
+  { 99654, true },
+  { 99668, true },
   { 99676, true },
-  { 99687, true },
-  { 99699, true },
-  { 99711, true },
-  { 99727, true },
-  { 99738, true },
-  { 99753, true },
-  { 99763, true },
-  { 99788, true },
-  { 99804, true },
-  { 99820, true },
-  { 99842, true },
-  { 99858, true },
-  { 99877, true },
-  { 99901, true },
-  { 99917, true },
-  { 99933, true },
-  { 99943, true },
-  { 99955, true },
-  { 99972, true },
-  { 99990, true },
-  { 100002, true },
-  { 100016, true },
-  { 100031, true },
-  { 100051, true },
-  { 100066, true },
-  { 100086, true },
-  { 100107, false },
-  { 100123, true },
-  { 100141, true },
-  { 100156, true },
-  { 100172, true },
-  { 100187, true },
-  { 100206, false },
-  { 100214, true },
-  { 100228, true },
-  { 100245, true },
-  { 100259, true },
-  { 100273, true },
-  { 100285, true },
-  { 100299, true },
-  { 100312, true },
-  { 100330, true },
-  { 100344, true },
-  { 100360, true },
-  { 100380, true },
-  { 100411, true },
-  { 100442, true },
-  { 100464, true },
-  { 100482, true },
-  { 100496, true },
-  { 100518, true },
-  { 100533, true },
-  { 100552, true },
-  { 100562, true },
-  { 100577, true },
-  { 100592, true },
-  { 100607, true },
-  { 100624, true },
-  { 100637, true },
-  { 100652, true },
-  { 100665, true },
-  { 100678, true },
-  { 100688, true },
-  { 100711, true },
-  { 100726, true },
-  { 100737, true },
-  { 100748, true },
-  { 100765, true },
-  { 100782, true },
-  { 100797, true },
-  { 100804, true },
-  { 100817, true },
-  { 100830, true },
-  { 100840, true },
-  { 100857, true },
-  { 100867, true },
-  { 100877, true },
-  { 100886, true },
-  { 100896, true },
-  { 100915, true },
-  { 100933, true },
-  { 100954, true },
-  { 100974, true },
-  { 100987, true },
-  { 101004, true },
-  { 101017, true },
-  { 101039, true },
-  { 101051, true },
-  { 101061, true },
-  { 101074, true },
-  { 101096, true },
-  { 101110, true },
-  { 101132, true },
-  { 101149, true },
-  { 101170, true },
-  { 101178, true },
-  { 101190, true },
-  { 101203, true },
-  { 101218, true },
-  { 101237, true },
-  { 101247, true },
-  { 101258, true },
-  { 101277, true },
-  { 101289, true },
-  { 101310, true },
-  { 101321, true },
-  { 101330, true },
-  { 101340, true },
-  { 101360, true },
-  { 101377, true },
-  { 101396, true },
-  { 101418, true },
-  { 101430, true },
-  { 101448, true },
-  { 101461, true },
-  { 101474, true },
-  { 101485, true },
-  { 101500, true },
-  { 101513, true },
-  { 101536, true },
-  { 101550, true },
-  { 101560, true },
-  { 101574, true },
-  { 101589, true },
-  { 101604, true },
-  { 101616, true },
-  { 101626, true },
-  { 101634, true },
-  { 101650, true },
-  { 101668, true },
-  { 101676, true },
-  { 101684, true },
-  { 101695, true },
-  { 101709, true },
-  { 101721, true },
-  { 101733, true },
-  { 101746, true },
-  { 101762, true },
-  { 101772, false },
-  { 101788, true },
-  { 101801, true },
-  { 101816, true },
-  { 101827, true },
-  { 101843, true },
-  { 101861, true },
-  { 101882, true },
-  { 101905, true },
-  { 101917, true },
-  { 101926, true },
-  { 101939, false },
-  { 101957, true },
-  { 101968, true },
-  { 101980, true },
-  { 102003, true },
-  { 102013, false },
-  { 102031, true },
-  { 102049, true },
-  { 102068, true },
-  { 102087, true },
-  { 102118, true },
-  { 102129, true },
-  { 102143, true },
-  { 102163, false },
-  { 102183, false },
-  { 102195, true },
-  { 102208, true },
-  { 102236, true },
+  { 99689, true },
+  { 99700, true },
+  { 99712, true },
+  { 99724, true },
+  { 99740, true },
+  { 99751, true },
+  { 99766, true },
+  { 99776, true },
+  { 99801, true },
+  { 99817, true },
+  { 99833, true },
+  { 99855, true },
+  { 99871, true },
+  { 99890, true },
+  { 99914, true },
+  { 99930, true },
+  { 99946, true },
+  { 99956, true },
+  { 99968, true },
+  { 99985, true },
+  { 100003, true },
+  { 100015, true },
+  { 100029, true },
+  { 100044, true },
+  { 100064, true },
+  { 100079, true },
+  { 100099, true },
+  { 100120, false },
+  { 100136, true },
+  { 100154, true },
+  { 100169, true },
+  { 100185, true },
+  { 100200, true },
+  { 100219, false },
+  { 100227, true },
+  { 100241, true },
+  { 100258, true },
+  { 100272, true },
+  { 100284, true },
+  { 100298, true },
+  { 100311, true },
+  { 100329, true },
+  { 100343, true },
+  { 100359, true },
+  { 100379, true },
+  { 100410, true },
+  { 100441, true },
+  { 100463, true },
+  { 100481, true },
+  { 100495, true },
+  { 100517, true },
+  { 100532, true },
+  { 100551, true },
+  { 100561, true },
+  { 100576, true },
+  { 100591, true },
+  { 100606, true },
+  { 100623, true },
+  { 100636, true },
+  { 100651, true },
+  { 100664, true },
+  { 100677, true },
+  { 100687, true },
+  { 100710, true },
+  { 100725, true },
+  { 100736, true },
+  { 100747, true },
+  { 100764, true },
+  { 100781, true },
+  { 100796, true },
+  { 100803, true },
+  { 100816, true },
+  { 100829, true },
+  { 100839, true },
+  { 100856, true },
+  { 100866, true },
+  { 100876, true },
+  { 100885, true },
+  { 100895, true },
+  { 100914, true },
+  { 100932, true },
+  { 100953, true },
+  { 100973, true },
+  { 100986, true },
+  { 101003, true },
+  { 101016, true },
+  { 101038, true },
+  { 101050, true },
+  { 101060, true },
+  { 101073, true },
+  { 101095, true },
+  { 101109, true },
+  { 101131, true },
+  { 101148, true },
+  { 101169, true },
+  { 101177, true },
+  { 101189, true },
+  { 101202, true },
+  { 101217, true },
+  { 101236, true },
+  { 101246, true },
+  { 101257, true },
+  { 101276, true },
+  { 101288, true },
+  { 101309, true },
+  { 101320, true },
+  { 101329, true },
+  { 101339, true },
+  { 101359, true },
+  { 101376, true },
+  { 101395, true },
+  { 101417, true },
+  { 101429, true },
+  { 101447, true },
+  { 101460, true },
+  { 101473, true },
+  { 101484, true },
+  { 101499, true },
+  { 101512, true },
+  { 101535, true },
+  { 101549, true },
+  { 101559, true },
+  { 101573, true },
+  { 101588, true },
+  { 101603, true },
+  { 101615, true },
+  { 101625, true },
+  { 101633, true },
+  { 101649, true },
+  { 101667, true },
+  { 101675, true },
+  { 101683, true },
+  { 101694, true },
+  { 101708, true },
+  { 101720, true },
+  { 101732, true },
+  { 101745, true },
+  { 101761, true },
+  { 101771, false },
+  { 101787, true },
+  { 101800, true },
+  { 101815, true },
+  { 101826, true },
+  { 101842, true },
+  { 101860, true },
+  { 101881, true },
+  { 101904, true },
+  { 101916, true },
+  { 101925, true },
+  { 101938, false },
+  { 101956, true },
+  { 101967, true },
+  { 101979, true },
+  { 102002, true },
+  { 102012, false },
+  { 102030, true },
+  { 102048, true },
+  { 102067, true },
+  { 102086, true },
+  { 102117, true },
+  { 102128, true },
+  { 102142, true },
+  { 102162, true },
+  { 102182, false },
+  { 102202, false },
+  { 102214, true },
+  { 102227, true },
   { 102255, true },
-  { 102269, true },
-  { 102284, false },
-  { 102294, true },
-  { 102304, true },
-  { 102314, true },
-  { 102326, true },
-  { 102341, true },
-  { 102356, true },
-  { 102365, true },
-  { 102373, true },
-  { 102386, true },
-  { 102413, true },
-  { 102421, true },
-  { 102438, true },
-  { 102450, true },
-  { 102467, true },
-  { 102488, true },
-  { 102503, true },
-  { 102517, true },
-  { 102527, true },
-  { 102535, true },
-  { 102544, true },
-  { 102553, true },
-  { 102570, true },
-  { 102582, true },
-  { 102590, true },
+  { 102274, true },
+  { 102288, true },
+  { 102303, false },
+  { 102313, true },
+  { 102323, true },
+  { 102333, true },
+  { 102345, true },
+  { 102360, true },
+  { 102375, true },
+  { 102384, true },
+  { 102392, true },
+  { 102405, true },
+  { 102432, true },
+  { 102440, true },
+  { 102457, true },
+  { 102469, true },
+  { 102486, true },
+  { 102507, true },
+  { 102522, true },
+  { 102536, true },
+  { 102546, true },
+  { 102554, true },
+  { 102563, true },
+  { 102572, true },
+  { 102589, true },
   { 102601, true },
-  { 102619, true },
-  { 102640, true },
+  { 102609, true },
+  { 102620, true },
+  { 102638, true },
   { 102659, true },
-  { 102673, true },
-  { 102685, true },
-  { 102703, true },
-  { 102715, true },
-  { 102726, true },
-  { 102733, true },
-  { 102742, true },
-  { 102751, true },
-  { 102758, true },
-  { 102766, true },
-  { 102780, false },
-  { 102791, true },
-  { 102802, true },
-  { 102817, true },
-  { 102827, true },
-  { 102840, true },
-  { 102852, true },
-  { 102863, true },
-  { 102873, false },
-  { 102883, true },
-  { 102891, true },
-  { 102905, true },
-  { 102919, true },
-  { 102939, true },
-  { 102954, true },
-  { 102965, true },
-  { 102978, true },
-  { 102990, true },
-  { 103005, true },
-  { 103018, true },
-  { 103045, true },
-  { 103059, true },
-  { 103073, true },
-  { 103090, true },
-  { 103110, true },
-  { 103125, true },
-  { 103135, true },
-  { 103148, true },
-  { 103165, true },
-  { 103175, true },
-  { 103202, true },
-  { 103212, true },
-  { 103225, true },
-  { 103234, true },
-  { 103241, true },
-  { 103257, true },
-  { 103269, true },
-  { 103280, true },
-  { 103291, true },
-  { 103305, true },
-  { 103316, true },
-  { 103326, true },
-  { 103347, true },
-  { 103358, true },
-  { 103370, true },
-  { 103393, true },
-  { 103407, true },
+  { 102678, true },
+  { 102692, true },
+  { 102704, true },
+  { 102722, true },
+  { 102734, true },
+  { 102745, true },
+  { 102752, true },
+  { 102761, true },
+  { 102770, true },
+  { 102777, true },
+  { 102785, true },
+  { 102799, false },
+  { 102810, true },
+  { 102821, true },
+  { 102836, true },
+  { 102846, true },
+  { 102859, true },
+  { 102871, true },
+  { 102882, true },
+  { 102892, false },
+  { 102902, true },
+  { 102910, true },
+  { 102924, true },
+  { 102938, true },
+  { 102958, true },
+  { 102973, true },
+  { 102984, true },
+  { 102997, true },
+  { 103009, true },
+  { 103024, true },
+  { 103037, true },
+  { 103064, true },
+  { 103078, true },
+  { 103092, true },
+  { 103109, true },
+  { 103129, true },
+  { 103144, true },
+  { 103154, true },
+  { 103167, true },
+  { 103184, true },
+  { 103194, true },
+  { 103221, true },
+  { 103231, true },
+  { 103244, true },
+  { 103253, true },
+  { 103260, true },
+  { 103276, true },
+  { 103288, true },
+  { 103299, true },
+  { 103310, true },
+  { 103324, true },
+  { 103335, true },
+  { 103345, true },
+  { 103366, true },
+  { 103377, true },
+  { 103389, true },
+  { 103412, true },
   { 103426, true },
-  { 103443, true },
-  { 103451, true },
-  { 103479, true },
-  { 103490, true },
-  { 103501, true },
-  { 103519, true },
-  { 103529, true },
+  { 103445, true },
+  { 103462, true },
+  { 103470, true },
+  { 103498, true },
+  { 103509, true },
+  { 103520, true },
   { 103538, true },
-  { 103554, true },
-  { 103570, true },
-  { 103579, true },
-  { 103597, true },
-  { 103629, true },
-  { 103657, true },
-  { 103678, true },
-  { 103699, true },
-  { 103719, true },
-  { 103740, true },
-  { 103757, true },
-  { 103771, true },
-  { 103782, true },
-  { 103802, true },
-  { 103814, true },
-  { 103835, true },
-  { 103849, true },
+  { 103548, true },
+  { 103557, true },
+  { 103573, true },
+  { 103589, true },
+  { 103598, true },
+  { 103616, true },
+  { 103648, true },
+  { 103676, true },
+  { 103697, true },
+  { 103718, true },
+  { 103738, true },
+  { 103759, true },
+  { 103776, true },
+  { 103790, true },
+  { 103801, true },
+  { 103821, true },
+  { 103833, true },
+  { 103854, true },
   { 103868, true },
-  { 103886, true },
-  { 103897, true },
-  { 103906, true },
-  { 103918, true },
-  { 103932, true },
-  { 103944, true },
-  { 103957, true },
-  { 103969, true },
-  { 103979, true },
-  { 103993, true },
-  { 104016, false },
-  { 104031, true },
-  { 104046, true },
+  { 103887, true },
+  { 103905, true },
+  { 103916, true },
+  { 103925, true },
+  { 103937, true },
+  { 103951, true },
+  { 103963, true },
+  { 103976, true },
+  { 103988, true },
+  { 103998, true },
+  { 104012, true },
+  { 104035, false },
+  { 104050, true },
   { 104065, true },
-  { 104083, true },
-  { 104097, true },
-  { 104111, true },
-  { 104124, true },
-  { 104137, true },
-  { 104152, true },
-  { 104164, true },
-  { 104178, true },
-  { 104194, true },
-  { 104209, true },
-  { 104218, true },
-  { 104234, true },
-  { 104252, true },
-  { 104263, true },
-  { 104290, true },
-  { 104305, true },
-  { 104318, true },
-  { 104334, true },
-  { 104351, false },
-  { 104368, true },
-  { 104390, true },
-  { 104412, true },
-  { 104434, true },
-  { 104448, true },
-  { 104460, true },
-  { 104474, true },
-  { 104485, true },
-  { 104500, true },
-  { 104509, true },
-  { 104525, true },
-  { 104542, true },
-  { 104553, true },
-  { 104562, true },
-  { 104576, true },
-  { 104589, true },
-  { 104603, true },
-  { 104617, true },
-  { 104629, true },
-  { 104641, true },
-  { 104654, true },
-  { 104667, true },
-  { 104677, true },
-  { 104691, true },
-  { 104704, true },
-  { 104726, true },
-  { 104748, true },
-  { 104759, false },
-  { 104774, true },
-  { 104785, false },
-  { 104805, true },
-  { 104825, true },
-  { 104842, true },
-  { 104861, true },
-  { 104879, true },
-  { 104898, true },
-  { 104910, true },
-  { 104931, true },
-  { 104956, true },
-  { 104968, true },
-  { 104987, true },
-  { 105002, true },
-  { 105022, true },
-  { 105035, false },
-  { 105043, true },
-  { 105052, true },
-  { 105064, true },
-  { 105080, true },
-  { 105098, true },
-  { 105115, true },
-  { 105127, true },
-  { 105141, true },
-  { 105151, true },
-  { 105164, true },
-  { 105182, true },
-  { 105189, true },
-  { 105203, true },
-  { 105210, true },
-  { 105217, true },
-  { 105229, true },
-  { 105240, true },
-  { 105253, true },
-  { 105267, true },
-  { 105281, true },
-  { 105297, true },
-  { 105308, true },
-  { 105315, true },
-  { 105328, true },
-  { 105341, true },
-  { 105350, true },
-  { 105364, true },
-  { 105378, true },
-  { 105394, false },
-  { 105409, true },
-  { 105437, true },
-  { 105452, true },
-  { 105473, true },
-  { 105487, true },
-  { 105501, true },
-  { 105522, true },
-  { 105538, true },
-  { 105553, true },
-  { 105565, true },
-  { 105575, true },
-  { 105586, true },
-  { 105596, true },
-  { 105609, true },
-  { 105619, true },
-  { 105635, true },
-  { 105648, true },
-  { 105668, true },
-  { 105687, true },
-  { 105706, true },
-  { 105726, true },
-  { 105744, true },
-  { 105761, true },
-  { 105773, true },
-  { 105785, true },
-  { 105810, true },
-  { 105821, true },
-  { 105834, true },
-  { 105849, true },
-  { 105867, true },
-  { 105879, true },
-  { 105894, true },
-  { 105920, true },
-  { 105931, true },
-  { 105942, true },
-  { 105953, true },
-  { 105965, true },
-  { 105976, true },
-  { 105986, true },
-  { 106000, true },
-  { 106013, true },
-  { 106022, true },
-  { 106031, true },
-  { 106044, true },
-  { 106051, false },
-  { 106059, true },
+  { 104084, true },
+  { 104102, true },
+  { 104116, true },
+  { 104130, true },
+  { 104143, true },
+  { 104156, true },
+  { 104171, true },
+  { 104183, true },
+  { 104197, true },
+  { 104213, true },
+  { 104228, true },
+  { 104237, true },
+  { 104253, true },
+  { 104271, true },
+  { 104282, true },
+  { 104309, true },
+  { 104324, true },
+  { 104337, true },
+  { 104353, true },
+  { 104370, false },
+  { 104387, true },
+  { 104409, true },
+  { 104431, true },
+  { 104453, true },
+  { 104467, true },
+  { 104479, true },
+  { 104493, true },
+  { 104504, true },
+  { 104519, true },
+  { 104528, true },
+  { 104544, true },
+  { 104561, true },
+  { 104572, true },
+  { 104581, true },
+  { 104595, true },
+  { 104608, true },
+  { 104622, true },
+  { 104636, true },
+  { 104648, true },
+  { 104660, true },
+  { 104673, true },
+  { 104686, true },
+  { 104696, true },
+  { 104710, true },
+  { 104723, true },
+  { 104745, true },
+  { 104767, true },
+  { 104778, false },
+  { 104793, false },
+  { 104813, true },
+  { 104833, true },
+  { 104850, true },
+  { 104869, true },
+  { 104887, true },
+  { 104906, true },
+  { 104918, true },
+  { 104939, true },
+  { 104964, true },
+  { 104976, true },
+  { 104995, true },
+  { 105010, true },
+  { 105030, true },
+  { 105043, false },
+  { 105051, true },
+  { 105060, true },
+  { 105072, true },
+  { 105088, true },
+  { 105106, true },
+  { 105123, true },
+  { 105135, true },
+  { 105149, true },
+  { 105159, true },
+  { 105172, true },
+  { 105190, true },
+  { 105197, true },
+  { 105211, true },
+  { 105218, true },
+  { 105225, true },
+  { 105237, true },
+  { 105248, true },
+  { 105261, true },
+  { 105275, true },
+  { 105289, true },
+  { 105305, true },
+  { 105316, true },
+  { 105323, true },
+  { 105336, true },
+  { 105349, true },
+  { 105358, true },
+  { 105372, true },
+  { 105386, true },
+  { 105402, false },
+  { 105417, true },
+  { 105445, true },
+  { 105460, true },
+  { 105481, true },
+  { 105495, true },
+  { 105509, true },
+  { 105530, true },
+  { 105546, true },
+  { 105561, true },
+  { 105573, true },
+  { 105583, true },
+  { 105594, true },
+  { 105604, true },
+  { 105617, true },
+  { 105627, true },
+  { 105643, true },
+  { 105656, true },
+  { 105676, true },
+  { 105695, true },
+  { 105714, true },
+  { 105734, true },
+  { 105752, true },
+  { 105769, true },
+  { 105781, true },
+  { 105793, true },
+  { 105818, true },
+  { 105829, true },
+  { 105842, true },
+  { 105857, true },
+  { 105875, true },
+  { 105887, true },
+  { 105902, true },
+  { 105928, true },
+  { 105939, true },
+  { 105950, true },
+  { 105961, true },
+  { 105973, true },
+  { 105984, true },
+  { 105994, true },
+  { 106008, true },
+  { 106021, true },
+  { 106030, true },
+  { 106039, true },
+  { 106052, true },
+  { 106059, false },
   { 106067, true },
-  { 106078, true },
-  { 106092, true },
-  { 106104, true },
-  { 106118, false },
-  { 106130, true },
-  { 106144, true },
-  { 106168, true },
-  { 106183, true },
-  { 106196, true },
-  { 106210, true },
-  { 106228, true },
-  { 106243, true },
+  { 106075, true },
+  { 106086, true },
+  { 106100, true },
+  { 106112, true },
+  { 106126, false },
+  { 106138, true },
+  { 106152, true },
+  { 106176, true },
+  { 106191, true },
+  { 106204, true },
+  { 106218, true },
+  { 106236, true },
   { 106251, true },
-  { 106268, true },
-  { 106293, true },
-  { 106313, true },
-  { 106337, true },
-  { 106349, true },
-  { 106360, true },
-  { 106376, true },
-  { 106390, true },
-  { 106399, true },
-  { 106415, true },
-  { 106433, true },
-  { 106448, true },
-  { 106468, true },
-  { 106481, true },
-  { 106497, true },
-  { 106511, true },
-  { 106527, true },
-  { 106547, true },
-  { 106565, true },
-  { 106584, true },
-  { 106601, true },
-  { 106612, true },
-  { 106628, true },
-  { 106638, true },
-  { 106667, true },
-  { 106687, true },
-  { 106704, true },
-  { 106721, true },
-  { 106746, true },
-  { 106762, true },
-  { 106771, true },
-  { 106784, true },
-  { 106796, true },
-  { 106805, false },
-  { 106819, true },
-  { 106836, true },
-  { 106853, true },
-  { 106886, true },
-  { 106906, true },
-  { 106918, true },
-  { 106931, true },
-  { 106944, true },
-  { 106959, true },
-  { 106970, true },
-  { 106987, true },
-  { 106999, true },
-  { 107011, true },
-  { 107023, true },
-  { 107032, true },
-  { 107044, true },
-  { 107061, true },
-  { 107075, true },
-  { 107096, true },
-  { 107110, true },
-  { 107126, true },
-  { 107141, true },
-  { 107155, true },
-  { 107173, true },
-  { 107194, true },
-  { 107208, true },
-  { 107222, true },
-  { 107233, true },
+  { 106259, true },
+  { 106276, true },
+  { 106301, true },
+  { 106321, true },
+  { 106345, true },
+  { 106357, true },
+  { 106368, true },
+  { 106384, true },
+  { 106398, true },
+  { 106407, true },
+  { 106423, true },
+  { 106441, true },
+  { 106456, true },
+  { 106476, true },
+  { 106489, true },
+  { 106505, true },
+  { 106519, true },
+  { 106535, true },
+  { 106555, true },
+  { 106573, true },
+  { 106592, true },
+  { 106609, true },
+  { 106620, true },
+  { 106636, true },
+  { 106646, true },
+  { 106675, true },
+  { 106695, true },
+  { 106712, true },
+  { 106729, true },
+  { 106754, true },
+  { 106770, true },
+  { 106779, true },
+  { 106792, true },
+  { 106804, true },
+  { 106813, false },
+  { 106827, true },
+  { 106844, true },
+  { 106861, true },
+  { 106894, true },
+  { 106914, true },
+  { 106926, true },
+  { 106940, true },
+  { 106953, true },
+  { 106966, true },
+  { 106981, true },
+  { 106992, true },
+  { 107009, true },
+  { 107021, true },
+  { 107033, true },
+  { 107045, true },
+  { 107054, true },
+  { 107066, true },
+  { 107083, true },
+  { 107097, true },
+  { 107118, true },
+  { 107132, true },
+  { 107148, true },
+  { 107163, true },
+  { 107177, true },
+  { 107195, true },
+  { 107216, true },
+  { 107230, true },
   { 107244, true },
-  { 107260, true },
-  { 107272, true },
-  { 107283, true },
-  { 107297, true },
-  { 107306, true },
-  { 107315, true },
-  { 107330, true },
-  { 107339, true },
+  { 107255, true },
+  { 107266, true },
+  { 107282, true },
+  { 107294, true },
+  { 107305, true },
+  { 107319, true },
+  { 107328, true },
+  { 107337, true },
   { 107352, true },
-  { 107360, true },
-  { 107371, true },
-  { 107385, true },
-  { 107400, true },
+  { 107361, true },
+  { 107374, true },
+  { 107382, true },
+  { 107393, true },
   { 107407, true },
-  { 107421, true },
-  { 107431, true },
-  { 107442, true },
-  { 107452, true },
-  { 107462, true },
-  { 107470, true },
-  { 107479, true },
-  { 107491, true },
-  { 107500, true },
-  { 107523, true },
-  { 107538, true },
-  { 107554, true },
+  { 107422, true },
+  { 107429, true },
+  { 107443, true },
+  { 107453, true },
+  { 107464, true },
+  { 107474, true },
+  { 107484, true },
+  { 107492, true },
+  { 107501, true },
+  { 107513, true },
+  { 107522, true },
+  { 107545, true },
+  { 107560, true },
   { 107576, true },
-  { 107591, true },
-  { 107599, true },
-  { 107609, true },
+  { 107598, true },
+  { 107613, true },
   { 107621, true },
-  { 107633, true },
-  { 107648, true },
-  { 107661, true },
-  { 107671, false },
-  { 107680, false },
-  { 107689, false },
-  { 107698, true },
-  { 107715, true },
-  { 107730, true },
-  { 107753, true },
-  { 107768, true },
-  { 107787, true },
-  { 107797, true },
-  { 107812, true },
-  { 107826, true },
-  { 107841, true },
-  { 107860, true },
-  { 107873, true },
-  { 107889, true },
-  { 107906, true },
-  { 107922, true },
-  { 107937, true },
-  { 107947, true },
-  { 107963, true },
-  { 107981, true },
-  { 108000, true },
-  { 108015, true },
-  { 108034, true },
-  { 108045, true },
-  { 108063, true },
-  { 108077, true },
-  { 108094, true },
-  { 108102, true },
+  { 107631, true },
+  { 107643, true },
+  { 107655, true },
+  { 107670, true },
+  { 107683, true },
+  { 107693, false },
+  { 107702, false },
+  { 107711, false },
+  { 107720, true },
+  { 107737, true },
+  { 107752, true },
+  { 107775, true },
+  { 107790, true },
+  { 107809, true },
+  { 107819, true },
+  { 107834, true },
+  { 107848, true },
+  { 107863, true },
+  { 107882, true },
+  { 107895, true },
+  { 107911, true },
+  { 107928, true },
+  { 107944, true },
+  { 107959, true },
+  { 107969, true },
+  { 107985, true },
+  { 108003, true },
+  { 108022, true },
+  { 108037, true },
+  { 108056, true },
+  { 108067, true },
+  { 108085, true },
+  { 108099, true },
   { 108116, true },
-  { 108130, true },
-  { 108144, true },
-  { 108161, false },
-  { 108181, true },
-  { 108194, true },
-  { 108206, true },
-  { 108221, true },
-  { 108239, true },
-  { 108250, true },
-  { 108260, true },
-  { 108270, true },
+  { 108124, true },
+  { 108138, true },
+  { 108152, true },
+  { 108166, true },
+  { 108183, false },
+  { 108203, true },
+  { 108216, true },
+  { 108228, true },
+  { 108243, true },
+  { 108261, true },
+  { 108272, true },
   { 108284, true },
-  { 108293, true },
-  { 108306, true },
-  { 108322, true },
-  { 108337, true },
-  { 108362, true },
-  { 108382, true },
-  { 108408, true },
-  { 108423, true },
-  { 108435, true },
-  { 108460, true },
-  { 108467, true },
-  { 108489, true },
-  { 108504, true },
-  { 108520, true },
-  { 108531, true },
-  { 108539, true },
-  { 108547, true },
-  { 108558, true },
-  { 108574, true },
-  { 108590, true },
-  { 108607, true },
-  { 108633, true },
-  { 108647, true },
-  { 108661, true },
-  { 108677, true },
-  { 108704, true },
-  { 108718, true },
-  { 108727, true },
-  { 108740, true },
+  { 108294, true },
+  { 108304, true },
+  { 108318, true },
+  { 108327, true },
+  { 108340, true },
+  { 108356, true },
+  { 108371, true },
+  { 108396, true },
+  { 108416, true },
+  { 108442, true },
+  { 108457, true },
+  { 108469, true },
+  { 108494, true },
+  { 108501, true },
+  { 108523, true },
+  { 108538, true },
+  { 108554, true },
+  { 108565, true },
+  { 108573, true },
+  { 108581, true },
+  { 108592, true },
+  { 108608, true },
+  { 108624, true },
+  { 108641, true },
+  { 108667, true },
+  { 108681, true },
+  { 108695, true },
+  { 108711, true },
+  { 108738, true },
   { 108752, true },
-  { 108768, true },
-  { 108791, true },
-  { 108811, true },
-  { 108830, true },
-  { 108852, true },
-  { 108874, false },
-  { 108885, true },
-  { 108902, true },
-  { 108916, true },
+  { 108761, true },
+  { 108774, true },
+  { 108786, true },
+  { 108802, true },
+  { 108825, true },
+  { 108845, true },
+  { 108864, true },
+  { 108886, true },
+  { 108908, false },
+  { 108919, true },
   { 108936, true },
-  { 108961, true },
-  { 108977, true },
-  { 108989, true },
+  { 108950, true },
+  { 108970, true },
+  { 108995, true },
   { 109011, true },
-  { 109026, true },
-  { 109042, true },
-  { 109057, true },
-  { 109074, true },
-  { 109089, true },
-  { 109106, true },
-  { 109121, true },
-  { 109136, true },
-  { 109148, true },
-  { 109163, true },
-  { 109177, false },
-  { 109187, true },
+  { 109023, true },
+  { 109045, true },
+  { 109060, true },
+  { 109076, true },
+  { 109091, true },
+  { 109108, true },
+  { 109123, true },
+  { 109138, true },
+  { 109153, true },
+  { 109165, true },
+  { 109180, true },
+  { 109194, false },
   { 109204, true },
-  { 109215, false },
-  { 109230, true },
+  { 109221, true },
+  { 109232, false },
   { 109247, true },
-  { 109261, true },
-  { 109274, true },
-  { 109287, true },
-  { 109299, true },
-  { 109311, true },
-  { 109321, true },
-  { 109333, true },
-  { 109348, true },
-  { 109360, true },
-  { 109371, true },
-  { 109391, true },
-  { 109403, true },
-  { 109414, true },
-  { 109429, true },
-  { 109445, true },
-  { 109456, true },
-  { 109481, true },
-  { 109490, true },
-  { 109505, true },
-  { 109513, true },
-  { 109526, true },
-  { 109549, true },
+  { 109264, true },
+  { 109278, true },
+  { 109291, true },
+  { 109304, true },
+  { 109316, true },
+  { 109328, true },
+  { 109338, true },
+  { 109350, true },
+  { 109365, true },
+  { 109377, true },
+  { 109388, true },
+  { 109408, true },
+  { 109420, true },
+  { 109431, true },
+  { 109446, true },
+  { 109462, true },
+  { 109473, true },
+  { 109498, true },
+  { 109507, true },
+  { 109522, true },
+  { 109530, true },
+  { 109543, true },
   { 109566, true },
-  { 109577, true },
-  { 109595, true },
-  { 109613, true },
-  { 109629, false },
-  { 109641, true },
-  { 109649, true },
-  { 109659, true },
-  { 109674, true },
-  { 109688, true },
-  { 109698, false },
-  { 109716, true },
-  { 109740, true },
-  { 109755, true },
-  { 109783, true },
-  { 109799, true },
-  { 109811, true },
-  { 109825, true },
-  { 109853, true },
-  { 109869, true },
+  { 109583, true },
+  { 109594, true },
+  { 109612, true },
+  { 109630, true },
+  { 109646, false },
+  { 109658, true },
+  { 109666, true },
+  { 109676, true },
+  { 109691, true },
+  { 109705, true },
+  { 109715, false },
+  { 109733, true },
+  { 109757, true },
+  { 109772, true },
+  { 109800, true },
+  { 109816, true },
+  { 109828, true },
+  { 109842, true },
+  { 109870, true },
   { 109886, true },
-  { 109900, true },
+  { 109903, true },
   { 109917, true },
-  { 109939, true },
-  { 109949, true },
-  { 109959, true },
-  { 109977, true },
-  { 109986, true },
-  { 110000, true },
-  { 110013, true },
-  { 110031, true },
-  { 110050, true },
-  { 110075, true },
-  { 110091, true },
-  { 110110, true },
-  { 110131, true },
+  { 109934, true },
+  { 109956, true },
+  { 109966, true },
+  { 109976, true },
+  { 109994, true },
+  { 110003, true },
+  { 110017, true },
+  { 110030, true },
+  { 110048, true },
+  { 110067, true },
+  { 110092, true },
+  { 110108, true },
+  { 110127, true },
   { 110148, true },
-  { 110162, true },
-  { 110175, true },
-  { 110204, true },
-  { 110234, true },
-  { 110246, true },
-  { 110254, true },
+  { 110165, true },
+  { 110179, true },
+  { 110192, true },
+  { 110221, true },
+  { 110251, true },
   { 110263, true },
-  { 110276, true },
-  { 110287, true },
-  { 110309, true },
-  { 110320, true },
-  { 110338, true },
-  { 110348, true },
-  { 110377, true },
-  { 110390, true },
-  { 110406, true },
+  { 110271, true },
+  { 110280, true },
+  { 110293, true },
+  { 110304, true },
+  { 110326, true },
+  { 110337, true },
+  { 110355, true },
+  { 110365, true },
+  { 110394, true },
+  { 110407, true },
   { 110423, true },
-  { 110446, true },
-  { 110462, true },
-  { 110485, true },
-  { 110511, true },
-  { 110525, true },
-  { 110539, true },
-  { 110558, true },
-  { 110572, false },
-  { 110582, true },
-  { 110594, true },
-  { 110610, true },
-  { 110618, true },
-  { 110637, true },
-  { 110649, false },
-  { 110660, true },
-  { 110668, true },
-  { 110683, true },
-  { 110699, true },
-  { 110713, true },
-  { 110725, true },
-  { 110738, true },
-  { 110747, true },
-  { 110761, true },
-  { 110780, true },
-  { 110789, true },
-  { 110800, true },
-  { 110812, true },
-  { 110832, true },
-  { 110845, true },
-  { 110855, true },
-  { 110868, true },
-  { 110880, true },
-  { 110896, true },
-  { 110904, false },
-  { 110912, true },
-  { 110934, true },
-  { 110942, true },
-  { 110963, true },
-  { 110987, true },
-  { 111003, true },
-  { 111019, true },
-  { 111029, true },
-  { 111043, true },
-  { 111060, true },
-  { 111070, true },
-  { 111080, true },
-  { 111095, true },
-  { 111107, true },
-  { 111117, true },
-  { 111127, true },
-  { 111136, true },
-  { 111146, true },
-  { 111161, true },
-  { 111173, true },
-  { 111196, true },
-  { 111209, true },
-  { 111222, true },
-  { 111236, true },
-  { 111251, true },
-  { 111264, true },
-  { 111276, true },
-  { 111285, true },
-  { 111303, true },
-  { 111316, true },
-  { 111331, true },
-  { 111346, true },
-  { 111356, true },
-  { 111376, true },
-  { 111390, true },
-  { 111413, true },
-  { 111425, true },
-  { 111440, true },
-  { 111448, true },
-  { 111459, true },
-  { 111481, true },
-  { 111492, false },
-  { 111505, true },
-  { 111515, true },
-  { 111523, true },
-  { 111531, true },
-  { 111546, true },
-  { 111556, true },
-  { 111566, true },
-  { 111581, true },
-  { 111589, true },
-  { 111597, true },
-  { 111606, true },
-  { 111617, true },
-  { 111629, true },
-  { 111641, true },
-  { 111651, true },
-  { 111661, true },
-  { 111673, true },
-  { 111687, true },
-  { 111702, true },
-  { 111719, true },
-  { 111731, true },
-  { 111742, true },
-  { 111749, true },
-  { 111763, true },
-  { 111774, true },
-  { 111785, true },
-  { 111796, true },
-  { 111804, true },
-  { 111819, true },
-  { 111833, true },
-  { 111847, true },
-  { 111862, true },
-  { 111877, true },
-  { 111890, true },
-  { 111901, true },
-  { 111916, true },
-  { 111934, true },
-  { 111947, true },
-  { 111954, true },
-  { 111974, true },
-  { 111983, true },
-  { 111995, true },
-  { 112008, true },
-  { 112023, true },
-  { 112035, true },
-  { 112050, true },
-  { 112063, true },
-  { 112079, true },
-  { 112099, true },
-  { 112119, true },
-  { 112142, true },
-  { 112154, true },
-  { 112163, true },
-  { 112175, true },
-  { 112184, true },
-  { 112194, true },
-  { 112203, true },
-  { 112211, true },
-  { 112221, false },
-  { 112228, true },
-  { 112239, true },
-  { 112252, true },
-  { 112267, true },
-  { 112284, true },
-  { 112296, true },
-  { 112317, true },
-  { 112324, true },
-  { 112344, true },
-  { 112354, true },
-  { 112365, false },
-  { 112378, true },
-  { 112392, true },
-  { 112407, true },
-  { 112417, true },
-  { 112428, true },
-  { 112440, true },
-  { 112460, false },
-  { 112476, true },
-  { 112485, false },
-  { 112494, true },
-  { 112513, true },
-  { 112521, true },
-  { 112533, true },
-  { 112551, true },
+  { 110440, true },
+  { 110456, true },
+  { 110479, true },
+  { 110505, true },
+  { 110519, true },
+  { 110533, true },
+  { 110552, true },
+  { 110566, false },
+  { 110576, true },
+  { 110588, true },
+  { 110604, true },
+  { 110612, true },
+  { 110631, true },
+  { 110643, false },
+  { 110654, true },
+  { 110662, true },
+  { 110677, true },
+  { 110693, true },
+  { 110707, true },
+  { 110719, true },
+  { 110732, true },
+  { 110741, true },
+  { 110755, true },
+  { 110774, true },
+  { 110783, true },
+  { 110794, true },
+  { 110806, true },
+  { 110826, true },
+  { 110839, true },
+  { 110849, true },
+  { 110862, true },
+  { 110874, true },
+  { 110890, true },
+  { 110898, false },
+  { 110906, true },
+  { 110928, true },
+  { 110936, true },
+  { 110957, true },
+  { 110981, true },
+  { 110997, true },
+  { 111013, true },
+  { 111023, true },
+  { 111037, true },
+  { 111054, true },
+  { 111064, true },
+  { 111074, true },
+  { 111089, true },
+  { 111101, true },
+  { 111111, true },
+  { 111121, true },
+  { 111130, true },
+  { 111140, true },
+  { 111155, true },
+  { 111167, true },
+  { 111190, true },
+  { 111203, true },
+  { 111216, true },
+  { 111230, true },
+  { 111245, true },
+  { 111258, true },
+  { 111270, true },
+  { 111279, true },
+  { 111297, true },
+  { 111310, true },
+  { 111325, true },
+  { 111340, true },
+  { 111350, true },
+  { 111370, true },
+  { 111384, true },
+  { 111407, true },
+  { 111419, true },
+  { 111434, true },
+  { 111442, true },
+  { 111453, true },
+  { 111475, true },
+  { 111486, false },
+  { 111499, true },
+  { 111509, true },
+  { 111517, true },
+  { 111525, true },
+  { 111540, true },
+  { 111550, true },
+  { 111560, true },
+  { 111575, true },
+  { 111583, true },
+  { 111591, true },
+  { 111600, true },
+  { 111611, true },
+  { 111623, true },
+  { 111635, true },
+  { 111645, true },
+  { 111655, true },
+  { 111667, true },
+  { 111681, true },
+  { 111696, true },
+  { 111713, true },
+  { 111725, true },
+  { 111736, true },
+  { 111743, true },
+  { 111757, true },
+  { 111768, true },
+  { 111779, true },
+  { 111790, true },
+  { 111798, true },
+  { 111813, true },
+  { 111827, true },
+  { 111841, true },
+  { 111856, true },
+  { 111871, true },
+  { 111884, true },
+  { 111895, true },
+  { 111910, true },
+  { 111928, true },
+  { 111941, true },
+  { 111948, true },
+  { 111968, true },
+  { 111977, true },
+  { 111989, true },
+  { 112002, true },
+  { 112017, true },
+  { 112029, true },
+  { 112044, true },
+  { 112057, true },
+  { 112073, true },
+  { 112093, true },
+  { 112113, true },
+  { 112136, true },
+  { 112148, true },
+  { 112157, true },
+  { 112169, true },
+  { 112178, true },
+  { 112188, true },
+  { 112197, true },
+  { 112205, true },
+  { 112215, false },
+  { 112222, true },
+  { 112233, true },
+  { 112246, true },
+  { 112261, true },
+  { 112278, true },
+  { 112290, true },
+  { 112311, true },
+  { 112318, true },
+  { 112338, true },
+  { 112348, true },
+  { 112359, false },
+  { 112372, true },
+  { 112386, true },
+  { 112401, true },
+  { 112411, true },
+  { 112422, true },
+  { 112434, true },
+  { 112454, false },
+  { 112470, true },
+  { 112479, false },
+  { 112488, true },
+  { 112507, true },
+  { 112515, true },
+  { 112527, true },
+  { 112543, true },
+  { 112555, true },
   { 112567, true },
-  { 112579, true },
-  { 112591, true },
-  { 112610, true },
-  { 112623, true },
-  { 112640, true },
-  { 112659, true },
-  { 112672, false },
+  { 112586, true },
+  { 112599, true },
+  { 112616, true },
+  { 112635, true },
+  { 112648, false },
+  { 112657, true },
+  { 112668, true },
   { 112681, true },
-  { 112692, true },
-  { 112705, true },
-  { 112725, true },
-  { 112742, true },
-  { 112754, true },
-  { 112765, true },
-  { 112780, true },
-  { 112796, false },
-  { 112811, true },
-  { 112825, true },
-  { 112838, true },
-  { 112857, true },
-  { 112874, true },
-  { 112885, true },
-  { 112896, true },
-  { 112913, false },
-  { 112934, false },
-  { 112950, false },
-  { 112970, true },
-  { 112982, true },
-  { 112989, true },
-  { 113012, true },
-  { 113024, true },
+  { 112701, true },
+  { 112718, true },
+  { 112730, true },
+  { 112741, true },
+  { 112756, true },
+  { 112772, false },
+  { 112787, true },
+  { 112801, true },
+  { 112814, true },
+  { 112833, true },
+  { 112850, true },
+  { 112861, true },
+  { 112872, true },
+  { 112889, false },
+  { 112910, false },
+  { 112926, false },
+  { 112946, true },
+  { 112958, true },
+  { 112965, true },
+  { 112988, true },
+  { 113000, true },
+  { 113013, true },
+  { 113025, true },
   { 113037, true },
-  { 113049, true },
-  { 113061, true },
-  { 113078, true },
-  { 113093, false },
+  { 113054, true },
+  { 113069, false },
+  { 113080, true },
+  { 113095, true },
   { 113104, true },
-  { 113119, true },
-  { 113128, true },
-  { 113139, true },
-  { 113154, true },
-  { 113175, true },
-  { 113193, true },
-  { 113220, true },
-  { 113230, true },
+  { 113115, true },
+  { 113130, true },
+  { 113151, true },
+  { 113169, true },
+  { 113196, true },
+  { 113206, true },
+  { 113214, true },
+  { 113224, true },
   { 113238, true },
-  { 113248, true },
-  { 113262, true },
-  { 113274, true },
-  { 113289, true },
-  { 113299, true },
-  { 113310, true },
-  { 113324, true },
-  { 113333, true },
-  { 113352, true },
-  { 113365, true },
-  { 113377, true },
-  { 113387, true },
-  { 113394, true },
-  { 113407, true },
-  { 113416, true },
-  { 113428, false },
-  { 113438, true },
-  { 113458, true },
-  { 113467, true },
-  { 113479, true },
-  { 113490, true },
-  { 113501, true },
-  { 113524, true },
-  { 113547, true },
-  { 113570, true },
-  { 113580, false },
-  { 113597, true },
-  { 113606, true },
-  { 113616, true },
-  { 113629, true },
-  { 113637, true },
-  { 113647, true },
-  { 113658, true },
-  { 113668, true },
-  { 113681, true },
-  { 113693, true },
+  { 113250, true },
+  { 113265, true },
+  { 113275, true },
+  { 113286, true },
+  { 113300, true },
+  { 113309, true },
+  { 113328, true },
+  { 113341, true },
+  { 113353, true },
+  { 113363, true },
+  { 113371, true },
+  { 113378, true },
+  { 113391, true },
+  { 113400, true },
+  { 113412, false },
+  { 113422, true },
+  { 113442, true },
+  { 113451, true },
+  { 113462, true },
+  { 113473, true },
+  { 113496, true },
+  { 113519, true },
+  { 113542, true },
+  { 113552, false },
+  { 113569, true },
+  { 113578, true },
+  { 113588, true },
+  { 113601, true },
+  { 113609, true },
+  { 113619, true },
+  { 113630, true },
+  { 113640, true },
+  { 113653, true },
+  { 113665, true },
+  { 113680, true },
+  { 113692, true },
   { 113708, true },
-  { 113720, true },
+  { 113722, true },
   { 113736, true },
-  { 113750, true },
-  { 113764, true },
-  { 113771, true },
-  { 113781, true },
-  { 113793, true },
-  { 113802, true },
-  { 113818, false },
-  { 113832, true },
-  { 113843, true },
-  { 113855, true },
-  { 113867, true },
-  { 113876, true },
-  { 113890, true },
-  { 113902, true },
-  { 113914, true },
-  { 113924, true },
-  { 113934, true },
+  { 113743, true },
+  { 113753, true },
+  { 113765, true },
+  { 113774, true },
+  { 113790, false },
+  { 113804, true },
+  { 113815, true },
+  { 113827, true },
+  { 113839, true },
+  { 113848, true },
+  { 113862, true },
+  { 113874, true },
+  { 113886, true },
+  { 113896, true },
+  { 113906, true },
+  { 113916, true },
+  { 113926, true },
   { 113944, true },
-  { 113954, true },
-  { 113972, true },
-  { 113987, true },
-  { 113998, true },
-  { 114011, true },
-  { 114022, true },
+  { 113959, true },
+  { 113970, true },
+  { 113983, true },
+  { 113994, true },
+  { 114001, true },
+  { 114018, false },
   { 114029, true },
-  { 114046, false },
-  { 114057, true },
-  { 114067, true },
-  { 114077, true },
-  { 114088, true },
-  { 114097, true },
-  { 114119, true },
-  { 114144, true },
-  { 114163, true },
-  { 114170, true },
-  { 114184, true },
-  { 114193, true },
-  { 114208, true },
-  { 114218, true },
-  { 114234, true },
-  { 114256, true },
-  { 114266, true },
-  { 114280, true },
-  { 114293, true },
-  { 114307, true },
-  { 114330, true },
-  { 114341, true },
-  { 114350, true },
-  { 114361, true },
-  { 114375, true },
-  { 114384, true },
-  { 114395, true },
-  { 114409, true },
-  { 114420, true },
-  { 114430, true },
-  { 114445, true },
-  { 114457, true },
-  { 114476, true },
-  { 114489, true },
-  { 114509, true },
-  { 114533, true },
-  { 114542, true },
-  { 114555, true },
-  { 114567, true },
-  { 114580, true },
-  { 114592, true },
-  { 114600, true },
-  { 114612, true },
-  { 114621, true },
-  { 114636, true },
-  { 114645, true },
-  { 114667, true },
-  { 114679, true },
-  { 114687, true },
-  { 114697, true },
-  { 114712, true },
+  { 114039, true },
+  { 114049, true },
+  { 114060, true },
+  { 114069, true },
+  { 114091, true },
+  { 114116, true },
+  { 114135, true },
+  { 114142, true },
+  { 114156, true },
+  { 114165, true },
+  { 114180, true },
+  { 114190, true },
+  { 114206, true },
+  { 114228, true },
+  { 114238, true },
+  { 114252, true },
+  { 114265, true },
+  { 114279, true },
+  { 114302, true },
+  { 114313, true },
+  { 114322, true },
+  { 114333, true },
+  { 114347, true },
+  { 114356, true },
+  { 114367, true },
+  { 114381, true },
+  { 114392, true },
+  { 114402, true },
+  { 114417, true },
+  { 114429, true },
+  { 114448, true },
+  { 114461, true },
+  { 114481, true },
+  { 114505, true },
+  { 114514, true },
+  { 114527, true },
+  { 114539, true },
+  { 114552, true },
+  { 114564, true },
+  { 114572, true },
+  { 114584, true },
+  { 114593, true },
+  { 114608, true },
+  { 114617, true },
+  { 114639, true },
+  { 114651, true },
+  { 114659, true },
+  { 114669, true },
+  { 114684, true },
+  { 114692, true },
+  { 114705, true },
   { 114720, true },
-  { 114733, true },
-  { 114748, true },
-  { 114759, true },
-  { 114770, true },
-  { 114779, true },
+  { 114731, true },
+  { 114742, true },
+  { 114751, true },
+  { 114766, true },
+  { 114780, true },
   { 114794, true },
-  { 114808, true },
-  { 114822, true },
-  { 114842, true },
-  { 114865, true },
-  { 114890, true },
-  { 114919, true },
-  { 114938, true },
-  { 114955, true },
-  { 114975, true },
-  { 114991, true },
-  { 115005, true },
-  { 115021, true },
-  { 115037, true },
-  { 115055, true },
-  { 115072, true },
-  { 115087, true },
-  { 115102, true },
+  { 114814, true },
+  { 114837, true },
+  { 114862, true },
+  { 114891, true },
+  { 114910, true },
+  { 114927, true },
+  { 114947, true },
+  { 114963, true },
+  { 114977, true },
+  { 114993, true },
+  { 115009, true },
+  { 115027, true },
+  { 115044, true },
+  { 115059, true },
+  { 115074, true },
+  { 115084, true },
+  { 115099, true },
   { 115112, true },
-  { 115127, true },
-  { 115140, true },
-  { 115157, true },
+  { 115129, true },
+  { 115147, true },
+  { 115160, true },
   { 115175, true },
-  { 115188, true },
-  { 115203, true },
-  { 115213, true },
-  { 115224, true },
-  { 115235, true },
-  { 115245, true },
-  { 115258, true },
-  { 115270, true },
-  { 115291, true },
-  { 115305, false },
-  { 115325, false },
-  { 115337, false },
-  { 115350, true },
-  { 115360, true },
-  { 115373, true },
-  { 115386, true },
-  { 115402, true },
-  { 115419, true },
-  { 115431, true },
-  { 115457, true },
-  { 115490, true },
-  { 115524, true },
-  { 115536, true },
-  { 115550, true },
+  { 115185, true },
+  { 115196, true },
+  { 115207, true },
+  { 115217, true },
+  { 115230, true },
+  { 115242, true },
+  { 115263, true },
+  { 115277, false },
+  { 115297, false },
+  { 115309, false },
+  { 115322, true },
+  { 115332, true },
+  { 115345, true },
+  { 115358, true },
+  { 115374, true },
+  { 115391, true },
+  { 115403, true },
+  { 115429, true },
+  { 115462, true },
+  { 115496, true },
+  { 115508, true },
+  { 115522, true },
+  { 115542, true },
+  { 115558, true },
   { 115570, true },
-  { 115586, true },
-  { 115598, true },
-  { 115624, true },
-  { 115645, true },
-  { 115659, true },
-  { 115677, false },
-  { 115691, true },
-  { 115709, true },
-  { 115726, true },
-  { 115738, true },
-  { 115751, true },
+  { 115596, true },
+  { 115617, true },
+  { 115631, true },
+  { 115649, false },
+  { 115663, true },
+  { 115681, true },
+  { 115698, true },
+  { 115710, true },
+  { 115723, true },
+  { 115743, true },
+  { 115759, true },
   { 115771, true },
-  { 115787, true },
-  { 115799, true },
-  { 115821, true },
-  { 115843, true },
-  { 115862, true },
-  { 115872, true },
-  { 115889, true },
-  { 115911, true },
+  { 115793, true },
+  { 115815, true },
+  { 115834, true },
+  { 115844, true },
+  { 115861, true },
+  { 115883, true },
+  { 115895, true },
+  { 115912, true },
   { 115923, true },
-  { 115940, true },
-  { 115951, true },
-  { 115964, true },
-  { 115984, true },
-  { 115994, true },
-  { 116002, true },
-  { 116013, true },
-  { 116038, true },
-  { 116053, true },
-  { 116070, true },
-  { 116089, true },
-  { 116100, false },
-  { 116113, true },
-  { 116124, true },
-  { 116140, true },
-  { 116155, true },
-  { 116175, true },
-  { 116186, true },
-  { 116200, true },
-  { 116212, true },
-  { 116230, true },
-  { 116253, true },
-  { 116278, true },
-  { 116301, true },
+  { 115936, true },
+  { 115956, true },
+  { 115966, true },
+  { 115974, true },
+  { 115985, true },
+  { 116010, true },
+  { 116025, true },
+  { 116042, true },
+  { 116061, true },
+  { 116072, false },
+  { 116085, true },
+  { 116096, true },
+  { 116112, true },
+  { 116127, true },
+  { 116147, true },
+  { 116158, true },
+  { 116172, true },
+  { 116184, true },
+  { 116202, true },
+  { 116225, true },
+  { 116250, true },
+  { 116273, true },
+  { 116289, true },
+  { 116306, true },
   { 116317, true },
-  { 116334, true },
-  { 116345, true },
-  { 116359, true },
-  { 116371, true },
-  { 116387, false },
-  { 116400, true },
-  { 116413, true },
-  { 116425, true },
-  { 116436, true },
-  { 116456, true },
-  { 116473, true },
-  { 116486, true },
-  { 116498, true },
-  { 116508, false },
-  { 116517, true },
-  { 116527, true },
-  { 116540, true },
-  { 116551, true },
-  { 116574, true },
-  { 116587, true },
-  { 116605, true },
-  { 116616, true },
-  { 116630, true },
-  { 116646, true },
-  { 116654, true },
-  { 116673, true },
-  { 116686, true },
-  { 116709, true },
-  { 116723, true },
-  { 116738, true },
-  { 116748, true },
-  { 116758, true },
+  { 116331, true },
+  { 116343, true },
+  { 116359, false },
+  { 116372, true },
+  { 116385, true },
+  { 116397, true },
+  { 116408, true },
+  { 116428, true },
+  { 116445, true },
+  { 116458, true },
+  { 116470, true },
+  { 116480, false },
+  { 116489, true },
+  { 116499, true },
+  { 116512, true },
+  { 116523, true },
+  { 116546, true },
+  { 116559, true },
+  { 116577, true },
+  { 116588, true },
+  { 116602, true },
+  { 116618, true },
+  { 116626, true },
+  { 116645, true },
+  { 116658, true },
+  { 116681, true },
+  { 116695, true },
+  { 116710, true },
+  { 116720, true },
+  { 116730, true },
+  { 116743, true },
+  { 116756, true },
   { 116771, true },
-  { 116784, true },
-  { 116799, true },
-  { 116822, true },
-  { 116838, true },
-  { 116854, true },
-  { 116871, true },
-  { 116884, true },
-  { 116896, true },
-  { 116909, true },
-  { 116921, true },
-  { 116936, true },
+  { 116794, true },
+  { 116810, true },
+  { 116826, true },
+  { 116843, true },
+  { 116856, true },
+  { 116868, true },
+  { 116881, true },
+  { 116893, true },
+  { 116908, true },
+  { 116920, true },
   { 116948, true },
-  { 116976, true },
-  { 116993, true },
-  { 117002, true },
-  { 117029, true },
-  { 117050, true },
+  { 116965, true },
+  { 116974, true },
+  { 117001, true },
+  { 117022, true },
+  { 117040, true },
+  { 117057, true },
   { 117068, true },
-  { 117085, true },
-  { 117096, true },
-  { 117114, true },
-  { 117129, true },
-  { 117141, true },
-  { 117153, true },
-  { 117165, true },
-  { 117184, true },
-  { 117219, true },
-  { 117242, true },
-  { 117264, true },
-  { 117278, true },
-  { 117295, true },
-  { 117308, true },
-  { 117320, true },
-  { 117337, true },
-  { 117354, false },
-  { 117373, true },
-  { 117391, true },
-  { 117405, true },
-  { 117436, true },
-  { 117453, true },
-  { 117468, true },
-  { 117480, true },
-  { 117492, true },
-  { 117505, true },
-  { 117524, true },
-  { 117546, true },
-  { 117558, true },
-  { 117575, true },
-  { 117592, true },
-  { 117614, true },
-  { 117630, true },
-  { 117643, true },
-  { 117655, true },
-  { 117676, true },
-  { 117695, true },
-  { 117707, true },
-  { 117722, true },
-  { 117739, true },
-  { 117756, true },
-  { 117772, true },
-  { 117787, true },
-  { 117803, true },
-  { 117819, true },
-  { 117843, true },
-  { 117865, true },
-  { 117890, true },
-  { 117912, true },
-  { 117927, true },
-  { 117954, true },
-  { 117972, true },
-  { 117989, true },
-  { 118012, true },
-  { 118038, true },
-  { 118053, true },
-  { 118071, true },
-  { 118092, true },
-  { 118120, true },
-  { 118139, true },
-  { 118163, true },
-  { 118187, true },
-  { 118200, true },
-  { 118213, true },
-  { 118230, true },
-  { 118245, true },
-  { 118270, true },
-  { 118284, true },
-  { 118305, false },
-  { 118319, true },
-  { 118329, false },
-  { 118345, true },
-  { 118364, true },
-  { 118380, true },
-  { 118404, true },
-  { 118421, false },
-  { 118430, true },
-  { 118445, true },
-  { 118455, true },
-  { 118467, true },
-  { 118488, true },
-  { 118501, true },
+  { 117086, true },
+  { 117101, true },
+  { 117113, true },
+  { 117125, true },
+  { 117137, true },
+  { 117156, true },
+  { 117191, true },
+  { 117214, true },
+  { 117236, true },
+  { 117250, true },
+  { 117267, true },
+  { 117280, true },
+  { 117292, true },
+  { 117309, true },
+  { 117326, false },
+  { 117345, true },
+  { 117363, true },
+  { 117377, true },
+  { 117408, true },
+  { 117425, true },
+  { 117440, true },
+  { 117452, true },
+  { 117464, true },
+  { 117477, true },
+  { 117496, true },
+  { 117518, true },
+  { 117530, true },
+  { 117547, true },
+  { 117564, true },
+  { 117586, true },
+  { 117602, true },
+  { 117615, true },
+  { 117627, true },
+  { 117648, true },
+  { 117667, true },
+  { 117679, true },
+  { 117694, true },
+  { 117711, true },
+  { 117728, true },
+  { 117744, true },
+  { 117759, true },
+  { 117775, true },
+  { 117799, true },
+  { 117821, true },
+  { 117846, true },
+  { 117868, true },
+  { 117883, true },
+  { 117910, true },
+  { 117928, true },
+  { 117945, true },
+  { 117968, true },
+  { 117994, true },
+  { 118009, true },
+  { 118027, true },
+  { 118048, true },
+  { 118076, true },
+  { 118095, true },
+  { 118119, true },
+  { 118143, true },
+  { 118156, true },
+  { 118169, true },
+  { 118186, true },
+  { 118201, true },
+  { 118226, true },
+  { 118240, true },
+  { 118261, false },
+  { 118275, true },
+  { 118285, false },
+  { 118301, true },
+  { 118320, true },
+  { 118336, true },
+  { 118360, true },
+  { 118377, false },
+  { 118386, true },
+  { 118401, true },
+  { 118411, true },
+  { 118423, true },
+  { 118444, true },
+  { 118457, true },
+  { 118474, true },
+  { 118487, true },
+  { 118505, true },
   { 118518, true },
-  { 118531, true },
-  { 118549, true },
-  { 118562, true },
-  { 118581, true },
-  { 118591, true },
-  { 118607, true },
-  { 118623, true },
-  { 118639, true },
-  { 118652, true },
-  { 118671, true },
-  { 118689, true },
-  { 118703, true },
-  { 118713, false },
-  { 118725, true },
-  { 118736, true },
-  { 118744, true },
-  { 118754, true },
-  { 118763, true },
-  { 118773, true },
-  { 118785, true },
-  { 118799, false },
-  { 118812, true },
-  { 118820, true },
-  { 118831, true },
-  { 118842, true },
-  { 118858, true },
-  { 118870, true },
+  { 118537, true },
+  { 118547, true },
+  { 118563, true },
+  { 118579, true },
+  { 118595, true },
+  { 118608, true },
+  { 118627, true },
+  { 118645, true },
+  { 118659, true },
+  { 118669, false },
+  { 118681, true },
+  { 118692, true },
+  { 118700, true },
+  { 118710, true },
+  { 118719, true },
+  { 118729, true },
+  { 118741, true },
+  { 118755, false },
+  { 118768, true },
+  { 118776, true },
+  { 118787, true },
+  { 118798, true },
+  { 118814, true },
+  { 118826, true },
+  { 118836, true },
+  { 118848, true },
+  { 118857, true },
+  { 118873, false },
   { 118880, true },
-  { 118892, true },
-  { 118901, true },
-  { 118917, false },
+  { 118888, true },
+  { 118898, true },
+  { 118910, true },
   { 118924, true },
-  { 118932, true },
-  { 118942, true },
-  { 118954, true },
-  { 118968, true },
-  { 118977, true },
-  { 118993, true },
+  { 118933, true },
+  { 118949, true },
+  { 118962, true },
+  { 118970, true },
+  { 118979, true },
+  { 118995, true },
   { 119006, true },
-  { 119014, true },
-  { 119023, true },
-  { 119039, true },
-  { 119050, true },
-  { 119060, false },
-  { 119078, true },
-  { 119088, true },
+  { 119016, false },
+  { 119034, true },
+  { 119044, true },
+  { 119055, true },
+  { 119067, true },
+  { 119079, false },
+  { 119090, true },
   { 119099, true },
-  { 119111, true },
-  { 119123, false },
-  { 119134, true },
-  { 119143, true },
-  { 119152, true },
-  { 119172, true },
-  { 119184, true },
-  { 119200, true },
-  { 119208, true },
-  { 119217, true },
-  { 119225, true },
-  { 119241, true },
-  { 119258, true },
+  { 119108, true },
+  { 119128, true },
+  { 119140, true },
+  { 119156, true },
+  { 119164, true },
+  { 119173, true },
+  { 119181, true },
+  { 119197, true },
+  { 119214, true },
+  { 119222, true },
+  { 119233, true },
+  { 119245, true },
+  { 119256, true },
   { 119266, true },
-  { 119277, true },
-  { 119289, true },
+  { 119281, true },
+  { 119291, true },
   { 119300, true },
-  { 119310, true },
-  { 119325, true },
-  { 119335, true },
-  { 119344, true },
-  { 119359, true },
-  { 119368, true },
-  { 119386, true },
-  { 119402, true },
-  { 119415, true },
-  { 119429, true },
-  { 119457, true },
-  { 119470, true },
+  { 119315, true },
+  { 119324, true },
+  { 119342, true },
+  { 119358, true },
+  { 119371, true },
+  { 119385, true },
+  { 119413, true },
+  { 119426, true },
+  { 119435, true },
+  { 119454, true },
+  { 119464, true },
   { 119479, true },
-  { 119498, true },
-  { 119508, true },
-  { 119523, true },
-  { 119540, true },
-  { 119563, true },
-  { 119582, true },
-  { 119591, true },
-  { 119604, true },
-  { 119618, true },
-  { 119641, true },
-  { 119663, true },
-  { 119673, true },
-  { 119689, true },
-  { 119705, true },
-  { 119716, true },
-  { 119726, true },
-  { 119738, true },
-  { 119751, true },
-  { 119763, true },
-  { 119780, true },
-  { 119797, true },
-  { 119808, true },
-  { 119826, true },
-  { 119840, true },
-  { 119854, true },
-  { 119872, true },
-  { 119891, true },
-  { 119907, true },
-  { 119918, true },
-  { 119929, true },
-  { 119947, true },
-  { 119966, true },
-  { 119979, true },
-  { 119990, true },
-  { 120000, true },
-  { 120013, true },
-  { 120029, true },
-  { 120040, true },
-  { 120050, true },
-  { 120060, true },
-  { 120070, true },
-  { 120080, true },
-  { 120091, true },
-  { 120101, true },
-  { 120113, true },
-  { 120123, true },
-  { 120132, true },
-  { 120149, true },
-  { 120168, true },
-  { 120181, true },
-  { 120200, true },
-  { 120213, true },
-  { 120230, true },
-  { 120262, true },
-  { 120276, true },
-  { 120288, true },
-  { 120312, true },
-  { 120335, true },
-  { 120367, true },
-  { 120389, true },
-  { 120414, true },
-  { 120426, true },
-  { 120439, true },
-  { 120465, true },
-  { 120484, true },
-  { 120498, true },
-  { 120510, true },
-  { 120524, true },
+  { 119496, true },
+  { 119519, true },
+  { 119538, true },
+  { 119547, true },
+  { 119560, true },
+  { 119574, true },
+  { 119597, true },
+  { 119619, true },
+  { 119629, true },
+  { 119645, true },
+  { 119661, true },
+  { 119672, true },
+  { 119682, true },
+  { 119694, true },
+  { 119707, true },
+  { 119719, true },
+  { 119736, true },
+  { 119753, true },
+  { 119764, true },
+  { 119782, true },
+  { 119796, true },
+  { 119810, true },
+  { 119828, true },
+  { 119847, true },
+  { 119863, true },
+  { 119874, true },
+  { 119885, true },
+  { 119903, true },
+  { 119922, true },
+  { 119935, true },
+  { 119946, true },
+  { 119956, true },
+  { 119969, true },
+  { 119985, true },
+  { 119996, true },
+  { 120006, true },
+  { 120016, true },
+  { 120026, true },
+  { 120036, true },
+  { 120047, true },
+  { 120057, true },
+  { 120069, true },
+  { 120079, true },
+  { 120088, true },
+  { 120105, true },
+  { 120124, true },
+  { 120137, true },
+  { 120156, true },
+  { 120169, true },
+  { 120186, true },
+  { 120218, true },
+  { 120232, true },
+  { 120244, true },
+  { 120268, true },
+  { 120291, true },
+  { 120323, true },
+  { 120345, true },
+  { 120370, true },
+  { 120382, true },
+  { 120395, true },
+  { 120421, true },
+  { 120440, true },
+  { 120454, true },
+  { 120466, true },
+  { 120480, true },
+  { 120493, true },
+  { 120508, true },
+  { 120523, true },
   { 120537, true },
-  { 120552, true },
-  { 120567, true },
-  { 120581, true },
-  { 120595, false },
-  { 120615, true },
-  { 120628, true },
-  { 120645, true },
-  { 120660, true },
-  { 120677, true },
-  { 120691, true },
-  { 120706, true },
-  { 120715, true },
-  { 120724, true },
-  { 120740, true },
-  { 120760, true },
-  { 120779, true },
-  { 120788, true },
-  { 120797, true },
-  { 120806, true },
-  { 120815, true },
-  { 120827, true },
-  { 120838, true },
-  { 120847, true },
-  { 120855, true },
-  { 120864, true },
-  { 120875, true },
-  { 120888, true },
-  { 120897, true },
-  { 120910, true },
-  { 120920, true },
-  { 120933, true },
-  { 120946, true },
-  { 120957, true },
-  { 120968, true },
-  { 120979, true },
-  { 120988, true },
-  { 120997, true },
-  { 121007, true },
-  { 121024, true },
-  { 121041, true },
-  { 121050, true },
-  { 121065, true },
-  { 121084, true },
-  { 121097, true },
-  { 121114, true },
-  { 121123, true },
-  { 121146, true },
+  { 120551, false },
+  { 120571, true },
+  { 120584, true },
+  { 120601, true },
+  { 120616, true },
+  { 120633, true },
+  { 120647, true },
+  { 120662, true },
+  { 120671, true },
+  { 120680, true },
+  { 120696, true },
+  { 120716, true },
+  { 120735, true },
+  { 120744, true },
+  { 120753, true },
+  { 120762, true },
+  { 120771, true },
+  { 120783, true },
+  { 120794, true },
+  { 120803, true },
+  { 120811, true },
+  { 120820, true },
+  { 120831, true },
+  { 120844, true },
+  { 120853, true },
+  { 120866, true },
+  { 120876, true },
+  { 120889, true },
+  { 120902, true },
+  { 120913, true },
+  { 120924, true },
+  { 120935, true },
+  { 120944, true },
+  { 120953, true },
+  { 120970, true },
+  { 120987, true },
+  { 120996, true },
+  { 121011, true },
+  { 121030, false },
+  { 121042, true },
+  { 121055, true },
+  { 121072, true },
+  { 121081, true },
+  { 121095, true },
+  { 121118, true },
+  { 121131, true },
+  { 121142, true },
   { 121159, true },
-  { 121170, true },
-  { 121187, true },
+  { 121173, true },
+  { 121184, true },
   { 121201, true },
-  { 121212, true },
-  { 121229, true },
-  { 121250, true },
-  { 121261, true },
-  { 121272, true },
+  { 121222, true },
+  { 121233, true },
+  { 121244, true },
+  { 121251, true },
+  { 121262, true },
+  { 121269, true },
   { 121279, true },
-  { 121290, true },
-  { 121297, true },
-  { 121307, true },
-  { 121319, true },
-  { 121333, true },
-  { 121342, true },
-  { 121355, true },
-  { 121367, true },
+  { 121291, true },
+  { 121305, true },
+  { 121314, true },
+  { 121327, true },
+  { 121339, true },
+  { 121356, true },
+  { 121370, true },
   { 121384, true },
+  { 121391, true },
   { 121398, true },
-  { 121412, true },
-  { 121419, true },
-  { 121426, true },
-  { 121435, true },
+  { 121407, true },
+  { 121415, true },
+  { 121425, true },
   { 121443, true },
-  { 121453, true },
-  { 121471, true },
-  { 121485, true },
-  { 121497, true },
-  { 121508, true },
-  { 121519, true },
-  { 121530, true },
-  { 121543, true },
-  { 121554, true },
+  { 121457, true },
+  { 121469, true },
+  { 121480, true },
+  { 121491, true },
+  { 121502, true },
+  { 121515, true },
+  { 121526, true },
+  { 121535, true },
+  { 121552, true },
   { 121563, true },
-  { 121580, true },
+  { 121570, true },
+  { 121577, true },
   { 121591, true },
-  { 121598, true },
-  { 121605, true },
-  { 121619, true },
-  { 121627, true },
-  { 121634, true },
-  { 121645, true },
-  { 121651, true },
-  { 121663, true },
-  { 121676, true },
-  { 121689, true },
-  { 121699, true },
-  { 121709, true },
-  { 121722, true },
+  { 121599, true },
+  { 121606, true },
+  { 121617, true },
+  { 121623, true },
+  { 121635, true },
+  { 121648, true },
+  { 121661, true },
+  { 121671, true },
+  { 121681, true },
+  { 121694, true },
+  { 121708, true },
+  { 121723, true },
   { 121736, true },
-  { 121751, true },
-  { 121764, true },
+  { 121749, true },
+  { 121758, true },
   { 121777, true },
-  { 121786, true },
-  { 121805, true },
-  { 121830, false },
-  { 121842, true },
-  { 121850, true },
-  { 121864, true },
+  { 121802, false },
+  { 121814, true },
+  { 121822, true },
+  { 121836, true },
+  { 121853, true },
+  { 121866, true },
   { 121881, true },
-  { 121894, true },
-  { 121909, true },
+  { 121900, true },
+  { 121913, true },
   { 121928, true },
   { 121941, true },
-  { 121956, true },
-  { 121969, true },
-  { 121985, true },
-  { 121996, true },
-  { 122009, true },
-  { 122026, true },
-  { 122040, false },
-  { 122059, true },
-  { 122074, true },
-  { 122086, true },
-  { 122094, true },
+  { 121957, true },
+  { 121968, true },
+  { 121981, true },
+  { 121998, true },
+  { 122012, false },
+  { 122031, true },
+  { 122046, true },
+  { 122058, true },
+  { 122066, true },
+  { 122078, true },
+  { 122092, true },
   { 122106, true },
-  { 122120, true },
-  { 122134, true },
-  { 122150, true },
-  { 122166, true },
-  { 122182, true },
-  { 122197, true },
-  { 122217, true },
-  { 122235, true },
-  { 122244, true },
-  { 122260, true },
-  { 122275, true },
-  { 122289, true },
-  { 122302, true },
-  { 122322, true },
-  { 122342, true },
-  { 122361, true },
-  { 122378, true },
-  { 122394, true },
-  { 122414, true },
-  { 122427, true },
-  { 122441, false },
-  { 122454, true },
-  { 122464, false },
-  { 122476, true },
-  { 122493, true },
-  { 122508, true },
-  { 122531, true },
-  { 122544, true },
-  { 122561, true },
-  { 122575, true },
-  { 122587, true },
-  { 122602, true },
-  { 122619, true },
-  { 122633, true },
-  { 122648, true },
-  { 122657, true },
-  { 122672, true },
+  { 122122, true },
+  { 122138, true },
+  { 122154, true },
+  { 122169, true },
+  { 122189, true },
+  { 122207, true },
+  { 122216, true },
+  { 122232, true },
+  { 122247, true },
+  { 122261, true },
+  { 122274, true },
+  { 122294, true },
+  { 122314, true },
+  { 122333, true },
+  { 122350, true },
+  { 122366, true },
+  { 122386, true },
+  { 122399, true },
+  { 122413, false },
+  { 122426, true },
+  { 122436, false },
+  { 122448, true },
+  { 122465, true },
+  { 122480, true },
+  { 122503, true },
+  { 122516, true },
+  { 122533, true },
+  { 122547, true },
+  { 122559, true },
+  { 122574, true },
+  { 122591, true },
+  { 122605, true },
+  { 122620, true },
+  { 122629, true },
+  { 122644, true },
+  { 122662, true },
+  { 122676, true },
   { 122690, true },
   { 122704, true },
-  { 122718, true },
-  { 122732, true },
-  { 122743, true },
-  { 122754, true },
-  { 122764, true },
-  { 122776, true },
-  { 122791, true },
+  { 122715, true },
+  { 122726, true },
+  { 122736, true },
+  { 122748, true },
+  { 122763, true },
+  { 122777, true },
+  { 122788, true },
   { 122805, true },
-  { 122816, true },
-  { 122833, true },
-  { 122847, true },
-  { 122857, true },
-  { 122869, true },
-  { 122883, true },
-  { 122895, false },
-  { 122910, true },
-  { 122926, true },
-  { 122945, true },
-  { 122956, true },
-  { 122968, true },
-  { 122986, true },
-  { 122998, true },
+  { 122819, true },
+  { 122829, true },
+  { 122841, true },
+  { 122855, true },
+  { 122867, false },
+  { 122882, true },
+  { 122898, true },
+  { 122917, true },
+  { 122928, true },
+  { 122940, true },
+  { 122958, true },
+  { 122970, true },
+  { 122983, true },
+  { 122994, true },
   { 123011, true },
-  { 123022, true },
-  { 123039, true },
-  { 123055, true },
-  { 123074, true },
-  { 123092, true },
-  { 123109, true },
-  { 123127, true },
-  { 123149, true },
-  { 123168, true },
-  { 123181, true },
-  { 123197, true },
-  { 123210, true },
-  { 123227, true },
-  { 123242, true },
-  { 123250, true },
-  { 123264, true },
+  { 123027, true },
+  { 123046, true },
+  { 123064, true },
+  { 123081, true },
+  { 123099, true },
+  { 123121, true },
+  { 123140, true },
+  { 123153, true },
+  { 123169, true },
+  { 123182, true },
+  { 123199, true },
+  { 123214, true },
+  { 123222, true },
+  { 123236, true },
+  { 123247, true },
+  { 123257, true },
   { 123275, true },
-  { 123285, true },
-  { 123303, true },
-  { 123321, true },
-  { 123334, true },
-  { 123353, true },
-  { 123369, true },
-  { 123379, true },
-  { 123393, true },
-  { 123401, true },
-  { 123409, true },
-  { 123422, true },
-  { 123435, true },
-  { 123447, true },
-  { 123458, true },
-  { 123473, true },
-  { 123483, true },
-  { 123494, true },
-  { 123502, true },
-  { 123517, true },
-  { 123524, true },
-  { 123540, true },
-  { 123549, true },
-  { 123557, true },
-  { 123567, true },
-  { 123579, true },
-  { 123589, true },
-  { 123602, true },
-  { 123620, true },
-  { 123645, true },
-  { 123659, true },
-  { 123678, true },
-  { 123692, true },
-  { 123705, true },
-  { 123713, true },
-  { 123729, false },
-  { 123746, true },
-  { 123767, true },
-  { 123786, true },
-  { 123805, true },
-  { 123824, true },
-  { 123840, true },
-  { 123855, true },
-  { 123872, true },
-  { 123883, true },
-  { 123893, true },
-  { 123903, true },
-  { 123912, true },
-  { 123925, true },
-  { 123935, true },
-  { 123957, true },
-  { 123974, true },
-  { 123990, true },
-  { 124008, true },
-  { 124021, true },
-  { 124032, true },
-  { 124048, true },
-  { 124066, true },
-  { 124082, true },
-  { 124098, true },
-  { 124113, false },
-  { 124127, true },
-  { 124144, true },
-  { 124162, true },
+  { 123293, true },
+  { 123306, true },
+  { 123325, true },
+  { 123341, true },
+  { 123351, true },
+  { 123365, true },
+  { 123373, true },
+  { 123381, true },
+  { 123394, true },
+  { 123407, true },
+  { 123419, true },
+  { 123430, true },
+  { 123445, true },
+  { 123455, true },
+  { 123466, true },
+  { 123474, true },
+  { 123489, true },
+  { 123496, true },
+  { 123512, true },
+  { 123521, true },
+  { 123529, true },
+  { 123539, true },
+  { 123551, true },
+  { 123561, true },
+  { 123574, true },
+  { 123592, true },
+  { 123617, true },
+  { 123631, true },
+  { 123650, true },
+  { 123664, true },
+  { 123677, true },
+  { 123685, true },
+  { 123701, false },
+  { 123718, true },
+  { 123739, true },
+  { 123758, true },
+  { 123777, true },
+  { 123796, true },
+  { 123811, true },
+  { 123828, true },
+  { 123839, true },
+  { 123849, true },
+  { 123859, true },
+  { 123868, true },
+  { 123881, true },
+  { 123891, true },
+  { 123913, true },
+  { 123930, true },
+  { 123946, true },
+  { 123964, true },
+  { 123977, true },
+  { 123988, true },
+  { 124004, true },
+  { 124022, true },
+  { 124038, true },
+  { 124054, true },
+  { 124069, false },
+  { 124083, true },
+  { 124100, true },
+  { 124118, true },
+  { 124137, true },
+  { 124148, true },
+  { 124164, true },
   { 124181, true },
-  { 124192, true },
-  { 124208, true },
-  { 124225, true },
-  { 124242, true },
-  { 124258, true },
-  { 124271, true },
-  { 124289, true },
-  { 124306, true },
-  { 124328, true },
-  { 124344, true },
-  { 124358, true },
-  { 124370, true },
-  { 124392, true },
-  { 124400, true },
-  { 124411, true },
-  { 124436, false },
-  { 124451, true },
-  { 124458, true },
-  { 124470, true },
-  { 124478, true },
-  { 124491, true },
-  { 124506, true },
-  { 124530, true },
+  { 124198, true },
+  { 124214, true },
+  { 124227, true },
+  { 124245, true },
+  { 124262, true },
+  { 124284, true },
+  { 124300, true },
+  { 124314, true },
+  { 124326, true },
+  { 124348, true },
+  { 124356, true },
+  { 124367, true },
+  { 124392, false },
+  { 124407, true },
+  { 124414, true },
+  { 124426, true },
+  { 124434, true },
+  { 124447, true },
+  { 124462, true },
+  { 124486, true },
+  { 124501, true },
+  { 124511, true },
+  { 124524, true },
+  { 124536, true },
   { 124545, true },
-  { 124555, true },
   { 124568, true },
-  { 124580, true },
-  { 124589, true },
-  { 124599, true },
-  { 124622, true },
-  { 124637, true },
+  { 124583, true },
+  { 124597, true },
+  { 124613, true },
+  { 124627, true },
+  { 124638, false },
   { 124651, true },
-  { 124667, true },
-  { 124681, true },
-  { 124692, false },
-  { 124705, true },
-  { 124719, true },
+  { 124665, true },
+  { 124673, true },
+  { 124682, true },
+  { 124695, true },
+  { 124704, true },
+  { 124714, true },
   { 124727, true },
-  { 124736, true },
-  { 124749, true },
-  { 124758, true },
-  { 124768, true },
-  { 124781, true },
-  { 124801, false },
-  { 124811, true },
-  { 124827, true },
-  { 124840, true },
-  { 124853, true },
-  { 124864, true },
-  { 124873, true },
-  { 124880, true },
-  { 124896, true },
-  { 124909, true },
-  { 124919, true },
-  { 124932, true },
-  { 124945, true },
-  { 124960, true },
-  { 124979, true },
-  { 124990, true },
-  { 124997, true },
-  { 125017, true },
-  { 125029, true },
-  { 125041, true },
-  { 125048, true },
-  { 125055, true },
-  { 125064, true },
-  { 125073, true },
-  { 125082, true },
-  { 125091, true },
-  { 125103, true },
-  { 125117, true },
+  { 124747, false },
+  { 124757, true },
+  { 124773, true },
+  { 124786, true },
+  { 124799, true },
+  { 124810, true },
+  { 124819, true },
+  { 124826, true },
+  { 124842, true },
+  { 124855, true },
+  { 124865, true },
+  { 124878, true },
+  { 124891, true },
+  { 124906, true },
+  { 124925, true },
+  { 124936, true },
+  { 124943, true },
+  { 124963, true },
+  { 124975, true },
+  { 124987, true },
+  { 124994, true },
+  { 125001, true },
+  { 125010, true },
+  { 125019, true },
+  { 125028, true },
+  { 125037, true },
+  { 125049, true },
+  { 125063, true },
+  { 125074, true },
+  { 125088, true },
+  { 125101, true },
+  { 125109, true },
   { 125128, true },
-  { 125142, true },
-  { 125155, true },
-  { 125163, true },
-  { 125182, true },
-  { 125193, true },
+  { 125139, true },
+  { 125153, true },
+  { 125164, true },
+  { 125180, true },
+  { 125194, true },
   { 125207, true },
-  { 125218, true },
-  { 125234, true },
-  { 125248, true },
-  { 125261, true },
-  { 125276, true },
-  { 125290, true },
-  { 125300, false },
-  { 125314, true },
-  { 125324, true },
-  { 125339, true },
-  { 125353, false },
-  { 125368, false },
-  { 125384, true },
-  { 125396, true },
-  { 125409, true },
-  { 125428, true },
-  { 125444, false },
-  { 125457, true },
-  { 125473, true },
-  { 125487, true },
-  { 125502, true },
-  { 125518, true },
-  { 125537, true },
-  { 125554, true },
-  { 125571, true },
-  { 125581, true },
-  { 125596, true },
-  { 125610, true },
-  { 125623, true },
-  { 125638, true },
-  { 125654, true },
-  { 125669, true },
-  { 125685, true },
-  { 125699, true },
-  { 125713, true },
-  { 125728, true },
-  { 125742, true },
-  { 125750, true },
-  { 125765, true },
-  { 125784, true },
-  { 125799, false },
-  { 125823, false },
-  { 125839, true },
-  { 125854, true },
-  { 125872, true },
-  { 125891, true },
-  { 125910, true },
-  { 125923, false },
-  { 125946, true },
+  { 125222, true },
+  { 125236, true },
+  { 125246, false },
+  { 125260, true },
+  { 125270, true },
+  { 125285, true },
+  { 125299, false },
+  { 125314, false },
+  { 125330, true },
+  { 125342, true },
+  { 125355, true },
+  { 125374, true },
+  { 125390, false },
+  { 125403, true },
+  { 125419, true },
+  { 125433, true },
+  { 125448, true },
+  { 125464, true },
+  { 125483, true },
+  { 125500, true },
+  { 125517, true },
+  { 125527, true },
+  { 125542, true },
+  { 125556, true },
+  { 125569, true },
+  { 125584, true },
+  { 125600, true },
+  { 125615, true },
+  { 125631, true },
+  { 125645, true },
+  { 125659, true },
+  { 125674, true },
+  { 125688, true },
+  { 125696, true },
+  { 125711, true },
+  { 125730, true },
+  { 125745, false },
+  { 125769, false },
+  { 125785, true },
+  { 125800, true },
+  { 125818, true },
+  { 125837, true },
+  { 125856, true },
+  { 125869, false },
+  { 125892, true },
+  { 125908, true },
+  { 125919, true },
+  { 125932, true },
+  { 125947, true },
   { 125962, true },
-  { 125973, true },
-  { 125986, true },
-  { 126001, true },
-  { 126016, true },
-  { 126031, true },
-  { 126047, true },
-  { 126062, true },
-  { 126078, true },
+  { 125977, true },
+  { 125993, true },
+  { 126008, true },
+  { 126024, true },
+  { 126041, true },
+  { 126053, true },
+  { 126067, true },
+  { 126077, true },
   { 126095, true },
-  { 126107, true },
-  { 126121, true },
-  { 126131, true },
-  { 126149, true },
-  { 126168, true },
-  { 126178, true },
-  { 126189, true },
-  { 126199, true },
-  { 126213, true },
-  { 126226, true },
-  { 126254, true },
-  { 126266, true },
-  { 126279, true },
-  { 126292, true },
-  { 126307, true },
-  { 126321, true },
-  { 126338, true },
-  { 126352, true },
-  { 126369, false },
-  { 126386, true },
-  { 126400, true },
-  { 126415, true },
-  { 126432, true },
+  { 126114, true },
+  { 126124, true },
+  { 126135, true },
+  { 126145, true },
+  { 126159, true },
+  { 126172, true },
+  { 126200, true },
+  { 126212, true },
+  { 126225, true },
+  { 126238, true },
+  { 126253, true },
+  { 126267, true },
+  { 126284, true },
+  { 126298, true },
+  { 126315, false },
+  { 126332, true },
+  { 126346, true },
+  { 126361, true },
+  { 126378, true },
+  { 126396, true },
+  { 126413, true },
+  { 126430, true },
+  { 126438, true },
   { 126450, true },
-  { 126467, true },
-  { 126484, true },
-  { 126492, true },
-  { 126504, true },
-  { 126525, true },
-  { 126536, true },
-  { 126550, true },
-  { 126562, true },
-  { 126578, true },
-  { 126591, true },
-  { 126617, true },
+  { 126471, true },
+  { 126482, true },
+  { 126496, true },
+  { 126508, true },
+  { 126524, true },
+  { 126537, true },
+  { 126563, true },
+  { 126589, true },
+  { 126599, true },
+  { 126612, true },
+  { 126622, true },
+  { 126635, true },
   { 126643, true },
-  { 126653, true },
-  { 126666, true },
-  { 126676, true },
-  { 126689, true },
+  { 126658, true },
+  { 126672, true },
+  { 126686, true },
   { 126697, true },
-  { 126712, true },
-  { 126726, true },
-  { 126740, true },
-  { 126751, true },
-  { 126771, true },
-  { 126789, true },
-  { 126806, true },
-  { 126821, true },
-  { 126839, true },
-  { 126855, true },
-  { 126863, true },
-  { 126877, true },
-  { 126894, false },
-  { 126905, true },
-  { 126921, true },
-  { 126934, true },
-  { 126944, false },
-  { 126958, true },
-  { 126969, true },
-  { 126985, true },
-  { 126993, true },
-  { 127003, true },
-  { 127018, true },
-  { 127034, true },
-  { 127053, true },
-  { 127066, true },
-  { 127080, true },
-  { 127098, true },
-  { 127118, true },
-  { 127133, true },
-  { 127151, true },
-  { 127170, true },
-  { 127183, true },
-  { 127200, true },
-  { 127215, true },
-  { 127226, true },
-  { 127244, true },
+  { 126717, true },
+  { 126735, true },
+  { 126752, true },
+  { 126767, true },
+  { 126785, true },
+  { 126801, true },
+  { 126809, true },
+  { 126823, true },
+  { 126840, false },
+  { 126851, true },
+  { 126867, true },
+  { 126880, true },
+  { 126890, false },
+  { 126904, true },
+  { 126915, true },
+  { 126931, true },
+  { 126939, true },
+  { 126949, true },
+  { 126964, true },
+  { 126980, true },
+  { 126999, true },
+  { 127012, true },
+  { 127026, true },
+  { 127044, true },
+  { 127064, true },
+  { 127079, true },
+  { 127097, true },
+  { 127116, true },
+  { 127129, true },
+  { 127146, true },
+  { 127161, true },
+  { 127172, true },
+  { 127190, true },
+  { 127209, true },
+  { 127228, true },
+  { 127239, true },
+  { 127250, true },
   { 127263, true },
-  { 127282, true },
-  { 127293, true },
-  { 127304, true },
-  { 127317, true },
-  { 127325, true },
-  { 127334, true },
-  { 127351, true },
-  { 127362, true },
+  { 127271, true },
+  { 127280, true },
+  { 127297, true },
+  { 127308, true },
+  { 127322, true },
+  { 127332, true },
+  { 127355, true },
+  { 127368, true },
   { 127376, true },
-  { 127386, true },
-  { 127409, true },
-  { 127422, true },
+  { 127388, true },
+  { 127402, true },
   { 127430, true },
-  { 127442, true },
-  { 127456, true },
-  { 127484, true },
-  { 127500, true },
-  { 127509, true },
-  { 127524, true },
-  { 127543, true },
-  { 127557, true },
+  { 127446, true },
+  { 127455, true },
+  { 127470, true },
+  { 127489, true },
+  { 127504, true },
+  { 127518, true },
+  { 127538, true },
+  { 127559, true },
   { 127577, true },
-  { 127598, true },
-  { 127616, true },
-  { 127629, true },
-  { 127644, true },
-  { 127657, true },
-  { 127671, true },
-  { 127682, true },
+  { 127590, true },
+  { 127605, true },
+  { 127618, true },
+  { 127632, true },
+  { 127643, true },
+  { 127664, true },
+  { 127677, true },
+  { 127691, true },
   { 127703, true },
-  { 127716, true },
+  { 127720, true },
   { 127730, true },
-  { 127742, true },
-  { 127759, true },
-  { 127769, true },
-  { 127779, true },
-  { 127786, true },
-  { 127799, true },
-  { 127810, true },
-  { 127825, false },
+  { 127740, true },
+  { 127747, true },
+  { 127760, true },
+  { 127771, true },
+  { 127786, false },
+  { 127793, true },
+  { 127801, true },
+  { 127821, true },
   { 127832, true },
-  { 127840, true },
-  { 127860, true },
-  { 127871, true },
-  { 127881, true },
-  { 127891, true },
-  { 127900, true },
-  { 127911, true },
-  { 127924, true },
-  { 127936, true },
-  { 127946, true },
-  { 127956, true },
-  { 127968, true },
-  { 127983, true },
-  { 127992, true },
-  { 128006, true },
+  { 127842, true },
+  { 127852, true },
+  { 127861, true },
+  { 127872, true },
+  { 127885, true },
+  { 127897, true },
+  { 127907, true },
+  { 127917, true },
+  { 127929, true },
+  { 127944, true },
+  { 127953, true },
+  { 127967, true },
+  { 127980, true },
+  { 127990, true },
+  { 128005, true },
   { 128019, true },
-  { 128029, true },
-  { 128044, true },
-  { 128058, true },
-  { 128069, true },
-  { 128084, true },
-  { 128094, false },
-  { 128104, true },
-  { 128132, true },
-  { 128145, true },
-  { 128164, true },
-  { 128177, true },
+  { 128030, true },
+  { 128045, true },
+  { 128055, false },
+  { 128065, true },
+  { 128093, true },
+  { 128106, true },
+  { 128125, true },
+  { 128138, true },
+  { 128147, true },
+  { 128158, true },
+  { 128172, true },
   { 128186, true },
-  { 128197, true },
-  { 128211, true },
-  { 128225, true },
-  { 128245, true },
-  { 128261, true },
-  { 128272, true },
-  { 128283, true },
-  { 128299, true },
-  { 128316, true },
-  { 128331, true },
-  { 128344, true },
-  { 128365, true },
-  { 128378, true },
+  { 128206, true },
+  { 128222, true },
+  { 128233, true },
+  { 128244, true },
+  { 128260, true },
+  { 128277, true },
+  { 128292, true },
+  { 128305, true },
+  { 128326, true },
+  { 128339, true },
+  { 128356, true },
+  { 128366, true },
+  { 128376, true },
+  { 128384, true },
   { 128395, true },
   { 128405, true },
-  { 128415, true },
-  { 128423, true },
-  { 128434, true },
-  { 128444, true },
+  { 128420, true },
+  { 128432, true },
+  { 128445, true },
   { 128459, true },
   { 128471, true },
-  { 128484, true },
-  { 128498, true },
-  { 128510, true },
-  { 128520, true },
-  { 128528, true },
-  { 128545, true },
-  { 128558, true },
-  { 128577, true },
-  { 128602, true },
-  { 128622, true },
-  { 128631, true },
-  { 128645, true },
-  { 128659, true },
-  { 128701, true },
+  { 128481, true },
+  { 128489, true },
+  { 128506, true },
+  { 128519, true },
+  { 128538, true },
+  { 128563, true },
+  { 128583, true },
+  { 128592, true },
+  { 128606, true },
+  { 128620, true },
+  { 128662, true },
+  { 128677, true },
+  { 128693, true },
+  { 128702, true },
   { 128716, true },
-  { 128732, true },
-  { 128741, true },
-  { 128755, true },
-  { 128764, true },
-  { 128776, true },
-  { 128788, true },
+  { 128725, true },
+  { 128737, true },
+  { 128749, true },
+  { 128762, true },
+  { 128775, true },
+  { 128793, true },
   { 128801, true },
   { 128814, true },
-  { 128832, true },
-  { 128840, true },
-  { 128853, true },
-  { 128864, true },
-  { 128878, true },
-  { 128888, true },
-  { 128898, true },
-  { 128910, true },
-  { 128921, true },
-  { 128936, true },
-  { 128948, true },
-  { 128965, true },
-  { 128980, true },
-  { 128992, true },
-  { 129005, true },
-  { 129017, true },
-  { 129032, true },
-  { 129045, true },
-  { 129057, true },
-  { 129067, true },
-  { 129083, true },
-  { 129092, true },
-  { 129107, true },
-  { 129128, true },
-  { 129141, true },
-  { 129159, true },
-  { 129174, true },
-  { 129188, true },
-  { 129206, true },
-  { 129224, true },
-  { 129236, true },
-  { 129247, true },
-  { 129260, true },
-  { 129278, true },
-  { 129289, true },
-  { 129303, true },
-  { 129323, true },
-  { 129336, true },
-  { 129345, true },
-  { 129357, true },
-  { 129377, true },
-  { 129386, true },
-  { 129395, true },
-  { 129413, true },
-  { 129428, true },
-  { 129435, true },
-  { 129454, true },
-  { 129465, true },
-  { 129480, true },
-  { 129495, true },
-  { 129509, true },
-  { 129521, true },
-  { 129540, true },
-  { 129564, true },
+  { 128825, true },
+  { 128839, true },
+  { 128849, true },
+  { 128859, true },
+  { 128871, true },
+  { 128882, true },
+  { 128897, true },
+  { 128909, true },
+  { 128926, true },
+  { 128941, true },
+  { 128953, true },
+  { 128966, true },
+  { 128978, true },
+  { 128993, true },
+  { 129006, true },
+  { 129018, true },
+  { 129028, true },
+  { 129044, true },
+  { 129053, true },
+  { 129068, true },
+  { 129089, true },
+  { 129102, true },
+  { 129120, true },
+  { 129135, true },
+  { 129149, true },
+  { 129167, true },
+  { 129185, true },
+  { 129197, true },
+  { 129208, true },
+  { 129221, true },
+  { 129239, true },
+  { 129250, true },
+  { 129264, true },
+  { 129284, true },
+  { 129297, true },
+  { 129306, true },
+  { 129318, true },
+  { 129338, true },
+  { 129347, true },
+  { 129356, true },
+  { 129374, true },
+  { 129389, true },
+  { 129396, true },
+  { 129415, true },
+  { 129426, true },
+  { 129441, true },
+  { 129456, true },
+  { 129470, true },
+  { 129482, true },
+  { 129501, true },
+  { 129525, true },
+  { 129536, true },
+  { 129550, true },
+  { 129562, true },
   { 129575, true },
-  { 129589, true },
-  { 129601, true },
-  { 129614, true },
-  { 129625, true },
-  { 129635, true },
-  { 129648, true },
-  { 129660, true },
-  { 129683, true },
+  { 129586, true },
+  { 129596, true },
+  { 129609, true },
+  { 129621, true },
+  { 129644, true },
+  { 129653, true },
+  { 129670, true },
+  { 129680, true },
   { 129692, true },
-  { 129709, true },
-  { 129719, true },
-  { 129731, true },
-  { 129742, true },
-  { 129753, true },
-  { 129768, true },
-  { 129782, true },
-  { 129790, true },
-  { 129804, true },
+  { 129703, true },
+  { 129714, true },
+  { 129729, true },
+  { 129743, true },
+  { 129751, true },
+  { 129765, true },
+  { 129779, true },
+  { 129787, true },
+  { 129800, true },
   { 129818, true },
-  { 129826, true },
-  { 129839, true },
-  { 129857, true },
-  { 129868, true },
-  { 129880, true },
-  { 129904, true },
-  { 129912, true },
-  { 129922, true },
-  { 129932, true },
-  { 129949, true },
-  { 129960, true },
-  { 129978, true },
-  { 129996, true },
-  { 130010, true },
-  { 130020, true },
-  { 130044, true },
-  { 130058, true },
-  { 130073, true },
-  { 130092, true },
-  { 130104, true },
-  { 130123, true },
-  { 130140, true },
-  { 130155, true },
-  { 130165, true },
-  { 130180, true },
-  { 130200, true },
-  { 130212, true },
-  { 130224, true },
+  { 129829, true },
+  { 129841, true },
+  { 129865, true },
+  { 129873, true },
+  { 129883, true },
+  { 129893, true },
+  { 129910, true },
+  { 129921, true },
+  { 129939, true },
+  { 129957, true },
+  { 129971, true },
+  { 129981, true },
+  { 130005, true },
+  { 130019, true },
+  { 130034, true },
+  { 130053, true },
+  { 130065, true },
+  { 130084, true },
+  { 130101, true },
+  { 130116, true },
+  { 130126, true },
+  { 130141, true },
+  { 130161, true },
+  { 130173, true },
+  { 130185, true },
+  { 130198, true },
+  { 130207, true },
+  { 130216, true },
+  { 130225, true },
   { 130237, true },
-  { 130246, true },
-  { 130255, true },
-  { 130264, true },
-  { 130276, true },
-  { 130283, true },
-  { 130311, true },
-  { 130338, true },
-  { 130364, true },
-  { 130389, true },
-  { 130399, true },
-  { 130408, true },
-  { 130423, true },
-  { 130438, false },
+  { 130244, true },
+  { 130272, true },
+  { 130299, true },
+  { 130325, true },
+  { 130350, true },
+  { 130360, true },
+  { 130369, true },
+  { 130384, true },
+  { 130399, false },
+  { 130417, true },
+  { 130428, true },
+  { 130440, true },
   { 130456, true },
-  { 130467, true },
-  { 130479, true },
-  { 130495, true },
-  { 130510, true },
-  { 130526, true },
-  { 130552, true },
-  { 130563, true },
-  { 130574, true },
-  { 130589, true },
-  { 130604, true },
-  { 130619, true },
-  { 130637, true },
-  { 130647, true },
-  { 130662, true },
-  { 130677, true },
+  { 130471, true },
+  { 130487, true },
+  { 130513, true },
+  { 130524, true },
+  { 130535, true },
+  { 130550, true },
+  { 130565, true },
+  { 130580, true },
+  { 130598, true },
+  { 130608, true },
+  { 130623, true },
+  { 130638, true },
+  { 130651, true },
+  { 130667, true },
   { 130690, true },
-  { 130706, true },
-  { 130729, true },
-  { 130743, true },
+  { 130704, true },
+  { 130714, true },
+  { 130727, true },
+  { 130740, true },
   { 130753, true },
-  { 130766, true },
-  { 130779, true },
-  { 130792, true },
-  { 130811, true },
-  { 130823, true },
-  { 130839, true },
-  { 130853, true },
-  { 130865, false },
-  { 130884, true },
-  { 130896, true },
-  { 130911, true },
-  { 130929, true },
-  { 130940, true },
-  { 130952, true },
-  { 130963, true },
-  { 130976, true },
-  { 130987, true },
-  { 131004, true },
-  { 131027, true },
-  { 131042, true },
-  { 131057, true },
-  { 131072, true },
-  { 131083, true },
-  { 131095, true },
-  { 131112, true },
-  { 131123, true },
+  { 130772, true },
+  { 130784, true },
+  { 130800, true },
+  { 130814, true },
+  { 130826, false },
+  { 130845, true },
+  { 130857, true },
+  { 130872, true },
+  { 130890, true },
+  { 130901, true },
+  { 130913, true },
+  { 130924, true },
+  { 130937, true },
+  { 130948, true },
+  { 130965, true },
+  { 130988, true },
+  { 131003, true },
+  { 131018, true },
+  { 131033, true },
+  { 131044, true },
+  { 131056, true },
+  { 131073, true },
+  { 131084, true },
+  { 131092, true },
+  { 131108, true },
+  { 131121, true },
   { 131131, true },
-  { 131147, true },
-  { 131160, true },
-  { 131170, true },
-  { 131181, true },
-  { 131189, true },
-  { 131206, true },
-  { 131221, true },
-  { 131231, true },
-  { 131241, true },
-  { 131252, true },
-  { 131263, true },
-  { 131283, true },
-  { 131298, true },
-  { 131315, true },
+  { 131142, true },
+  { 131150, true },
+  { 131167, true },
+  { 131182, true },
+  { 131192, true },
+  { 131202, true },
+  { 131213, true },
+  { 131224, true },
+  { 131244, true },
+  { 131259, true },
+  { 131276, true },
+  { 131290, true },
+  { 131303, true },
+  { 131313, true },
   { 131329, true },
-  { 131342, true },
   { 131352, true },
-  { 131368, true },
-  { 131391, true },
-  { 131404, true },
-  { 131418, true },
-  { 131428, true },
-  { 131439, true },
-  { 131458, true },
-  { 131469, true },
-  { 131491, true },
-  { 131506, true },
-  { 131526, true },
-  { 131540, true },
-  { 131551, true },
-  { 131564, true },
-  { 131574, true },
-  { 131592, true },
-  { 131617, true },
-  { 131634, true },
-  { 131648, true },
-  { 131660, true },
-  { 131676, true },
-  { 131690, true },
-  { 131701, true },
-  { 131711, false },
-  { 131723, true },
-  { 131740, true },
-  { 131757, true },
+  { 131365, true },
+  { 131379, true },
+  { 131389, true },
+  { 131400, true },
+  { 131419, true },
+  { 131430, true },
+  { 131452, true },
+  { 131464, true },
+  { 131479, true },
+  { 131499, true },
+  { 131513, true },
+  { 131524, true },
+  { 131537, true },
+  { 131547, true },
+  { 131565, true },
+  { 131590, true },
+  { 131607, true },
+  { 131621, true },
+  { 131633, true },
+  { 131649, true },
+  { 131663, true },
+  { 131674, true },
+  { 131684, false },
+  { 131696, true },
+  { 131713, true },
+  { 131730, true },
+  { 131750, true },
   { 131777, true },
-  { 131804, true },
-  { 131829, true },
-  { 131845, true },
-  { 131860, true },
-  { 131880, true },
-  { 131892, true },
-  { 131908, true },
-  { 131920, true },
-  { 131937, true },
-  { 131954, true },
+  { 131802, true },
+  { 131818, true },
+  { 131833, true },
+  { 131853, true },
+  { 131865, true },
+  { 131881, true },
+  { 131893, true },
+  { 131910, true },
+  { 131927, true },
+  { 131947, true },
+  { 131957, true },
   { 131974, true },
-  { 131984, true },
-  { 132001, true },
-  { 132015, true },
-  { 132032, true },
-  { 132045, true },
-  { 132057, true },
+  { 131988, true },
+  { 132005, true },
+  { 132018, true },
+  { 132030, true },
+  { 132042, true },
+  { 132055, false },
   { 132069, true },
-  { 132082, false },
-  { 132096, true },
-  { 132119, false },
-  { 132133, true },
-  { 132145, true },
-  { 132156, true },
-  { 132168, true },
-  { 132186, true },
-  { 132199, true },
-  { 132214, true },
-  { 132223, true },
-  { 132234, true },
-  { 132248, true },
-  { 132266, true },
-  { 132276, true },
-  { 132288, true },
-  { 132311, true },
-  { 132344, true },
-  { 132354, true },
-  { 132363, true },
-  { 132382, true },
-  { 132394, true },
-  { 132408, true },
-  { 132429, true },
-  { 132443, true },
-  { 132457, true },
-  { 132475, true },
-  { 132493, true },
-  { 132511, true },
-  { 132524, true },
+  { 132092, false },
+  { 132106, true },
+  { 132118, true },
+  { 132129, true },
+  { 132141, true },
+  { 132159, true },
+  { 132172, true },
+  { 132187, true },
+  { 132196, true },
+  { 132207, true },
+  { 132221, true },
+  { 132239, true },
+  { 132249, true },
+  { 132261, true },
+  { 132284, true },
+  { 132317, true },
+  { 132327, true },
+  { 132336, true },
+  { 132355, true },
+  { 132367, true },
+  { 132381, true },
+  { 132402, true },
+  { 132416, true },
+  { 132430, true },
+  { 132448, true },
+  { 132466, true },
+  { 132484, true },
+  { 132497, true },
+  { 132509, true },
+  { 132522, true },
   { 132536, true },
-  { 132549, true },
-  { 132563, true },
-  { 132577, true },
-  { 132592, true },
-  { 132606, true },
-  { 132617, true },
-  { 132626, true },
+  { 132550, true },
+  { 132565, true },
+  { 132579, true },
+  { 132590, true },
+  { 132599, true },
+  { 132609, true },
+  { 132621, true },
   { 132636, true },
   { 132648, true },
-  { 132663, true },
-  { 132675, true },
-  { 132698, true },
-  { 132710, true },
-  { 132723, true },
-  { 132731, true },
-  { 132742, true },
-  { 132751, true },
-  { 132759, true },
-  { 132772, true },
-  { 132795, true },
-  { 132807, true },
-  { 132823, true },
-  { 132835, true },
+  { 132671, true },
+  { 132683, true },
+  { 132696, true },
+  { 132704, true },
+  { 132715, true },
+  { 132724, true },
+  { 132732, true },
+  { 132745, true },
+  { 132768, true },
+  { 132780, true },
+  { 132796, true },
+  { 132808, true },
+  { 132831, true },
+  { 132842, true },
   { 132858, true },
-  { 132869, true },
-  { 132885, true },
-  { 132901, true },
-  { 132916, true },
-  { 132929, true },
-  { 132939, true },
-  { 132948, true },
-  { 132955, true },
-  { 132968, true },
-  { 132985, true },
-  { 133008, true },
-  { 133025, true },
-  { 133043, true },
-  { 133072, true },
-  { 133089, true },
-  { 133103, true },
-  { 133119, true },
-  { 133133, true },
-  { 133147, true },
-  { 133159, true },
-  { 133168, true },
-  { 133184, true },
-  { 133201, true },
-  { 133217, false },
-  { 133232, true },
-  { 133245, true },
+  { 132874, true },
+  { 132889, true },
+  { 132902, true },
+  { 132912, true },
+  { 132921, true },
+  { 132928, true },
+  { 132941, true },
+  { 132958, true },
+  { 132981, true },
+  { 132998, true },
+  { 133016, true },
+  { 133045, true },
+  { 133062, true },
+  { 133076, true },
+  { 133092, true },
+  { 133106, true },
+  { 133120, true },
+  { 133132, true },
+  { 133141, true },
+  { 133157, true },
+  { 133174, true },
+  { 133190, false },
+  { 133205, true },
+  { 133218, true },
+  { 133229, true },
+  { 133247, true },
   { 133256, true },
-  { 133274, true },
-  { 133283, true },
-  { 133297, true },
-  { 133315, true },
-  { 133333, true },
+  { 133270, true },
+  { 133288, true },
+  { 133306, true },
+  { 133314, true },
+  { 133324, true },
   { 133341, true },
-  { 133351, true },
-  { 133368, true },
-  { 133376, true },
-  { 133386, true },
-  { 133397, true },
-  { 133407, true },
-  { 133421, true },
-  { 133429, true },
-  { 133441, true },
+  { 133349, true },
+  { 133359, true },
+  { 133370, true },
+  { 133380, true },
+  { 133394, true },
+  { 133402, true },
+  { 133414, true },
+  { 133428, true },
+  { 133446, true },
   { 133455, true },
-  { 133473, true },
-  { 133482, true },
-  { 133493, true },
-  { 133506, true },
-  { 133519, true },
-  { 133534, true },
-  { 133552, true },
-  { 133560, true },
-  { 133575, true },
-  { 133588, true },
-  { 133606, true },
-  { 133624, true },
-  { 133636, true },
-  { 133646, true },
-  { 133656, true },
-  { 133667, true },
-  { 133679, true },
-  { 133693, true },
-  { 133705, true },
-  { 133719, true },
-  { 133730, true },
-  { 133741, true },
+  { 133466, true },
+  { 133479, true },
+  { 133492, true },
+  { 133507, true },
+  { 133525, true },
+  { 133533, true },
+  { 133548, true },
+  { 133561, true },
+  { 133579, true },
+  { 133591, true },
+  { 133601, true },
+  { 133611, true },
+  { 133622, true },
+  { 133634, true },
+  { 133648, true },
+  { 133660, true },
+  { 133674, true },
+  { 133685, true },
+  { 133696, true },
+  { 133710, true },
+  { 133734, false },
   { 133755, true },
-  { 133779, false },
-  { 133800, true },
-  { 133817, true },
-  { 133835, true },
-  { 133852, true },
-  { 133869, true },
-  { 133884, true },
-  { 133898, true },
-  { 133910, true },
-  { 133925, true },
-  { 133933, true },
-  { 133946, true },
-  { 133954, true },
+  { 133772, true },
+  { 133790, true },
+  { 133807, true },
+  { 133824, true },
+  { 133839, true },
+  { 133853, true },
+  { 133865, true },
+  { 133880, true },
+  { 133888, true },
+  { 133901, true },
+  { 133909, true },
+  { 133927, true },
+  { 133944, true },
+  { 133959, true },
   { 133972, true },
-  { 133989, true },
-  { 134004, true },
-  { 134017, true },
-  { 134040, true },
-  { 134053, true },
+  { 133995, true },
+  { 134008, true },
+  { 134022, true },
+  { 134044, true },
+  { 134056, true },
   { 134067, true },
-  { 134089, true },
-  { 134101, true },
-  { 134112, true },
-  { 134123, true },
-  { 134133, true },
-  { 134144, false },
-  { 134165, false },
-  { 134176, true },
-  { 134190, true },
-  { 134202, true },
-  { 134216, true },
-  { 134234, true },
-  { 134248, true },
-  { 134259, true },
-  { 134276, true },
-  { 134287, true },
+  { 134078, true },
+  { 134088, true },
+  { 134099, false },
+  { 134120, false },
+  { 134131, true },
+  { 134145, true },
+  { 134157, true },
+  { 134171, true },
+  { 134189, true },
+  { 134203, true },
+  { 134214, true },
+  { 134231, true },
+  { 134242, true },
+  { 134252, true },
+  { 134272, true },
+  { 134283, true },
   { 134297, true },
-  { 134317, true },
-  { 134328, true },
-  { 134342, true },
-  { 134356, true },
-  { 134367, true },
-  { 134380, true },
-  { 134391, true },
-  { 134407, true },
-  { 134420, true },
-  { 134428, true },
-  { 134442, false },
-  { 134455, true },
-  { 134467, false },
-  { 134480, true },
-  { 134493, true },
-  { 134505, true },
-  { 134517, true },
-  { 134532, true },
-  { 134547, true },
-  { 134557, true },
-  { 134572, true },
-  { 134586, true },
-  { 134599, true },
-  { 134609, false },
-  { 134620, true },
-  { 134642, true },
-  { 134656, true },
-  { 134669, true },
-  { 134680, true },
-  { 134690, true },
-  { 134700, true },
-  { 134711, true },
-  { 134723, true },
+  { 134311, true },
+  { 134322, true },
+  { 134335, true },
+  { 134346, true },
+  { 134362, true },
+  { 134375, true },
+  { 134383, true },
+  { 134397, false },
+  { 134410, true },
+  { 134422, false },
+  { 134435, true },
+  { 134448, true },
+  { 134460, true },
+  { 134472, true },
+  { 134487, true },
+  { 134502, true },
+  { 134512, true },
+  { 134527, true },
+  { 134541, true },
+  { 134554, true },
+  { 134564, false },
+  { 134575, true },
+  { 134597, true },
+  { 134611, true },
+  { 134624, true },
+  { 134635, true },
+  { 134645, true },
+  { 134655, true },
+  { 134666, true },
+  { 134678, true },
+  { 134693, true },
+  { 134703, true },
+  { 134714, true },
+  { 134725, true },
   { 134738, true },
-  { 134748, true },
-  { 134759, true },
-  { 134770, true },
-  { 134783, true },
-  { 134795, true },
-  { 134807, true },
-  { 134817, true },
-  { 134825, true },
-  { 134847, true },
-  { 134859, true },
-  { 134868, true },
-  { 134884, true },
-  { 134893, true },
-  { 134905, true },
-  { 134917, true },
-  { 134927, true },
-  { 134937, true },
-  { 134947, true },
-  { 134960, false },
-  { 134971, true },
-  { 134984, false },
-  { 135009, true },
-  { 135021, true },
-  { 135030, true },
-  { 135039, true },
+  { 134750, true },
+  { 134762, true },
+  { 134772, true },
+  { 134780, true },
+  { 134802, true },
+  { 134814, true },
+  { 134823, true },
+  { 134839, true },
+  { 134848, true },
+  { 134860, true },
+  { 134872, true },
+  { 134882, true },
+  { 134892, true },
+  { 134902, true },
+  { 134915, false },
+  { 134926, true },
+  { 134939, false },
+  { 134964, true },
+  { 134976, true },
+  { 134985, true },
+  { 134994, true },
+  { 135011, true },
+  { 135029, true },
+  { 135037, true },
   { 135056, true },
-  { 135074, true },
-  { 135082, true },
-  { 135101, true },
-  { 135114, true },
-  { 135128, true },
-  { 135138, true },
-  { 135157, true },
-  { 135180, true },
-  { 135199, true },
-  { 135211, true },
-  { 135235, true },
-  { 135249, true },
-  { 135267, true },
-  { 135285, true },
-  { 135303, true },
-  { 135319, true },
-  { 135338, true },
-  { 135348, true },
-  { 135371, false },
-  { 135384, true },
-  { 135395, true },
-  { 135405, true },
-  { 135418, true },
-  { 135427, true },
-  { 135438, true },
-  { 135450, true },
-  { 135460, false },
-  { 135473, true },
-  { 135483, true },
-  { 135491, true },
-  { 135503, true },
-  { 135515, true },
-  { 135523, true },
-  { 135535, true },
-  { 135550, true },
-  { 135559, true },
-  { 135574, true },
-  { 135583, true },
+  { 135069, true },
+  { 135083, true },
+  { 135093, true },
+  { 135112, true },
+  { 135135, true },
+  { 135154, true },
+  { 135166, true },
+  { 135190, true },
+  { 135204, true },
+  { 135222, true },
+  { 135240, true },
+  { 135254, true },
+  { 135272, true },
+  { 135288, true },
+  { 135307, true },
+  { 135317, true },
+  { 135340, false },
+  { 135353, true },
+  { 135364, true },
+  { 135374, true },
+  { 135387, true },
+  { 135396, true },
+  { 135407, true },
+  { 135419, true },
+  { 135429, false },
+  { 135442, true },
+  { 135452, true },
+  { 135460, true },
+  { 135472, true },
+  { 135484, true },
+  { 135492, true },
+  { 135504, true },
+  { 135519, true },
+  { 135528, true },
+  { 135543, true },
+  { 135552, true },
+  { 135558, true },
+  { 135570, true },
+  { 135580, true },
   { 135589, true },
-  { 135601, true },
-  { 135611, true },
-  { 135620, true },
-  { 135630, true },
-  { 135637, false },
-  { 135652, true },
-  { 135663, true },
-  { 135674, true },
+  { 135599, true },
+  { 135606, false },
+  { 135621, true },
+  { 135632, true },
+  { 135643, true },
+  { 135661, true },
+  { 135676, true },
   { 135692, true },
-  { 135707, true },
-  { 135723, true },
-  { 135736, true },
-  { 135749, true },
-  { 135763, true },
-  { 135775, true },
-  { 135789, true },
-  { 135802, true },
-  { 135816, true },
-  { 135827, true },
-  { 135836, true },
-  { 135851, true },
-  { 135870, true },
-  { 135880, true },
-  { 135892, true },
-  { 135905, true },
-  { 135913, true },
-  { 135926, true },
-  { 135938, true },
-  { 135951, true },
-  { 135971, true },
-  { 135990, true },
-  { 136006, true },
-  { 136023, true },
-  { 136035, true },
-  { 136055, true },
-  { 136069, true },
-  { 136084, true },
-  { 136099, true },
+  { 135705, true },
+  { 135718, true },
+  { 135732, true },
+  { 135744, true },
+  { 135758, true },
+  { 135771, true },
+  { 135785, true },
+  { 135796, true },
+  { 135805, true },
+  { 135820, true },
+  { 135839, true },
+  { 135849, true },
+  { 135861, true },
+  { 135874, true },
+  { 135882, true },
+  { 135895, true },
+  { 135907, true },
+  { 135920, true },
+  { 135940, true },
+  { 135959, true },
+  { 135975, true },
+  { 135992, true },
+  { 136004, true },
+  { 136024, true },
+  { 136038, true },
+  { 136053, true },
+  { 136068, true },
+  { 136081, true },
+  { 136100, true },
   { 136112, true },
-  { 136131, true },
-  { 136143, true },
-  { 136155, true },
-  { 136167, true },
-  { 136180, true },
-  { 136199, true },
-  { 136207, true },
-  { 136226, true },
-  { 136244, true },
-  { 136266, true },
-  { 136282, true },
-  { 136293, true },
-  { 136312, true },
-  { 136327, true },
-  { 136337, true },
-  { 136351, true },
-  { 136366, false },
-  { 136377, true },
-  { 136396, true },
-  { 136405, false },
-  { 136416, true },
-  { 136424, true },
+  { 136124, true },
+  { 136136, true },
+  { 136149, true },
+  { 136168, true },
+  { 136176, true },
+  { 136195, true },
+  { 136213, true },
+  { 136235, true },
+  { 136251, true },
+  { 136262, true },
+  { 136281, true },
+  { 136296, true },
+  { 136306, true },
+  { 136320, true },
+  { 136335, false },
+  { 136346, true },
+  { 136365, true },
+  { 136374, false },
+  { 136385, true },
+  { 136393, true },
+  { 136401, true },
+  { 136409, true },
+  { 136420, true },
   { 136432, true },
-  { 136440, true },
-  { 136451, true },
-  { 136463, true },
-  { 136478, true },
-  { 136492, true },
-  { 136506, true },
-  { 136517, true },
-  { 136526, true },
-  { 136542, true },
-  { 136564, true },
-  { 136576, true },
-  { 136594, true },
-  { 136612, true },
+  { 136447, true },
+  { 136461, true },
+  { 136475, true },
+  { 136486, true },
+  { 136495, true },
+  { 136511, true },
+  { 136533, true },
+  { 136545, true },
+  { 136563, true },
+  { 136581, true },
+  { 136588, true },
+  { 136600, true },
+  { 136610, true },
   { 136619, true },
-  { 136631, true },
-  { 136641, true },
-  { 136650, true },
-  { 136657, true },
-  { 136669, true },
+  { 136626, true },
+  { 136638, true },
+  { 136658, true },
+  { 136679, true },
   { 136689, true },
-  { 136710, true },
-  { 136720, true },
-  { 136743, true },
-  { 136778, true },
-  { 136812, true },
-  { 136835, true },
-  { 136890, true },
-  { 136902, true },
-  { 136912, true },
-  { 136930, true },
-  { 136945, true },
-  { 136958, false },
-  { 136972, true },
-  { 136987, true },
-  { 137001, true },
-  { 137013, false },
-  { 137029, true },
-  { 137054, true },
-  { 137064, true },
-  { 137075, true },
-  { 137087, true },
-  { 137109, true },
-  { 137132, true },
-  { 137142, true },
-  { 137152, true },
-  { 137175, true },
-  { 137188, false },
-  { 137202, true },
-  { 137220, true },
-  { 137231, true },
-  { 137242, true },
-  { 137261, true },
-  { 137277, true },
-  { 137290, true },
-  { 137315, true },
-  { 137329, true },
-  { 137342, true },
-  { 137371, true },
-  { 137384, true },
-  { 137394, true },
-  { 137406, true },
-  { 137419, true },
-  { 137438, true },
-  { 137448, true },
-  { 137462, true },
-  { 137480, true },
-  { 137497, true },
-  { 137514, true },
-  { 137526, true },
-  { 137540, true },
-  { 137554, true },
-  { 137564, true },
-  { 137576, true },
+  { 136712, true },
+  { 136747, true },
+  { 136781, true },
+  { 136804, true },
+  { 136859, true },
+  { 136871, true },
+  { 136881, true },
+  { 136899, true },
+  { 136914, true },
+  { 136927, false },
+  { 136941, true },
+  { 136956, true },
+  { 136970, true },
+  { 136982, false },
+  { 136998, true },
+  { 137023, true },
+  { 137033, true },
+  { 137044, true },
+  { 137056, true },
+  { 137078, true },
+  { 137101, true },
+  { 137111, true },
+  { 137121, true },
+  { 137144, true },
+  { 137157, false },
+  { 137171, true },
+  { 137189, true },
+  { 137200, true },
+  { 137211, true },
+  { 137230, true },
+  { 137246, true },
+  { 137259, true },
+  { 137284, true },
+  { 137298, true },
+  { 137311, true },
+  { 137340, true },
+  { 137353, true },
+  { 137363, true },
+  { 137375, true },
+  { 137388, true },
+  { 137407, true },
+  { 137417, true },
+  { 137431, true },
+  { 137449, true },
+  { 137466, true },
+  { 137483, true },
+  { 137495, true },
+  { 137509, true },
+  { 137523, true },
+  { 137533, true },
+  { 137545, true },
+  { 137556, true },
+  { 137572, true },
   { 137587, true },
-  { 137603, true },
-  { 137618, true },
-  { 137630, true },
-  { 137642, true },
-  { 137657, false },
-  { 137666, true },
-  { 137686, true },
-  { 137706, true },
-  { 137722, true },
-  { 137743, true },
-  { 137757, true },
-  { 137770, true },
-  { 137782, true },
+  { 137599, true },
+  { 137611, true },
+  { 137626, false },
+  { 137635, true },
+  { 137655, true },
+  { 137675, true },
+  { 137691, true },
+  { 137712, true },
+  { 137726, true },
+  { 137739, true },
+  { 137751, true },
+  { 137768, true },
+  { 137778, true },
   { 137799, true },
-  { 137809, true },
-  { 137830, true },
-  { 137844, true },
-  { 137858, true },
-  { 137867, true },
-  { 137885, true },
-  { 137900, true },
-  { 137912, true },
-  { 137930, true },
-  { 137941, true },
-  { 137954, true },
-  { 137966, true },
+  { 137813, true },
+  { 137827, true },
+  { 137836, true },
+  { 137854, true },
+  { 137869, true },
+  { 137881, true },
+  { 137899, true },
+  { 137910, true },
+  { 137923, true },
+  { 137935, true },
+  { 137949, true },
+  { 137961, true },
   { 137980, true },
   { 137992, true },
-  { 138011, true },
+  { 138004, true },
   { 138023, true },
   { 138035, true },
-  { 138054, true },
-  { 138066, true },
-  { 138087, true },
-  { 138103, true },
-  { 138116, true },
-  { 138133, true },
-  { 138148, true },
-  { 138162, true },
-  { 138175, true },
-  { 138188, true },
-  { 138202, true },
-  { 138217, true },
-  { 138231, true },
-  { 138246, true },
-  { 138254, true },
-  { 138264, true },
-  { 138277, true },
+  { 138056, true },
+  { 138072, true },
+  { 138085, true },
+  { 138102, true },
+  { 138117, true },
+  { 138131, true },
+  { 138144, true },
+  { 138157, true },
+  { 138171, true },
+  { 138186, true },
+  { 138198, true },
+  { 138212, true },
+  { 138227, true },
+  { 138235, true },
+  { 138245, true },
+  { 138258, true },
+  { 138280, true },
   { 138299, true },
-  { 138318, true },
-  { 138341, false },
+  { 138322, false },
+  { 138335, true },
   { 138354, true },
-  { 138373, true },
-  { 138391, true },
-  { 138399, true },
-  { 138419, false },
-  { 138437, true },
-  { 138457, true },
-  { 138475, true },
-  { 138488, true },
-  { 138503, true },
-  { 138518, true },
-  { 138533, true },
-  { 138547, true },
-  { 138562, true },
-  { 138587, true },
-  { 138609, true },
-  { 138620, true },
-  { 138636, true },
-  { 138650, true },
-  { 138663, true },
-  { 138691, true },
-  { 138718, true },
-  { 138743, true },
-  { 138771, true },
+  { 138372, true },
+  { 138380, true },
+  { 138400, false },
+  { 138418, true },
+  { 138438, true },
+  { 138456, true },
+  { 138469, true },
+  { 138484, true },
+  { 138499, true },
+  { 138514, true },
+  { 138528, true },
+  { 138543, true },
+  { 138568, true },
+  { 138590, true },
+  { 138601, true },
+  { 138617, true },
+  { 138631, true },
+  { 138644, true },
+  { 138672, true },
+  { 138699, true },
+  { 138724, true },
+  { 138752, true },
+  { 138766, true },
   { 138785, true },
-  { 138804, true },
-  { 138818, true },
-  { 138834, true },
-  { 138847, true },
-  { 138858, true },
-  { 138878, true },
-  { 138889, true },
-  { 138907, true },
-  { 138918, true },
-  { 138930, true },
-  { 138958, true },
-  { 138968, true },
-  { 138985, true },
-  { 139002, true },
-  { 139016, true },
-  { 139026, true },
-  { 139049, true },
+  { 138799, true },
+  { 138815, true },
+  { 138828, true },
+  { 138839, true },
+  { 138859, true },
+  { 138870, true },
+  { 138888, true },
+  { 138899, true },
+  { 138911, true },
+  { 138939, true },
+  { 138949, true },
+  { 138966, true },
+  { 138983, true },
+  { 138997, true },
+  { 139007, true },
+  { 139030, true },
+  { 139053, true },
+  { 139063, true },
   { 139072, true },
-  { 139082, true },
-  { 139091, true },
-  { 139113, true },
-  { 139125, true },
-  { 139136, true },
-  { 139148, true },
-  { 139160, true },
-  { 139172, true },
-  { 139183, true },
-  { 139201, true },
+  { 139094, true },
+  { 139106, true },
+  { 139117, true },
+  { 139129, true },
+  { 139141, true },
+  { 139153, true },
+  { 139164, true },
+  { 139182, true },
+  { 139197, true },
+  { 139207, true },
   { 139216, true },
-  { 139226, true },
-  { 139235, true },
-  { 139253, false },
-  { 139264, true },
-  { 139275, true },
-  { 139299, false },
-  { 139309, true },
-  { 139317, true },
-  { 139331, true },
-  { 139343, true },
-  { 139355, true },
-  { 139366, true },
-  { 139384, true },
-  { 139402, true },
-  { 139422, true },
-  { 139437, true },
-  { 139454, true },
-  { 139470, true },
-  { 139483, true },
-  { 139494, true },
-  { 139509, true },
-  { 139530, true },
-  { 139548, true },
-  { 139563, true },
-  { 139579, true },
-  { 139592, true },
-  { 139606, true },
-  { 139619, true },
-  { 139629, true },
-  { 139639, true },
-  { 139664, true },
-  { 139680, true },
-  { 139689, true },
-  { 139709, true },
-  { 139724, true },
-  { 139740, true },
-  { 139751, true },
-  { 139762, true },
-  { 139773, true },
-  { 139789, true },
-  { 139803, true },
-  { 139820, true },
-  { 139832, true },
-  { 139849, true },
-  { 139860, true },
-  { 139873, true },
-  { 139885, true },
-  { 139897, true },
-  { 139911, true },
-  { 139921, true },
-  { 139935, true },
-  { 139951, true },
-  { 139964, true },
-  { 139980, true },
-  { 139989, true },
-  { 140004, true },
+  { 139234, false },
+  { 139245, true },
+  { 139256, true },
+  { 139280, false },
+  { 139290, true },
+  { 139298, true },
+  { 139312, true },
+  { 139324, true },
+  { 139336, true },
+  { 139347, true },
+  { 139365, true },
+  { 139383, true },
+  { 139403, true },
+  { 139418, true },
+  { 139435, true },
+  { 139451, true },
+  { 139464, true },
+  { 139475, true },
+  { 139490, true },
+  { 139511, true },
+  { 139529, true },
+  { 139545, true },
+  { 139558, true },
+  { 139572, true },
+  { 139585, true },
+  { 139595, true },
+  { 139605, true },
+  { 139630, true },
+  { 139646, true },
+  { 139655, true },
+  { 139675, true },
+  { 139690, true },
+  { 139706, true },
+  { 139717, true },
+  { 139728, true },
+  { 139739, true },
+  { 139755, true },
+  { 139769, true },
+  { 139786, true },
+  { 139798, true },
+  { 139815, true },
+  { 139826, true },
+  { 139839, true },
+  { 139851, true },
+  { 139863, true },
+  { 139877, true },
+  { 139887, true },
+  { 139901, true },
+  { 139917, true },
+  { 139930, true },
+  { 139946, true },
+  { 139955, true },
+  { 139970, true },
+  { 139988, true },
+  { 140007, true },
   { 140022, true },
-  { 140041, true },
-  { 140056, true },
-  { 140068, true },
-  { 140085, false },
-  { 140105, false },
-  { 140121, true },
-  { 140132, true },
-  { 140145, true },
-  { 140171, true },
-  { 140184, true },
-  { 140195, true },
-  { 140215, true },
-  { 140236, true },
-  { 140249, false },
-  { 140270, false },
-  { 140287, true },
-  { 140298, true },
+  { 140034, true },
+  { 140051, false },
+  { 140071, false },
+  { 140087, true },
+  { 140098, true },
+  { 140111, true },
+  { 140137, true },
+  { 140150, true },
+  { 140161, true },
+  { 140181, true },
+  { 140202, true },
+  { 140215, false },
+  { 140236, false },
+  { 140253, true },
+  { 140264, true },
+  { 140283, true },
+  { 140302, true },
   { 140317, true },
-  { 140336, true },
-  { 140351, true },
-  { 140362, true },
-  { 140379, true },
-  { 140387, true },
-  { 140414, true },
-  { 140425, true },
-  { 140434, true },
-  { 140449, true },
-  { 140466, true },
-  { 140476, true },
-  { 140491, true },
-  { 140503, true },
-  { 140524, true },
-  { 140533, true },
-  { 140546, true },
-  { 140559, true },
-  { 140577, true },
-  { 140586, true },
-  { 140595, true },
-  { 140604, true },
-  { 140616, false },
-  { 140633, false },
-  { 140644, true },
-  { 140662, true },
-  { 140673, true },
-  { 140688, true },
-  { 140704, true },
-  { 140726, true },
-  { 140734, true },
-  { 140747, true },
-  { 140759, true },
-  { 140770, true },
-  { 140787, true },
-  { 140801, true },
-  { 140811, true },
-  { 140828, true },
-  { 140846, true },
-  { 140863, true },
-  { 140880, true },
+  { 140328, true },
+  { 140345, true },
+  { 140353, true },
+  { 140380, true },
+  { 140391, true },
+  { 140400, true },
+  { 140415, true },
+  { 140432, true },
+  { 140442, true },
+  { 140457, true },
+  { 140469, true },
+  { 140490, true },
+  { 140499, true },
+  { 140512, true },
+  { 140525, true },
+  { 140543, true },
+  { 140552, true },
+  { 140561, true },
+  { 140570, true },
+  { 140582, false },
+  { 140599, false },
+  { 140610, true },
+  { 140628, true },
+  { 140639, true },
+  { 140654, true },
+  { 140669, true },
+  { 140685, true },
+  { 140707, true },
+  { 140715, true },
+  { 140728, true },
+  { 140740, true },
+  { 140751, true },
+  { 140768, true },
+  { 140782, true },
+  { 140792, true },
+  { 140809, true },
+  { 140827, true },
+  { 140844, true },
+  { 140861, true },
+  { 140869, true },
   { 140888, true },
-  { 140907, true },
-  { 140922, true },
-  { 140946, true },
-  { 140970, true },
-  { 140988, true },
-  { 141002, true },
-  { 141013, true },
-  { 141026, true },
-  { 141041, true },
-  { 141055, true },
+  { 140903, true },
+  { 140927, true },
+  { 140951, true },
+  { 140969, true },
+  { 140983, true },
+  { 140994, true },
+  { 141007, true },
+  { 141022, true },
+  { 141036, true },
+  { 141050, true },
   { 141069, true },
-  { 141088, true },
-  { 141099, true },
-  { 141109, true },
-  { 141120, true },
-  { 141142, true },
-  { 141154, true },
-  { 141165, true },
-  { 141192, true },
-  { 141204, true },
-  { 141227, true },
-  { 141239, true },
-  { 141254, true },
-  { 141277, true },
-  { 141298, true },
-  { 141311, true },
-  { 141318, true },
-  { 141338, true },
-  { 141354, true },
-  { 141368, true },
-  { 141382, true },
-  { 141392, false },
-  { 141409, true },
-  { 141420, true },
-  { 141427, true },
+  { 141080, true },
+  { 141090, true },
+  { 141101, true },
+  { 141123, true },
+  { 141135, true },
+  { 141146, true },
+  { 141173, true },
+  { 141185, true },
+  { 141208, true },
+  { 141220, true },
+  { 141235, true },
+  { 141258, true },
+  { 141279, true },
+  { 141292, true },
+  { 141299, true },
+  { 141319, true },
+  { 141335, true },
+  { 141349, true },
+  { 141363, true },
+  { 141373, false },
+  { 141390, true },
+  { 141401, true },
+  { 141408, true },
+  { 141417, true },
   { 141436, true },
-  { 141455, true },
-  { 141468, true },
-  { 141486, true },
-  { 141496, true },
-  { 141516, true },
-  { 141526, true },
-  { 141541, true },
-  { 141554, true },
-  { 141564, true },
-  { 141588, true },
-  { 141601, true },
-  { 141618, true },
-  { 141630, false },
-  { 141645, true },
-  { 141655, true },
-  { 141668, true },
-  { 141683, true },
-  { 141693, true },
-  { 141711, true },
-  { 141722, true },
-  { 141734, true },
-  { 141752, true },
-  { 141773, false },
-  { 141799, true },
-  { 141816, true },
-  { 141830, true },
-  { 141843, true },
-  { 141857, false },
-  { 141870, true },
-  { 141881, true },
-  { 141895, true },
-  { 141908, true },
-  { 141920, true },
-  { 141933, true },
-  { 141950, true },
-  { 141965, true },
-  { 141981, true },
-  { 141993, false },
-  { 142007, true },
-  { 142027, true },
-  { 142040, true },
-  { 142053, true },
-  { 142066, true },
-  { 142076, true },
-  { 142087, true },
-  { 142098, true },
-  { 142109, true },
-  { 142121, true },
-  { 142134, true },
-  { 142158, true },
-  { 142181, true },
-  { 142193, true },
-  { 142207, true },
-  { 142218, true },
-  { 142231, true },
-  { 142239, true },
-  { 142251, true },
-  { 142265, true },
-  { 142280, true },
-  { 142303, true },
-  { 142314, true },
-  { 142328, true },
-  { 142341, false },
-  { 142356, true },
-  { 142368, true },
-  { 142388, true },
-  { 142404, true },
-  { 142416, false },
-  { 142430, true },
-  { 142444, true },
-  { 142456, true },
-  { 142470, true },
-  { 142485, true },
-  { 142499, true },
-  { 142512, true },
-  { 142529, true },
-  { 142542, true },
-  { 142568, true },
-  { 142578, true },
-  { 142606, true },
-  { 142634, true },
-  { 142644, true },
-  { 142671, false },
-  { 142683, true },
-  { 142693, true },
-  { 142703, true },
-  { 142716, true },
-  { 142725, true },
-  { 142741, true },
-  { 142754, true },
-  { 142768, true },
-  { 142784, false },
-  { 142799, true },
-  { 142817, true },
-  { 142836, true },
-  { 142849, true },
-  { 142864, true },
-  { 142878, true },
-  { 142894, true },
-  { 142908, true },
-  { 142926, true },
-  { 142939, true },
-  { 142949, false },
-  { 142960, true },
-  { 142971, true },
-  { 142981, true },
-  { 142993, true },
-  { 143003, true },
-  { 143014, true },
-  { 143041, true },
-  { 143059, true },
-  { 143079, true },
-  { 143093, true },
-  { 143104, true },
-  { 143113, true },
-  { 143122, true },
-  { 143139, false },
-  { 143153, true },
-  { 143176, true },
-  { 143192, true },
-  { 143213, true },
-  { 143229, true },
-  { 143242, true },
-  { 143264, true },
-  { 143274, true },
-  { 143282, true },
-  { 143291, true },
-  { 143302, true },
-  { 143317, true },
-  { 143331, true },
-  { 143341, true },
-  { 143358, true },
-  { 143373, true },
-  { 143387, true },
-  { 143397, true },
-  { 143417, true },
-  { 143432, true },
-  { 143450, true },
-  { 143465, true },
-  { 143491, true },
-  { 143505, true },
-  { 143518, true },
-  { 143530, true },
-  { 143549, true },
-  { 143562, true },
-  { 143586, false },
-  { 143605, true },
-  { 143633, true },
-  { 143647, true },
-  { 143665, true },
-  { 143678, true },
-  { 143691, true },
-  { 143705, true },
-  { 143717, true },
-  { 143728, true },
-  { 143742, true },
-  { 143764, true },
-  { 143783, true },
-  { 143801, true },
-  { 143816, true },
-  { 143824, true },
-  { 143835, true },
-  { 143848, true },
-  { 143859, true },
-  { 143875, true },
-  { 143889, true },
-  { 143907, true },
-  { 143923, true },
-  { 143937, true },
-  { 143952, true },
-  { 143967, true },
-  { 143979, true },
-  { 143991, true },
-  { 144017, true },
-  { 144036, true },
-  { 144052, true },
-  { 144065, true },
-  { 144084, true },
-  { 144101, true },
-  { 144111, true },
-  { 144122, true },
-  { 144134, true },
-  { 144146, false },
-  { 144161, true },
-  { 144179, true },
-  { 144188, true },
-  { 144195, true },
-  { 144203, true },
-  { 144217, true },
-  { 144230, true },
-  { 144243, true },
-  { 144256, true },
-  { 144267, true },
-  { 144280, true },
-  { 144290, true },
-  { 144300, true },
-  { 144312, true },
-  { 144320, true },
-  { 144332, true },
-  { 144341, true },
-  { 144348, true },
-  { 144359, true },
-  { 144370, true },
-  { 144388, true },
-  { 144402, true },
-  { 144416, true },
-  { 144439, true },
-  { 144449, true },
-  { 144460, true },
-  { 144475, true },
-  { 144493, true },
-  { 144510, true },
-  { 144524, true },
-  { 144539, true },
-  { 144555, true },
-  { 144568, true },
-  { 144584, true },
-  { 144598, true },
-  { 144610, true },
-  { 144622, true },
-  { 144634, true },
-  { 144647, true },
-  { 144664, true },
-  { 144677, false },
-  { 144688, true },
-  { 144702, true },
-  { 144713, true },
-  { 144728, true },
-  { 144735, true },
-  { 144744, true },
-  { 144763, true },
-  { 144782, true },
-  { 144808, true },
-  { 144820, true },
-  { 144844, false },
-  { 144859, true },
-  { 144870, true },
-  { 144881, true },
-  { 144904, false },
-  { 144915, false },
-  { 144926, false },
-  { 144938, true },
-  { 144952, true },
-  { 144965, true },
-  { 144978, true },
-  { 144991, true },
-  { 145013, false },
-  { 145023, true },
-  { 145043, true },
-  { 145061, true },
-  { 145075, true },
-  { 145092, false },
-  { 145107, false },
-  { 145123, true },
-  { 145140, true },
-  { 145151, true },
-  { 145173, true },
-  { 145187, true },
-  { 145207, true },
-  { 145224, true },
-  { 145234, true },
-  { 145242, true },
-  { 145253, true },
-  { 145261, true },
-  { 145270, true },
-  { 145281, true },
-  { 145293, true },
-  { 145303, true },
-  { 145318, true },
-  { 145331, true },
-  { 145345, true },
-  { 145353, true },
-  { 145363, true },
-  { 145380, true },
-  { 145401, true },
-  { 145415, true },
-  { 145432, true },
-  { 145455, true },
-  { 145470, true },
-  { 145492, true },
-  { 145512, true },
-  { 145527, true },
-  { 145542, true },
-  { 145553, true },
-  { 145569, true },
-  { 145583, true },
-  { 145596, true },
-  { 145609, true },
-  { 145622, true },
-  { 145635, true },
-  { 145648, true },
-  { 145667, true },
-  { 145680, true },
-  { 145692, true },
-  { 145703, false },
-  { 145719, true },
-  { 145732, true },
-  { 145746, true },
-  { 145759, true },
-  { 145769, true },
-  { 145789, true },
-  { 145812, true },
-  { 145832, true },
-  { 145843, true },
-  { 145853, true },
-  { 145868, true },
-  { 145884, true },
-  { 145894, true },
-  { 145906, true },
+  { 141449, true },
+  { 141467, true },
+  { 141477, true },
+  { 141497, true },
+  { 141507, true },
+  { 141522, true },
+  { 141535, true },
+  { 141545, true },
+  { 141569, true },
+  { 141582, true },
+  { 141599, true },
+  { 141611, false },
+  { 141626, true },
+  { 141636, true },
+  { 141654, true },
+  { 141667, true },
+  { 141682, true },
+  { 141692, true },
+  { 141710, true },
+  { 141721, true },
+  { 141733, true },
+  { 141751, true },
+  { 141772, false },
+  { 141798, true },
+  { 141815, true },
+  { 141829, true },
+  { 141842, true },
+  { 141856, false },
+  { 141869, true },
+  { 141880, true },
+  { 141894, true },
+  { 141907, true },
+  { 141919, true },
+  { 141932, true },
+  { 141949, true },
+  { 141964, true },
+  { 141980, true },
+  { 141992, false },
+  { 142006, true },
+  { 142026, true },
+  { 142039, true },
+  { 142052, true },
+  { 142065, true },
+  { 142075, true },
+  { 142086, true },
+  { 142097, true },
+  { 142108, true },
+  { 142120, true },
+  { 142133, true },
+  { 142157, true },
+  { 142180, true },
+  { 142192, true },
+  { 142206, true },
+  { 142217, true },
+  { 142230, true },
+  { 142238, true },
+  { 142250, true },
+  { 142264, true },
+  { 142279, true },
+  { 142302, true },
+  { 142313, true },
+  { 142327, true },
+  { 142340, false },
+  { 142355, true },
+  { 142367, true },
+  { 142387, true },
+  { 142403, true },
+  { 142415, false },
+  { 142429, true },
+  { 142443, true },
+  { 142455, true },
+  { 142469, true },
+  { 142484, true },
+  { 142498, true },
+  { 142511, true },
+  { 142528, true },
+  { 142541, true },
+  { 142567, true },
+  { 142577, true },
+  { 142605, true },
+  { 142633, true },
+  { 142643, true },
+  { 142670, false },
+  { 142682, true },
+  { 142692, true },
+  { 142702, true },
+  { 142715, true },
+  { 142724, true },
+  { 142740, true },
+  { 142753, true },
+  { 142767, true },
+  { 142783, false },
+  { 142798, true },
+  { 142816, true },
+  { 142835, true },
+  { 142848, true },
+  { 142863, true },
+  { 142877, true },
+  { 142893, true },
+  { 142907, true },
+  { 142925, true },
+  { 142938, true },
+  { 142948, false },
+  { 142959, true },
+  { 142970, true },
+  { 142980, true },
+  { 142992, true },
+  { 143002, true },
+  { 143013, true },
+  { 143040, true },
+  { 143058, true },
+  { 143078, true },
+  { 143092, true },
+  { 143103, true },
+  { 143112, true },
+  { 143121, true },
+  { 143138, false },
+  { 143152, true },
+  { 143175, true },
+  { 143191, true },
+  { 143212, true },
+  { 143228, true },
+  { 143241, true },
+  { 143263, true },
+  { 143273, true },
+  { 143281, true },
+  { 143290, true },
+  { 143301, true },
+  { 143316, true },
+  { 143330, true },
+  { 143340, true },
+  { 143357, true },
+  { 143372, true },
+  { 143386, true },
+  { 143396, true },
+  { 143416, true },
+  { 143431, true },
+  { 143449, true },
+  { 143464, true },
+  { 143490, true },
+  { 143504, true },
+  { 143517, true },
+  { 143529, true },
+  { 143548, true },
+  { 143561, true },
+  { 143585, false },
+  { 143604, true },
+  { 143632, true },
+  { 143646, true },
+  { 143664, true },
+  { 143677, true },
+  { 143690, true },
+  { 143704, true },
+  { 143716, true },
+  { 143727, true },
+  { 143741, true },
+  { 143763, true },
+  { 143782, true },
+  { 143800, true },
+  { 143815, true },
+  { 143823, true },
+  { 143834, true },
+  { 143847, true },
+  { 143858, true },
+  { 143874, true },
+  { 143888, true },
+  { 143906, true },
+  { 143922, true },
+  { 143936, true },
+  { 143951, true },
+  { 143966, true },
+  { 143978, true },
+  { 143990, true },
+  { 144016, true },
+  { 144035, true },
+  { 144051, true },
+  { 144064, true },
+  { 144083, true },
+  { 144100, true },
+  { 144110, true },
+  { 144121, true },
+  { 144133, true },
+  { 144145, false },
+  { 144160, true },
+  { 144178, true },
+  { 144187, true },
+  { 144194, true },
+  { 144202, true },
+  { 144216, true },
+  { 144229, true },
+  { 144242, true },
+  { 144255, true },
+  { 144266, true },
+  { 144279, true },
+  { 144289, true },
+  { 144299, true },
+  { 144311, true },
+  { 144319, true },
+  { 144331, true },
+  { 144340, true },
+  { 144347, true },
+  { 144358, true },
+  { 144369, true },
+  { 144387, true },
+  { 144401, true },
+  { 144415, true },
+  { 144438, true },
+  { 144448, true },
+  { 144459, true },
+  { 144474, true },
+  { 144492, true },
+  { 144509, true },
+  { 144523, true },
+  { 144538, true },
+  { 144554, true },
+  { 144567, true },
+  { 144583, true },
+  { 144597, true },
+  { 144609, true },
+  { 144621, true },
+  { 144633, true },
+  { 144646, true },
+  { 144663, true },
+  { 144676, false },
+  { 144687, true },
+  { 144701, true },
+  { 144712, true },
+  { 144727, true },
+  { 144734, true },
+  { 144743, true },
+  { 144762, true },
+  { 144781, true },
+  { 144807, true },
+  { 144819, true },
+  { 144843, false },
+  { 144858, true },
+  { 144869, true },
+  { 144880, false },
+  { 144891, false },
+  { 144902, false },
+  { 144914, true },
+  { 144928, true },
+  { 144941, true },
+  { 144954, true },
+  { 144967, true },
+  { 144989, false },
+  { 144999, true },
+  { 145019, true },
+  { 145037, true },
+  { 145051, true },
+  { 145068, false },
+  { 145083, false },
+  { 145099, true },
+  { 145116, true },
+  { 145127, true },
+  { 145149, true },
+  { 145163, true },
+  { 145183, true },
+  { 145200, true },
+  { 145210, true },
+  { 145218, true },
+  { 145229, true },
+  { 145237, true },
+  { 145246, true },
+  { 145257, true },
+  { 145269, true },
+  { 145279, true },
+  { 145294, true },
+  { 145307, true },
+  { 145321, true },
+  { 145329, true },
+  { 145339, true },
+  { 145356, true },
+  { 145377, true },
+  { 145391, true },
+  { 145408, true },
+  { 145431, true },
+  { 145446, true },
+  { 145468, true },
+  { 145488, true },
+  { 145503, true },
+  { 145518, true },
+  { 145529, true },
+  { 145545, true },
+  { 145559, true },
+  { 145572, true },
+  { 145585, true },
+  { 145598, true },
+  { 145611, true },
+  { 145624, true },
+  { 145643, true },
+  { 145656, true },
+  { 145668, true },
+  { 145679, false },
+  { 145695, true },
+  { 145708, true },
+  { 145722, true },
+  { 145735, true },
+  { 145745, true },
+  { 145765, true },
+  { 145788, true },
+  { 145808, true },
+  { 145819, true },
+  { 145829, true },
+  { 145844, true },
+  { 145860, true },
+  { 145870, true },
+  { 145882, true },
+  { 145899, true },
+  { 145907, true },
   { 145923, true },
-  { 145931, true },
-  { 145947, true },
-  { 145962, true },
+  { 145938, true },
+  { 145958, true },
+  { 145968, true },
   { 145982, true },
-  { 145992, true },
-  { 146006, true },
-  { 146031, true },
-  { 146045, true },
-  { 146059, true },
-  { 146073, true },
-  { 146087, true },
-  { 146101, true },
-  { 146116, true },
-  { 146130, true },
-  { 146144, true },
-  { 146158, true },
-  { 146178, true },
-  { 146195, true },
-  { 146213, true },
+  { 146007, true },
+  { 146021, true },
+  { 146035, true },
+  { 146049, true },
+  { 146063, true },
+  { 146077, true },
+  { 146092, true },
+  { 146106, true },
+  { 146120, true },
+  { 146134, true },
+  { 146154, true },
+  { 146171, true },
+  { 146189, true },
+  { 146204, true },
+  { 146215, true },
   { 146228, true },
-  { 146239, true },
-  { 146252, true },
-  { 146270, true },
-  { 146285, true },
-  { 146301, true },
-  { 146313, true },
-  { 146327, true },
-  { 146344, true },
-  { 146357, true },
-  { 146372, true },
-  { 146382, true },
-  { 146391, true },
-  { 146404, false },
-  { 146419, true },
-  { 146430, true },
-  { 146445, true },
-  { 146457, true },
-  { 146474, true },
-  { 146483, true },
-  { 146495, true },
-  { 146512, true },
-  { 146528, false },
-  { 146538, true },
-  { 146553, true },
-  { 146569, true },
-  { 146588, true },
-  { 146603, true },
-  { 146615, true },
-  { 146631, true },
-  { 146641, true },
-  { 146657, true },
-  { 146677, true },
-  { 146691, true },
-  { 146705, true },
-  { 146724, true },
-  { 146744, true },
-  { 146756, true },
-  { 146772, true },
-  { 146785, true },
+  { 146246, true },
+  { 146261, true },
+  { 146277, true },
+  { 146289, true },
+  { 146303, true },
+  { 146320, true },
+  { 146333, true },
+  { 146348, true },
+  { 146358, true },
+  { 146367, true },
+  { 146380, false },
+  { 146395, true },
+  { 146406, true },
+  { 146421, true },
+  { 146433, true },
+  { 146450, true },
+  { 146459, true },
+  { 146471, true },
+  { 146488, true },
+  { 146504, false },
+  { 146514, true },
+  { 146529, true },
+  { 146545, true },
+  { 146564, true },
+  { 146579, true },
+  { 146591, true },
+  { 146607, true },
+  { 146617, true },
+  { 146633, true },
+  { 146653, true },
+  { 146667, true },
+  { 146681, true },
+  { 146700, true },
+  { 146720, true },
+  { 146732, true },
+  { 146748, true },
+  { 146761, true },
+  { 146771, true },
+  { 146781, true },
   { 146795, true },
-  { 146805, true },
-  { 146819, true },
-  { 146842, true },
-  { 146852, true },
-  { 146861, true },
-  { 146880, true },
-  { 146897, true },
-  { 146906, true },
-  { 146919, true },
-  { 146934, true },
-  { 146948, true },
-  { 146967, true },
-  { 146985, true },
-  { 147000, true },
-  { 147014, true },
-  { 147029, true },
+  { 146818, true },
+  { 146828, true },
+  { 146837, true },
+  { 146856, true },
+  { 146873, true },
+  { 146882, true },
+  { 146895, true },
+  { 146910, true },
+  { 146924, true },
+  { 146943, true },
+  { 146961, true },
+  { 146976, true },
+  { 146990, true },
+  { 147005, true },
+  { 147021, true },
+  { 147037, true },
   { 147045, true },
-  { 147061, true },
-  { 147069, true },
-  { 147079, true },
-  { 147090, true },
-  { 147110, true },
-  { 147122, true },
+  { 147055, true },
+  { 147066, true },
+  { 147086, true },
+  { 147098, true },
+  { 147109, true },
+  { 147121, true },
   { 147133, true },
-  { 147145, true },
-  { 147157, true },
-  { 147170, true },
-  { 147185, true },
-  { 147199, true },
+  { 147146, true },
+  { 147161, true },
+  { 147175, true },
+  { 147189, true },
+  { 147197, true },
+  { 147205, true },
   { 147213, true },
-  { 147221, true },
-  { 147229, true },
-  { 147237, true },
-  { 147247, true },
-  { 147256, true },
-  { 147268, true },
-  { 147290, true },
-  { 147309, true },
-  { 147319, true },
-  { 147330, true },
-  { 147347, true },
+  { 147223, true },
+  { 147232, true },
+  { 147244, true },
+  { 147266, true },
+  { 147285, true },
+  { 147295, true },
+  { 147306, true },
+  { 147323, true },
+  { 147336, true },
+  { 147346, true },
   { 147360, true },
-  { 147370, true },
-  { 147384, true },
-  { 147396, true },
-  { 147407, true },
-  { 147435, true },
-  { 147453, true },
+  { 147372, true },
+  { 147383, true },
+  { 147411, true },
+  { 147429, true },
+  { 147447, true },
+  { 147461, true },
   { 147471, true },
   { 147485, true },
-  { 147495, true },
-  { 147509, true },
-  { 147516, true },
-  { 147526, true },
-  { 147541, true },
-  { 147563, true },
-  { 147571, true },
-  { 147581, true },
-  { 147600, true },
-  { 147618, true },
-  { 147630, true },
-  { 147640, true },
-  { 147650, true },
-  { 147660, true },
+  { 147492, true },
+  { 147502, true },
+  { 147517, true },
+  { 147539, true },
+  { 147547, true },
+  { 147557, true },
+  { 147576, true },
+  { 147594, true },
+  { 147606, true },
+  { 147616, true },
+  { 147626, true },
+  { 147636, true },
+  { 147648, true },
+  { 147659, true },
   { 147672, true },
-  { 147683, true },
-  { 147696, true },
+  { 147680, true },
+  { 147694, true },
   { 147704, true },
-  { 147718, true },
-  { 147728, true },
-  { 147739, true },
-  { 147746, true },
-  { 147757, true },
-  { 147765, true },
-  { 147783, true },
-  { 147799, true },
-  { 147810, false },
-  { 147825, true },
-  { 147835, true },
-  { 147843, true },
-  { 147852, true },
-  { 147861, true },
-  { 147881, true },
-  { 147895, true },
-  { 147904, false },
-  { 147915, true },
-  { 147927, true },
-  { 147946, true },
-  { 147959, true },
-  { 147975, true },
-  { 147987, true },
+  { 147715, true },
+  { 147722, true },
+  { 147733, true },
+  { 147741, true },
+  { 147759, true },
+  { 147775, true },
+  { 147786, false },
+  { 147801, true },
+  { 147811, true },
+  { 147819, true },
+  { 147828, true },
+  { 147837, true },
+  { 147857, true },
+  { 147871, true },
+  { 147880, false },
+  { 147891, true },
+  { 147903, true },
+  { 147922, true },
+  { 147935, true },
+  { 147951, true },
+  { 147963, true },
+  { 147976, true },
+  { 147989, false },
   { 148000, true },
-  { 148013, false },
-  { 148024, true },
-  { 148041, true },
-  { 148053, true },
-  { 148068, true },
+  { 148017, true },
+  { 148029, true },
+  { 148044, true },
+  { 148054, true },
+  { 148066, true },
   { 148078, true },
-  { 148090, true },
-  { 148102, true },
-  { 148113, true },
-  { 148124, true },
-  { 148136, true },
-  { 148159, true },
-  { 148169, true },
-  { 148179, true },
-  { 148195, true },
-  { 148210, true },
-  { 148223, true },
-  { 148249, true },
+  { 148089, true },
+  { 148100, true },
+  { 148112, true },
+  { 148135, true },
+  { 148145, true },
+  { 148155, true },
+  { 148171, true },
+  { 148186, true },
+  { 148199, true },
+  { 148225, true },
+  { 148234, true },
+  { 148243, true },
   { 148258, true },
-  { 148267, true },
-  { 148282, true },
-  { 148292, true },
-  { 148305, true },
-  { 148318, true },
-  { 148333, true },
-  { 148343, true },
-  { 148360, true },
+  { 148268, true },
+  { 148281, true },
+  { 148294, true },
+  { 148309, true },
+  { 148319, true },
+  { 148336, true },
+  { 148352, true },
+  { 148366, false },
   { 148376, true },
-  { 148390, false },
-  { 148400, true },
-  { 148414, true },
-  { 148425, true },
+  { 148390, true },
+  { 148401, true },
+  { 148417, true },
+  { 148427, true },
   { 148441, true },
-  { 148451, true },
+  { 148452, true },
   { 148465, true },
-  { 148476, true },
-  { 148489, true },
-  { 148502, true },
-  { 148519, true },
-  { 148534, true },
-  { 148546, true },
-  { 148563, true },
-  { 148581, true },
-  { 148592, false },
-  { 148607, true },
-  { 148628, true },
+  { 148478, true },
+  { 148495, true },
+  { 148510, true },
+  { 148522, true },
+  { 148539, true },
+  { 148557, true },
+  { 148568, false },
+  { 148583, true },
+  { 148604, true },
+  { 148615, true },
   { 148639, true },
   { 148654, true },
   { 148679, true },
@@ -29146,8757 +29152,8759 @@ static const nsSTSPreload kSTSPreloadList[] = {
   { 149140, true },
   { 149153, true },
   { 149167, true },
-  { 149184, true },
-  { 149195, true },
-  { 149209, true },
-  { 149221, false },
-  { 149246, true },
-  { 149270, true },
-  { 149280, false },
-  { 149306, true },
-  { 149323, true },
-  { 149340, true },
-  { 149354, true },
-  { 149384, false },
-  { 149398, true },
-  { 149415, true },
-  { 149429, true },
-  { 149452, true },
-  { 149460, true },
+  { 149183, true },
+  { 149200, true },
+  { 149211, true },
+  { 149225, true },
+  { 149237, false },
+  { 149262, true },
+  { 149286, true },
+  { 149296, false },
+  { 149322, true },
+  { 149339, true },
+  { 149356, true },
+  { 149370, true },
+  { 149400, false },
+  { 149414, true },
+  { 149431, true },
+  { 149445, true },
   { 149468, true },
   { 149476, true },
   { 149484, true },
   { 149492, true },
-  { 149503, true },
-  { 149513, true },
-  { 149527, true },
-  { 149546, true },
-  { 149555, true },
-  { 149568, true },
-  { 149579, true },
-  { 149590, true },
-  { 149615, true },
-  { 149627, true },
-  { 149636, true },
-  { 149646, true },
-  { 149661, true },
-  { 149675, true },
-  { 149688, true },
-  { 149705, true },
-  { 149721, true },
-  { 149744, true },
-  { 149766, true },
-  { 149784, true },
-  { 149803, false },
-  { 149822, true },
-  { 149835, true },
-  { 149848, true },
-  { 149872, true },
-  { 149883, true },
-  { 149902, true },
-  { 149919, true },
-  { 149932, true },
-  { 149960, true },
-  { 149973, true },
-  { 149993, true },
-  { 150004, true },
-  { 150017, true },
-  { 150032, true },
-  { 150052, true },
-  { 150072, true },
-  { 150086, true },
-  { 150099, true },
-  { 150120, false },
+  { 149500, true },
+  { 149508, true },
+  { 149519, true },
+  { 149529, true },
+  { 149543, true },
+  { 149562, true },
+  { 149571, true },
+  { 149584, true },
+  { 149595, true },
+  { 149606, true },
+  { 149631, true },
+  { 149643, true },
+  { 149652, false },
+  { 149668, true },
+  { 149678, true },
+  { 149693, true },
+  { 149707, true },
+  { 149720, true },
+  { 149737, true },
+  { 149753, true },
+  { 149776, true },
+  { 149798, true },
+  { 149816, true },
+  { 149835, false },
+  { 149854, true },
+  { 149867, true },
+  { 149880, true },
+  { 149904, true },
+  { 149915, true },
+  { 149934, true },
+  { 149951, true },
+  { 149964, true },
+  { 149992, true },
+  { 150005, true },
+  { 150025, true },
+  { 150036, true },
+  { 150049, true },
+  { 150064, true },
+  { 150084, true },
+  { 150104, true },
+  { 150118, true },
   { 150131, true },
-  { 150150, true },
-  { 150169, true },
-  { 150180, true },
-  { 150198, true },
-  { 150210, true },
-  { 150221, true },
-  { 150251, true },
-  { 150262, true },
-  { 150276, true },
-  { 150290, true },
-  { 150302, true },
-  { 150317, true },
-  { 150336, true },
-  { 150350, true },
-  { 150370, true },
-  { 150393, true },
-  { 150408, true },
-  { 150419, true },
-  { 150443, true },
-  { 150464, true },
-  { 150477, true },
-  { 150494, true },
-  { 150512, true },
-  { 150528, true },
-  { 150546, true },
+  { 150152, false },
+  { 150163, true },
+  { 150182, true },
+  { 150201, true },
+  { 150212, true },
+  { 150230, true },
+  { 150242, true },
+  { 150253, true },
+  { 150283, true },
+  { 150294, true },
+  { 150308, true },
+  { 150322, true },
+  { 150334, true },
+  { 150349, true },
+  { 150368, true },
+  { 150382, true },
+  { 150402, true },
+  { 150425, true },
+  { 150440, true },
+  { 150451, true },
+  { 150475, true },
+  { 150496, true },
+  { 150509, true },
+  { 150526, true },
+  { 150544, true },
   { 150560, true },
-  { 150582, true },
-  { 150599, true },
-  { 150613, true },
-  { 150629, true },
+  { 150578, true },
+  { 150592, true },
+  { 150614, true },
+  { 150631, true },
   { 150645, true },
-  { 150665, true },
-  { 150676, true },
-  { 150690, true },
-  { 150706, true },
-  { 150721, true },
+  { 150661, true },
+  { 150677, true },
+  { 150697, true },
+  { 150708, true },
+  { 150722, true },
   { 150738, true },
-  { 150748, true },
-  { 150771, true },
-  { 150787, true },
-  { 150806, true },
-  { 150821, true },
-  { 150836, true },
-  { 150850, true },
-  { 150867, true },
-  { 150891, true },
-  { 150907, true },
-  { 150924, true },
-  { 150943, true },
-  { 150958, true },
-  { 150969, true },
-  { 150985, true },
+  { 150753, true },
+  { 150770, true },
+  { 150780, true },
+  { 150803, true },
+  { 150819, true },
+  { 150838, true },
+  { 150853, true },
+  { 150868, true },
+  { 150879, true },
+  { 150893, true },
+  { 150910, true },
+  { 150934, true },
+  { 150950, true },
+  { 150967, true },
+  { 150986, true },
   { 151001, true },
-  { 151018, true },
-  { 151030, true },
-  { 151043, true },
-  { 151063, true },
-  { 151078, true },
-  { 151097, true },
-  { 151113, true },
-  { 151123, true },
-  { 151136, true },
-  { 151155, true },
-  { 151171, true },
-  { 151191, true },
-  { 151203, true },
-  { 151220, true },
-  { 151235, true },
-  { 151247, true },
-  { 151260, true },
-  { 151270, true },
-  { 151287, true },
-  { 151299, false },
-  { 151309, true },
-  { 151326, true },
-  { 151349, true },
-  { 151366, false },
-  { 151381, true },
-  { 151400, true },
-  { 151425, true },
-  { 151458, true },
+  { 151012, true },
+  { 151028, true },
+  { 151044, true },
+  { 151061, true },
+  { 151073, true },
+  { 151086, true },
+  { 151106, true },
+  { 151121, true },
+  { 151140, true },
+  { 151156, true },
+  { 151166, true },
+  { 151179, true },
+  { 151198, true },
+  { 151214, true },
+  { 151234, true },
+  { 151246, true },
+  { 151263, true },
+  { 151278, true },
+  { 151290, true },
+  { 151303, true },
+  { 151313, true },
+  { 151330, true },
+  { 151342, false },
+  { 151352, true },
+  { 151369, true },
+  { 151392, true },
+  { 151409, false },
+  { 151424, true },
+  { 151443, true },
   { 151468, true },
-  { 151482, true },
   { 151501, true },
-  { 151515, true },
-  { 151528, true },
+  { 151511, true },
+  { 151525, true },
   { 151544, true },
-  { 151563, true },
-  { 151593, false },
-  { 151616, true },
-  { 151630, true },
-  { 151644, true },
-  { 151656, true },
-  { 151671, true },
-  { 151691, true },
-  { 151705, true },
-  { 151717, true },
-  { 151737, true },
-  { 151755, true },
-  { 151773, true },
-  { 151784, true },
-  { 151799, true },
-  { 151812, true },
-  { 151825, true },
-  { 151838, true },
-  { 151849, true },
-  { 151864, true },
-  { 151875, true },
-  { 151902, true },
+  { 151558, true },
+  { 151571, true },
+  { 151587, true },
+  { 151606, true },
+  { 151636, false },
+  { 151659, true },
+  { 151673, true },
+  { 151687, true },
+  { 151699, true },
+  { 151714, true },
+  { 151734, true },
+  { 151748, true },
+  { 151760, true },
+  { 151780, true },
+  { 151798, true },
+  { 151816, true },
+  { 151827, true },
+  { 151842, true },
+  { 151855, true },
+  { 151868, true },
+  { 151881, true },
+  { 151892, true },
+  { 151907, true },
   { 151918, true },
-  { 151932, true },
-  { 151944, true },
+  { 151945, true },
   { 151961, true },
   { 151975, true },
-  { 151983, true },
-  { 152002, true },
-  { 152016, true },
-  { 152038, true },
-  { 152055, true },
-  { 152064, true },
-  { 152077, true },
-  { 152087, false },
-  { 152099, true },
-  { 152110, true },
+  { 151987, true },
+  { 152004, true },
+  { 152018, true },
+  { 152026, true },
+  { 152045, true },
+  { 152059, true },
+  { 152081, true },
+  { 152098, true },
+  { 152107, true },
   { 152120, true },
-  { 152143, true },
-  { 152157, true },
-  { 152172, true },
-  { 152196, true },
+  { 152130, false },
+  { 152142, true },
+  { 152153, true },
+  { 152163, true },
+  { 152186, true },
+  { 152200, true },
   { 152215, true },
-  { 152229, true },
-  { 152243, true },
-  { 152264, true },
-  { 152283, true },
-  { 152293, true },
-  { 152309, true },
-  { 152337, true },
-  { 152353, true },
-  { 152370, true },
-  { 152383, true },
-  { 152400, true },
-  { 152416, true },
-  { 152435, true },
-  { 152448, true },
-  { 152462, true },
-  { 152475, true },
-  { 152486, true },
-  { 152494, true },
-  { 152510, true },
-  { 152523, true },
-  { 152543, true },
-  { 152557, true },
-  { 152577, true },
-  { 152593, false },
-  { 152610, true },
-  { 152629, true },
-  { 152646, true },
-  { 152660, true },
-  { 152681, true },
-  { 152700, true },
-  { 152718, true },
-  { 152731, true },
-  { 152741, true },
-  { 152759, true },
-  { 152772, true },
-  { 152792, true },
-  { 152801, false },
-  { 152818, false },
-  { 152841, true },
-  { 152862, true },
-  { 152871, true },
-  { 152887, true },
-  { 152905, true },
-  { 152917, true },
-  { 152930, true },
-  { 152943, true },
-  { 152959, true },
+  { 152239, true },
+  { 152258, true },
+  { 152272, true },
+  { 152286, true },
+  { 152307, true },
+  { 152326, true },
+  { 152336, true },
+  { 152352, true },
+  { 152380, true },
+  { 152396, true },
+  { 152413, true },
+  { 152426, true },
+  { 152443, true },
+  { 152459, true },
+  { 152478, true },
+  { 152491, true },
+  { 152505, true },
+  { 152518, true },
+  { 152529, true },
+  { 152537, true },
+  { 152553, true },
+  { 152566, true },
+  { 152586, true },
+  { 152600, true },
+  { 152620, true },
+  { 152636, false },
+  { 152653, true },
+  { 152670, true },
+  { 152684, true },
+  { 152705, true },
+  { 152724, true },
+  { 152742, true },
+  { 152755, true },
+  { 152765, true },
+  { 152783, true },
+  { 152796, true },
+  { 152816, true },
+  { 152825, false },
+  { 152842, false },
+  { 152865, true },
+  { 152886, true },
+  { 152895, true },
+  { 152911, true },
+  { 152929, true },
+  { 152941, true },
+  { 152954, true },
   { 152967, true },
-  { 152982, true },
-  { 152998, false },
-  { 153010, true },
-  { 153020, true },
+  { 152983, true },
+  { 152991, true },
+  { 153006, true },
+  { 153022, false },
   { 153034, true },
-  { 153049, true },
-  { 153059, true },
-  { 153078, true },
-  { 153091, true },
-  { 153106, true },
-  { 153121, true },
-  { 153140, true },
-  { 153162, true },
-  { 153180, true },
-  { 153199, true },
-  { 153213, true },
-  { 153224, true },
-  { 153238, true },
-  { 153250, true },
-  { 153264, true },
-  { 153277, false },
-  { 153299, true },
-  { 153316, true },
-  { 153325, true },
-  { 153343, true },
-  { 153360, true },
-  { 153373, true },
-  { 153381, true },
-  { 153392, true },
-  { 153406, true },
-  { 153418, false },
-  { 153438, true },
-  { 153455, true },
-  { 153463, true },
-  { 153474, false },
-  { 153483, false },
-  { 153499, true },
-  { 153514, false },
-  { 153532, true },
-  { 153545, true },
-  { 153561, true },
-  { 153571, true },
-  { 153582, false },
-  { 153597, true },
-  { 153606, true },
-  { 153619, true },
-  { 153632, true },
+  { 153044, true },
+  { 153058, true },
+  { 153073, true },
+  { 153083, true },
+  { 153102, true },
+  { 153115, true },
+  { 153130, true },
+  { 153145, true },
+  { 153164, true },
+  { 153186, true },
+  { 153204, true },
+  { 153223, true },
+  { 153237, true },
+  { 153248, true },
+  { 153262, true },
+  { 153274, true },
+  { 153288, true },
+  { 153301, false },
+  { 153323, true },
+  { 153340, true },
+  { 153349, true },
+  { 153367, true },
+  { 153384, true },
+  { 153397, true },
+  { 153405, true },
+  { 153416, true },
+  { 153430, true },
+  { 153442, false },
+  { 153462, true },
+  { 153479, true },
+  { 153487, true },
+  { 153498, false },
+  { 153507, false },
+  { 153523, true },
+  { 153538, false },
+  { 153556, true },
+  { 153569, true },
+  { 153585, true },
+  { 153595, true },
+  { 153606, false },
+  { 153621, true },
+  { 153630, true },
   { 153643, true },
-  { 153657, true },
-  { 153670, true },
-  { 153687, false },
-  { 153704, true },
-  { 153711, true },
-  { 153719, true },
+  { 153656, true },
+  { 153667, true },
+  { 153681, true },
+  { 153694, true },
+  { 153711, false },
   { 153728, true },
-  { 153740, true },
-  { 153763, true },
-  { 153777, true },
-  { 153791, true },
-  { 153808, true },
-  { 153819, true },
-  { 153833, false },
-  { 153849, false },
-  { 153863, true },
-  { 153870, true },
-  { 153880, true },
-  { 153891, true },
-  { 153902, true },
-  { 153917, true },
-  { 153929, true },
-  { 153937, true },
-  { 153949, true },
-  { 153964, false },
-  { 153974, true },
-  { 153986, true },
+  { 153735, true },
+  { 153743, true },
+  { 153752, true },
+  { 153764, true },
+  { 153787, true },
+  { 153801, true },
+  { 153815, true },
+  { 153832, true },
+  { 153843, true },
+  { 153857, false },
+  { 153873, false },
+  { 153887, true },
+  { 153894, true },
+  { 153904, true },
+  { 153915, true },
+  { 153926, true },
+  { 153941, true },
+  { 153953, true },
+  { 153961, true },
+  { 153973, true },
+  { 153988, false },
   { 153998, true },
   { 154010, true },
-  { 154025, true },
-  { 154054, true },
-  { 154068, true },
-  { 154076, true },
-  { 154088, true },
-  { 154096, true },
-  { 154105, true },
-  { 154118, true },
-  { 154126, true },
-  { 154136, true },
-  { 154147, true },
-  { 154154, true },
-  { 154163, true },
-  { 154173, true },
-  { 154193, true },
-  { 154205, true },
+  { 154022, true },
+  { 154034, true },
+  { 154049, true },
+  { 154078, true },
+  { 154092, true },
+  { 154100, true },
+  { 154112, true },
+  { 154120, true },
+  { 154129, true },
+  { 154142, true },
+  { 154150, true },
+  { 154160, true },
+  { 154171, true },
+  { 154178, true },
+  { 154187, true },
+  { 154197, true },
   { 154217, true },
-  { 154227, true },
-  { 154236, false },
-  { 154245, true },
-  { 154268, true },
-  { 154288, false },
-  { 154309, true },
-  { 154320, true },
+  { 154229, true },
+  { 154241, true },
+  { 154251, true },
+  { 154260, false },
+  { 154269, true },
+  { 154292, true },
+  { 154312, false },
   { 154333, true },
-  { 154342, true },
-  { 154356, true },
-  { 154373, true },
-  { 154389, true },
-  { 154407, true },
-  { 154421, true },
-  { 154438, true },
-  { 154450, true },
-  { 154463, true },
-  { 154477, true },
-  { 154495, true },
-  { 154509, true },
-  { 154521, true },
-  { 154537, false },
-  { 154555, true },
-  { 154572, true },
-  { 154594, true },
-  { 154605, true },
-  { 154616, true },
-  { 154630, true },
-  { 154646, true },
-  { 154657, true },
-  { 154668, true },
-  { 154680, true },
-  { 154694, true },
+  { 154344, true },
+  { 154357, true },
+  { 154366, true },
+  { 154380, true },
+  { 154397, true },
+  { 154413, true },
+  { 154431, true },
+  { 154445, true },
+  { 154462, true },
+  { 154474, true },
+  { 154487, true },
+  { 154501, true },
+  { 154519, true },
+  { 154533, true },
+  { 154545, true },
+  { 154561, false },
+  { 154579, true },
+  { 154596, true },
+  { 154618, true },
+  { 154629, true },
+  { 154640, true },
+  { 154654, true },
+  { 154670, true },
+  { 154681, true },
+  { 154692, true },
   { 154704, true },
-  { 154716, true },
-  { 154732, true },
-  { 154761, true },
-  { 154776, true },
-  { 154792, true },
-  { 154818, true },
-  { 154835, true },
-  { 154854, true },
-  { 154871, true },
-  { 154887, true },
-  { 154898, true },
-  { 154906, true },
-  { 154918, true },
-  { 154935, true },
-  { 154948, true },
-  { 154963, true },
-  { 154975, true },
-  { 154988, true },
-  { 155002, true },
-  { 155014, true },
+  { 154718, true },
+  { 154728, true },
+  { 154740, true },
+  { 154756, true },
+  { 154785, true },
+  { 154800, true },
+  { 154816, true },
+  { 154842, true },
+  { 154859, true },
+  { 154878, true },
+  { 154895, true },
+  { 154911, true },
+  { 154922, true },
+  { 154930, true },
+  { 154942, true },
+  { 154959, true },
+  { 154972, true },
+  { 154987, true },
+  { 154999, true },
+  { 155012, true },
   { 155026, true },
-  { 155040, true },
-  { 155057, true },
-  { 155070, true },
-  { 155085, true },
-  { 155098, true },
-  { 155111, true },
-  { 155123, true },
-  { 155134, true },
-  { 155157, true },
-  { 155175, true },
-  { 155194, true },
-  { 155220, true },
-  { 155237, true },
-  { 155265, true },
-  { 155278, true },
-  { 155292, true },
-  { 155310, true },
-  { 155327, true },
-  { 155344, true },
-  { 155355, true },
-  { 155376, true },
-  { 155398, true },
-  { 155420, true },
-  { 155432, true },
-  { 155440, true },
-  { 155461, true },
-  { 155482, true },
-  { 155503, true },
-  { 155521, true },
-  { 155537, true },
-  { 155549, true },
-  { 155564, true },
-  { 155576, true },
-  { 155594, true },
-  { 155607, true },
-  { 155617, true },
-  { 155629, true },
-  { 155647, true },
-  { 155661, true },
-  { 155677, true },
-  { 155703, false },
-  { 155732, true },
-  { 155743, true },
+  { 155038, true },
+  { 155050, true },
+  { 155064, true },
+  { 155081, true },
+  { 155094, true },
+  { 155109, true },
+  { 155122, true },
+  { 155135, true },
+  { 155147, true },
+  { 155158, true },
+  { 155181, true },
+  { 155199, true },
+  { 155218, true },
+  { 155244, true },
+  { 155261, true },
+  { 155289, true },
+  { 155302, true },
+  { 155316, true },
+  { 155334, true },
+  { 155351, true },
+  { 155368, true },
+  { 155379, true },
+  { 155400, true },
+  { 155422, true },
+  { 155444, true },
+  { 155456, true },
+  { 155464, true },
+  { 155485, true },
+  { 155506, true },
+  { 155527, true },
+  { 155545, true },
+  { 155561, true },
+  { 155573, true },
+  { 155588, true },
+  { 155600, true },
+  { 155618, true },
+  { 155631, true },
+  { 155641, true },
+  { 155653, true },
+  { 155671, true },
+  { 155685, true },
+  { 155701, true },
+  { 155727, false },
+  { 155756, true },
   { 155767, true },
-  { 155782, true },
-  { 155798, true },
-  { 155813, true },
-  { 155842, true },
-  { 155855, true },
-  { 155873, true },
-  { 155892, true },
-  { 155903, true },
-  { 155912, true },
-  { 155926, true },
-  { 155942, true },
-  { 155965, true },
-  { 155992, true },
-  { 156010, true },
-  { 156037, true },
-  { 156063, true },
-  { 156080, false },
-  { 156091, true },
-  { 156101, true },
-  { 156116, true },
-  { 156127, true },
-  { 156150, true },
-  { 156168, true },
-  { 156181, true },
+  { 155791, true },
+  { 155806, true },
+  { 155822, true },
+  { 155837, true },
+  { 155866, true },
+  { 155879, true },
+  { 155897, true },
+  { 155916, true },
+  { 155927, true },
+  { 155936, true },
+  { 155950, true },
+  { 155966, true },
+  { 155989, true },
+  { 156016, true },
+  { 156034, true },
+  { 156061, true },
+  { 156087, true },
+  { 156104, false },
+  { 156115, true },
+  { 156125, true },
+  { 156140, true },
+  { 156151, true },
+  { 156174, true },
   { 156192, true },
-  { 156211, true },
-  { 156233, true },
-  { 156252, true },
-  { 156266, true },
-  { 156278, false },
-  { 156298, true },
-  { 156308, true },
+  { 156205, true },
+  { 156216, true },
+  { 156235, true },
+  { 156257, true },
+  { 156276, true },
+  { 156290, true },
+  { 156302, false },
   { 156322, true },
-  { 156343, true },
-  { 156361, true },
-  { 156375, true },
-  { 156388, true },
-  { 156400, true },
+  { 156332, true },
+  { 156346, true },
+  { 156367, true },
+  { 156385, true },
+  { 156399, true },
   { 156412, true },
-  { 156425, true },
-  { 156435, true },
-  { 156447, true },
-  { 156455, true },
-  { 156469, true },
-  { 156486, true },
-  { 156500, true },
-  { 156521, true },
-  { 156533, true },
-  { 156548, true },
-  { 156566, true },
-  { 156582, true },
-  { 156594, true },
-  { 156606, true },
-  { 156618, true },
-  { 156630, true },
-  { 156642, true },
-  { 156654, true },
-  { 156666, true },
-  { 156678, true },
-  { 156694, false },
-  { 156714, true },
-  { 156727, true },
-  { 156736, true },
-  { 156750, true },
-  { 156766, true },
-  { 156779, true },
-  { 156792, true },
-  { 156815, true },
-  { 156828, true },
-  { 156836, true },
-  { 156851, true },
+  { 156424, true },
+  { 156436, true },
+  { 156449, true },
+  { 156459, true },
+  { 156471, true },
+  { 156479, true },
+  { 156496, true },
+  { 156510, true },
+  { 156531, true },
+  { 156543, true },
+  { 156558, true },
+  { 156576, true },
+  { 156592, true },
+  { 156604, true },
+  { 156616, true },
+  { 156628, true },
+  { 156640, true },
+  { 156652, true },
+  { 156664, true },
+  { 156676, true },
+  { 156688, true },
+  { 156704, false },
+  { 156724, true },
+  { 156737, true },
+  { 156746, true },
+  { 156760, true },
+  { 156776, true },
+  { 156789, true },
+  { 156802, true },
+  { 156825, true },
+  { 156838, true },
+  { 156846, true },
   { 156861, true },
-  { 156879, true },
-  { 156893, true },
-  { 156902, true },
-  { 156915, false },
-  { 156931, true },
-  { 156946, true },
-  { 156958, true },
-  { 156974, true },
-  { 156986, true },
-  { 156997, true },
-  { 157006, true },
-  { 157013, true },
-  { 157028, true },
-  { 157043, true },
-  { 157055, true },
-  { 157073, true },
-  { 157095, true },
-  { 157114, true },
-  { 157133, true },
-  { 157150, true },
-  { 157172, true },
-  { 157192, true },
-  { 157211, true },
-  { 157228, true },
-  { 157246, true },
-  { 157264, true },
-  { 157281, true },
-  { 157299, true },
-  { 157321, true },
-  { 157338, true },
-  { 157356, true },
-  { 157373, true },
-  { 157387, true },
-  { 157404, true },
-  { 157420, true },
-  { 157437, true },
-  { 157454, true },
-  { 157475, true },
-  { 157490, true },
-  { 157514, true },
-  { 157531, true },
-  { 157542, true },
-  { 157555, true },
-  { 157568, true },
-  { 157580, true },
+  { 156871, true },
+  { 156889, true },
+  { 156903, true },
+  { 156912, true },
+  { 156925, false },
+  { 156941, true },
+  { 156956, true },
+  { 156968, true },
+  { 156984, true },
+  { 156996, true },
+  { 157007, true },
+  { 157016, true },
+  { 157023, true },
+  { 157038, true },
+  { 157053, true },
+  { 157065, true },
+  { 157083, true },
+  { 157105, true },
+  { 157124, true },
+  { 157143, true },
+  { 157160, true },
+  { 157182, true },
+  { 157202, true },
+  { 157221, true },
+  { 157238, true },
+  { 157256, true },
+  { 157274, true },
+  { 157291, true },
+  { 157309, true },
+  { 157331, true },
+  { 157348, true },
+  { 157366, true },
+  { 157383, true },
+  { 157397, true },
+  { 157414, true },
+  { 157430, true },
+  { 157447, true },
+  { 157464, true },
+  { 157485, true },
+  { 157500, true },
+  { 157524, true },
+  { 157541, true },
+  { 157552, true },
+  { 157565, true },
+  { 157578, true },
   { 157590, true },
-  { 157605, true },
-  { 157616, true },
-  { 157628, true },
-  { 157648, true },
-  { 157657, true },
-  { 157666, true },
-  { 157691, true },
-  { 157703, true },
-  { 157721, true },
-  { 157737, true },
-  { 157748, true },
-  { 157764, true },
-  { 157784, true },
-  { 157807, true },
-  { 157828, true },
-  { 157841, true },
-  { 157859, true },
-  { 157878, true },
-  { 157887, false },
-  { 157901, true },
-  { 157912, true },
-  { 157925, true },
-  { 157939, true },
-  { 157954, true },
-  { 157965, true },
-  { 157981, true },
-  { 157990, true },
+  { 157600, true },
+  { 157615, true },
+  { 157626, true },
+  { 157638, true },
+  { 157658, true },
+  { 157667, true },
+  { 157676, true },
+  { 157701, true },
+  { 157713, true },
+  { 157731, true },
+  { 157747, true },
+  { 157758, true },
+  { 157774, true },
+  { 157794, true },
+  { 157817, true },
+  { 157838, true },
+  { 157851, true },
+  { 157869, true },
+  { 157888, true },
+  { 157897, false },
+  { 157911, true },
+  { 157922, true },
+  { 157935, true },
+  { 157949, true },
+  { 157964, true },
+  { 157975, true },
+  { 157991, true },
   { 158004, true },
-  { 158017, true },
-  { 158031, true },
-  { 158044, true },
-  { 158055, true },
-  { 158063, true },
-  { 158076, true },
-  { 158088, true },
-  { 158101, true },
-  { 158113, true },
-  { 158123, true },
-  { 158137, true },
-  { 158151, true },
+  { 158013, true },
+  { 158027, true },
+  { 158040, true },
+  { 158054, true },
+  { 158067, true },
+  { 158078, true },
+  { 158086, true },
+  { 158099, true },
+  { 158111, true },
+  { 158124, true },
+  { 158136, true },
+  { 158146, true },
   { 158160, true },
-  { 158175, true },
-  { 158186, true },
-  { 158199, true },
-  { 158210, true },
-  { 158223, true },
-  { 158237, true },
-  { 158255, true },
-  { 158268, true },
-  { 158280, true },
-  { 158295, true },
-  { 158313, true },
-  { 158329, true },
-  { 158341, true },
-  { 158354, true },
-  { 158366, true },
-  { 158381, true },
-  { 158391, true },
-  { 158401, true },
-  { 158415, true },
-  { 158430, true },
-  { 158447, true },
-  { 158458, true },
-  { 158473, true },
-  { 158487, true },
-  { 158501, true },
-  { 158512, true },
+  { 158174, true },
+  { 158183, true },
+  { 158198, true },
+  { 158209, true },
+  { 158222, true },
+  { 158233, true },
+  { 158246, true },
+  { 158260, true },
+  { 158278, true },
+  { 158291, true },
+  { 158303, true },
+  { 158318, true },
+  { 158336, true },
+  { 158352, true },
+  { 158364, true },
+  { 158377, true },
+  { 158389, true },
+  { 158404, true },
+  { 158414, true },
+  { 158424, true },
+  { 158438, true },
+  { 158453, true },
+  { 158470, true },
+  { 158481, true },
+  { 158496, true },
+  { 158510, true },
   { 158524, true },
-  { 158551, true },
-  { 158565, true },
-  { 158573, true },
-  { 158595, true },
-  { 158609, true },
-  { 158623, true },
-  { 158634, true },
-  { 158653, true },
-  { 158672, true },
-  { 158691, true },
-  { 158710, true },
-  { 158730, true },
-  { 158750, true },
-  { 158770, true },
-  { 158788, true },
-  { 158807, true },
-  { 158826, true },
-  { 158845, true },
-  { 158864, true },
-  { 158878, true },
-  { 158891, true },
-  { 158903, true },
-  { 158916, false },
-  { 158938, true },
-  { 158953, true },
-  { 158965, true },
-  { 158973, true },
-  { 158998, true },
-  { 159014, true },
-  { 159023, true },
-  { 159037, true },
-  { 159048, true },
-  { 159060, true },
-  { 159077, true },
-  { 159090, true },
+  { 158535, true },
+  { 158547, true },
+  { 158574, true },
+  { 158588, true },
+  { 158596, true },
+  { 158618, true },
+  { 158632, true },
+  { 158646, true },
+  { 158657, true },
+  { 158676, true },
+  { 158695, true },
+  { 158714, true },
+  { 158733, true },
+  { 158753, true },
+  { 158773, true },
+  { 158793, true },
+  { 158811, true },
+  { 158830, true },
+  { 158849, true },
+  { 158868, true },
+  { 158887, true },
+  { 158901, true },
+  { 158914, true },
+  { 158926, true },
+  { 158939, false },
+  { 158961, true },
+  { 158976, true },
+  { 158988, true },
+  { 159013, true },
+  { 159029, true },
+  { 159038, true },
+  { 159052, true },
+  { 159063, true },
+  { 159075, true },
+  { 159092, true },
   { 159105, true },
-  { 159121, true },
-  { 159139, true },
-  { 159152, true },
-  { 159176, true },
-  { 159199, true },
-  { 159225, true },
-  { 159237, true },
-  { 159251, true },
+  { 159120, true },
+  { 159136, true },
+  { 159154, true },
+  { 159167, true },
+  { 159191, true },
+  { 159214, true },
+  { 159240, true },
+  { 159252, true },
   { 159266, true },
-  { 159279, true },
-  { 159290, true },
-  { 159300, true },
-  { 159314, true },
+  { 159281, true },
+  { 159294, true },
+  { 159305, true },
+  { 159315, true },
   { 159329, true },
-  { 159338, true },
-  { 159351, true },
-  { 159367, true },
-  { 159386, true },
-  { 159400, true },
+  { 159344, true },
+  { 159353, true },
+  { 159366, true },
+  { 159382, true },
+  { 159401, true },
   { 159415, true },
-  { 159426, true },
-  { 159436, true },
-  { 159448, true },
+  { 159430, true },
+  { 159441, true },
+  { 159451, true },
   { 159463, true },
-  { 159480, true },
-  { 159504, true },
-  { 159535, true },
+  { 159478, true },
+  { 159495, true },
+  { 159519, true },
   { 159550, true },
-  { 159568, true },
-  { 159589, true },
-  { 159603, true },
-  { 159621, true },
-  { 159631, true },
-  { 159643, true },
-  { 159653, true },
-  { 159670, true },
-  { 159683, true },
+  { 159565, true },
+  { 159583, true },
+  { 159604, true },
+  { 159618, true },
+  { 159636, true },
+  { 159646, true },
+  { 159658, true },
+  { 159668, true },
+  { 159685, true },
   { 159698, true },
-  { 159711, true },
-  { 159724, true },
-  { 159736, true },
-  { 159744, true },
-  { 159762, true },
-  { 159793, true },
-  { 159804, true },
+  { 159713, true },
+  { 159726, true },
+  { 159739, true },
+  { 159751, true },
+  { 159759, true },
+  { 159777, true },
+  { 159808, true },
   { 159819, true },
-  { 159836, true },
+  { 159834, true },
   { 159851, true },
-  { 159864, true },
-  { 159880, true },
-  { 159900, true },
-  { 159915, true },
-  { 159931, true },
-  { 159944, true },
-  { 159958, true },
-  { 159966, true },
-  { 159982, true },
-  { 159995, true },
-  { 160005, true },
-  { 160019, true },
-  { 160029, true },
+  { 159866, true },
+  { 159879, true },
+  { 159894, true },
+  { 159910, true },
+  { 159930, true },
+  { 159945, true },
+  { 159961, true },
+  { 159974, true },
+  { 159988, true },
+  { 159996, true },
+  { 160012, true },
+  { 160025, true },
+  { 160035, true },
   { 160049, true },
-  { 160058, true },
-  { 160067, true },
-  { 160081, true },
-  { 160089, true },
-  { 160100, true },
-  { 160109, true },
-  { 160117, true },
-  { 160129, true },
-  { 160142, true },
-  { 160161, true },
-  { 160171, true },
-  { 160180, true },
-  { 160196, true },
-  { 160207, true },
-  { 160220, true },
-  { 160227, true },
-  { 160236, true },
-  { 160252, true },
-  { 160263, true },
-  { 160270, true },
+  { 160059, true },
+  { 160079, true },
+  { 160088, true },
+  { 160097, true },
+  { 160111, true },
+  { 160119, true },
+  { 160130, true },
+  { 160139, true },
+  { 160147, true },
+  { 160159, true },
+  { 160172, true },
+  { 160191, true },
+  { 160201, true },
+  { 160210, true },
+  { 160226, true },
+  { 160237, true },
+  { 160250, true },
+  { 160257, true },
+  { 160266, true },
+  { 160282, true },
   { 160293, true },
-  { 160302, true },
-  { 160322, true },
-  { 160330, true },
-  { 160340, true },
-  { 160361, true },
-  { 160373, true },
-  { 160382, true },
-  { 160390, true },
-  { 160399, true },
-  { 160410, true },
-  { 160421, true },
-  { 160431, true },
-  { 160442, true },
-  { 160449, true },
-  { 160459, true },
-  { 160468, true },
-  { 160476, true },
-  { 160487, true },
-  { 160499, true },
-  { 160505, true },
-  { 160513, true },
-  { 160527, true },
-  { 160537, true },
-  { 160553, true },
-  { 160565, true },
+  { 160300, true },
+  { 160323, true },
+  { 160332, true },
+  { 160352, true },
+  { 160360, true },
+  { 160370, true },
+  { 160391, true },
+  { 160403, true },
+  { 160412, true },
+  { 160420, true },
+  { 160429, true },
+  { 160440, true },
+  { 160451, true },
+  { 160461, true },
+  { 160472, true },
+  { 160479, true },
+  { 160489, true },
+  { 160498, true },
+  { 160506, true },
+  { 160517, true },
+  { 160529, true },
+  { 160535, true },
+  { 160543, true },
+  { 160557, true },
+  { 160567, true },
+  { 160583, true },
   { 160595, true },
-  { 160615, true },
-  { 160629, false },
-  { 160647, false },
-  { 160663, true },
-  { 160678, true },
-  { 160698, true },
-  { 160714, true },
-  { 160729, true },
-  { 160750, true },
-  { 160764, true },
-  { 160783, true },
+  { 160625, true },
+  { 160645, true },
+  { 160659, false },
+  { 160677, false },
+  { 160693, true },
+  { 160708, true },
+  { 160728, true },
+  { 160744, true },
+  { 160759, true },
+  { 160780, true },
   { 160794, true },
-  { 160804, true },
-  { 160822, true },
-  { 160835, true },
-  { 160846, true },
-  { 160860, true },
-  { 160874, true },
-  { 160888, true },
-  { 160903, true },
-  { 160936, true },
-  { 160956, true },
-  { 160972, true },
-  { 160985, true },
-  { 161005, false },
-  { 161021, true },
-  { 161035, true },
-  { 161054, true },
-  { 161069, true },
+  { 160813, true },
+  { 160824, true },
+  { 160834, true },
+  { 160852, true },
+  { 160865, true },
+  { 160876, true },
+  { 160890, true },
+  { 160904, true },
+  { 160918, true },
+  { 160933, true },
+  { 160966, true },
+  { 160986, true },
+  { 161002, true },
+  { 161015, true },
+  { 161035, false },
+  { 161051, true },
+  { 161065, true },
   { 161084, true },
   { 161099, true },
-  { 161125, true },
-  { 161142, true },
+  { 161114, true },
+  { 161129, true },
   { 161155, true },
-  { 161171, true },
-  { 161179, true },
-  { 161192, true },
-  { 161199, true },
-  { 161211, true },
-  { 161223, true },
-  { 161238, true },
-  { 161250, true },
-  { 161261, true },
-  { 161273, true },
-  { 161290, true },
-  { 161301, true },
-  { 161321, true },
+  { 161172, true },
+  { 161185, true },
+  { 161201, true },
+  { 161209, true },
+  { 161222, true },
+  { 161229, true },
+  { 161241, true },
+  { 161253, true },
+  { 161268, true },
+  { 161280, true },
+  { 161291, true },
+  { 161303, true },
+  { 161320, true },
   { 161331, true },
   { 161351, true },
-  { 161362, false },
-  { 161380, true },
-  { 161393, true },
-  { 161404, true },
-  { 161414, true },
-  { 161428, true },
-  { 161440, true },
-  { 161451, true },
+  { 161371, true },
+  { 161382, false },
+  { 161400, true },
+  { 161413, true },
+  { 161424, true },
+  { 161434, true },
+  { 161448, true },
   { 161460, true },
-  { 161473, true },
-  { 161483, true },
-  { 161500, true },
-  { 161511, true },
-  { 161527, true },
-  { 161538, true },
-  { 161550, true },
-  { 161560, false },
-  { 161575, true },
-  { 161590, true },
-  { 161599, true },
-  { 161614, true },
-  { 161627, true },
-  { 161643, true },
-  { 161655, true },
-  { 161666, true },
-  { 161680, true },
-  { 161691, true },
-  { 161713, true },
-  { 161734, true },
-  { 161747, true },
-  { 161766, true },
-  { 161778, true },
-  { 161791, true },
-  { 161800, true },
-  { 161815, true },
-  { 161829, true },
-  { 161842, true },
-  { 161854, true },
-  { 161871, true },
-  { 161895, true },
-  { 161916, true },
-  { 161929, true },
-  { 161947, true },
-  { 161968, true },
-  { 161985, true },
-  { 161997, true },
-  { 162014, true },
-  { 162026, true },
-  { 162040, true },
-  { 162058, true },
-  { 162071, true },
+  { 161471, true },
+  { 161480, true },
+  { 161493, true },
+  { 161503, true },
+  { 161520, true },
+  { 161531, true },
+  { 161547, true },
+  { 161558, true },
+  { 161570, true },
+  { 161580, false },
+  { 161595, true },
+  { 161610, true },
+  { 161619, true },
+  { 161634, true },
+  { 161647, true },
+  { 161663, true },
+  { 161675, true },
+  { 161686, true },
+  { 161700, true },
+  { 161711, true },
+  { 161733, true },
+  { 161754, true },
+  { 161767, true },
+  { 161786, true },
+  { 161798, true },
+  { 161811, true },
+  { 161820, true },
+  { 161835, true },
+  { 161849, true },
+  { 161862, true },
+  { 161874, true },
+  { 161891, true },
+  { 161915, true },
+  { 161936, true },
+  { 161949, true },
+  { 161967, true },
+  { 161988, true },
+  { 162005, true },
+  { 162017, true },
+  { 162034, true },
+  { 162046, true },
+  { 162060, true },
   { 162078, true },
-  { 162090, true },
-  { 162100, true },
-  { 162114, true },
-  { 162127, true },
-  { 162140, true },
-  { 162154, true },
-  { 162167, true },
-  { 162184, true },
-  { 162199, true },
-  { 162213, true },
-  { 162225, true },
-  { 162238, true },
+  { 162091, true },
+  { 162098, true },
+  { 162110, true },
+  { 162120, true },
+  { 162134, true },
+  { 162147, true },
+  { 162160, true },
+  { 162174, true },
+  { 162187, true },
+  { 162204, true },
+  { 162219, true },
+  { 162233, true },
+  { 162245, true },
   { 162258, true },
   { 162278, true },
-  { 162293, true },
-  { 162308, true },
-  { 162323, true },
-  { 162342, true },
-  { 162361, true },
-  { 162380, true },
-  { 162395, true },
-  { 162406, true },
-  { 162419, false },
-  { 162432, true },
-  { 162447, true },
-  { 162461, true },
-  { 162472, true },
-  { 162487, true },
-  { 162503, true },
-  { 162516, true },
-  { 162529, true },
+  { 162298, true },
+  { 162313, true },
+  { 162328, true },
+  { 162343, true },
+  { 162362, true },
+  { 162381, true },
+  { 162400, true },
+  { 162415, true },
+  { 162426, true },
+  { 162439, false },
+  { 162452, true },
+  { 162467, true },
+  { 162481, true },
+  { 162492, true },
+  { 162507, true },
+  { 162523, true },
+  { 162536, true },
   { 162549, true },
-  { 162558, true },
-  { 162574, true },
-  { 162587, true },
-  { 162604, true },
-  { 162619, true },
-  { 162628, true },
-  { 162642, true },
-  { 162652, true },
-  { 162665, true },
-  { 162678, true },
-  { 162696, true },
-  { 162704, false },
-  { 162717, true },
-  { 162730, true },
-  { 162753, true },
-  { 162782, true },
-  { 162800, true },
-  { 162831, true },
-  { 162861, true },
-  { 162883, true },
-  { 162899, true },
-  { 162910, false },
-  { 162923, true },
-  { 162935, true },
-  { 162951, true },
-  { 162966, true },
-  { 162983, false },
-  { 163002, true },
-  { 163021, true },
-  { 163032, true },
-  { 163042, true },
+  { 162569, true },
+  { 162578, true },
+  { 162594, true },
+  { 162607, true },
+  { 162624, true },
+  { 162639, true },
+  { 162648, true },
+  { 162662, true },
+  { 162672, true },
+  { 162685, true },
+  { 162698, true },
+  { 162716, true },
+  { 162724, false },
+  { 162737, true },
+  { 162750, true },
+  { 162773, true },
+  { 162802, true },
+  { 162820, true },
+  { 162851, true },
+  { 162881, true },
+  { 162903, true },
+  { 162919, true },
+  { 162930, false },
+  { 162943, true },
+  { 162955, true },
+  { 162971, true },
+  { 162986, true },
+  { 163003, false },
+  { 163022, true },
+  { 163041, true },
   { 163052, true },
-  { 163067, true },
-  { 163081, true },
-  { 163092, true },
-  { 163102, true },
+  { 163062, true },
+  { 163072, true },
+  { 163087, true },
+  { 163101, true },
   { 163112, true },
-  { 163124, true },
-  { 163140, true },
-  { 163151, true },
-  { 163168, true },
-  { 163181, true },
-  { 163194, true },
-  { 163204, true },
-  { 163215, true },
-  { 163225, false },
-  { 163240, true },
-  { 163255, true },
-  { 163272, true },
-  { 163289, true },
-  { 163304, true },
-  { 163314, true },
+  { 163122, true },
+  { 163132, true },
+  { 163144, true },
+  { 163160, true },
+  { 163171, true },
+  { 163188, true },
+  { 163201, true },
+  { 163214, true },
+  { 163224, true },
+  { 163235, true },
+  { 163245, false },
+  { 163260, true },
+  { 163275, true },
+  { 163292, true },
+  { 163309, true },
   { 163324, true },
-  { 163340, true },
-  { 163353, true },
-  { 163363, true },
-  { 163380, true },
-  { 163392, true },
-  { 163406, true },
-  { 163420, true },
-  { 163431, true },
-  { 163448, true },
-  { 163457, true },
+  { 163334, true },
+  { 163344, true },
+  { 163360, true },
+  { 163373, true },
+  { 163383, true },
+  { 163400, true },
+  { 163412, true },
+  { 163426, true },
+  { 163440, true },
+  { 163451, true },
   { 163468, true },
-  { 163478, true },
-  { 163492, true },
-  { 163503, true },
+  { 163477, true },
+  { 163488, true },
+  { 163498, true },
   { 163512, true },
-  { 163526, true },
-  { 163536, true },
+  { 163523, true },
+  { 163532, true },
   { 163546, true },
-  { 163562, true },
-  { 163570, true },
-  { 163581, true },
-  { 163593, true },
-  { 163603, true },
-  { 163612, true },
-  { 163620, true },
-  { 163633, true },
-  { 163644, false },
-  { 163652, true },
-  { 163670, true },
-  { 163677, true },
-  { 163688, false },
-  { 163708, true },
-  { 163715, true },
-  { 163730, true },
-  { 163745, true },
-  { 163756, false },
-  { 163772, true },
-  { 163788, true },
-  { 163804, true },
-  { 163819, true },
-  { 163831, true },
+  { 163556, true },
+  { 163566, true },
+  { 163582, true },
+  { 163590, true },
+  { 163601, true },
+  { 163613, true },
+  { 163623, true },
+  { 163632, true },
+  { 163640, true },
+  { 163653, true },
+  { 163664, false },
+  { 163672, true },
+  { 163690, true },
+  { 163697, true },
+  { 163708, false },
+  { 163728, true },
+  { 163735, true },
+  { 163750, true },
+  { 163765, true },
+  { 163776, false },
+  { 163792, true },
+  { 163808, true },
+  { 163824, true },
+  { 163839, true },
   { 163851, true },
-  { 163865, true },
-  { 163877, true },
-  { 163893, true },
-  { 163903, true },
-  { 163916, true },
-  { 163934, true },
-  { 163948, true },
-  { 163965, true },
-  { 163984, true },
-  { 164000, true },
-  { 164012, true },
-  { 164031, true },
-  { 164054, true },
-  { 164066, true },
-  { 164078, true },
-  { 164091, true },
-  { 164113, true },
-  { 164127, true },
-  { 164138, true },
-  { 164148, true },
-  { 164159, true },
-  { 164176, true },
-  { 164191, true },
-  { 164200, true },
-  { 164209, true },
-  { 164217, true },
-  { 164234, true },
-  { 164248, true },
-  { 164264, true },
-  { 164286, true },
-  { 164302, true },
-  { 164316, true },
-  { 164324, true },
-  { 164341, true },
-  { 164358, true },
-  { 164372, true },
-  { 164391, true },
-  { 164407, false },
-  { 164421, true },
-  { 164434, true },
-  { 164451, true },
-  { 164466, true },
-  { 164485, true },
-  { 164496, true },
-  { 164507, true },
-  { 164521, true },
-  { 164535, true },
-  { 164550, true },
-  { 164571, true },
-  { 164587, true },
-  { 164605, true },
-  { 164623, true },
-  { 164636, true },
-  { 164664, true },
-  { 164676, true },
-  { 164692, true },
-  { 164710, true },
-  { 164718, true },
-  { 164729, true },
-  { 164737, true },
-  { 164751, true },
-  { 164765, true },
-  { 164772, false },
-  { 164782, false },
-  { 164802, true },
-  { 164813, true },
-  { 164820, true },
-  { 164830, true },
-  { 164841, true },
-  { 164852, true },
-  { 164865, true },
-  { 164875, false },
-  { 164894, true },
-  { 164908, true },
-  { 164920, false },
-  { 164933, true },
-  { 164944, false },
-  { 164956, false },
-  { 164977, true },
-  { 164999, true },
-  { 165012, true },
-  { 165030, true },
-  { 165046, true },
-  { 165064, true },
-  { 165073, true },
-  { 165085, true },
-  { 165101, true },
-  { 165112, true },
-  { 165136, true },
-  { 165150, true },
-  { 165161, false },
-  { 165177, true },
-  { 165192, true },
-  { 165204, true },
-  { 165212, true },
-  { 165227, true },
+  { 163871, true },
+  { 163885, true },
+  { 163897, true },
+  { 163913, true },
+  { 163923, true },
+  { 163936, true },
+  { 163954, true },
+  { 163968, true },
+  { 163985, true },
+  { 164004, true },
+  { 164020, true },
+  { 164032, true },
+  { 164051, true },
+  { 164074, true },
+  { 164086, true },
+  { 164098, true },
+  { 164111, true },
+  { 164133, true },
+  { 164147, true },
+  { 164158, true },
+  { 164168, true },
+  { 164179, true },
+  { 164196, true },
+  { 164211, true },
+  { 164220, true },
+  { 164229, true },
+  { 164237, true },
+  { 164254, true },
+  { 164268, true },
+  { 164284, true },
+  { 164306, true },
+  { 164322, true },
+  { 164336, true },
+  { 164344, true },
+  { 164361, true },
+  { 164378, true },
+  { 164392, true },
+  { 164411, true },
+  { 164427, false },
+  { 164441, true },
+  { 164454, true },
+  { 164471, true },
+  { 164486, true },
+  { 164505, true },
+  { 164516, true },
+  { 164527, true },
+  { 164541, true },
+  { 164555, true },
+  { 164570, true },
+  { 164591, true },
+  { 164607, true },
+  { 164625, true },
+  { 164643, true },
+  { 164656, true },
+  { 164684, true },
+  { 164696, true },
+  { 164712, true },
+  { 164730, true },
+  { 164738, true },
+  { 164749, true },
+  { 164757, true },
+  { 164771, true },
+  { 164785, true },
+  { 164792, false },
+  { 164802, false },
+  { 164822, true },
+  { 164833, true },
+  { 164840, true },
+  { 164850, true },
+  { 164861, true },
+  { 164872, true },
+  { 164885, true },
+  { 164895, false },
+  { 164914, true },
+  { 164928, true },
+  { 164940, false },
+  { 164953, true },
+  { 164964, false },
+  { 164976, false },
+  { 164997, true },
+  { 165019, true },
+  { 165032, true },
+  { 165050, true },
+  { 165066, true },
+  { 165084, true },
+  { 165093, true },
+  { 165105, true },
+  { 165121, true },
+  { 165132, true },
+  { 165156, true },
+  { 165170, true },
+  { 165181, false },
+  { 165197, true },
+  { 165215, true },
+  { 165230, true },
   { 165242, true },
-  { 165261, true },
+  { 165250, true },
+  { 165265, true },
   { 165280, true },
-  { 165295, true },
-  { 165306, true },
-  { 165322, true },
-  { 165336, true },
-  { 165354, true },
-  { 165364, false },
-  { 165393, true },
-  { 165407, true },
+  { 165299, true },
+  { 165318, true },
+  { 165333, true },
+  { 165344, true },
+  { 165360, true },
+  { 165374, true },
+  { 165392, true },
+  { 165402, false },
   { 165431, true },
-  { 165450, true },
-  { 165463, true },
-  { 165476, true },
-  { 165491, true },
-  { 165505, true },
-  { 165518, true },
-  { 165538, true },
-  { 165553, true },
-  { 165571, true },
-  { 165581, false },
-  { 165596, true },
-  { 165604, true },
-  { 165617, false },
-  { 165631, true },
-  { 165642, true },
-  { 165650, true },
-  { 165658, true },
-  { 165672, true },
-  { 165694, true },
-  { 165706, true },
-  { 165718, true },
-  { 165730, true },
-  { 165745, true },
-  { 165765, true },
-  { 165788, true },
-  { 165807, true },
-  { 165826, true },
-  { 165845, true },
-  { 165864, true },
-  { 165883, true },
-  { 165902, true },
-  { 165921, true },
-  { 165938, true },
-  { 165956, true },
-  { 165973, true },
-  { 165988, true },
-  { 166006, true },
-  { 166021, true },
-  { 166034, false },
-  { 166048, true },
-  { 166072, true },
-  { 166089, true },
-  { 166107, true },
-  { 166123, true },
-  { 166141, true },
-  { 166158, true },
-  { 166174, true },
-  { 166187, true },
-  { 166200, true },
-  { 166213, true },
-  { 166230, true },
-  { 166251, true },
-  { 166269, true },
-  { 166284, true },
-  { 166301, true },
-  { 166320, true },
-  { 166337, true },
-  { 166349, true },
-  { 166360, true },
-  { 166368, true },
-  { 166381, true },
-  { 166400, true },
-  { 166427, true },
-  { 166443, true },
-  { 166459, true },
-  { 166473, true },
-  { 166486, true },
-  { 166499, true },
-  { 166512, true },
+  { 165445, true },
+  { 165469, true },
+  { 165488, true },
+  { 165501, true },
+  { 165514, true },
+  { 165529, true },
+  { 165543, true },
+  { 165556, true },
+  { 165576, true },
+  { 165591, true },
+  { 165602, true },
+  { 165620, true },
+  { 165630, false },
+  { 165645, true },
+  { 165653, true },
+  { 165666, false },
+  { 165680, true },
+  { 165691, true },
+  { 165699, true },
+  { 165707, true },
+  { 165721, true },
+  { 165743, true },
+  { 165755, true },
+  { 165767, true },
+  { 165779, true },
+  { 165794, true },
+  { 165814, true },
+  { 165837, true },
+  { 165856, true },
+  { 165875, true },
+  { 165894, true },
+  { 165913, true },
+  { 165932, true },
+  { 165951, true },
+  { 165970, true },
+  { 165987, true },
+  { 166005, true },
+  { 166022, true },
+  { 166037, true },
+  { 166055, true },
+  { 166070, true },
+  { 166083, false },
+  { 166097, true },
+  { 166121, true },
+  { 166138, true },
+  { 166156, true },
+  { 166172, true },
+  { 166190, true },
+  { 166207, true },
+  { 166223, true },
+  { 166236, true },
+  { 166249, true },
+  { 166262, true },
+  { 166279, true },
+  { 166300, true },
+  { 166318, true },
+  { 166333, true },
+  { 166350, true },
+  { 166369, true },
+  { 166386, true },
+  { 166398, true },
+  { 166409, true },
+  { 166417, true },
+  { 166430, true },
+  { 166449, true },
+  { 166476, true },
+  { 166492, true },
+  { 166508, true },
   { 166522, true },
   { 166535, true },
-  { 166546, true },
-  { 166566, true },
-  { 166582, true },
-  { 166602, true },
-  { 166617, true },
-  { 166627, true },
-  { 166638, false },
-  { 166653, true },
-  { 166668, false },
-  { 166678, false },
-  { 166688, false },
-  { 166698, true },
-  { 166710, true },
-  { 166718, false },
+  { 166548, true },
+  { 166561, true },
+  { 166571, true },
+  { 166584, true },
+  { 166595, true },
+  { 166615, true },
+  { 166631, true },
+  { 166651, true },
+  { 166666, true },
+  { 166676, true },
+  { 166687, false },
+  { 166702, true },
+  { 166717, false },
   { 166727, false },
-  { 166738, true },
-  { 166746, true },
-  { 166755, true },
-  { 166763, true },
-  { 166776, true },
-  { 166796, true },
-  { 166817, true },
-  { 166833, true },
-  { 166850, true },
-  { 166869, true },
-  { 166886, true },
-  { 166907, true },
-  { 166921, true },
-  { 166931, true },
-  { 166942, true },
-  { 166951, true },
-  { 166960, true },
-  { 166983, true },
-  { 166996, true },
-  { 167018, true },
-  { 167028, true },
-  { 167057, true },
-  { 167070, true },
-  { 167089, true },
+  { 166737, false },
+  { 166747, true },
+  { 166759, true },
+  { 166767, false },
+  { 166776, false },
+  { 166787, true },
+  { 166795, true },
+  { 166804, true },
+  { 166812, true },
+  { 166825, true },
+  { 166845, true },
+  { 166866, true },
+  { 166882, true },
+  { 166899, true },
+  { 166918, true },
+  { 166935, true },
+  { 166956, true },
+  { 166970, true },
+  { 166980, true },
+  { 166991, true },
+  { 167000, true },
+  { 167009, true },
+  { 167032, true },
+  { 167045, true },
+  { 167067, true },
+  { 167077, true },
   { 167106, true },
-  { 167129, true },
-  { 167137, true },
+  { 167119, true },
+  { 167138, true },
   { 167155, true },
-  { 167173, true },
-  { 167184, true },
-  { 167195, false },
-  { 167206, true },
-  { 167219, true },
-  { 167230, true },
-  { 167243, true },
-  { 167256, true },
-  { 167273, true },
-  { 167286, true },
-  { 167297, true },
-  { 167307, true },
-  { 167316, true },
-  { 167326, true },
-  { 167336, true },
-  { 167349, true },
-  { 167360, true },
-  { 167381, true },
-  { 167394, true },
-  { 167407, true },
-  { 167417, true },
+  { 167178, true },
+  { 167186, true },
+  { 167204, true },
+  { 167222, true },
+  { 167233, true },
+  { 167244, false },
+  { 167255, true },
+  { 167268, true },
+  { 167279, true },
+  { 167292, true },
+  { 167305, true },
+  { 167322, true },
+  { 167335, true },
+  { 167346, true },
+  { 167356, true },
+  { 167365, true },
+  { 167375, true },
+  { 167385, true },
+  { 167398, true },
+  { 167409, true },
   { 167430, true },
-  { 167449, true },
-  { 167460, true },
-  { 167475, true },
-  { 167489, true },
-  { 167500, true },
-  { 167512, true },
+  { 167443, true },
+  { 167456, true },
+  { 167466, true },
+  { 167479, true },
+  { 167498, true },
+  { 167509, true },
   { 167524, true },
-  { 167532, true },
-  { 167546, true },
+  { 167538, true },
+  { 167549, true },
   { 167561, true },
-  { 167583, true },
-  { 167598, false },
-  { 167612, true },
-  { 167635, false },
-  { 167647, true },
-  { 167663, true },
-  { 167682, false },
-  { 167697, true },
-  { 167711, true },
-  { 167720, true },
-  { 167735, true },
-  { 167750, true },
-  { 167762, true },
-  { 167773, true },
-  { 167786, true },
-  { 167796, true },
-  { 167814, true },
+  { 167573, true },
+  { 167581, true },
+  { 167595, true },
+  { 167610, true },
+  { 167632, true },
+  { 167647, false },
+  { 167661, true },
+  { 167684, false },
+  { 167696, true },
+  { 167712, true },
+  { 167731, false },
+  { 167746, true },
+  { 167760, true },
+  { 167769, true },
+  { 167784, true },
+  { 167799, true },
+  { 167811, true },
+  { 167822, true },
   { 167835, true },
-  { 167861, true },
+  { 167845, true },
+  { 167863, true },
   { 167884, true },
-  { 167917, true },
-  { 167936, true },
-  { 167960, true },
-  { 167988, true },
-  { 168015, true },
-  { 168029, true },
-  { 168038, true },
-  { 168049, true },
-  { 168063, true },
-  { 168074, true },
-  { 168085, false },
-  { 168109, true },
-  { 168120, true },
-  { 168132, true },
-  { 168146, true },
-  { 168157, true },
-  { 168167, true },
-  { 168175, true },
-  { 168182, true },
-  { 168193, true },
-  { 168203, true },
-  { 168214, true },
-  { 168225, true },
-  { 168235, true },
-  { 168246, true },
-  { 168255, true },
-  { 168270, true },
-  { 168285, true },
-  { 168298, true },
-  { 168309, true },
-  { 168318, true },
-  { 168329, true },
-  { 168340, true },
-  { 168351, true },
-  { 168365, true },
-  { 168374, true },
-  { 168390, true },
-  { 168398, true },
-  { 168410, true },
-  { 168422, true },
-  { 168438, true },
-  { 168446, true },
-  { 168456, true },
-  { 168475, true },
-  { 168483, true },
-  { 168496, true },
-  { 168509, true },
-  { 168526, true },
-  { 168537, true },
-  { 168549, true },
+  { 167910, true },
+  { 167933, true },
+  { 167966, true },
+  { 167985, true },
+  { 168009, true },
+  { 168037, true },
+  { 168064, true },
+  { 168078, true },
+  { 168087, true },
+  { 168098, true },
+  { 168112, true },
+  { 168123, true },
+  { 168134, false },
+  { 168158, true },
+  { 168169, true },
+  { 168181, true },
+  { 168195, true },
+  { 168206, true },
+  { 168216, true },
+  { 168224, true },
+  { 168231, true },
+  { 168242, true },
+  { 168252, true },
+  { 168263, true },
+  { 168274, true },
+  { 168284, true },
+  { 168295, true },
+  { 168304, true },
+  { 168319, true },
+  { 168334, true },
+  { 168347, true },
+  { 168358, true },
+  { 168367, true },
+  { 168378, true },
+  { 168389, true },
+  { 168400, true },
+  { 168414, true },
+  { 168423, true },
+  { 168439, true },
+  { 168447, true },
+  { 168459, true },
+  { 168471, true },
+  { 168487, true },
+  { 168495, true },
+  { 168505, true },
+  { 168524, true },
+  { 168532, true },
+  { 168545, true },
   { 168558, true },
-  { 168571, true },
-  { 168580, true },
-  { 168601, true },
+  { 168575, true },
+  { 168586, true },
+  { 168598, true },
+  { 168607, true },
   { 168620, true },
+  { 168629, true },
   { 168650, true },
-  { 168680, true },
-  { 168696, true },
-  { 168711, true },
-  { 168724, true },
-  { 168737, true },
-  { 168754, true },
-  { 168766, true },
-  { 168779, true },
-  { 168795, true },
+  { 168669, true },
+  { 168699, true },
+  { 168729, true },
+  { 168745, true },
+  { 168760, true },
+  { 168773, true },
+  { 168786, true },
   { 168803, true },
-  { 168811, true },
-  { 168825, true },
-  { 168844, false },
-  { 168853, true },
-  { 168863, true },
-  { 168885, true },
-  { 168907, true },
-  { 168922, true },
-  { 168935, true },
-  { 168949, true },
-  { 168963, true },
+  { 168815, true },
+  { 168828, true },
+  { 168844, true },
+  { 168852, true },
+  { 168860, true },
+  { 168874, true },
+  { 168893, false },
+  { 168902, true },
+  { 168912, true },
+  { 168934, true },
+  { 168956, true },
   { 168971, true },
-  { 168983, true },
-  { 168994, true },
-  { 169005, true },
-  { 169017, true },
-  { 169035, true },
-  { 169048, true },
-  { 169061, true },
-  { 169073, true },
-  { 169083, true },
-  { 169093, true },
-  { 169102, true },
-  { 169113, true },
-  { 169124, false },
-  { 169134, false },
-  { 169150, true },
-  { 169160, true },
-  { 169174, true },
-  { 169186, true },
+  { 168984, true },
+  { 168998, true },
+  { 169012, true },
+  { 169020, true },
+  { 169032, true },
+  { 169043, true },
+  { 169054, true },
+  { 169066, true },
+  { 169084, true },
+  { 169097, true },
+  { 169110, true },
+  { 169122, true },
+  { 169132, true },
+  { 169142, true },
+  { 169151, true },
+  { 169162, true },
+  { 169173, false },
+  { 169183, false },
   { 169199, true },
   { 169209, true },
   { 169223, true },
   { 169235, true },
-  { 169244, true },
-  { 169280, true },
+  { 169248, true },
+  { 169258, true },
+  { 169272, true },
+  { 169284, true },
   { 169293, true },
-  { 169303, true },
-  { 169316, true },
-  { 169327, true },
-  { 169350, false },
-  { 169364, true },
+  { 169329, true },
+  { 169342, true },
+  { 169352, true },
+  { 169365, true },
   { 169376, true },
-  { 169389, true },
-  { 169402, false },
-  { 169412, true },
-  { 169424, true },
-  { 169435, true },
-  { 169449, true },
+  { 169399, false },
+  { 169413, true },
+  { 169425, true },
+  { 169438, true },
+  { 169451, false },
   { 169461, true },
-  { 169475, true },
-  { 169485, true },
-  { 169494, true },
-  { 169504, true },
-  { 169515, true },
-  { 169530, true },
-  { 169542, true },
-  { 169554, true },
-  { 169566, true },
-  { 169580, true },
-  { 169597, true },
-  { 169607, true },
-  { 169617, false },
-  { 169626, false },
-  { 169645, true },
-  { 169660, true },
-  { 169676, true },
-  { 169691, false },
-  { 169701, false },
-  { 169713, true },
-  { 169726, true },
-  { 169744, true },
-  { 169759, true },
-  { 169774, false },
-  { 169790, true },
-  { 169802, true },
-  { 169815, true },
-  { 169827, true },
-  { 169838, true },
-  { 169851, false },
-  { 169866, true },
-  { 169881, true },
-  { 169891, true },
-  { 169901, true },
-  { 169918, true },
-  { 169932, true },
-  { 169946, true },
-  { 169969, true },
-  { 169981, true },
-  { 169992, true },
-  { 170008, true },
-  { 170019, true },
+  { 169473, true },
+  { 169484, true },
+  { 169498, true },
+  { 169510, true },
+  { 169524, true },
+  { 169534, true },
+  { 169543, true },
+  { 169553, true },
+  { 169564, true },
+  { 169579, true },
+  { 169591, true },
+  { 169603, true },
+  { 169615, true },
+  { 169629, true },
+  { 169646, true },
+  { 169656, true },
+  { 169666, false },
+  { 169675, false },
+  { 169694, true },
+  { 169709, true },
+  { 169725, true },
+  { 169740, false },
+  { 169750, true },
+  { 169762, false },
+  { 169774, true },
+  { 169787, true },
+  { 169805, true },
+  { 169820, true },
+  { 169835, false },
+  { 169851, true },
+  { 169863, true },
+  { 169876, true },
+  { 169888, true },
+  { 169899, true },
+  { 169912, false },
+  { 169927, true },
+  { 169942, true },
+  { 169952, true },
+  { 169962, true },
+  { 169979, true },
+  { 169993, true },
+  { 170007, true },
   { 170030, true },
-  { 170048, true },
-  { 170066, true },
-  { 170079, true },
-  { 170100, false },
-  { 170119, true },
-  { 170139, true },
-  { 170161, true },
-  { 170185, true },
-  { 170197, true },
-  { 170212, true },
-  { 170230, true },
+  { 170042, true },
+  { 170053, true },
+  { 170069, true },
+  { 170080, true },
+  { 170091, true },
+  { 170109, true },
+  { 170127, true },
+  { 170140, true },
+  { 170161, false },
+  { 170180, true },
+  { 170200, true },
+  { 170222, true },
   { 170246, true },
-  { 170262, true },
-  { 170278, true },
-  { 170295, true },
-  { 170311, true },
-  { 170328, true },
-  { 170350, true },
-  { 170372, false },
-  { 170386, true },
-  { 170397, true },
-  { 170413, true },
-  { 170424, true },
-  { 170444, true },
-  { 170455, true },
-  { 170470, true },
-  { 170486, true },
-  { 170501, true },
+  { 170258, true },
+  { 170273, true },
+  { 170291, true },
+  { 170307, true },
+  { 170323, true },
+  { 170339, true },
+  { 170356, true },
+  { 170372, true },
+  { 170389, true },
+  { 170411, true },
+  { 170433, false },
+  { 170447, true },
+  { 170458, true },
+  { 170474, true },
+  { 170485, true },
+  { 170505, true },
   { 170516, true },
-  { 170530, true },
-  { 170553, true },
-  { 170567, true },
-  { 170582, true },
-  { 170599, true },
-  { 170616, true },
+  { 170531, true },
+  { 170547, true },
+  { 170562, true },
+  { 170577, true },
+  { 170591, true },
+  { 170614, true },
   { 170628, true },
-  { 170653, true },
-  { 170665, true },
-  { 170680, true },
-  { 170696, true },
-  { 170711, true },
-  { 170740, true },
-  { 170759, true },
-  { 170781, true },
-  { 170799, true },
-  { 170813, true },
-  { 170826, true },
-  { 170841, true },
-  { 170856, true },
-  { 170863, true },
-  { 170879, true },
-  { 170890, true },
-  { 170903, true },
-  { 170914, true },
+  { 170643, true },
+  { 170660, true },
+  { 170677, true },
+  { 170689, true },
+  { 170714, true },
+  { 170726, true },
+  { 170741, true },
+  { 170757, true },
+  { 170772, true },
+  { 170801, true },
+  { 170820, true },
+  { 170842, true },
+  { 170860, true },
+  { 170874, true },
+  { 170887, true },
+  { 170902, true },
+  { 170917, true },
   { 170924, true },
-  { 170935, true },
-  { 170949, true },
-  { 170963, true },
+  { 170940, true },
+  { 170951, true },
+  { 170964, true },
   { 170975, true },
-  { 170987, true },
-  { 170998, true },
-  { 171013, true },
-  { 171027, true },
-  { 171038, true },
-  { 171051, true },
-  { 171080, true },
-  { 171096, true },
-  { 171115, true },
-  { 171124, true },
-  { 171139, true },
-  { 171149, true },
-  { 171159, true },
-  { 171168, true },
+  { 170985, true },
+  { 170996, true },
+  { 171010, true },
+  { 171024, true },
+  { 171036, true },
+  { 171048, true },
+  { 171059, true },
+  { 171074, true },
+  { 171088, true },
+  { 171099, true },
+  { 171112, true },
+  { 171141, true },
+  { 171157, true },
   { 171176, true },
-  { 171192, true },
-  { 171207, true },
-  { 171216, true },
-  { 171224, true },
-  { 171233, true },
-  { 171245, false },
-  { 171256, true },
-  { 171272, true },
-  { 171291, true },
-  { 171303, false },
-  { 171320, false },
-  { 171340, true },
-  { 171355, true },
-  { 171365, true },
-  { 171381, true },
-  { 171394, true },
-  { 171412, true },
-  { 171427, true },
-  { 171436, true },
-  { 171451, true },
-  { 171465, true },
-  { 171481, true },
-  { 171496, true },
-  { 171518, true },
-  { 171539, true },
-  { 171558, true },
-  { 171577, true },
-  { 171593, true },
+  { 171185, true },
+  { 171200, true },
+  { 171210, true },
+  { 171220, true },
+  { 171229, true },
+  { 171237, true },
+  { 171253, true },
+  { 171268, true },
+  { 171277, true },
+  { 171289, true },
+  { 171297, true },
+  { 171306, true },
+  { 171318, false },
+  { 171329, true },
+  { 171345, true },
+  { 171364, true },
+  { 171376, false },
+  { 171393, false },
+  { 171413, true },
+  { 171428, true },
+  { 171438, true },
+  { 171454, true },
+  { 171467, true },
+  { 171485, true },
+  { 171500, true },
+  { 171509, true },
+  { 171524, true },
+  { 171538, true },
+  { 171554, true },
+  { 171569, true },
+  { 171591, true },
   { 171612, true },
-  { 171623, true },
-  { 171632, true },
-  { 171644, true },
-  { 171654, true },
-  { 171669, true },
-  { 171683, true },
+  { 171631, true },
+  { 171650, true },
+  { 171666, true },
+  { 171685, true },
   { 171696, true },
-  { 171704, true },
-  { 171712, true },
-  { 171721, true },
-  { 171733, true },
-  { 171745, true },
-  { 171754, true },
-  { 171766, true },
-  { 171774, true },
-  { 171786, true },
-  { 171812, true },
-  { 171835, false },
-  { 171851, true },
-  { 171865, true },
+  { 171705, true },
+  { 171717, true },
+  { 171727, true },
+  { 171742, true },
+  { 171756, true },
+  { 171769, true },
+  { 171777, true },
+  { 171785, true },
+  { 171794, true },
+  { 171806, true },
+  { 171818, true },
+  { 171827, true },
+  { 171839, true },
+  { 171847, true },
+  { 171859, true },
   { 171885, true },
-  { 171896, true },
-  { 171917, true },
-  { 171936, true },
-  { 171950, true },
-  { 171965, true },
-  { 171979, true },
-  { 171996, true },
-  { 172010, true },
-  { 172030, false },
-  { 172045, true },
-  { 172053, true },
-  { 172068, true },
+  { 171908, false },
+  { 171924, true },
+  { 171938, true },
+  { 171958, true },
+  { 171969, true },
+  { 171990, true },
+  { 172009, true },
+  { 172023, true },
+  { 172038, true },
+  { 172052, true },
+  { 172069, true },
   { 172083, true },
-  { 172097, true },
-  { 172108, true },
+  { 172103, false },
   { 172118, true },
-  { 172135, true },
-  { 172153, true },
-  { 172173, true },
-  { 172197, true },
-  { 172204, true },
-  { 172215, true },
-  { 172226, true },
-  { 172239, true },
-  { 172255, true },
-  { 172267, false },
+  { 172126, true },
+  { 172141, true },
+  { 172156, true },
+  { 172170, true },
+  { 172181, true },
+  { 172191, true },
+  { 172209, true },
+  { 172229, true },
+  { 172253, true },
+  { 172260, true },
+  { 172271, true },
   { 172282, true },
-  { 172298, true },
+  { 172295, true },
   { 172311, true },
-  { 172319, true },
-  { 172329, true },
-  { 172342, true },
-  { 172357, false },
-  { 172366, true },
-  { 172380, true },
-  { 172395, true },
-  { 172405, true },
-  { 172417, true },
-  { 172427, true },
-  { 172437, true },
-  { 172450, true },
-  { 172463, true },
-  { 172475, true },
+  { 172323, false },
+  { 172338, true },
+  { 172354, true },
+  { 172367, true },
+  { 172375, true },
+  { 172385, true },
+  { 172398, true },
+  { 172413, false },
+  { 172422, true },
+  { 172436, true },
+  { 172451, true },
+  { 172461, true },
+  { 172473, true },
   { 172483, true },
-  { 172494, true },
-  { 172504, true },
+  { 172493, true },
+  { 172506, true },
   { 172518, true },
-  { 172539, true },
-  { 172552, true },
-  { 172562, false },
+  { 172526, true },
+  { 172537, true },
+  { 172547, true },
+  { 172561, true },
   { 172582, true },
-  { 172590, true },
-  { 172601, true },
-  { 172609, true },
-  { 172616, true },
-  { 172626, true },
-  { 172638, true },
-  { 172648, true },
-  { 172656, false },
-  { 172676, true },
+  { 172595, true },
+  { 172605, false },
+  { 172625, true },
+  { 172633, true },
+  { 172644, true },
+  { 172652, true },
+  { 172659, true },
+  { 172669, true },
+  { 172681, true },
   { 172691, true },
-  { 172718, true },
-  { 172727, true },
-  { 172736, true },
-  { 172744, true },
-  { 172758, true },
-  { 172773, true },
-  { 172785, true },
-  { 172798, true },
-  { 172807, true },
-  { 172825, true },
-  { 172836, true },
-  { 172847, true },
-  { 172855, true },
-  { 172865, true },
-  { 172873, true },
-  { 172885, true },
-  { 172894, true },
-  { 172904, false },
-  { 172939, true },
-  { 172952, true },
-  { 172962, true },
-  { 172974, true },
-  { 172989, true },
-  { 173001, true },
-  { 173015, true },
-  { 173031, true },
-  { 173049, true },
-  { 173062, true },
-  { 173075, true },
+  { 172699, false },
+  { 172719, true },
+  { 172734, true },
+  { 172761, true },
+  { 172770, true },
+  { 172779, true },
+  { 172787, true },
+  { 172801, true },
+  { 172816, true },
+  { 172828, true },
+  { 172841, true },
+  { 172850, true },
+  { 172868, true },
+  { 172879, true },
+  { 172890, true },
+  { 172898, true },
+  { 172908, true },
+  { 172916, true },
+  { 172928, true },
+  { 172937, true },
+  { 172947, false },
+  { 172982, true },
+  { 172995, true },
+  { 173005, true },
+  { 173017, true },
+  { 173032, true },
+  { 173044, true },
+  { 173058, true },
+  { 173074, true },
   { 173092, true },
   { 173105, true },
-  { 173120, true },
-  { 173139, true },
-  { 173154, true },
-  { 173162, true },
-  { 173174, true },
-  { 173188, true },
-  { 173208, true },
-  { 173220, true },
-  { 173239, true },
-  { 173265, true },
-  { 173287, true },
-  { 173305, true },
-  { 173322, true },
-  { 173339, true },
-  { 173350, true },
-  { 173368, true },
-  { 173380, true },
+  { 173118, true },
+  { 173135, true },
+  { 173148, true },
+  { 173163, true },
+  { 173182, true },
+  { 173197, true },
+  { 173205, true },
+  { 173217, true },
+  { 173231, true },
+  { 173251, true },
+  { 173263, true },
+  { 173282, true },
+  { 173308, true },
+  { 173330, true },
+  { 173348, true },
+  { 173365, true },
+  { 173382, true },
   { 173393, true },
-  { 173409, true },
-  { 173440, true },
-  { 173454, true },
-  { 173471, true },
-  { 173489, true },
-  { 173508, true },
-  { 173524, true },
-  { 173547, true },
-  { 173566, true },
-  { 173580, true },
-  { 173596, true },
-  { 173624, true },
-  { 173640, true },
-  { 173657, true },
-  { 173688, true },
-  { 173718, false },
-  { 173734, true },
-  { 173750, true },
-  { 173761, true },
-  { 173773, true },
-  { 173786, true },
-  { 173806, true },
-  { 173825, true },
-  { 173843, true },
-  { 173865, true },
-  { 173878, true },
-  { 173895, true },
-  { 173909, true },
-  { 173934, true },
-  { 173951, true },
-  { 173968, true },
-  { 173987, true },
-  { 174002, true },
-  { 174013, true },
-  { 174033, true },
-  { 174048, true },
-  { 174063, true },
-  { 174081, true },
-  { 174097, true },
-  { 174109, true },
-  { 174119, true },
-  { 174136, true },
-  { 174154, true },
-  { 174166, false },
-  { 174180, true },
-  { 174187, false },
-  { 174219, true },
-  { 174232, true },
-  { 174251, true },
-  { 174265, true },
+  { 173411, true },
+  { 173423, true },
+  { 173436, true },
+  { 173452, true },
+  { 173483, true },
+  { 173497, true },
+  { 173514, true },
+  { 173532, true },
+  { 173551, true },
+  { 173567, true },
+  { 173590, true },
+  { 173609, true },
+  { 173623, true },
+  { 173639, true },
+  { 173667, true },
+  { 173683, true },
+  { 173700, true },
+  { 173731, true },
+  { 173761, false },
+  { 173777, true },
+  { 173793, true },
+  { 173804, true },
+  { 173816, true },
+  { 173829, true },
+  { 173849, true },
+  { 173868, true },
+  { 173886, true },
+  { 173908, true },
+  { 173921, true },
+  { 173938, true },
+  { 173952, true },
+  { 173977, true },
+  { 173994, true },
+  { 174011, true },
+  { 174030, true },
+  { 174045, true },
+  { 174056, true },
+  { 174076, true },
+  { 174091, true },
+  { 174106, true },
+  { 174124, true },
+  { 174140, true },
+  { 174152, true },
+  { 174162, true },
+  { 174179, true },
+  { 174197, true },
+  { 174209, false },
+  { 174223, true },
+  { 174230, false },
+  { 174262, true },
   { 174275, true },
-  { 174289, true },
-  { 174306, true },
+  { 174294, true },
+  { 174308, true },
   { 174318, true },
   { 174332, true },
-  { 174348, false },
-  { 174363, true },
-  { 174377, true },
-  { 174388, true },
-  { 174399, true },
-  { 174411, true },
+  { 174349, true },
+  { 174361, true },
+  { 174375, true },
+  { 174391, false },
+  { 174406, true },
   { 174420, true },
-  { 174427, true },
-  { 174438, true },
-  { 174446, true },
-  { 174453, true },
-  { 174464, true },
-  { 174472, true },
-  { 174482, true },
-  { 174490, true },
-  { 174498, true },
-  { 174511, true },
-  { 174526, true },
-  { 174536, true },
-  { 174546, true },
-  { 174553, true },
-  { 174565, true },
+  { 174431, true },
+  { 174442, true },
+  { 174454, true },
+  { 174463, true },
+  { 174470, true },
+  { 174481, true },
+  { 174489, true },
+  { 174496, true },
+  { 174507, true },
+  { 174515, true },
+  { 174525, true },
+  { 174533, true },
+  { 174541, true },
+  { 174554, true },
+  { 174569, true },
   { 174579, true },
-  { 174588, true },
-  { 174597, true },
-  { 174613, true },
-  { 174625, true },
-  { 174637, true },
-  { 174649, true },
-  { 174660, true },
-  { 174672, true },
-  { 174683, true },
-  { 174694, true },
-  { 174709, true },
-  { 174717, true },
-  { 174729, true },
-  { 174754, true },
-  { 174765, true },
-  { 174776, true },
-  { 174787, true },
-  { 174801, true },
-  { 174817, true },
-  { 174828, true },
-  { 174840, true },
-  { 174854, true },
-  { 174868, true },
-  { 174883, true },
-  { 174904, true },
-  { 174919, true },
-  { 174940, true },
-  { 174948, true },
-  { 174962, true },
-  { 174969, true },
+  { 174589, true },
+  { 174596, true },
+  { 174608, true },
+  { 174622, true },
+  { 174631, true },
+  { 174650, true },
+  { 174659, true },
+  { 174675, true },
+  { 174687, true },
+  { 174699, true },
+  { 174711, true },
+  { 174722, true },
+  { 174734, true },
+  { 174745, true },
+  { 174756, true },
+  { 174771, true },
+  { 174779, true },
+  { 174791, true },
+  { 174816, true },
+  { 174827, true },
+  { 174838, true },
+  { 174849, true },
+  { 174863, true },
+  { 174879, true },
+  { 174890, true },
+  { 174902, true },
+  { 174916, true },
+  { 174930, true },
+  { 174945, true },
+  { 174966, true },
   { 174981, true },
-  { 174993, true },
-  { 175007, true },
-  { 175020, true },
-  { 175036, false },
-  { 175049, true },
-  { 175062, true },
-  { 175076, true },
-  { 175087, true },
-  { 175096, true },
-  { 175106, true },
-  { 175113, true },
+  { 175002, true },
+  { 175010, true },
+  { 175024, true },
+  { 175031, true },
+  { 175043, true },
+  { 175055, true },
+  { 175069, true },
+  { 175082, true },
+  { 175098, false },
+  { 175111, true },
   { 175124, true },
-  { 175136, true },
-  { 175145, true },
-  { 175154, true },
-  { 175162, true },
-  { 175177, true },
-  { 175185, true },
-  { 175197, true },
-  { 175209, true },
-  { 175219, true },
-  { 175229, true },
-  { 175240, true },
-  { 175249, true },
-  { 175258, true },
-  { 175276, true },
-  { 175294, true },
-  { 175305, true },
-  { 175316, false },
-  { 175327, true },
-  { 175335, true },
-  { 175343, false },
-  { 175351, true },
-  { 175359, true },
-  { 175375, true },
-  { 175381, true },
-  { 175394, true },
-  { 175405, true },
-  { 175417, true },
-  { 175436, true },
-  { 175462, true },
-  { 175476, true },
-  { 175490, true },
-  { 175505, true },
-  { 175518, true },
-  { 175530, true },
-  { 175543, true },
-  { 175555, true },
-  { 175565, false },
-  { 175583, true },
-  { 175599, true },
-  { 175614, true },
-  { 175625, true },
-  { 175642, true },
-  { 175654, true },
-  { 175665, true },
-  { 175684, true },
-  { 175700, true },
-  { 175712, true },
-  { 175724, true },
-  { 175737, true },
-  { 175749, true },
-  { 175766, true },
-  { 175773, true },
+  { 175138, true },
+  { 175149, true },
+  { 175158, true },
+  { 175168, true },
+  { 175175, true },
+  { 175186, true },
+  { 175198, true },
+  { 175207, true },
+  { 175216, true },
+  { 175224, true },
+  { 175239, true },
+  { 175247, true },
+  { 175259, true },
+  { 175271, true },
+  { 175281, true },
+  { 175291, true },
+  { 175302, true },
+  { 175311, true },
+  { 175320, true },
+  { 175338, true },
+  { 175356, true },
+  { 175367, true },
+  { 175378, false },
+  { 175389, true },
+  { 175397, true },
+  { 175405, false },
+  { 175413, true },
+  { 175421, true },
+  { 175437, true },
+  { 175443, true },
+  { 175456, true },
+  { 175467, true },
+  { 175479, true },
+  { 175498, true },
+  { 175524, true },
+  { 175538, true },
+  { 175552, true },
+  { 175567, true },
+  { 175580, true },
+  { 175592, true },
+  { 175605, true },
+  { 175617, true },
+  { 175627, false },
+  { 175645, true },
+  { 175661, true },
+  { 175676, true },
+  { 175687, true },
+  { 175704, true },
+  { 175716, true },
+  { 175727, true },
+  { 175746, true },
+  { 175762, true },
+  { 175774, true },
   { 175786, true },
-  { 175803, true },
+  { 175799, true },
   { 175811, true },
-  { 175833, true },
-  { 175844, true },
-  { 175854, true },
-  { 175864, true },
-  { 175876, false },
-  { 175887, true },
-  { 175896, true },
-  { 175907, true },
-  { 175925, true },
-  { 175944, true },
-  { 175960, true },
-  { 175973, true },
-  { 175986, true },
-  { 176002, true },
-  { 176029, true },
-  { 176041, true },
-  { 176051, true },
-  { 176066, true },
-  { 176074, true },
+  { 175828, true },
+  { 175835, true },
+  { 175848, true },
+  { 175865, true },
+  { 175873, true },
+  { 175895, true },
+  { 175906, true },
+  { 175916, true },
+  { 175926, true },
+  { 175938, false },
+  { 175949, true },
+  { 175958, true },
+  { 175969, true },
+  { 175987, true },
+  { 176006, true },
+  { 176022, true },
+  { 176035, true },
+  { 176048, true },
+  { 176064, true },
   { 176091, true },
-  { 176120, true },
-  { 176134, true },
-  { 176144, true },
-  { 176180, true },
-  { 176213, true },
-  { 176236, true },
-  { 176249, true },
-  { 176261, true },
-  { 176273, true },
-  { 176282, true },
-  { 176295, false },
-  { 176318, true },
-  { 176334, true },
-  { 176352, true },
-  { 176369, true },
-  { 176393, true },
-  { 176405, true },
+  { 176103, true },
+  { 176113, true },
+  { 176128, true },
+  { 176136, true },
+  { 176153, true },
+  { 176182, true },
+  { 176196, true },
+  { 176206, true },
+  { 176242, true },
+  { 176275, true },
+  { 176298, true },
+  { 176311, true },
+  { 176323, true },
+  { 176335, true },
+  { 176344, true },
+  { 176357, false },
+  { 176380, true },
+  { 176396, true },
   { 176414, true },
-  { 176423, true },
-  { 176432, true },
-  { 176444, true },
-  { 176453, true },
-  { 176461, true },
-  { 176472, true },
-  { 176497, true },
-  { 176508, true },
-  { 176521, true },
+  { 176431, true },
+  { 176455, true },
+  { 176467, true },
+  { 176476, true },
+  { 176485, true },
+  { 176494, true },
+  { 176506, true },
+  { 176515, true },
+  { 176523, true },
   { 176534, true },
-  { 176547, true },
-  { 176561, true },
-  { 176574, true },
-  { 176585, false },
+  { 176559, true },
+  { 176570, true },
+  { 176583, true },
   { 176596, true },
-  { 176604, true },
-  { 176612, true },
-  { 176627, true },
-  { 176635, true },
-  { 176643, true },
-  { 176655, true },
-  { 176663, true },
-  { 176676, false },
-  { 176687, true },
-  { 176702, true },
-  { 176732, true },
-  { 176752, false },
-  { 176760, true },
-  { 176778, true },
-  { 176788, true },
-  { 176808, true },
-  { 176828, false },
-  { 176841, true },
-  { 176852, true },
-  { 176875, true },
-  { 176901, true },
-  { 176911, true },
-  { 176924, true },
-  { 176940, true },
-  { 176955, false },
+  { 176609, true },
+  { 176623, true },
+  { 176636, true },
+  { 176647, false },
+  { 176658, true },
+  { 176666, true },
+  { 176674, true },
+  { 176689, true },
+  { 176697, true },
+  { 176705, true },
+  { 176717, true },
+  { 176725, true },
+  { 176738, false },
+  { 176749, true },
+  { 176764, true },
+  { 176794, true },
+  { 176814, false },
+  { 176822, true },
+  { 176840, true },
+  { 176850, true },
+  { 176870, true },
+  { 176890, false },
+  { 176903, true },
+  { 176914, true },
+  { 176937, true },
+  { 176963, true },
   { 176973, true },
-  { 176993, true },
-  { 177010, true },
-  { 177027, true },
-  { 177045, true },
-  { 177058, true },
-  { 177073, true },
-  { 177085, true },
-  { 177095, true },
-  { 177102, true },
-  { 177122, true },
-  { 177135, true },
-  { 177152, true },
+  { 176986, true },
+  { 177002, true },
+  { 177017, false },
+  { 177035, true },
+  { 177052, true },
+  { 177069, true },
+  { 177087, true },
+  { 177100, true },
+  { 177115, true },
+  { 177127, true },
+  { 177137, true },
+  { 177144, true },
   { 177164, true },
-  { 177178, true },
-  { 177190, true },
-  { 177205, true },
-  { 177223, true },
-  { 177236, true },
-  { 177249, true },
-  { 177260, true },
-  { 177271, true },
-  { 177288, true },
-  { 177299, true },
-  { 177314, true },
-  { 177325, true },
-  { 177337, true },
-  { 177349, false },
-  { 177361, true },
-  { 177371, true },
-  { 177384, false },
-  { 177402, true },
-  { 177412, false },
-  { 177423, true },
-  { 177438, true },
-  { 177455, true },
-  { 177472, true },
-  { 177489, true },
-  { 177500, true },
-  { 177510, true },
-  { 177525, true },
-  { 177535, true },
-  { 177550, true },
+  { 177177, true },
+  { 177194, true },
+  { 177206, true },
+  { 177220, true },
+  { 177232, true },
+  { 177247, true },
+  { 177265, true },
+  { 177278, true },
+  { 177291, true },
+  { 177302, true },
+  { 177313, true },
+  { 177330, true },
+  { 177341, true },
+  { 177356, true },
+  { 177367, true },
+  { 177379, true },
+  { 177391, false },
+  { 177403, true },
+  { 177413, true },
+  { 177426, false },
+  { 177444, true },
+  { 177454, false },
+  { 177465, true },
+  { 177480, true },
+  { 177497, true },
+  { 177514, true },
+  { 177531, true },
+  { 177542, true },
+  { 177552, true },
   { 177567, true },
-  { 177578, true },
-  { 177596, true },
-  { 177607, true },
-  { 177622, true },
-  { 177637, true },
-  { 177662, true },
-  { 177687, true },
-  { 177700, true },
-  { 177717, true },
+  { 177577, true },
+  { 177592, true },
+  { 177609, true },
+  { 177620, true },
+  { 177638, true },
+  { 177649, true },
+  { 177664, true },
+  { 177679, true },
+  { 177704, true },
   { 177729, true },
-  { 177749, true },
-  { 177770, true },
-  { 177784, true },
-  { 177801, true },
+  { 177742, true },
+  { 177759, true },
+  { 177771, true },
+  { 177791, true },
+  { 177812, true },
   { 177826, true },
-  { 177847, true },
-  { 177869, true },
-  { 177899, true },
-  { 177920, true },
+  { 177843, true },
+  { 177868, true },
+  { 177889, true },
+  { 177911, true },
   { 177941, true },
-  { 177965, true },
-  { 177980, true },
-  { 177990, true },
-  { 178013, true },
-  { 178024, true },
-  { 178031, true },
-  { 178050, true },
-  { 178059, true },
+  { 177962, true },
+  { 177983, true },
+  { 178007, true },
+  { 178022, true },
+  { 178032, true },
+  { 178055, true },
   { 178066, true },
-  { 178077, true },
-  { 178096, true },
-  { 178113, true },
-  { 178126, true },
-  { 178135, true },
-  { 178145, true },
-  { 178156, true },
-  { 178166, true },
+  { 178073, true },
+  { 178092, true },
+  { 178101, true },
+  { 178108, true },
+  { 178119, true },
+  { 178138, true },
+  { 178155, true },
+  { 178168, true },
   { 178177, true },
-  { 178189, true },
-  { 178205, true },
-  { 178215, true },
-  { 178229, true },
-  { 178237, true },
+  { 178187, true },
+  { 178198, true },
+  { 178208, true },
+  { 178219, true },
+  { 178231, true },
   { 178247, true },
   { 178257, true },
-  { 178269, true },
-  { 178280, true },
-  { 178294, true },
-  { 178309, true },
-  { 178333, true },
-  { 178349, true },
-  { 178363, true },
-  { 178388, true },
-  { 178396, true },
-  { 178414, true },
-  { 178427, true },
+  { 178271, true },
+  { 178279, true },
+  { 178289, true },
+  { 178299, true },
+  { 178311, true },
+  { 178322, true },
+  { 178336, true },
+  { 178351, true },
+  { 178375, true },
+  { 178391, true },
+  { 178405, true },
+  { 178430, true },
   { 178438, true },
-  { 178453, true },
-  { 178472, true },
-  { 178493, true },
-  { 178505, true },
-  { 178516, true },
-  { 178531, true },
-  { 178545, true },
-  { 178561, true },
-  { 178579, true },
-  { 178591, true },
-  { 178609, true },
+  { 178456, true },
+  { 178469, true },
+  { 178480, true },
+  { 178495, true },
+  { 178514, true },
+  { 178535, true },
+  { 178547, true },
+  { 178558, true },
+  { 178573, true },
+  { 178587, true },
+  { 178603, true },
   { 178621, true },
-  { 178638, true },
-  { 178652, true },
-  { 178667, true },
-  { 178681, true },
-  { 178695, true },
-  { 178706, true },
+  { 178633, true },
+  { 178651, true },
+  { 178663, true },
+  { 178680, true },
+  { 178694, true },
+  { 178709, true },
   { 178723, true },
-  { 178733, true },
-  { 178742, true },
-  { 178755, true },
-  { 178764, true },
-  { 178782, true },
-  { 178793, true },
-  { 178805, true },
-  { 178826, true },
-  { 178833, true },
-  { 178844, true },
-  { 178861, false },
-  { 178887, false },
-  { 178899, true },
-  { 178912, true },
-  { 178931, true },
-  { 178948, true },
-  { 178959, true },
-  { 178976, true },
-  { 178986, true },
-  { 178999, true },
-  { 179014, true },
-  { 179035, true },
-  { 179051, true },
-  { 179075, true },
-  { 179089, true },
-  { 179100, true },
-  { 179114, true },
+  { 178737, true },
+  { 178748, true },
+  { 178765, true },
+  { 178775, true },
+  { 178784, true },
+  { 178797, true },
+  { 178806, true },
+  { 178824, true },
+  { 178835, true },
+  { 178847, true },
+  { 178868, true },
+  { 178875, true },
+  { 178886, true },
+  { 178903, false },
+  { 178929, false },
+  { 178941, true },
+  { 178954, true },
+  { 178973, true },
+  { 178990, true },
+  { 179001, true },
+  { 179018, true },
+  { 179028, true },
+  { 179041, true },
+  { 179056, true },
+  { 179077, true },
+  { 179093, true },
+  { 179117, true },
   { 179131, true },
-  { 179148, true },
-  { 179158, true },
+  { 179142, true },
+  { 179156, true },
   { 179173, true },
-  { 179185, true },
+  { 179190, true },
   { 179200, true },
-  { 179210, true },
-  { 179223, true },
-  { 179236, true },
-  { 179249, true },
-  { 179263, true },
-  { 179283, true },
+  { 179215, true },
+  { 179227, true },
+  { 179242, true },
+  { 179252, true },
+  { 179265, true },
+  { 179278, true },
+  { 179291, true },
   { 179305, true },
-  { 179319, true },
-  { 179334, false },
+  { 179325, true },
   { 179347, true },
-  { 179362, true },
-  { 179373, true },
-  { 179393, true },
-  { 179409, true },
-  { 179428, true },
-  { 179442, true },
-  { 179461, true },
-  { 179482, true },
-  { 179493, true },
-  { 179509, true },
-  { 179528, true },
-  { 179536, true },
-  { 179544, true },
-  { 179555, true },
-  { 179569, true },
+  { 179361, true },
+  { 179376, false },
+  { 179389, true },
+  { 179404, true },
+  { 179415, true },
+  { 179435, true },
+  { 179451, true },
+  { 179470, true },
+  { 179484, true },
+  { 179503, true },
+  { 179524, true },
+  { 179535, true },
+  { 179551, true },
+  { 179570, true },
+  { 179578, true },
   { 179586, true },
-  { 179595, true },
+  { 179597, true },
   { 179611, true },
-  { 179626, true },
+  { 179628, true },
   { 179637, true },
-  { 179648, true },
-  { 179660, true },
-  { 179671, true },
-  { 179681, true },
-  { 179692, true },
+  { 179653, true },
+  { 179668, true },
+  { 179679, true },
+  { 179690, true },
   { 179702, true },
   { 179713, true },
   { 179723, true },
   { 179734, true },
-  { 179741, true },
-  { 179759, true },
-  { 179771, true },
-  { 179781, true },
-  { 179792, true },
-  { 179814, true },
-  { 179828, true },
-  { 179847, true },
-  { 179855, true },
-  { 179874, true },
+  { 179744, true },
+  { 179755, true },
+  { 179765, true },
+  { 179776, true },
+  { 179783, true },
+  { 179801, true },
+  { 179813, true },
+  { 179823, true },
+  { 179834, true },
+  { 179856, true },
+  { 179870, true },
   { 179889, true },
-  { 179911, true },
-  { 179920, true },
-  { 179932, true },
-  { 179950, true },
-  { 179964, true },
-  { 179976, true },
-  { 179987, true },
-  { 179998, true },
-  { 180017, true },
-  { 180027, true },
-  { 180039, true },
-  { 180048, true },
-  { 180064, true },
-  { 180072, true },
-  { 180084, true },
-  { 180099, true },
-  { 180119, true },
-  { 180127, true },
-  { 180140, true },
-  { 180157, true },
-  { 180166, true },
-  { 180184, true },
-  { 180196, true },
-  { 180215, true },
-  { 180229, true },
-  { 180249, true },
-  { 180272, true },
-  { 180285, true },
-  { 180295, true },
-  { 180307, true },
-  { 180331, true },
-  { 180354, true },
-  { 180368, true },
-  { 180385, true },
-  { 180401, true },
-  { 180418, true },
-  { 180433, true },
-  { 180448, true },
-  { 180467, true },
-  { 180483, true },
+  { 179897, true },
+  { 179916, true },
+  { 179931, true },
+  { 179953, true },
+  { 179962, true },
+  { 179974, true },
+  { 179992, true },
+  { 180006, true },
+  { 180018, true },
+  { 180029, true },
+  { 180040, true },
+  { 180059, true },
+  { 180069, true },
+  { 180081, true },
+  { 180090, true },
+  { 180106, true },
+  { 180114, true },
+  { 180126, true },
+  { 180141, true },
+  { 180161, true },
+  { 180169, true },
+  { 180182, true },
+  { 180199, true },
+  { 180208, true },
+  { 180226, true },
+  { 180238, true },
+  { 180257, true },
+  { 180271, true },
+  { 180291, true },
+  { 180314, true },
+  { 180327, true },
+  { 180337, true },
+  { 180349, true },
+  { 180373, true },
+  { 180389, true },
+  { 180412, true },
+  { 180426, true },
+  { 180443, true },
+  { 180459, true },
+  { 180476, true },
   { 180491, true },
-  { 180509, true },
-  { 180518, false },
-  { 180527, true },
-  { 180539, true },
-  { 180553, true },
+  { 180506, true },
+  { 180525, true },
+  { 180541, true },
+  { 180549, true },
   { 180567, true },
-  { 180577, true },
-  { 180588, true },
-  { 180601, true },
-  { 180610, true },
-  { 180633, true },
-  { 180641, true },
-  { 180653, true },
-  { 180663, false },
-  { 180672, true },
-  { 180679, true },
-  { 180687, true },
-  { 180696, false },
-  { 180710, true },
-  { 180724, true },
-  { 180734, true },
-  { 180744, true },
-  { 180754, true },
-  { 180766, true },
-  { 180779, true },
-  { 180791, true },
-  { 180803, true },
-  { 180817, true },
-  { 180835, false },
-  { 180848, true },
-  { 180863, true },
-  { 180877, true },
-  { 180895, true },
-  { 180905, true },
-  { 180916, true },
-  { 180934, true },
-  { 180946, true },
-  { 180959, true },
-  { 180973, true },
-  { 180987, true },
-  { 180997, true },
-  { 181010, true },
-  { 181020, true },
+  { 180576, false },
+  { 180585, true },
+  { 180597, true },
+  { 180611, true },
+  { 180625, true },
+  { 180635, true },
+  { 180646, true },
+  { 180659, true },
+  { 180668, true },
+  { 180691, true },
+  { 180699, true },
+  { 180711, true },
+  { 180721, false },
+  { 180730, true },
+  { 180737, true },
+  { 180745, true },
+  { 180754, false },
+  { 180768, true },
+  { 180782, true },
+  { 180792, true },
+  { 180802, true },
+  { 180812, true },
+  { 180824, true },
+  { 180837, true },
+  { 180849, true },
+  { 180861, true },
+  { 180875, true },
+  { 180893, false },
+  { 180906, true },
+  { 180921, true },
+  { 180935, true },
+  { 180953, true },
+  { 180963, true },
+  { 180974, true },
+  { 180992, true },
+  { 181004, true },
+  { 181017, true },
   { 181031, true },
-  { 181040, true },
-  { 181057, true },
+  { 181045, true },
+  { 181055, true },
   { 181068, true },
-  { 181077, true },
-  { 181090, true },
-  { 181101, true },
-  { 181119, true },
-  { 181129, true },
-  { 181139, true },
-  { 181151, true },
-  { 181163, true },
-  { 181174, true },
-  { 181190, true },
-  { 181207, true },
-  { 181220, true },
-  { 181234, true },
-  { 181243, true },
-  { 181256, true },
-  { 181273, false },
-  { 181284, true },
-  { 181300, true },
-  { 181316, false },
+  { 181078, true },
+  { 181089, true },
+  { 181098, true },
+  { 181115, true },
+  { 181126, true },
+  { 181135, true },
+  { 181148, true },
+  { 181159, true },
+  { 181177, true },
+  { 181187, true },
+  { 181197, true },
+  { 181209, true },
+  { 181221, true },
+  { 181232, true },
+  { 181248, true },
+  { 181265, true },
+  { 181278, true },
+  { 181292, true },
+  { 181301, true },
+  { 181314, true },
   { 181331, false },
-  { 181342, false },
-  { 181349, true },
-  { 181365, true },
-  { 181383, true },
-  { 181402, true },
-  { 181417, true },
-  { 181434, true },
-  { 181450, true },
-  { 181471, true },
-  { 181485, true },
-  { 181502, true },
-  { 181527, true },
-  { 181548, true },
-  { 181567, true },
-  { 181582, false },
-  { 181596, true },
-  { 181610, true },
-  { 181623, true },
-  { 181644, true },
-  { 181656, true },
+  { 181342, true },
+  { 181358, true },
+  { 181374, false },
+  { 181389, false },
+  { 181400, false },
+  { 181407, true },
+  { 181423, true },
+  { 181441, true },
+  { 181460, true },
+  { 181475, true },
+  { 181492, true },
+  { 181508, true },
+  { 181529, true },
+  { 181543, true },
+  { 181560, true },
+  { 181585, true },
+  { 181606, true },
+  { 181625, true },
+  { 181640, false },
+  { 181654, true },
   { 181668, true },
   { 181681, true },
-  { 181691, true },
-  { 181711, true },
-  { 181724, true },
-  { 181743, true },
-  { 181759, true },
-  { 181777, true },
-  { 181791, false },
-  { 181803, true },
-  { 181813, true },
-  { 181827, true },
-  { 181837, true },
-  { 181853, true },
-  { 181879, true },
-  { 181907, true },
-  { 181920, true },
-  { 181936, true },
-  { 181960, true },
-  { 181976, true },
-  { 181991, true },
-  { 182003, true },
-  { 182015, true },
-  { 182027, false },
-  { 182045, true },
-  { 182058, true },
-  { 182077, true },
-  { 182095, true },
-  { 182110, true },
-  { 182133, true },
-  { 182150, true },
-  { 182169, true },
-  { 182189, true },
-  { 182212, true },
-  { 182231, true },
-  { 182250, true },
-  { 182269, true },
-  { 182287, true },
-  { 182306, true },
-  { 182317, true },
+  { 181702, true },
+  { 181714, true },
+  { 181726, true },
+  { 181739, true },
+  { 181749, true },
+  { 181769, true },
+  { 181782, true },
+  { 181801, true },
+  { 181817, true },
+  { 181835, true },
+  { 181849, false },
+  { 181861, true },
+  { 181871, true },
+  { 181885, true },
+  { 181895, true },
+  { 181911, true },
+  { 181937, true },
+  { 181965, true },
+  { 181978, true },
+  { 181994, true },
+  { 182018, true },
+  { 182034, true },
+  { 182049, true },
+  { 182061, true },
+  { 182073, true },
+  { 182085, false },
+  { 182103, true },
+  { 182116, true },
+  { 182135, true },
+  { 182153, true },
+  { 182168, true },
+  { 182191, true },
+  { 182208, true },
+  { 182227, true },
+  { 182247, true },
+  { 182270, true },
+  { 182289, true },
+  { 182308, true },
   { 182327, true },
-  { 182342, true },
-  { 182362, true },
-  { 182383, true },
-  { 182403, true },
-  { 182422, true },
-  { 182436, true },
-  { 182460, true },
-  { 182475, true },
-  { 182489, true },
-  { 182499, true },
-  { 182519, true },
-  { 182549, true },
-  { 182572, true },
-  { 182595, true },
-  { 182624, true },
-  { 182642, true },
-  { 182658, true },
-  { 182677, true },
-  { 182689, true },
-  { 182699, true },
-  { 182719, false },
-  { 182731, true },
-  { 182744, true },
-  { 182762, true },
-  { 182779, true },
-  { 182797, true },
-  { 182817, true },
-  { 182832, true },
-  { 182845, true },
-  { 182857, true },
-  { 182868, true },
-  { 182880, true },
-  { 182892, true },
-  { 182905, true },
-  { 182923, true },
-  { 182938, true },
-  { 182953, true },
-  { 182967, true },
-  { 182987, true },
-  { 182998, true },
-  { 183010, true },
+  { 182345, true },
+  { 182364, true },
+  { 182375, true },
+  { 182385, true },
+  { 182400, true },
+  { 182420, true },
+  { 182441, true },
+  { 182461, true },
+  { 182480, true },
+  { 182494, true },
+  { 182518, true },
+  { 182533, true },
+  { 182547, true },
+  { 182557, true },
+  { 182577, true },
+  { 182607, true },
+  { 182630, true },
+  { 182653, true },
+  { 182682, true },
+  { 182700, true },
+  { 182716, true },
+  { 182735, true },
+  { 182747, true },
+  { 182757, true },
+  { 182777, false },
+  { 182789, true },
+  { 182802, true },
+  { 182820, true },
+  { 182837, true },
+  { 182855, true },
+  { 182875, true },
+  { 182890, true },
+  { 182899, true },
+  { 182912, true },
+  { 182924, true },
+  { 182935, true },
+  { 182947, true },
+  { 182959, true },
+  { 182972, true },
+  { 182990, true },
+  { 183005, true },
   { 183020, true },
   { 183034, true },
   { 183054, true },
-  { 183068, true },
-  { 183086, true },
-  { 183099, true },
-  { 183114, true },
-  { 183130, true },
-  { 183145, true },
-  { 183157, true },
-  { 183172, true },
-  { 183188, true },
-  { 183198, true },
-  { 183205, true },
-  { 183220, true },
-  { 183233, true },
-  { 183253, true },
+  { 183065, true },
+  { 183077, true },
+  { 183087, true },
+  { 183101, true },
+  { 183121, true },
+  { 183135, true },
+  { 183153, true },
+  { 183166, true },
+  { 183181, true },
+  { 183197, true },
+  { 183212, true },
+  { 183224, true },
+  { 183239, true },
+  { 183255, true },
   { 183265, true },
-  { 183276, true },
-  { 183289, true },
-  { 183298, true },
-  { 183318, true },
-  { 183338, true },
-  { 183361, true },
-  { 183381, true },
-  { 183395, true },
-  { 183407, true },
-  { 183418, true },
+  { 183272, true },
+  { 183287, true },
+  { 183300, true },
+  { 183320, true },
+  { 183332, true },
+  { 183343, true },
+  { 183356, true },
+  { 183365, true },
+  { 183385, true },
+  { 183405, true },
   { 183428, true },
-  { 183439, false },
-  { 183450, true },
-  { 183461, true },
-  { 183472, false },
-  { 183482, false },
-  { 183499, true },
-  { 183511, true },
-  { 183527, true },
-  { 183540, true },
-  { 183549, true },
-  { 183563, true },
-  { 183574, true },
-  { 183586, true },
-  { 183595, true },
-  { 183613, true },
-  { 183627, true },
-  { 183638, true },
-  { 183649, true },
+  { 183448, true },
+  { 183462, true },
+  { 183474, true },
+  { 183485, true },
+  { 183495, true },
+  { 183506, false },
+  { 183517, true },
+  { 183528, true },
+  { 183539, false },
+  { 183549, false },
+  { 183566, true },
+  { 183578, true },
+  { 183594, true },
+  { 183607, true },
+  { 183616, true },
+  { 183630, true },
+  { 183641, true },
+  { 183653, true },
   { 183662, true },
-  { 183675, true },
-  { 183684, true },
-  { 183699, true },
-  { 183710, true },
-  { 183728, true },
-  { 183748, true },
-  { 183760, true },
-  { 183770, true },
-  { 183781, true },
-  { 183814, true },
-  { 183826, true },
-  { 183840, true },
-  { 183854, true },
-  { 183869, true },
-  { 183883, true },
-  { 183897, false },
-  { 183917, true },
-  { 183934, true },
-  { 183947, true },
-  { 183962, true },
-  { 183978, true },
-  { 183997, true },
-  { 184015, true },
-  { 184031, true },
-  { 184048, true },
-  { 184060, true },
-  { 184073, true },
-  { 184086, true },
-  { 184100, true },
-  { 184113, true },
-  { 184126, true },
-  { 184142, true },
-  { 184156, true },
-  { 184169, true },
-  { 184182, true },
-  { 184195, true },
-  { 184208, true },
-  { 184221, true },
+  { 183680, true },
+  { 183694, true },
+  { 183705, true },
+  { 183716, true },
+  { 183729, true },
+  { 183742, true },
+  { 183751, true },
+  { 183766, true },
+  { 183777, true },
+  { 183795, true },
+  { 183815, true },
+  { 183827, true },
+  { 183837, true },
+  { 183848, true },
+  { 183881, true },
+  { 183893, true },
+  { 183907, true },
+  { 183921, true },
+  { 183936, true },
+  { 183950, true },
+  { 183964, false },
+  { 183984, true },
+  { 184001, true },
+  { 184014, true },
+  { 184029, true },
+  { 184045, true },
+  { 184064, true },
+  { 184082, true },
+  { 184098, true },
+  { 184115, true },
+  { 184127, true },
+  { 184140, true },
+  { 184153, true },
+  { 184167, true },
+  { 184180, true },
+  { 184193, true },
+  { 184209, true },
+  { 184223, true },
   { 184236, true },
   { 184249, true },
-  { 184263, true },
-  { 184276, true },
-  { 184290, true },
+  { 184262, true },
+  { 184275, true },
+  { 184288, true },
   { 184303, true },
   { 184316, true },
-  { 184329, true },
-  { 184342, true },
-  { 184355, true },
-  { 184367, true },
-  { 184374, true },
-  { 184391, true },
-  { 184404, true },
-  { 184413, true },
-  { 184424, true },
-  { 184433, true },
-  { 184446, true },
-  { 184477, true },
-  { 184494, true },
-  { 184507, true },
-  { 184520, true },
-  { 184536, true },
-  { 184549, true },
-  { 184562, true },
-  { 184573, true },
-  { 184582, true },
-  { 184597, true },
-  { 184609, true },
-  { 184625, true },
-  { 184650, true },
-  { 184674, true },
-  { 184695, true },
-  { 184712, false },
-  { 184725, true },
-  { 184739, true },
-  { 184752, true },
-  { 184763, true },
-  { 184780, true },
-  { 184791, true },
-  { 184810, true },
-  { 184828, false },
-  { 184840, true },
-  { 184853, true },
-  { 184863, true },
-  { 184899, true },
-  { 184912, true },
-  { 184926, true },
-  { 184939, true },
-  { 184948, true },
-  { 184956, false },
+  { 184330, true },
+  { 184343, true },
+  { 184357, true },
+  { 184370, true },
+  { 184383, true },
+  { 184396, true },
+  { 184409, true },
+  { 184422, true },
+  { 184434, true },
+  { 184441, true },
+  { 184458, true },
+  { 184471, true },
+  { 184480, true },
+  { 184491, true },
+  { 184500, true },
+  { 184513, true },
+  { 184544, true },
+  { 184561, true },
+  { 184574, true },
+  { 184587, true },
+  { 184603, true },
+  { 184616, true },
+  { 184629, true },
+  { 184640, true },
+  { 184649, true },
+  { 184664, true },
+  { 184676, true },
+  { 184692, true },
+  { 184717, true },
+  { 184741, true },
+  { 184762, true },
+  { 184779, false },
+  { 184792, true },
+  { 184806, true },
+  { 184819, true },
+  { 184830, true },
+  { 184847, true },
+  { 184858, true },
+  { 184877, true },
+  { 184895, false },
+  { 184907, true },
+  { 184920, true },
+  { 184930, true },
   { 184966, true },
-  { 184980, true },
-  { 184992, true },
-  { 185010, true },
-  { 185024, true },
-  { 185042, true },
-  { 185063, true },
-  { 185083, true },
-  { 185106, true },
-  { 185122, true },
-  { 185139, true },
-  { 185153, true },
-  { 185169, true },
-  { 185182, true },
-  { 185203, true },
-  { 185223, true },
-  { 185237, true },
-  { 185247, true },
-  { 185260, true },
-  { 185269, true },
-  { 185303, true },
-  { 185320, true },
-  { 185331, true },
-  { 185342, true },
-  { 185354, true },
-  { 185368, true },
-  { 185379, true },
+  { 184979, true },
+  { 184993, true },
+  { 185006, true },
+  { 185015, true },
+  { 185023, false },
+  { 185033, true },
+  { 185047, true },
+  { 185059, true },
+  { 185077, true },
+  { 185091, true },
+  { 185109, true },
+  { 185130, true },
+  { 185150, true },
+  { 185173, true },
+  { 185189, true },
+  { 185206, true },
+  { 185220, true },
+  { 185236, true },
+  { 185249, true },
+  { 185270, true },
+  { 185290, true },
+  { 185304, true },
+  { 185314, true },
+  { 185327, true },
+  { 185336, true },
+  { 185370, true },
+  { 185387, true },
   { 185398, true },
-  { 185411, true },
-  { 185423, true },
-  { 185436, true },
-  { 185452, true },
-  { 185471, true },
-  { 185486, true },
-  { 185500, true },
-  { 185515, true },
-  { 185532, false },
-  { 185547, true },
+  { 185409, true },
+  { 185421, true },
+  { 185435, true },
+  { 185446, true },
+  { 185465, true },
+  { 185478, true },
+  { 185490, true },
+  { 185503, true },
+  { 185519, true },
+  { 185538, true },
+  { 185553, true },
   { 185567, true },
-  { 185578, true },
-  { 185598, false },
-  { 185607, true },
-  { 185616, true },
-  { 185627, true },
-  { 185639, true },
-  { 185653, true },
-  { 185666, true },
-  { 185684, true },
-  { 185696, true },
-  { 185711, true },
-  { 185723, true },
-  { 185734, false },
+  { 185582, true },
+  { 185599, false },
+  { 185614, true },
+  { 185634, true },
+  { 185645, true },
+  { 185665, false },
+  { 185674, true },
+  { 185683, true },
+  { 185694, true },
+  { 185706, true },
+  { 185720, true },
+  { 185733, true },
   { 185751, true },
-  { 185761, true },
-  { 185782, true },
-  { 185810, false },
-  { 185821, true },
-  { 185841, true },
-  { 185848, true },
-  { 185859, true },
-  { 185869, true },
-  { 185879, true },
-  { 185893, true },
-  { 185907, false },
-  { 185918, true },
-  { 185926, false },
+  { 185763, true },
+  { 185778, true },
+  { 185790, true },
+  { 185801, false },
+  { 185818, true },
+  { 185828, true },
+  { 185849, true },
+  { 185877, false },
+  { 185888, true },
+  { 185908, true },
+  { 185915, true },
+  { 185926, true },
+  { 185936, true },
   { 185946, true },
-  { 185959, true },
-  { 185975, true },
-  { 185990, true },
-  { 186006, true },
-  { 186020, true },
-  { 186035, true },
-  { 186048, true },
-  { 186064, true },
-  { 186077, true },
-  { 186086, true },
-  { 186106, true },
-  { 186119, true },
-  { 186138, true },
-  { 186156, true },
-  { 186166, true },
-  { 186180, true },
-  { 186198, true },
-  { 186206, true },
-  { 186226, true },
-  { 186250, true },
-  { 186282, true },
-  { 186296, true },
-  { 186311, true },
-  { 186330, true },
-  { 186349, true },
-  { 186366, true },
-  { 186383, true },
-  { 186396, true },
-  { 186411, true },
-  { 186432, true },
-  { 186453, true },
-  { 186467, true },
-  { 186483, true },
-  { 186508, true },
-  { 186520, true },
+  { 185960, true },
+  { 185974, true },
+  { 185985, false },
+  { 185996, true },
+  { 186004, false },
+  { 186024, true },
+  { 186037, true },
+  { 186053, true },
+  { 186068, true },
+  { 186084, true },
+  { 186098, true },
+  { 186113, true },
+  { 186126, true },
+  { 186142, true },
+  { 186155, true },
+  { 186164, true },
+  { 186184, true },
+  { 186197, true },
+  { 186216, true },
+  { 186234, true },
+  { 186244, true },
+  { 186258, true },
+  { 186276, true },
+  { 186284, true },
+  { 186304, true },
+  { 186328, true },
+  { 186360, true },
+  { 186374, true },
+  { 186389, true },
+  { 186408, true },
+  { 186427, true },
+  { 186444, true },
+  { 186461, true },
+  { 186474, true },
+  { 186489, true },
+  { 186510, true },
   { 186531, true },
-  { 186548, true },
-  { 186572, true },
-  { 186581, true },
-  { 186595, true },
-  { 186608, true },
-  { 186621, true },
-  { 186633, true },
-  { 186646, true },
-  { 186663, true },
-  { 186688, true },
-  { 186701, true },
-  { 186716, true },
-  { 186728, true },
-  { 186742, true },
-  { 186756, true },
-  { 186773, true },
-  { 186793, true },
-  { 186809, true },
-  { 186827, true },
-  { 186838, true },
-  { 186853, true },
-  { 186866, true },
-  { 186881, true },
-  { 186889, false },
-  { 186902, true },
-  { 186914, true },
-  { 186929, true },
-  { 186943, true },
-  { 186957, true },
-  { 186966, true },
-  { 186975, true },
-  { 186991, true },
+  { 186545, true },
+  { 186561, true },
+  { 186586, true },
+  { 186598, true },
+  { 186609, true },
+  { 186626, true },
+  { 186650, true },
+  { 186659, true },
+  { 186673, true },
+  { 186686, true },
+  { 186699, true },
+  { 186711, true },
+  { 186724, true },
+  { 186741, true },
+  { 186766, true },
+  { 186779, true },
+  { 186794, true },
+  { 186806, true },
+  { 186820, true },
+  { 186834, true },
+  { 186851, true },
+  { 186871, true },
+  { 186887, true },
+  { 186905, true },
+  { 186916, true },
+  { 186931, true },
+  { 186944, true },
+  { 186959, true },
+  { 186967, false },
+  { 186980, true },
+  { 186992, true },
   { 187007, true },
-  { 187029, true },
-  { 187046, true },
-  { 187060, true },
-  { 187070, true },
-  { 187084, true },
-  { 187102, true },
-  { 187119, true },
+  { 187021, true },
+  { 187035, true },
+  { 187044, true },
+  { 187053, true },
+  { 187069, true },
+  { 187085, true },
+  { 187107, true },
+  { 187124, true },
   { 187138, true },
-  { 187155, true },
-  { 187173, true },
-  { 187191, true },
-  { 187204, true },
-  { 187212, true },
-  { 187219, true },
-  { 187231, true },
-  { 187242, true },
-  { 187258, true },
-  { 187268, true },
-  { 187281, true },
-  { 187293, true },
-  { 187306, true },
+  { 187148, true },
+  { 187162, true },
+  { 187180, true },
+  { 187197, true },
+  { 187216, true },
+  { 187233, true },
+  { 187251, true },
+  { 187269, true },
+  { 187282, true },
+  { 187290, true },
+  { 187297, true },
+  { 187309, true },
   { 187320, true },
   { 187336, true },
-  { 187349, true },
-  { 187363, true },
-  { 187380, true },
-  { 187391, true },
-  { 187401, true },
-  { 187421, true },
-  { 187433, true },
-  { 187447, true },
-  { 187462, true },
-  { 187474, true },
-  { 187483, true },
-  { 187491, true },
-  { 187503, true },
-  { 187514, true },
-  { 187528, true },
-  { 187549, true },
-  { 187568, true },
-  { 187586, true },
-  { 187605, true },
-  { 187623, true },
-  { 187632, true },
-  { 187644, true },
-  { 187666, true },
-  { 187684, true },
-  { 187697, true },
-  { 187711, true },
-  { 187730, true },
-  { 187743, true },
-  { 187755, true },
-  { 187767, true },
-  { 187778, true },
-  { 187792, true },
-  { 187806, false },
+  { 187346, true },
+  { 187359, true },
+  { 187371, true },
+  { 187384, true },
+  { 187398, true },
+  { 187414, true },
+  { 187427, true },
+  { 187441, true },
+  { 187458, true },
+  { 187469, true },
+  { 187479, true },
+  { 187499, true },
+  { 187511, true },
+  { 187525, true },
+  { 187540, true },
+  { 187552, true },
+  { 187561, true },
+  { 187569, true },
+  { 187581, true },
+  { 187592, true },
+  { 187606, true },
+  { 187627, true },
+  { 187646, true },
+  { 187664, true },
+  { 187683, true },
+  { 187701, true },
+  { 187710, true },
+  { 187722, true },
+  { 187744, true },
+  { 187762, true },
+  { 187775, true },
+  { 187789, true },
+  { 187808, true },
   { 187821, true },
-  { 187841, true },
-  { 187854, true },
-  { 187871, true },
-  { 187882, true },
-  { 187893, true },
-  { 187907, true },
-  { 187928, true },
-  { 187944, true },
-  { 187955, true },
-  { 187974, true },
-  { 187990, true },
-  { 188008, true },
-  { 188024, true },
-  { 188047, true },
-  { 188063, true },
-  { 188077, true },
-  { 188089, true },
-  { 188098, true },
-  { 188111, true },
-  { 188129, true },
-  { 188144, true },
-  { 188160, true },
-  { 188175, true },
-  { 188191, true },
-  { 188206, true },
-  { 188221, true },
-  { 188237, true },
-  { 188252, true },
-  { 188267, true },
+  { 187833, true },
+  { 187845, true },
+  { 187856, true },
+  { 187870, true },
+  { 187884, false },
+  { 187899, true },
+  { 187919, true },
+  { 187932, true },
+  { 187949, true },
+  { 187960, true },
+  { 187971, true },
+  { 187985, true },
+  { 188006, true },
+  { 188022, true },
+  { 188033, true },
+  { 188052, true },
+  { 188068, true },
+  { 188086, true },
+  { 188102, true },
+  { 188125, true },
+  { 188141, true },
+  { 188155, true },
+  { 188167, true },
+  { 188176, true },
+  { 188189, true },
+  { 188207, true },
+  { 188222, true },
+  { 188238, true },
+  { 188253, true },
+  { 188269, true },
   { 188284, true },
-  { 188294, true },
-  { 188304, true },
-  { 188317, true },
+  { 188299, true },
+  { 188315, true },
   { 188330, true },
-  { 188340, true },
-  { 188361, true },
-  { 188373, false },
-  { 188384, true },
-  { 188398, true },
-  { 188410, true },
-  { 188419, false },
-  { 188438, true },
-  { 188455, true },
-  { 188468, true },
-  { 188483, true },
-  { 188499, true },
-  { 188513, true },
-  { 188527, false },
-  { 188537, true },
-  { 188550, true },
-  { 188560, true },
-  { 188570, false },
-  { 188579, false },
-  { 188587, true },
-  { 188595, false },
+  { 188345, true },
+  { 188362, true },
+  { 188372, true },
+  { 188382, true },
+  { 188395, true },
+  { 188408, true },
+  { 188418, true },
+  { 188439, true },
+  { 188451, false },
+  { 188462, true },
+  { 188476, true },
+  { 188488, true },
+  { 188497, false },
+  { 188516, true },
+  { 188533, true },
+  { 188546, true },
+  { 188561, true },
+  { 188577, true },
+  { 188591, true },
+  { 188605, false },
   { 188615, true },
   { 188628, true },
-  { 188646, true },
-  { 188658, false },
-  { 188670, true },
-  { 188684, true },
-  { 188701, true },
-  { 188715, true },
-  { 188732, true },
+  { 188638, true },
+  { 188648, false },
+  { 188657, false },
+  { 188665, true },
+  { 188673, false },
+  { 188693, true },
+  { 188706, true },
+  { 188724, true },
+  { 188736, false },
   { 188748, true },
-  { 188767, true },
-  { 188783, true },
-  { 188800, true },
-  { 188820, true },
-  { 188843, true },
-  { 188869, true },
-  { 188882, true },
-  { 188896, true },
-  { 188910, true },
-  { 188924, true },
-  { 188945, true },
-  { 188959, true },
-  { 188975, true },
+  { 188762, true },
+  { 188779, true },
+  { 188793, true },
+  { 188810, true },
+  { 188826, true },
+  { 188845, true },
+  { 188861, true },
+  { 188878, true },
+  { 188898, true },
+  { 188921, true },
+  { 188947, true },
+  { 188960, true },
+  { 188974, true },
   { 188988, true },
-  { 189005, true },
-  { 189034, true },
-  { 189045, true },
-  { 189059, true },
-  { 189078, false },
-  { 189100, true },
-  { 189115, true },
+  { 189002, true },
+  { 189023, true },
+  { 189037, true },
+  { 189053, true },
+  { 189066, true },
+  { 189083, true },
+  { 189112, true },
   { 189123, true },
-  { 189135, true },
-  { 189148, true },
-  { 189161, true },
-  { 189174, false },
-  { 189185, true },
-  { 189196, true },
-  { 189214, true },
-  { 189233, true },
-  { 189249, true },
-  { 189265, true },
+  { 189137, true },
+  { 189156, false },
+  { 189178, true },
+  { 189193, true },
+  { 189201, true },
+  { 189213, true },
+  { 189226, true },
+  { 189239, true },
+  { 189252, false },
+  { 189263, true },
   { 189274, true },
-  { 189288, false },
-  { 189302, true },
-  { 189320, true },
-  { 189338, true },
-  { 189355, true },
+  { 189292, true },
+  { 189311, true },
+  { 189327, true },
+  { 189343, true },
+  { 189352, true },
   { 189366, false },
-  { 189382, false },
-  { 189406, true },
-  { 189420, true },
-  { 189435, true },
-  { 189462, true },
-  { 189477, true },
-  { 189502, true },
-  { 189521, true },
-  { 189531, true },
-  { 189576, true },
-  { 189621, true },
-  { 189629, true },
-  { 189641, true },
-  { 189653, true },
-  { 189667, true },
-  { 189692, true },
-  { 189709, true },
-  { 189726, true },
-  { 189741, true },
-  { 189753, true },
-  { 189765, true },
-  { 189778, true },
-  { 189786, true },
+  { 189380, true },
+  { 189398, true },
+  { 189416, true },
+  { 189433, true },
+  { 189444, false },
+  { 189460, false },
+  { 189484, true },
+  { 189498, true },
+  { 189513, true },
+  { 189540, true },
+  { 189555, true },
+  { 189580, true },
+  { 189599, true },
+  { 189609, true },
+  { 189654, true },
+  { 189699, true },
+  { 189707, true },
+  { 189719, true },
+  { 189731, true },
+  { 189745, true },
+  { 189770, true },
+  { 189787, true },
   { 189804, true },
-  { 189813, false },
-  { 189821, true },
-  { 189833, true },
-  { 189854, true },
-  { 189867, true },
-  { 189880, true },
-  { 189892, true },
-  { 189904, true },
-  { 189917, false },
-  { 189930, true },
-  { 189946, true },
-  { 189960, true },
-  { 189978, true },
-  { 189999, true },
-  { 190020, true },
-  { 190039, true },
-  { 190064, true },
-  { 190073, true },
-  { 190085, true },
+  { 189819, true },
+  { 189831, true },
+  { 189843, true },
+  { 189856, true },
+  { 189864, true },
+  { 189882, true },
+  { 189891, false },
+  { 189899, true },
+  { 189911, true },
+  { 189932, true },
+  { 189945, true },
+  { 189958, true },
+  { 189970, true },
+  { 189982, true },
+  { 189995, false },
+  { 190008, true },
+  { 190024, true },
+  { 190038, true },
+  { 190056, true },
+  { 190077, true },
   { 190098, true },
-  { 190111, true },
-  { 190123, true },
-  { 190131, true },
-  { 190143, true },
-  { 190162, true },
-  { 190174, true },
-  { 190191, true },
-  { 190208, true },
-  { 190220, false },
-  { 190229, true },
-  { 190238, true },
-  { 190253, true },
-  { 190275, true },
-  { 190294, true },
-  { 190309, true },
-  { 190324, true },
-  { 190338, true },
-  { 190351, true },
-  { 190373, true },
-  { 190388, true },
-  { 190403, true },
-  { 190418, true },
+  { 190117, true },
+  { 190142, true },
+  { 190151, true },
+  { 190163, true },
+  { 190176, true },
+  { 190189, true },
+  { 190201, true },
+  { 190209, true },
+  { 190221, true },
+  { 190240, true },
+  { 190252, true },
+  { 190269, true },
+  { 190286, true },
+  { 190298, false },
+  { 190307, true },
+  { 190316, true },
+  { 190331, true },
+  { 190353, true },
+  { 190372, true },
+  { 190387, true },
+  { 190402, true },
+  { 190416, true },
   { 190429, true },
-  { 190438, true },
-  { 190450, true },
-  { 190467, true },
-  { 190479, true },
-  { 190495, false },
-  { 190511, false },
-  { 190526, true },
-  { 190539, false },
-  { 190563, true },
-  { 190571, true },
-  { 190582, true },
-  { 190593, true },
+  { 190451, true },
+  { 190466, true },
+  { 190481, true },
+  { 190496, true },
+  { 190507, true },
+  { 190516, true },
+  { 190528, true },
+  { 190545, true },
+  { 190557, true },
+  { 190573, false },
+  { 190589, false },
   { 190604, true },
-  { 190615, true },
-  { 190626, false },
-  { 190639, true },
-  { 190653, true },
-  { 190665, true },
-  { 190678, true },
-  { 190690, true },
-  { 190706, true },
-  { 190721, true },
-  { 190740, true },
-  { 190751, true },
-  { 190775, true },
-  { 190789, true },
-  { 190803, true },
+  { 190617, false },
+  { 190641, true },
+  { 190649, true },
+  { 190660, true },
+  { 190671, true },
+  { 190682, true },
+  { 190693, true },
+  { 190704, false },
+  { 190717, true },
+  { 190731, true },
+  { 190743, true },
+  { 190756, true },
+  { 190768, true },
+  { 190784, true },
+  { 190799, true },
   { 190818, true },
-  { 190838, true },
-  { 190854, true },
-  { 190874, true },
-  { 190886, true },
-  { 190909, true },
-  { 190926, true },
-  { 190956, true },
-  { 190968, true },
-  { 190979, true },
-  { 190989, true },
-  { 191003, true },
-  { 191016, true },
-  { 191034, false },
-  { 191044, true },
-  { 191058, true },
-  { 191073, true },
-  { 191091, true },
-  { 191100, true },
-  { 191113, false },
-  { 191130, true },
-  { 191141, true },
-  { 191151, true },
-  { 191160, true },
-  { 191181, true },
-  { 191192, true },
-  { 191214, true },
-  { 191230, true },
+  { 190829, true },
+  { 190853, true },
+  { 190867, true },
+  { 190881, true },
+  { 190896, true },
+  { 190916, true },
+  { 190932, true },
+  { 190952, true },
+  { 190964, true },
+  { 190987, true },
+  { 191004, true },
+  { 191034, true },
+  { 191046, true },
+  { 191057, true },
+  { 191067, true },
+  { 191081, true },
+  { 191094, true },
+  { 191112, false },
+  { 191122, true },
+  { 191137, true },
+  { 191155, true },
+  { 191164, true },
+  { 191177, true },
+  { 191194, true },
+  { 191205, true },
+  { 191215, true },
+  { 191224, true },
   { 191245, true },
-  { 191265, true },
-  { 191280, true },
-  { 191295, true },
-  { 191312, true },
-  { 191334, true },
-  { 191352, true },
-  { 191362, true },
-  { 191384, true },
-  { 191401, true },
-  { 191420, true },
-  { 191442, false },
-  { 191459, true },
-  { 191473, true },
-  { 191486, true },
-  { 191503, true },
-  { 191528, true },
-  { 191545, true },
-  { 191561, true },
-  { 191571, true },
-  { 191582, true },
-  { 191591, true },
-  { 191598, true },
-  { 191608, true },
-  { 191622, true },
-  { 191640, true },
-  { 191660, true },
-  { 191674, true },
-  { 191683, true },
-  { 191707, true },
-  { 191728, true },
-  { 191748, true },
-  { 191766, true },
-  { 191779, true },
-  { 191800, true },
-  { 191818, true },
+  { 191256, true },
+  { 191278, true },
+  { 191294, true },
+  { 191309, true },
+  { 191329, true },
+  { 191344, true },
+  { 191359, true },
+  { 191376, true },
+  { 191398, true },
+  { 191416, true },
+  { 191426, true },
+  { 191448, true },
+  { 191465, true },
+  { 191484, true },
+  { 191506, false },
+  { 191523, true },
+  { 191537, true },
+  { 191550, true },
+  { 191567, true },
+  { 191592, true },
+  { 191609, true },
+  { 191625, true },
+  { 191635, true },
+  { 191646, true },
+  { 191655, true },
+  { 191662, true },
+  { 191672, true },
+  { 191686, true },
+  { 191704, true },
+  { 191724, true },
+  { 191738, true },
+  { 191747, true },
+  { 191771, true },
+  { 191792, true },
+  { 191812, true },
   { 191830, true },
-  { 191838, true },
-  { 191860, true },
-  { 191876, true },
-  { 191889, true },
-  { 191914, true },
-  { 191925, true },
-  { 191936, true },
-  { 191957, true },
-  { 191972, true },
-  { 191984, true },
-  { 192001, true },
-  { 192027, true },
-  { 192046, true },
-  { 192063, true },
-  { 192092, false },
+  { 191843, true },
+  { 191864, true },
+  { 191882, true },
+  { 191894, true },
+  { 191902, true },
+  { 191924, true },
+  { 191940, true },
+  { 191953, true },
+  { 191978, true },
+  { 191989, true },
+  { 192000, true },
+  { 192021, true },
+  { 192036, true },
+  { 192048, true },
+  { 192065, true },
+  { 192091, true },
   { 192110, true },
-  { 192138, true },
-  { 192154, true },
-  { 192170, true },
-  { 192193, true },
-  { 192212, false },
-  { 192231, true },
-  { 192243, true },
-  { 192263, false },
-  { 192285, true },
-  { 192298, true },
-  { 192320, true },
-  { 192333, true },
-  { 192348, true },
-  { 192363, true },
-  { 192377, true },
-  { 192400, true },
-  { 192410, true },
-  { 192420, true },
-  { 192439, true },
-  { 192452, true },
+  { 192127, true },
+  { 192156, false },
+  { 192174, true },
+  { 192202, true },
+  { 192218, true },
+  { 192234, true },
+  { 192257, true },
+  { 192276, false },
+  { 192295, true },
+  { 192307, true },
+  { 192327, false },
+  { 192349, true },
+  { 192362, true },
+  { 192384, true },
+  { 192397, true },
+  { 192412, true },
+  { 192427, true },
+  { 192441, true },
+  { 192464, true },
   { 192474, true },
-  { 192494, true },
-  { 192513, true },
-  { 192525, true },
+  { 192484, true },
+  { 192503, true },
+  { 192516, true },
   { 192538, true },
-  { 192551, true },
-  { 192572, true },
-  { 192598, true },
-  { 192619, true },
-  { 192640, true },
-  { 192661, true },
-  { 192681, true },
-  { 192693, true },
-  { 192713, true },
-  { 192731, true },
-  { 192749, true },
-  { 192759, true },
-  { 192771, true },
-  { 192780, true },
-  { 192803, true },
-  { 192819, true },
-  { 192831, true },
-  { 192849, true },
-  { 192874, true },
-  { 192889, true },
-  { 192910, true },
-  { 192926, true },
-  { 192943, true },
-  { 192959, true },
-  { 192980, false },
-  { 192997, false },
-  { 193015, true },
-  { 193025, true },
-  { 193039, true },
-  { 193053, true },
-  { 193063, true },
-  { 193075, true },
-  { 193087, true },
-  { 193097, true },
-  { 193108, true },
-  { 193119, true },
-  { 193133, true },
-  { 193145, true },
-  { 193169, true },
-  { 193181, true },
-  { 193210, true },
-  { 193225, true },
-  { 193239, true },
-  { 193255, true },
-  { 193270, true },
-  { 193284, true },
-  { 193296, true },
-  { 193316, true },
-  { 193329, true },
-  { 193343, true },
-  { 193355, true },
-  { 193367, true },
-  { 193385, true },
-  { 193397, true },
-  { 193416, true },
-  { 193433, true },
-  { 193454, true },
-  { 193478, true },
-  { 193501, true },
-  { 193513, true },
-  { 193531, true },
-  { 193547, true },
-  { 193567, false },
-  { 193585, true },
-  { 193605, true },
-  { 193620, true },
-  { 193646, true },
-  { 193672, true },
-  { 193685, true },
-  { 193698, true },
-  { 193718, true },
-  { 193726, true },
-  { 193737, true },
-  { 193747, true },
-  { 193774, true },
-  { 193793, true },
-  { 193812, true },
-  { 193826, true },
-  { 193844, true },
-  { 193859, true },
-  { 193875, false },
-  { 193894, true },
+  { 192558, true },
+  { 192577, true },
+  { 192589, true },
+  { 192602, true },
+  { 192615, true },
+  { 192636, true },
+  { 192662, true },
+  { 192683, true },
+  { 192704, true },
+  { 192725, true },
+  { 192745, true },
+  { 192757, true },
+  { 192777, true },
+  { 192795, true },
+  { 192813, true },
+  { 192823, true },
+  { 192835, true },
+  { 192844, true },
+  { 192867, true },
+  { 192883, true },
+  { 192895, true },
+  { 192913, true },
+  { 192938, true },
+  { 192953, true },
+  { 192974, true },
+  { 192990, true },
+  { 193007, true },
+  { 193023, true },
+  { 193044, false },
+  { 193061, false },
+  { 193079, true },
+  { 193089, true },
+  { 193103, true },
+  { 193117, true },
+  { 193127, true },
+  { 193139, true },
+  { 193151, true },
+  { 193161, true },
+  { 193172, true },
+  { 193183, true },
+  { 193197, true },
+  { 193209, true },
+  { 193233, true },
+  { 193245, true },
+  { 193274, true },
+  { 193289, true },
+  { 193303, true },
+  { 193319, true },
+  { 193334, true },
+  { 193348, true },
+  { 193360, true },
+  { 193380, true },
+  { 193393, true },
+  { 193407, true },
+  { 193419, true },
+  { 193431, true },
+  { 193449, true },
+  { 193461, true },
+  { 193480, true },
+  { 193497, true },
+  { 193518, true },
+  { 193542, true },
+  { 193565, true },
+  { 193577, true },
+  { 193595, true },
+  { 193611, true },
+  { 193631, false },
+  { 193649, true },
+  { 193669, true },
+  { 193684, true },
+  { 193710, true },
+  { 193736, true },
+  { 193749, true },
+  { 193762, true },
+  { 193782, true },
+  { 193790, true },
+  { 193801, true },
+  { 193811, true },
+  { 193838, true },
+  { 193857, true },
+  { 193876, true },
+  { 193890, true },
   { 193908, true },
-  { 193917, true },
-  { 193934, true },
-  { 193950, true },
-  { 193967, true },
-  { 193985, true },
-  { 194004, true },
-  { 194021, true },
-  { 194034, true },
-  { 194044, true },
-  { 194059, true },
-  { 194067, true },
-  { 194085, true },
-  { 194113, true },
-  { 194128, true },
-  { 194143, true },
-  { 194161, true },
-  { 194178, true },
-  { 194192, true },
-  { 194207, false },
-  { 194220, false },
-  { 194230, false },
-  { 194243, false },
-  { 194258, true },
-  { 194276, true },
-  { 194293, true },
-  { 194305, true },
-  { 194317, true },
-  { 194329, true },
-  { 194345, true },
-  { 194357, true },
-  { 194370, true },
-  { 194382, true },
-  { 194395, true },
-  { 194409, true },
-  { 194425, true },
-  { 194437, true },
-  { 194450, true },
-  { 194460, true },
+  { 193923, true },
+  { 193939, false },
+  { 193958, true },
+  { 193972, true },
+  { 193981, true },
+  { 193998, true },
+  { 194014, true },
+  { 194031, true },
+  { 194049, true },
+  { 194066, true },
+  { 194079, true },
+  { 194089, true },
+  { 194104, true },
+  { 194112, true },
+  { 194130, true },
+  { 194158, true },
+  { 194173, true },
+  { 194188, true },
+  { 194206, true },
+  { 194223, true },
+  { 194237, true },
+  { 194252, false },
+  { 194265, false },
+  { 194275, false },
+  { 194288, false },
+  { 194303, true },
+  { 194321, true },
+  { 194338, true },
+  { 194350, true },
+  { 194362, true },
+  { 194374, true },
+  { 194390, true },
+  { 194402, true },
+  { 194415, true },
+  { 194427, true },
+  { 194440, true },
+  { 194454, true },
   { 194470, true },
-  { 194483, true },
-  { 194498, true },
-  { 194510, true },
-  { 194521, true },
-  { 194539, true },
-  { 194547, true },
+  { 194482, true },
+  { 194495, true },
+  { 194505, true },
+  { 194515, true },
+  { 194528, true },
+  { 194543, true },
   { 194555, true },
-  { 194565, true },
-  { 194577, true },
-  { 194591, true },
-  { 194605, true },
-  { 194618, true },
-  { 194635, true },
-  { 194665, true },
-  { 194692, true },
-  { 194707, true },
-  { 194723, true },
-  { 194738, true },
-  { 194753, true },
+  { 194566, true },
+  { 194584, true },
+  { 194592, true },
+  { 194600, true },
+  { 194610, true },
+  { 194622, true },
+  { 194636, true },
+  { 194650, true },
+  { 194663, true },
+  { 194680, true },
+  { 194710, true },
+  { 194737, true },
+  { 194752, true },
   { 194768, true },
-  { 194779, true },
-  { 194787, true },
-  { 194802, true },
+  { 194783, true },
+  { 194798, true },
   { 194813, true },
-  { 194826, true },
-  { 194834, true },
-  { 194844, true },
-  { 194860, true },
-  { 194877, true },
-  { 194902, true },
-  { 194919, true },
-  { 194932, true },
-  { 194953, true },
-  { 194966, true },
-  { 194978, true },
-  { 194986, true },
-  { 195003, true },
-  { 195019, false },
-  { 195026, true },
-  { 195037, true },
-  { 195047, true },
-  { 195055, true },
-  { 195067, false },
-  { 195091, true },
-  { 195123, true },
-  { 195150, true },
-  { 195170, true },
-  { 195194, true },
-  { 195211, false },
-  { 195224, true },
+  { 194824, true },
+  { 194832, true },
+  { 194847, true },
+  { 194858, true },
+  { 194871, true },
+  { 194879, true },
+  { 194889, true },
+  { 194905, true },
+  { 194922, true },
+  { 194947, true },
+  { 194964, true },
+  { 194977, true },
+  { 194998, true },
+  { 195011, true },
+  { 195023, true },
+  { 195031, true },
+  { 195048, true },
+  { 195064, false },
+  { 195071, true },
+  { 195082, true },
+  { 195092, true },
+  { 195100, true },
+  { 195112, false },
+  { 195136, true },
+  { 195168, true },
+  { 195195, true },
+  { 195215, true },
   { 195239, true },
-  { 195250, true },
-  { 195261, true },
-  { 195271, true },
+  { 195256, false },
+  { 195269, true },
   { 195284, true },
-  { 195292, true },
-  { 195304, true },
-  { 195316, false },
-  { 195328, false },
-  { 195336, false },
-  { 195361, true },
-  { 195380, true },
-  { 195393, true },
-  { 195408, true },
-  { 195422, true },
-  { 195435, true },
-  { 195447, true },
-  { 195464, true },
-  { 195478, true },
-  { 195495, true },
-  { 195507, true },
-  { 195521, true },
-  { 195536, true },
-  { 195554, true },
-  { 195569, true },
-  { 195577, true },
-  { 195584, true },
-  { 195604, true },
-  { 195618, true },
-  { 195626, true },
-  { 195634, true },
-  { 195649, false },
-  { 195664, true },
-  { 195676, true },
-  { 195690, false },
-  { 195701, true },
-  { 195712, true },
-  { 195725, false },
-  { 195735, true },
-  { 195745, true },
-  { 195755, true },
-  { 195762, true },
-  { 195775, true },
-  { 195783, true },
+  { 195295, true },
+  { 195306, true },
+  { 195316, true },
+  { 195329, true },
+  { 195337, true },
+  { 195349, true },
+  { 195361, false },
+  { 195373, false },
+  { 195381, false },
+  { 195406, true },
+  { 195425, true },
+  { 195438, true },
+  { 195453, true },
+  { 195467, true },
+  { 195480, true },
+  { 195492, true },
+  { 195509, true },
+  { 195523, true },
+  { 195540, true },
+  { 195552, true },
+  { 195566, true },
+  { 195581, true },
+  { 195599, true },
+  { 195614, true },
+  { 195622, true },
+  { 195629, true },
+  { 195649, true },
+  { 195663, true },
+  { 195671, true },
+  { 195679, true },
+  { 195694, false },
+  { 195709, true },
+  { 195721, true },
+  { 195735, false },
+  { 195746, true },
+  { 195757, true },
+  { 195770, false },
+  { 195780, true },
+  { 195790, true },
   { 195800, true },
-  { 195808, true },
-  { 195817, true },
-  { 195833, true },
-  { 195852, true },
-  { 195863, true },
-  { 195875, true },
-  { 195885, true },
-  { 195902, false },
-  { 195913, true },
-  { 195921, true },
-  { 195931, true },
-  { 195940, true },
-  { 195961, true },
-  { 195986, false },
-  { 196002, true },
-  { 196014, true },
-  { 196026, true },
-  { 196039, true },
+  { 195807, true },
+  { 195820, true },
+  { 195828, true },
+  { 195845, true },
+  { 195853, true },
+  { 195862, true },
+  { 195878, true },
+  { 195897, true },
+  { 195908, true },
+  { 195920, true },
+  { 195930, true },
+  { 195947, false },
+  { 195958, true },
+  { 195966, true },
+  { 195976, true },
+  { 195985, true },
+  { 196006, true },
+  { 196031, false },
   { 196047, true },
-  { 196055, false },
-  { 196075, false },
-  { 196094, false },
-  { 196113, false },
-  { 196133, true },
-  { 196153, false },
-  { 196173, false },
-  { 196192, false },
-  { 196211, true },
-  { 196230, true },
-  { 196241, true },
-  { 196251, true },
-  { 196263, true },
-  { 196272, true },
-  { 196285, true },
-  { 196300, true },
-  { 196310, true },
-  { 196323, false },
-  { 196334, true },
+  { 196059, true },
+  { 196071, true },
+  { 196084, true },
+  { 196092, true },
+  { 196100, false },
+  { 196120, false },
+  { 196139, false },
+  { 196158, false },
+  { 196178, true },
+  { 196198, false },
+  { 196218, false },
+  { 196237, false },
+  { 196256, true },
+  { 196275, true },
+  { 196286, true },
+  { 196296, true },
+  { 196308, true },
+  { 196317, true },
+  { 196330, true },
   { 196345, true },
-  { 196354, true },
-  { 196362, true },
-  { 196375, true },
-  { 196383, true },
-  { 196393, true },
-  { 196402, true },
-  { 196417, true },
+  { 196355, true },
+  { 196368, false },
+  { 196379, true },
+  { 196390, true },
+  { 196399, true },
+  { 196411, true },
+  { 196419, true },
+  { 196432, true },
   { 196440, true },
-  { 196459, false },
-  { 196470, true },
-  { 196492, true },
-  { 196506, true },
-  { 196515, true },
-  { 196523, true },
-  { 196535, true },
-  { 196552, true },
-  { 196561, true },
-  { 196568, true },
-  { 196576, true },
-  { 196587, true },
-  { 196601, true },
-  { 196613, true },
+  { 196450, true },
+  { 196459, true },
+  { 196474, true },
+  { 196497, true },
+  { 196516, false },
+  { 196527, true },
+  { 196549, true },
+  { 196563, true },
+  { 196572, true },
+  { 196580, true },
+  { 196592, true },
+  { 196609, true },
+  { 196618, true },
   { 196625, true },
-  { 196634, true },
-  { 196646, false },
-  { 196657, true },
+  { 196633, true },
+  { 196644, true },
+  { 196658, true },
   { 196670, true },
-  { 196696, true },
-  { 196719, false },
-  { 196739, true },
-  { 196756, true },
-  { 196770, true },
-  { 196789, true },
-  { 196804, true },
-  { 196820, true },
-  { 196833, true },
-  { 196844, true },
-  { 196859, true },
-  { 196879, true },
-  { 196899, true },
-  { 196914, true },
-  { 196931, true },
-  { 196940, true },
-  { 196958, true },
-  { 196973, true },
-  { 196994, true },
-  { 197014, true },
-  { 197029, true },
-  { 197044, true },
-  { 197059, true },
-  { 197074, true },
-  { 197088, true },
+  { 196682, true },
+  { 196691, true },
+  { 196703, false },
+  { 196714, true },
+  { 196727, true },
+  { 196753, true },
+  { 196776, false },
+  { 196796, true },
+  { 196813, true },
+  { 196827, true },
+  { 196846, true },
+  { 196861, true },
+  { 196877, true },
+  { 196890, true },
+  { 196901, true },
+  { 196916, true },
+  { 196936, true },
+  { 196956, true },
+  { 196971, true },
+  { 196988, true },
+  { 196997, true },
+  { 197015, true },
+  { 197030, true },
+  { 197051, true },
+  { 197071, true },
+  { 197086, true },
   { 197101, true },
-  { 197115, true },
-  { 197124, true },
-  { 197138, true },
-  { 197153, true },
-  { 197162, true },
-  { 197180, true },
-  { 197191, true },
-  { 197201, true },
+  { 197116, true },
+  { 197131, true },
+  { 197145, true },
+  { 197158, true },
+  { 197172, true },
+  { 197181, true },
+  { 197195, true },
   { 197210, true },
-  { 197221, true },
-  { 197231, true },
-  { 197240, true },
-  { 197250, true },
-  { 197263, true },
-  { 197274, true },
-  { 197284, true },
-  { 197293, true },
-  { 197300, true },
-  { 197311, true },
-  { 197322, true },
-  { 197333, true },
-  { 197347, true },
-  { 197354, true },
-  { 197365, true },
-  { 197373, true },
-  { 197391, true },
-  { 197403, true },
+  { 197219, true },
+  { 197237, true },
+  { 197248, true },
+  { 197258, true },
+  { 197267, true },
+  { 197278, true },
+  { 197288, true },
+  { 197297, true },
+  { 197307, true },
+  { 197320, true },
+  { 197331, true },
+  { 197341, true },
+  { 197350, true },
+  { 197357, true },
+  { 197368, true },
+  { 197379, true },
+  { 197390, true },
+  { 197404, true },
   { 197411, true },
-  { 197431, false },
-  { 197447, true },
-  { 197466, true },
-  { 197489, true },
-  { 197508, true },
-  { 197525, true },
-  { 197536, true },
-  { 197558, true },
-  { 197581, true },
-  { 197594, true },
-  { 197603, true },
-  { 197618, true },
-  { 197641, true },
+  { 197422, true },
+  { 197430, true },
+  { 197448, true },
+  { 197460, true },
+  { 197468, true },
+  { 197488, false },
+  { 197504, true },
+  { 197523, true },
+  { 197546, true },
+  { 197565, true },
+  { 197582, true },
+  { 197593, true },
+  { 197615, true },
+  { 197638, true },
+  { 197651, true },
+  { 197660, true },
   { 197675, true },
-  { 197691, true },
-  { 197705, true },
-  { 197721, true },
-  { 197743, true },
-  { 197756, true },
-  { 197783, true },
-  { 197797, true },
-  { 197807, true },
-  { 197817, true },
-  { 197835, true },
-  { 197845, true },
+  { 197698, true },
+  { 197732, true },
+  { 197748, true },
+  { 197762, true },
+  { 197778, true },
+  { 197800, true },
+  { 197813, true },
+  { 197840, true },
+  { 197854, true },
   { 197864, true },
-  { 197887, true },
-  { 197901, true },
-  { 197915, true },
-  { 197931, true },
-  { 197942, true },
-  { 197957, true },
-  { 197980, true },
-  { 197995, true },
-  { 198018, true },
-  { 198027, true },
-  { 198040, true },
-  { 198058, true },
+  { 197874, true },
+  { 197892, true },
+  { 197902, true },
+  { 197921, true },
+  { 197944, true },
+  { 197958, true },
+  { 197972, true },
+  { 197988, true },
+  { 197999, true },
+  { 198014, true },
+  { 198037, true },
+  { 198052, true },
   { 198075, true },
-  { 198085, true },
-  { 198110, true },
-  { 198128, true },
-  { 198143, true },
-  { 198153, true },
-  { 198165, true },
-  { 198178, false },
-  { 198190, true },
-  { 198207, true },
-  { 198217, true },
-  { 198240, true },
-  { 198261, true },
-  { 198283, true },
-  { 198301, true },
-  { 198312, true },
-  { 198326, true },
-  { 198339, true },
-  { 198350, true },
-  { 198362, true },
-  { 198376, true },
-  { 198389, true },
-  { 198400, true },
-  { 198410, true },
-  { 198424, true },
-  { 198439, true },
-  { 198449, true },
-  { 198462, true },
-  { 198471, true },
-  { 198480, true },
+  { 198084, true },
+  { 198097, true },
+  { 198115, true },
+  { 198132, true },
+  { 198142, true },
+  { 198167, true },
+  { 198185, true },
+  { 198200, true },
+  { 198210, true },
+  { 198222, true },
+  { 198235, false },
+  { 198247, true },
+  { 198264, true },
+  { 198274, true },
+  { 198297, true },
+  { 198318, true },
+  { 198340, true },
+  { 198358, true },
+  { 198369, true },
+  { 198383, true },
+  { 198396, true },
+  { 198407, true },
+  { 198419, true },
+  { 198433, true },
+  { 198446, true },
+  { 198457, true },
+  { 198467, true },
+  { 198481, true },
   { 198496, true },
-  { 198512, true },
-  { 198526, true },
+  { 198506, true },
+  { 198519, true },
+  { 198528, true },
   { 198537, true },
-  { 198552, true },
-  { 198562, true },
-  { 198574, true },
-  { 198588, true },
-  { 198601, true },
-  { 198619, true },
-  { 198628, true },
-  { 198639, true },
-  { 198651, true },
-  { 198664, true },
-  { 198676, true },
-  { 198685, true },
-  { 198696, true },
+  { 198553, true },
+  { 198569, true },
+  { 198583, false },
+  { 198600, true },
+  { 198611, true },
+  { 198626, true },
+  { 198636, true },
+  { 198648, true },
+  { 198662, true },
+  { 198675, true },
+  { 198693, true },
+  { 198702, true },
   { 198713, true },
-  { 198729, true },
-  { 198741, true },
-  { 198753, true },
+  { 198725, true },
+  { 198738, true },
+  { 198750, true },
+  { 198759, true },
   { 198770, true },
-  { 198782, true },
-  { 198792, true },
-  { 198805, true },
-  { 198822, true },
-  { 198836, true },
-  { 198851, true },
-  { 198863, true },
-  { 198874, true },
-  { 198881, true },
-  { 198892, true },
-  { 198908, true },
-  { 198916, true },
-  { 198923, true },
-  { 198940, true },
-  { 198953, true },
-  { 198968, true },
-  { 198987, true },
-  { 198998, true },
-  { 199017, true },
-  { 199040, true },
-  { 199052, false },
-  { 199066, true },
-  { 199082, true },
-  { 199100, true },
-  { 199112, true },
-  { 199129, true },
+  { 198787, true },
+  { 198803, true },
+  { 198815, true },
+  { 198827, true },
+  { 198844, true },
+  { 198856, true },
+  { 198866, true },
+  { 198879, true },
+  { 198896, true },
+  { 198910, true },
+  { 198925, true },
+  { 198937, true },
+  { 198948, true },
+  { 198955, true },
+  { 198966, true },
+  { 198982, true },
+  { 198990, true },
+  { 198997, true },
+  { 199014, true },
+  { 199027, true },
+  { 199042, true },
+  { 199061, true },
+  { 199072, true },
+  { 199091, true },
+  { 199114, true },
+  { 199126, false },
   { 199140, true },
-  { 199156, false },
-  { 199175, true },
-  { 199188, true },
+  { 199156, true },
+  { 199174, true },
+  { 199186, true },
   { 199203, true },
-  { 199222, true },
-  { 199238, true },
-  { 199259, true },
-  { 199275, true },
-  { 199287, true },
-  { 199301, true },
-  { 199315, true },
-  { 199328, true },
-  { 199338, true },
-  { 199359, true },
-  { 199381, true },
-  { 199400, true },
-  { 199411, true },
-  { 199428, true },
-  { 199443, true },
-  { 199463, true },
-  { 199490, true },
-  { 199521, true },
-  { 199533, true },
-  { 199548, true },
-  { 199567, false },
-  { 199584, true },
-  { 199599, true },
-  { 199615, true },
-  { 199627, true },
-  { 199650, true },
-  { 199665, true },
-  { 199676, true },
-  { 199684, true },
-  { 199707, true },
-  { 199719, true },
-  { 199732, true },
-  { 199740, true },
-  { 199766, true },
-  { 199784, true },
-  { 199797, true },
+  { 199214, true },
+  { 199230, false },
+  { 199249, true },
+  { 199262, true },
+  { 199277, true },
+  { 199296, true },
+  { 199312, true },
+  { 199333, true },
+  { 199349, true },
+  { 199361, true },
+  { 199375, true },
+  { 199389, true },
+  { 199402, true },
+  { 199412, true },
+  { 199433, true },
+  { 199455, true },
+  { 199474, true },
+  { 199485, true },
+  { 199502, true },
+  { 199517, true },
+  { 199537, true },
+  { 199564, true },
+  { 199595, true },
+  { 199607, true },
+  { 199622, true },
+  { 199641, false },
+  { 199658, true },
+  { 199673, true },
+  { 199689, true },
+  { 199701, true },
+  { 199724, true },
+  { 199739, true },
+  { 199750, true },
+  { 199758, true },
+  { 199781, true },
+  { 199793, true },
+  { 199806, true },
   { 199814, true },
   { 199840, true },
-  { 199852, true },
-  { 199879, true },
-  { 199910, true },
-  { 199921, true },
-  { 199931, true },
-  { 199946, true },
-  { 199957, true },
-  { 199968, true },
+  { 199858, true },
+  { 199871, true },
+  { 199888, true },
+  { 199914, true },
+  { 199926, true },
+  { 199953, true },
   { 199984, true },
-  { 199996, true },
+  { 199995, true },
   { 200005, true },
-  { 200018, true },
-  { 200046, true },
-  { 200067, true },
-  { 200081, true },
-  { 200103, true },
+  { 200020, true },
+  { 200031, true },
+  { 200042, true },
+  { 200058, true },
+  { 200070, true },
+  { 200079, true },
+  { 200092, true },
   { 200120, true },
-  { 200132, true },
-  { 200148, true },
-  { 200162, true },
-  { 200172, true },
-  { 200182, true },
+  { 200141, true },
+  { 200155, true },
+  { 200177, true },
   { 200194, true },
-  { 200205, true },
-  { 200216, true },
-  { 200230, true },
-  { 200248, true },
-  { 200265, true },
-  { 200285, true },
-  { 200296, true },
-  { 200307, true },
-  { 200314, true },
-  { 200324, true },
-  { 200351, true },
-  { 200371, true },
-  { 200389, true },
-  { 200404, false },
-  { 200415, true },
-  { 200431, true },
-  { 200448, true },
-  { 200465, true },
-  { 200487, true },
-  { 200501, true },
-  { 200517, false },
-  { 200534, true },
-  { 200550, true },
-  { 200563, true },
-  { 200573, true },
-  { 200584, true },
-  { 200602, true },
-  { 200616, true },
+  { 200206, true },
+  { 200222, true },
+  { 200236, true },
+  { 200246, true },
+  { 200256, true },
+  { 200268, true },
+  { 200279, true },
+  { 200290, true },
+  { 200304, true },
+  { 200322, true },
+  { 200339, true },
+  { 200359, true },
+  { 200370, true },
+  { 200381, true },
+  { 200388, true },
+  { 200398, true },
+  { 200425, true },
+  { 200445, true },
+  { 200463, true },
+  { 200478, false },
+  { 200489, true },
+  { 200505, true },
+  { 200522, true },
+  { 200539, true },
+  { 200561, true },
+  { 200575, true },
+  { 200591, false },
+  { 200608, true },
+  { 200624, true },
   { 200637, true },
-  { 200655, true },
-  { 200672, true },
+  { 200647, true },
+  { 200658, true },
+  { 200676, true },
   { 200690, true },
-  { 200708, true },
-  { 200726, true },
-  { 200740, true },
-  { 200750, true },
-  { 200761, true },
-  { 200783, true },
-  { 200805, true },
-  { 200822, true },
-  { 200842, true },
-  { 200853, true },
-  { 200872, true },
-  { 200886, true },
-  { 200903, true },
-  { 200915, true },
-  { 200932, true },
-  { 200953, true },
-  { 200965, true },
-  { 200988, true },
+  { 200711, true },
+  { 200729, true },
+  { 200746, true },
+  { 200764, true },
+  { 200782, true },
+  { 200800, true },
+  { 200814, true },
+  { 200824, true },
+  { 200835, true },
+  { 200857, true },
+  { 200879, true },
+  { 200896, true },
+  { 200916, true },
+  { 200927, true },
+  { 200946, true },
+  { 200960, true },
+  { 200977, true },
+  { 200989, true },
   { 201006, true },
-  { 201026, true },
-  { 201037, true },
-  { 201047, true },
-  { 201063, true },
-  { 201074, true },
-  { 201086, false },
-  { 201106, true },
-  { 201125, true },
-  { 201138, true },
-  { 201159, true },
-  { 201169, true },
-  { 201183, true },
-  { 201200, true },
-  { 201220, true },
-  { 201234, true },
-  { 201249, true },
-  { 201263, true },
-  { 201277, true },
-  { 201295, true },
-  { 201309, true },
-  { 201324, true },
-  { 201345, true },
-  { 201356, true },
-  { 201370, true },
-  { 201383, false },
-  { 201397, true },
-  { 201413, true },
+  { 201027, true },
+  { 201039, true },
+  { 201062, true },
+  { 201080, true },
+  { 201100, true },
+  { 201111, true },
+  { 201121, true },
+  { 201137, true },
+  { 201148, true },
+  { 201160, false },
+  { 201180, true },
+  { 201199, true },
+  { 201212, true },
+  { 201233, true },
+  { 201243, true },
+  { 201257, true },
+  { 201274, true },
+  { 201294, true },
+  { 201308, true },
+  { 201323, true },
+  { 201337, true },
+  { 201351, true },
+  { 201369, true },
+  { 201383, true },
+  { 201398, true },
+  { 201419, true },
   { 201430, true },
-  { 201446, true },
-  { 201469, true },
-  { 201478, false },
-  { 201486, true },
-  { 201496, false },
-  { 201518, true },
-  { 201532, true },
-  { 201545, true },
+  { 201444, true },
+  { 201457, false },
+  { 201471, true },
+  { 201487, true },
+  { 201504, true },
+  { 201520, true },
+  { 201543, true },
+  { 201552, false },
   { 201560, true },
-  { 201574, true },
-  { 201589, true },
-  { 201603, true },
-  { 201617, true },
-  { 201630, true },
-  { 201644, true },
-  { 201657, true },
-  { 201685, true },
-  { 201697, true },
-  { 201712, true },
-  { 201737, true },
-  { 201751, true },
-  { 201772, true },
+  { 201570, false },
+  { 201592, true },
+  { 201606, true },
+  { 201619, true },
+  { 201634, true },
+  { 201648, true },
+  { 201663, true },
+  { 201677, true },
+  { 201691, true },
+  { 201704, true },
+  { 201718, true },
+  { 201731, true },
+  { 201759, true },
+  { 201771, true },
   { 201786, true },
-  { 201797, true },
-  { 201805, true },
-  { 201823, true },
-  { 201835, true },
-  { 201852, true },
-  { 201877, true },
-  { 201887, true },
-  { 201905, true },
-  { 201930, true },
-  { 201950, true },
-  { 201971, true },
-  { 201991, true },
-  { 202001, true },
-  { 202014, false },
-  { 202039, true },
-  { 202060, true },
-  { 202086, true },
-  { 202106, true },
-  { 202126, true },
-  { 202151, true },
-  { 202165, true },
-  { 202178, true },
-  { 202189, true },
-  { 202197, true },
-  { 202206, true },
-  { 202214, true },
-  { 202228, true },
-  { 202242, true },
-  { 202255, true },
+  { 201811, true },
+  { 201825, true },
+  { 201846, true },
+  { 201860, true },
+  { 201871, true },
+  { 201879, true },
+  { 201897, true },
+  { 201909, true },
+  { 201926, true },
+  { 201951, true },
+  { 201961, true },
+  { 201979, true },
+  { 202004, true },
+  { 202024, true },
+  { 202045, true },
+  { 202065, true },
+  { 202075, true },
+  { 202088, false },
+  { 202113, true },
+  { 202134, true },
+  { 202160, true },
+  { 202180, true },
+  { 202200, true },
+  { 202225, true },
+  { 202239, true },
+  { 202252, true },
+  { 202263, true },
   { 202271, true },
-  { 202284, true },
-  { 202294, true },
-  { 202305, true },
+  { 202280, true },
+  { 202288, true },
+  { 202302, true },
   { 202316, true },
-  { 202334, true },
-  { 202350, true },
-  { 202360, false },
-  { 202372, true },
-  { 202384, true },
-  { 202402, true },
-  { 202423, true },
-  { 202447, true },
-  { 202459, true },
-  { 202469, true },
-  { 202485, true },
-  { 202509, true },
-  { 202516, true },
-  { 202532, true },
-  { 202549, true },
-  { 202563, true },
-  { 202575, true },
-  { 202587, true },
-  { 202600, true },
-  { 202612, true },
-  { 202618, true },
-  { 202628, true },
-  { 202642, true },
-  { 202651, true },
-  { 202672, true },
-  { 202685, true },
+  { 202329, true },
+  { 202345, true },
+  { 202358, true },
+  { 202368, true },
+  { 202379, true },
+  { 202390, true },
+  { 202408, true },
+  { 202424, true },
+  { 202434, false },
+  { 202446, true },
+  { 202458, true },
+  { 202476, true },
+  { 202497, true },
+  { 202521, true },
+  { 202533, true },
+  { 202543, true },
+  { 202559, true },
+  { 202583, true },
+  { 202590, true },
+  { 202606, true },
+  { 202623, true },
+  { 202637, true },
+  { 202649, true },
+  { 202661, true },
+  { 202674, true },
+  { 202686, true },
+  { 202692, true },
   { 202702, true },
-  { 202717, true },
-  { 202742, true },
-  { 202768, true },
-  { 202783, true },
-  { 202793, true },
-  { 202804, true },
-  { 202813, false },
-  { 202835, true },
-  { 202844, true },
-  { 202859, true },
-  { 202869, true },
-  { 202885, true },
-  { 202898, true },
-  { 202910, true },
-  { 202927, true },
-  { 202948, true },
-  { 202968, true },
-  { 202989, true },
-  { 203006, true },
+  { 202716, true },
+  { 202725, true },
+  { 202746, true },
+  { 202759, true },
+  { 202776, true },
+  { 202791, true },
+  { 202816, true },
+  { 202842, true },
+  { 202857, true },
+  { 202867, true },
+  { 202878, true },
+  { 202887, false },
+  { 202909, true },
+  { 202918, true },
+  { 202933, true },
+  { 202943, true },
+  { 202959, true },
+  { 202972, true },
+  { 202984, true },
+  { 203001, true },
   { 203022, true },
-  { 203041, true },
-  { 203053, true },
-  { 203067, true },
-  { 203082, true },
-  { 203098, true },
-  { 203112, true },
-  { 203124, true },
-  { 203138, true },
-  { 203150, true },
-  { 203169, true },
-  { 203185, true },
-  { 203201, true },
-  { 203217, true },
-  { 203235, true },
-  { 203254, true },
-  { 203264, true },
-  { 203281, true },
-  { 203298, true },
-  { 203316, true },
-  { 203334, true },
-  { 203349, true },
-  { 203365, true },
-  { 203379, true },
-  { 203397, true },
-  { 203414, true },
-  { 203427, true },
-  { 203446, true },
-  { 203466, true },
-  { 203483, true },
-  { 203499, true },
-  { 203517, true },
-  { 203530, true },
-  { 203547, false },
-  { 203564, false },
-  { 203585, true },
-  { 203602, true },
-  { 203612, true },
-  { 203631, true },
+  { 203042, true },
+  { 203063, true },
+  { 203080, true },
+  { 203096, true },
+  { 203115, true },
+  { 203127, true },
+  { 203142, true },
+  { 203158, true },
+  { 203172, true },
+  { 203184, true },
+  { 203198, true },
+  { 203210, true },
+  { 203229, true },
+  { 203245, true },
+  { 203261, true },
+  { 203277, true },
+  { 203295, true },
+  { 203314, true },
+  { 203324, true },
+  { 203341, true },
+  { 203358, true },
+  { 203376, true },
+  { 203394, true },
+  { 203409, true },
+  { 203425, true },
+  { 203439, true },
+  { 203457, true },
+  { 203474, true },
+  { 203487, true },
+  { 203506, true },
+  { 203526, true },
+  { 203543, true },
+  { 203559, true },
+  { 203577, true },
+  { 203590, true },
+  { 203607, false },
+  { 203624, false },
   { 203645, true },
-  { 203658, true },
-  { 203666, true },
-  { 203677, true },
-  { 203692, true },
+  { 203662, true },
+  { 203672, true },
+  { 203691, true },
   { 203705, true },
-  { 203716, true },
-  { 203734, true },
-  { 203746, true },
-  { 203759, true },
-  { 203783, true },
-  { 203792, true },
-  { 203807, true },
-  { 203831, true },
-  { 203858, true },
-  { 203876, true },
-  { 203888, true },
-  { 203897, true },
-  { 203908, true },
-  { 203931, true },
-  { 203944, true },
-  { 203952, true },
-  { 203960, true },
+  { 203718, true },
+  { 203726, true },
+  { 203737, true },
+  { 203752, true },
+  { 203765, true },
+  { 203776, true },
+  { 203794, true },
+  { 203806, true },
+  { 203819, true },
+  { 203843, true },
+  { 203852, true },
+  { 203867, true },
+  { 203891, true },
+  { 203918, true },
+  { 203936, true },
+  { 203948, true },
+  { 203957, true },
   { 203968, true },
-  { 203978, true },
-  { 203985, true },
+  { 203991, true },
   { 204004, true },
-  { 204011, true },
-  { 204026, true },
-  { 204035, true },
-  { 204047, false },
-  { 204067, true },
-  { 204077, true },
-  { 204094, true },
-  { 204110, true },
-  { 204129, true },
-  { 204140, true },
-  { 204158, true },
-  { 204175, true },
-  { 204197, true },
-  { 204210, true },
+  { 204012, true },
+  { 204020, true },
+  { 204028, true },
+  { 204038, true },
+  { 204045, true },
+  { 204064, true },
+  { 204071, true },
+  { 204086, true },
+  { 204095, true },
+  { 204107, false },
+  { 204127, true },
+  { 204137, true },
+  { 204154, true },
+  { 204170, true },
+  { 204189, true },
+  { 204200, true },
+  { 204218, true },
   { 204235, true },
-  { 204254, true },
-  { 204266, true },
-  { 204277, true },
-  { 204290, true },
-  { 204309, true },
-  { 204324, true },
-  { 204339, true },
-  { 204355, true },
-  { 204378, true },
-  { 204398, true },
-  { 204411, true },
-  { 204426, true },
-  { 204439, true },
-  { 204453, true },
-  { 204467, true },
-  { 204478, true },
-  { 204488, true },
-  { 204508, true },
+  { 204257, true },
+  { 204270, true },
+  { 204295, true },
+  { 204314, true },
+  { 204326, true },
+  { 204337, true },
+  { 204350, true },
+  { 204369, true },
+  { 204384, true },
+  { 204399, true },
+  { 204415, true },
+  { 204438, true },
+  { 204458, true },
+  { 204471, true },
+  { 204486, true },
+  { 204499, true },
+  { 204513, true },
   { 204527, true },
-  { 204539, true },
-  { 204556, true },
-  { 204574, true },
-  { 204586, true },
-  { 204603, true },
-  { 204618, true },
-  { 204637, true },
-  { 204648, true },
-  { 204672, true },
-  { 204694, true },
-  { 204704, true },
-  { 204716, true },
-  { 204726, true },
+  { 204538, true },
+  { 204549, true },
+  { 204559, true },
+  { 204579, true },
+  { 204598, true },
+  { 204610, true },
+  { 204627, true },
+  { 204645, true },
+  { 204657, true },
+  { 204674, true },
+  { 204689, true },
+  { 204708, true },
+  { 204719, true },
   { 204743, true },
-  { 204753, true },
-  { 204767, true },
-  { 204783, true },
+  { 204765, true },
+  { 204775, true },
+  { 204787, true },
+  { 204797, true },
   { 204814, true },
-  { 204823, true },
-  { 204837, true },
-  { 204850, true },
-  { 204867, true },
-  { 204884, true },
-  { 204896, true },
-  { 204912, true },
-  { 204929, true },
-  { 204942, true },
+  { 204824, true },
+  { 204838, true },
+  { 204854, true },
+  { 204885, true },
+  { 204894, true },
+  { 204908, true },
+  { 204921, true },
+  { 204938, true },
   { 204955, true },
-  { 204965, true },
-  { 204979, true },
-  { 204993, true },
-  { 205002, true },
-  { 205012, true },
-  { 205027, true },
-  { 205037, true },
-  { 205051, true },
-  { 205067, true },
-  { 205084, true },
-  { 205097, true },
-  { 205115, true },
-  { 205132, true },
-  { 205148, true },
-  { 205165, true },
-  { 205187, true },
-  { 205209, true },
-  { 205220, true },
-  { 205232, true },
-  { 205250, true },
-  { 205264, true },
-  { 205277, true },
-  { 205290, true },
-  { 205309, true },
-  { 205329, true },
-  { 205341, true },
+  { 204967, true },
+  { 204983, true },
+  { 205000, true },
+  { 205013, true },
+  { 205026, true },
+  { 205036, true },
+  { 205050, true },
+  { 205064, true },
+  { 205073, true },
+  { 205083, true },
+  { 205098, true },
+  { 205108, true },
+  { 205122, true },
+  { 205138, true },
+  { 205155, true },
+  { 205168, true },
+  { 205186, true },
+  { 205203, true },
+  { 205219, true },
+  { 205236, true },
+  { 205258, true },
+  { 205280, true },
+  { 205291, true },
+  { 205303, true },
+  { 205321, true },
+  { 205335, true },
   { 205348, true },
-  { 205360, true },
-  { 205370, true },
-  { 205382, true },
-  { 205393, true },
-  { 205408, true },
-  { 205420, true },
-  { 205432, true },
-  { 205451, true },
-  { 205477, true },
-  { 205486, true },
-  { 205501, true },
-  { 205515, true },
-  { 205531, true },
-  { 205546, true },
-  { 205568, true },
-  { 205581, true },
-  { 205595, true },
-  { 205620, true },
-  { 205636, true },
-  { 205654, true },
-  { 205668, true },
-  { 205678, true },
-  { 205689, true },
-  { 205699, true },
-  { 205711, true },
-  { 205724, true },
-  { 205736, true },
-  { 205755, true },
-  { 205773, true },
-  { 205789, true },
-  { 205804, true },
-  { 205819, true },
-  { 205829, false },
-  { 205852, true },
-  { 205868, true },
-  { 205881, true },
-  { 205892, true },
-  { 205902, false },
-  { 205919, true },
-  { 205935, true },
+  { 205361, true },
+  { 205380, true },
+  { 205400, true },
+  { 205412, true },
+  { 205419, true },
+  { 205431, true },
+  { 205441, true },
+  { 205453, true },
+  { 205464, true },
+  { 205479, true },
+  { 205491, true },
+  { 205503, true },
+  { 205522, true },
+  { 205548, true },
+  { 205557, true },
+  { 205572, true },
+  { 205586, true },
+  { 205602, true },
+  { 205617, true },
+  { 205639, true },
+  { 205652, true },
+  { 205666, true },
+  { 205691, true },
+  { 205707, true },
+  { 205725, true },
+  { 205739, true },
+  { 205749, true },
+  { 205760, true },
+  { 205770, true },
+  { 205782, true },
+  { 205795, true },
+  { 205807, true },
+  { 205826, true },
+  { 205844, true },
+  { 205860, true },
+  { 205875, true },
+  { 205890, true },
+  { 205900, false },
+  { 205923, true },
+  { 205939, true },
   { 205952, true },
-  { 205972, true },
-  { 206003, true },
-  { 206024, true },
-  { 206049, true },
-  { 206070, true },
-  { 206081, true },
-  { 206098, true },
-  { 206109, true },
-  { 206121, true },
-  { 206136, true },
-  { 206148, true },
-  { 206161, true },
-  { 206181, true },
-  { 206189, true },
-  { 206200, true },
-  { 206209, true },
-  { 206218, true },
-  { 206225, true },
-  { 206233, true },
-  { 206247, true },
-  { 206258, true },
-  { 206270, false },
-  { 206277, true },
+  { 205963, true },
+  { 205973, false },
+  { 205990, true },
+  { 206006, true },
+  { 206023, true },
+  { 206043, true },
+  { 206074, true },
+  { 206095, true },
+  { 206120, true },
+  { 206141, true },
+  { 206152, true },
+  { 206169, true },
+  { 206180, true },
+  { 206192, true },
+  { 206207, true },
+  { 206219, true },
+  { 206232, true },
+  { 206252, true },
+  { 206260, true },
+  { 206271, true },
+  { 206280, true },
   { 206289, true },
   { 206296, true },
   { 206304, true },
-  { 206317, false },
-  { 206326, true },
-  { 206335, true },
-  { 206346, true },
-  { 206353, true },
-  { 206370, true },
-  { 206379, true },
-  { 206387, true },
-  { 206401, true },
-  { 206409, true },
-  { 206428, false },
-  { 206448, true },
+  { 206318, true },
+  { 206329, true },
+  { 206341, false },
+  { 206348, true },
+  { 206360, true },
+  { 206367, true },
+  { 206375, true },
+  { 206388, false },
+  { 206397, true },
+  { 206406, true },
+  { 206417, true },
+  { 206424, true },
+  { 206441, true },
+  { 206450, true },
   { 206458, true },
-  { 206479, true },
-  { 206488, true },
+  { 206472, true },
+  { 206480, true },
   { 206499, false },
-  { 206511, true },
-  { 206527, true },
-  { 206541, true },
-  { 206558, true },
-  { 206575, true },
-  { 206586, true },
-  { 206615, false },
-  { 206627, true },
-  { 206640, true },
-  { 206661, true },
-  { 206672, true },
-  { 206686, true },
+  { 206519, true },
+  { 206529, true },
+  { 206550, true },
+  { 206559, true },
+  { 206570, false },
+  { 206582, true },
+  { 206598, true },
+  { 206612, true },
+  { 206629, true },
+  { 206646, true },
+  { 206657, true },
+  { 206686, false },
   { 206698, true },
-  { 206712, true },
-  { 206720, true },
-  { 206737, true },
-  { 206749, true },
-  { 206764, true },
-  { 206778, true },
-  { 206786, true },
-  { 206794, true },
-  { 206806, true },
-  { 206814, true },
-  { 206827, true },
-  { 206839, true },
-  { 206853, true },
-  { 206870, true },
-  { 206888, true },
-  { 206901, true },
-  { 206911, true },
-  { 206920, false },
-  { 206930, true },
-  { 206942, false },
-  { 206954, true },
-  { 206967, true },
-  { 206980, true },
-  { 206989, true },
-  { 207012, true },
-  { 207026, true },
-  { 207034, true },
-  { 207047, true },
-  { 207063, true },
-  { 207080, true },
-  { 207093, true },
-  { 207111, true },
-  { 207123, true },
+  { 206711, true },
+  { 206732, true },
+  { 206743, true },
+  { 206757, true },
+  { 206769, true },
+  { 206783, true },
+  { 206791, true },
+  { 206808, true },
+  { 206820, true },
+  { 206835, true },
+  { 206849, true },
+  { 206857, true },
+  { 206865, true },
+  { 206877, true },
+  { 206885, true },
+  { 206898, true },
+  { 206910, true },
+  { 206924, true },
+  { 206941, true },
+  { 206959, true },
+  { 206972, true },
+  { 206982, true },
+  { 206991, false },
+  { 207001, true },
+  { 207013, false },
+  { 207025, true },
+  { 207038, true },
+  { 207051, true },
+  { 207060, true },
+  { 207083, true },
+  { 207097, true },
+  { 207105, true },
+  { 207118, true },
   { 207134, true },
-  { 207153, true },
-  { 207175, true },
-  { 207197, true },
-  { 207217, true },
-  { 207235, false },
-  { 207251, true },
-  { 207274, true },
-  { 207283, true },
-  { 207291, true },
-  { 207306, true },
-  { 207325, true },
-  { 207341, true },
-  { 207355, true },
-  { 207371, true },
-  { 207391, false },
-  { 207416, true },
-  { 207433, true },
-  { 207443, true },
-  { 207461, true },
-  { 207469, true },
-  { 207482, true },
-  { 207489, true },
-  { 207501, true },
+  { 207151, true },
+  { 207164, true },
+  { 207182, true },
+  { 207194, true },
+  { 207205, true },
+  { 207224, true },
+  { 207246, true },
+  { 207268, true },
+  { 207288, true },
+  { 207306, false },
+  { 207322, true },
+  { 207345, true },
+  { 207354, true },
+  { 207362, true },
+  { 207377, true },
+  { 207396, true },
+  { 207412, true },
+  { 207426, true },
+  { 207442, true },
+  { 207462, false },
+  { 207487, true },
+  { 207504, true },
   { 207514, true },
-  { 207524, true },
   { 207532, true },
   { 207540, true },
-  { 207548, true },
-  { 207555, true },
-  { 207566, false },
-  { 207589, true },
-  { 207608, true },
-  { 207633, true },
-  { 207650, true },
-  { 207662, true },
-  { 207674, true },
-  { 207688, true },
-  { 207698, true },
-  { 207709, true },
-  { 207724, true },
+  { 207553, true },
+  { 207560, true },
+  { 207572, true },
+  { 207585, true },
+  { 207595, true },
+  { 207603, true },
+  { 207611, true },
+  { 207619, true },
+  { 207626, true },
+  { 207637, false },
+  { 207660, true },
+  { 207679, true },
+  { 207704, true },
+  { 207721, true },
   { 207733, true },
-  { 207747, true },
-  { 207756, true },
-  { 207771, true },
-  { 207782, true },
+  { 207745, true },
+  { 207759, true },
+  { 207769, true },
+  { 207780, true },
   { 207795, true },
-  { 207817, true },
+  { 207804, true },
+  { 207818, true },
   { 207827, true },
-  { 207848, true },
-  { 207865, true },
-  { 207886, true },
-  { 207900, true },
-  { 207916, true },
-  { 207929, true },
-  { 207941, true },
-  { 207951, true },
-  { 207964, true },
-  { 207988, true },
-  { 208007, true },
-  { 208019, true },
-  { 208037, true },
-  { 208046, false },
-  { 208063, true },
-  { 208081, true },
+  { 207842, true },
+  { 207853, true },
+  { 207866, true },
+  { 207888, true },
+  { 207898, true },
+  { 207919, true },
+  { 207936, true },
+  { 207957, true },
+  { 207971, true },
+  { 207987, true },
+  { 208000, true },
+  { 208012, true },
+  { 208022, true },
+  { 208035, true },
+  { 208059, true },
+  { 208078, true },
   { 208090, true },
-  { 208104, true },
+  { 208108, true },
   { 208117, false },
-  { 208138, true },
-  { 208148, true },
-  { 208167, true },
-  { 208180, true },
-  { 208200, true },
-  { 208225, true },
-  { 208235, true },
-  { 208246, true },
-  { 208258, true },
-  { 208273, true },
-  { 208286, true },
-  { 208302, true },
+  { 208134, true },
+  { 208152, true },
+  { 208161, true },
+  { 208175, true },
+  { 208188, false },
+  { 208209, true },
+  { 208219, true },
+  { 208238, true },
+  { 208251, true },
+  { 208271, true },
+  { 208296, true },
+  { 208306, true },
   { 208317, true },
-  { 208332, true },
-  { 208352, true },
-  { 208365, true },
-  { 208393, true },
-  { 208410, false },
-  { 208419, true },
-  { 208438, true },
-  { 208455, false },
-  { 208470, true },
-  { 208480, true },
-  { 208493, true },
+  { 208329, true },
+  { 208344, true },
+  { 208357, true },
+  { 208373, true },
+  { 208388, true },
+  { 208403, true },
+  { 208423, true },
+  { 208436, true },
+  { 208464, true },
+  { 208481, false },
+  { 208490, true },
   { 208509, true },
-  { 208525, true },
+  { 208526, false },
   { 208541, true },
-  { 208559, true },
-  { 208569, true },
-  { 208582, true },
-  { 208594, true },
-  { 208607, true },
-  { 208620, true },
-  { 208629, true },
+  { 208551, true },
+  { 208564, true },
+  { 208580, true },
+  { 208596, true },
+  { 208612, true },
+  { 208630, true },
+  { 208640, true },
   { 208653, true },
-  { 208677, false },
-  { 208690, true },
-  { 208701, true },
-  { 208717, true },
-  { 208729, true },
-  { 208745, true },
-  { 208762, true },
-  { 208779, false },
-  { 208791, true },
-  { 208808, true },
-  { 208823, true },
-  { 208842, false },
-  { 208851, true },
-  { 208873, true },
-  { 208886, false },
-  { 208901, true },
-  { 208923, true },
-  { 208938, true },
-  { 208953, true },
-  { 208965, true },
-  { 208984, false },
-  { 209007, true },
-  { 209023, true },
-  { 209039, true },
-  { 209057, true },
-  { 209075, false },
-  { 209095, true },
-  { 209107, true },
-  { 209120, true },
-  { 209136, true },
-  { 209147, true },
-  { 209163, true },
-  { 209182, true },
-  { 209193, true },
-  { 209203, true },
-  { 209220, true },
-  { 209232, true },
-  { 209251, true },
-  { 209263, true },
-  { 209280, true },
-  { 209301, true },
-  { 209312, true },
-  { 209331, true },
-  { 209352, true },
+  { 208665, true },
+  { 208678, true },
+  { 208691, true },
+  { 208700, true },
+  { 208724, true },
+  { 208748, false },
+  { 208761, true },
+  { 208772, true },
+  { 208788, true },
+  { 208800, true },
+  { 208816, true },
+  { 208833, true },
+  { 208850, false },
+  { 208862, true },
+  { 208879, true },
+  { 208894, true },
+  { 208913, false },
+  { 208922, true },
+  { 208933, true },
+  { 208955, true },
+  { 208968, false },
+  { 208983, true },
+  { 209005, true },
+  { 209020, true },
+  { 209035, true },
+  { 209047, true },
+  { 209066, false },
+  { 209089, true },
+  { 209105, true },
+  { 209121, true },
+  { 209139, true },
+  { 209157, false },
+  { 209177, true },
+  { 209189, true },
+  { 209202, true },
+  { 209218, true },
+  { 209229, true },
+  { 209245, true },
+  { 209264, true },
+  { 209275, true },
+  { 209285, true },
+  { 209302, true },
+  { 209314, true },
+  { 209333, true },
+  { 209345, true },
   { 209362, true },
-  { 209371, true },
-  { 209384, true },
-  { 209392, true },
-  { 209408, true },
-  { 209432, false },
-  { 209450, true },
-  { 209468, false },
-  { 209488, true },
-  { 209504, true },
-  { 209522, true },
-  { 209534, true },
-  { 209551, true },
-  { 209574, true },
-  { 209593, true },
-  { 209613, true },
-  { 209626, true },
-  { 209638, true },
-  { 209648, true },
+  { 209383, true },
+  { 209394, true },
+  { 209413, true },
+  { 209434, true },
+  { 209444, true },
+  { 209453, true },
+  { 209466, true },
+  { 209474, true },
+  { 209490, true },
+  { 209514, false },
+  { 209532, true },
+  { 209550, false },
+  { 209570, true },
+  { 209586, true },
+  { 209604, true },
+  { 209616, true },
+  { 209633, true },
   { 209656, true },
-  { 209678, true },
-  { 209698, true },
-  { 209706, true },
+  { 209675, true },
+  { 209695, true },
+  { 209708, true },
   { 209720, true },
-  { 209736, true },
-  { 209746, true },
+  { 209730, true },
+  { 209738, true },
   { 209760, true },
-  { 209772, true },
-  { 209781, true },
-  { 209790, true },
-  { 209799, true },
-  { 209816, true },
-  { 209826, true },
-  { 209847, true },
-  { 209860, true },
-  { 209886, true },
-  { 209903, true },
-  { 209924, true },
+  { 209780, true },
+  { 209788, true },
+  { 209802, true },
+  { 209818, true },
+  { 209828, true },
+  { 209842, true },
+  { 209854, true },
+  { 209863, true },
+  { 209872, true },
+  { 209881, true },
+  { 209898, true },
+  { 209908, true },
+  { 209929, true },
   { 209942, true },
-  { 209960, true },
-  { 209976, true },
-  { 209989, true },
-  { 209999, true },
-  { 210016, true },
-  { 210033, true },
+  { 209968, true },
+  { 209985, true },
+  { 210006, true },
+  { 210024, true },
   { 210042, true },
-  { 210056, true },
-  { 210070, true },
-  { 210082, true },
-  { 210101, true },
-  { 210111, true },
-  { 210128, true },
-  { 210150, true },
-  { 210172, true },
-  { 210186, true },
-  { 210200, true },
-  { 210214, true },
+  { 210058, true },
+  { 210071, true },
+  { 210081, true },
+  { 210098, true },
+  { 210115, true },
+  { 210124, true },
+  { 210138, true },
+  { 210152, true },
+  { 210164, true },
+  { 210183, true },
+  { 210193, true },
+  { 210210, true },
   { 210232, true },
-  { 210247, true },
-  { 210261, true },
+  { 210254, true },
   { 210268, true },
-  { 210277, true },
-  { 210289, true },
-  { 210295, true },
-  { 210301, true },
-  { 210309, true },
-  { 210321, true },
-  { 210342, true },
-  { 210354, true },
-  { 210364, true },
-  { 210375, true },
-  { 210387, true },
-  { 210405, true },
-  { 210418, true },
-  { 210437, true },
-  { 210453, true },
-  { 210466, true },
-  { 210477, true },
-  { 210490, true },
-  { 210508, true },
-  { 210523, true },
-  { 210537, true },
-  { 210559, false },
-  { 210573, true },
-  { 210592, true },
-  { 210608, true },
+  { 210282, true },
+  { 210296, true },
+  { 210314, true },
+  { 210329, true },
+  { 210343, true },
+  { 210350, true },
+  { 210359, true },
+  { 210371, true },
+  { 210377, true },
+  { 210383, true },
+  { 210391, true },
+  { 210403, true },
+  { 210424, true },
+  { 210436, true },
+  { 210446, true },
+  { 210457, true },
+  { 210469, true },
+  { 210487, true },
+  { 210500, true },
+  { 210519, true },
+  { 210535, true },
+  { 210548, true },
+  { 210559, true },
+  { 210572, true },
+  { 210590, true },
+  { 210605, true },
   { 210619, true },
-  { 210629, true },
-  { 210637, true },
-  { 210654, true },
-  { 210671, true },
-  { 210685, true },
-  { 210697, true },
-  { 210709, true },
-  { 210726, true },
-  { 210740, true },
-  { 210754, false },
+  { 210641, false },
+  { 210655, true },
+  { 210674, true },
+  { 210690, true },
+  { 210701, true },
+  { 210711, true },
+  { 210719, true },
+  { 210736, true },
+  { 210753, true },
   { 210767, true },
-  { 210781, true },
-  { 210799, true },
-  { 210811, true },
-  { 210823, true },
-  { 210842, true },
-  { 210861, true },
-  { 210878, true },
-  { 210894, true },
-  { 210907, true },
-  { 210919, true },
-  { 210932, true },
-  { 210948, true },
-  { 210961, true },
-  { 210974, true },
+  { 210779, true },
+  { 210791, true },
+  { 210808, true },
+  { 210822, true },
+  { 210836, false },
+  { 210849, true },
+  { 210863, true },
+  { 210881, true },
+  { 210893, true },
+  { 210905, true },
+  { 210924, true },
+  { 210943, true },
+  { 210960, true },
+  { 210976, true },
   { 210989, true },
-  { 211017, true },
-  { 211027, true },
-  { 211038, true },
-  { 211051, true },
-  { 211066, true },
-  { 211079, true },
-  { 211104, true },
-  { 211116, true },
-  { 211130, true },
-  { 211144, true },
-  { 211160, true },
-  { 211183, true },
-  { 211207, true },
-  { 211223, true },
-  { 211238, true },
-  { 211270, true },
-  { 211294, true },
-  { 211309, true },
-  { 211321, true },
-  { 211343, true },
-  { 211362, true },
-  { 211380, true },
-  { 211393, true },
-  { 211410, true },
-  { 211421, true },
-  { 211433, true },
-  { 211453, true },
-  { 211465, true },
-  { 211477, true },
-  { 211495, true },
-  { 211512, true },
-  { 211527, true },
-  { 211546, true },
+  { 211001, true },
+  { 211014, true },
+  { 211030, true },
+  { 211043, true },
+  { 211056, true },
+  { 211071, true },
+  { 211099, true },
+  { 211109, true },
+  { 211120, true },
+  { 211133, true },
+  { 211148, true },
+  { 211161, true },
+  { 211186, true },
+  { 211198, true },
+  { 211212, true },
+  { 211226, true },
+  { 211242, true },
+  { 211265, true },
+  { 211289, true },
+  { 211305, true },
+  { 211320, true },
+  { 211352, true },
+  { 211376, true },
+  { 211391, true },
+  { 211403, true },
+  { 211425, true },
+  { 211444, true },
+  { 211462, true },
+  { 211475, true },
+  { 211492, true },
+  { 211503, true },
+  { 211515, true },
+  { 211535, true },
+  { 211547, true },
   { 211559, true },
-  { 211575, true },
-  { 211593, true },
-  { 211605, true },
-  { 211621, true },
-  { 211634, true },
-  { 211654, true },
-  { 211667, true },
-  { 211689, true },
-  { 211706, true },
-  { 211721, true },
-  { 211737, true },
-  { 211758, true },
-  { 211778, true },
-  { 211791, true },
+  { 211577, true },
+  { 211594, true },
+  { 211609, true },
+  { 211628, true },
+  { 211641, true },
+  { 211657, true },
+  { 211675, true },
+  { 211687, true },
+  { 211703, true },
+  { 211716, true },
+  { 211736, true },
+  { 211749, true },
+  { 211771, true },
+  { 211788, true },
   { 211803, true },
-  { 211815, true },
-  { 211829, true },
-  { 211847, true },
-  { 211862, true },
-  { 211879, true },
-  { 211898, true },
-  { 211917, true },
-  { 211932, true },
+  { 211819, true },
+  { 211840, true },
+  { 211860, true },
+  { 211873, true },
+  { 211885, true },
+  { 211897, true },
+  { 211911, true },
+  { 211929, true },
   { 211944, true },
   { 211961, true },
-  { 211976, true },
-  { 211993, true },
-  { 212011, true },
-  { 212031, true },
-  { 212042, true },
-  { 212054, true },
-  { 212076, true },
-  { 212088, true },
-  { 212097, true },
-  { 212109, true },
+  { 211980, true },
+  { 211999, true },
+  { 212014, true },
+  { 212026, true },
+  { 212043, true },
+  { 212058, true },
+  { 212075, true },
+  { 212093, true },
+  { 212113, true },
   { 212124, true },
-  { 212142, true },
-  { 212157, true },
-  { 212173, true },
-  { 212192, true },
-  { 212208, true },
-  { 212225, true },
-  { 212238, true },
-  { 212257, true },
-  { 212275, true },
-  { 212281, true },
-  { 212299, true },
-  { 212322, true },
-  { 212331, true },
-  { 212339, false },
-  { 212359, true },
-  { 212376, true },
-  { 212388, true },
-  { 212407, false },
-  { 212424, true },
-  { 212443, true },
-  { 212454, true },
-  { 212473, true },
-  { 212490, true },
-  { 212513, true },
-  { 212539, true },
-  { 212550, true },
-  { 212568, true },
-  { 212588, true },
-  { 212605, true },
-  { 212624, true },
-  { 212642, true },
-  { 212660, true },
-  { 212669, true },
-  { 212676, true },
-  { 212683, true },
-  { 212694, true },
+  { 212136, true },
+  { 212158, true },
+  { 212170, true },
+  { 212179, true },
+  { 212191, true },
+  { 212206, true },
+  { 212224, true },
+  { 212239, true },
+  { 212255, true },
+  { 212274, true },
+  { 212290, true },
+  { 212307, true },
+  { 212320, true },
+  { 212339, true },
+  { 212357, true },
+  { 212363, true },
+  { 212381, true },
+  { 212404, true },
+  { 212413, true },
+  { 212421, false },
+  { 212441, true },
+  { 212458, true },
+  { 212470, true },
+  { 212489, false },
+  { 212506, true },
+  { 212525, true },
+  { 212536, true },
+  { 212555, true },
+  { 212572, true },
+  { 212595, true },
+  { 212621, true },
+  { 212632, true },
+  { 212650, true },
+  { 212670, true },
+  { 212687, true },
   { 212706, true },
-  { 212716, true },
-  { 212727, false },
-  { 212747, true },
-  { 212755, true },
-  { 212766, true },
-  { 212777, true },
+  { 212724, true },
+  { 212742, true },
+  { 212751, true },
+  { 212758, true },
+  { 212765, true },
+  { 212776, true },
   { 212788, true },
-  { 212812, true },
-  { 212835, true },
-  { 212864, true },
-  { 212877, true },
-  { 212896, true },
-  { 212909, true },
-  { 212927, true },
-  { 212942, true },
-  { 212965, true },
-  { 212982, true },
-  { 212993, true },
-  { 213010, true },
-  { 213025, true },
-  { 213036, true },
-  { 213051, true },
-  { 213064, true },
-  { 213075, true },
-  { 213093, true },
-  { 213119, true },
-  { 213148, true },
-  { 213160, true },
-  { 213173, false },
-  { 213193, true },
-  { 213208, true },
-  { 213226, true },
-  { 213241, true },
-  { 213262, false },
-  { 213278, true },
-  { 213294, true },
-  { 213312, true },
-  { 213328, true },
-  { 213343, true },
-  { 213361, true },
-  { 213377, true },
-  { 213389, true },
-  { 213401, true },
-  { 213423, true },
-  { 213445, true },
-  { 213465, true },
-  { 213486, true },
-  { 213505, true },
-  { 213525, true },
-  { 213546, true },
-  { 213566, true },
-  { 213585, true },
-  { 213602, true },
-  { 213620, false },
-  { 213638, true },
-  { 213658, true },
-  { 213677, true },
-  { 213696, true },
-  { 213712, true },
-  { 213732, true },
-  { 213753, true },
-  { 213780, true },
-  { 213792, true },
-  { 213803, true },
-  { 213814, true },
-  { 213828, true },
-  { 213843, true },
-  { 213854, true },
-  { 213873, true },
-  { 213884, true },
-  { 213898, true },
-  { 213909, true },
-  { 213921, true },
-  { 213930, true },
-  { 213945, true },
+  { 212798, true },
+  { 212809, false },
+  { 212829, true },
+  { 212837, true },
+  { 212848, true },
+  { 212859, true },
+  { 212870, true },
+  { 212883, true },
+  { 212902, true },
+  { 212915, true },
+  { 212933, true },
+  { 212948, true },
+  { 212971, true },
+  { 212988, true },
+  { 212999, true },
+  { 213016, true },
+  { 213031, true },
+  { 213042, true },
+  { 213057, true },
+  { 213070, true },
+  { 213081, true },
+  { 213099, true },
+  { 213125, true },
+  { 213154, true },
+  { 213166, true },
+  { 213179, false },
+  { 213199, true },
+  { 213214, true },
+  { 213232, true },
+  { 213247, true },
+  { 213268, false },
+  { 213284, true },
+  { 213300, true },
+  { 213318, true },
+  { 213334, true },
+  { 213349, true },
+  { 213367, true },
+  { 213383, true },
+  { 213395, true },
+  { 213407, true },
+  { 213429, true },
+  { 213451, true },
+  { 213471, true },
+  { 213492, true },
+  { 213511, true },
+  { 213531, true },
+  { 213552, true },
+  { 213572, true },
+  { 213591, true },
+  { 213608, true },
+  { 213626, false },
+  { 213644, true },
+  { 213664, true },
+  { 213683, true },
+  { 213699, true },
+  { 213719, true },
+  { 213740, true },
+  { 213767, true },
+  { 213779, true },
+  { 213790, true },
+  { 213801, true },
+  { 213815, true },
+  { 213830, true },
+  { 213841, true },
+  { 213860, true },
+  { 213871, true },
+  { 213885, true },
+  { 213896, true },
+  { 213908, true },
+  { 213917, true },
+  { 213932, true },
+  { 213942, true },
   { 213955, true },
-  { 213968, true },
-  { 213987, true },
-  { 214005, true },
-  { 214025, true },
-  { 214041, true },
-  { 214050, true },
-  { 214060, true },
-  { 214081, false },
-  { 214098, true },
-  { 214118, true },
+  { 213974, true },
+  { 213992, true },
+  { 214012, true },
+  { 214028, true },
+  { 214037, true },
+  { 214047, true },
+  { 214068, false },
+  { 214085, true },
+  { 214105, true },
+  { 214114, true },
   { 214127, true },
-  { 214140, true },
-  { 214157, true },
-  { 214180, true },
-  { 214194, true },
-  { 214208, true },
-  { 214220, true },
-  { 214237, true },
-  { 214252, true },
-  { 214262, true },
-  { 214279, true },
-  { 214295, true },
-  { 214312, true },
-  { 214328, true },
-  { 214340, true },
-  { 214351, true },
-  { 214365, false },
-  { 214381, true },
-  { 214395, true },
-  { 214406, true },
-  { 214415, true },
-  { 214430, true },
-  { 214446, true },
+  { 214144, true },
+  { 214167, true },
+  { 214181, true },
+  { 214195, true },
+  { 214207, true },
+  { 214224, true },
+  { 214239, true },
+  { 214249, true },
+  { 214266, true },
+  { 214282, true },
+  { 214299, true },
+  { 214315, true },
+  { 214327, true },
+  { 214338, true },
+  { 214352, false },
+  { 214368, true },
+  { 214382, true },
+  { 214393, true },
+  { 214402, true },
+  { 214417, true },
+  { 214433, true },
+  { 214445, true },
   { 214458, true },
-  { 214471, true },
+  { 214467, true },
   { 214480, true },
-  { 214493, true },
-  { 214510, true },
-  { 214519, true },
-  { 214531, true },
-  { 214543, true },
-  { 214555, true },
-  { 214574, true },
-  { 214586, true },
-  { 214595, true },
-  { 214607, true },
-  { 214622, true },
-  { 214634, true },
-  { 214651, true },
-  { 214663, true },
-  { 214679, true },
-  { 214695, true },
-  { 214716, true },
-  { 214732, true },
-  { 214750, true },
-  { 214766, true },
-  { 214782, true },
-  { 214802, true },
-  { 214817, true },
-  { 214829, true },
-  { 214844, true },
-  { 214854, true },
-  { 214869, true },
-  { 214881, true },
-  { 214893, true },
-  { 214910, true },
-  { 214925, true },
-  { 214939, true },
-  { 214950, true },
-  { 214961, true },
-  { 214972, true },
-  { 214983, true },
+  { 214497, true },
+  { 214506, true },
+  { 214518, true },
+  { 214530, true },
+  { 214542, true },
+  { 214561, true },
+  { 214573, true },
+  { 214582, true },
+  { 214594, true },
+  { 214609, true },
+  { 214621, true },
+  { 214638, true },
+  { 214650, true },
+  { 214666, true },
+  { 214682, true },
+  { 214703, true },
+  { 214719, true },
+  { 214737, true },
+  { 214753, true },
+  { 214769, true },
+  { 214789, true },
+  { 214804, true },
+  { 214816, true },
+  { 214831, true },
+  { 214841, true },
+  { 214856, true },
+  { 214868, true },
+  { 214880, true },
+  { 214897, true },
+  { 214912, true },
+  { 214926, true },
+  { 214937, true },
+  { 214948, true },
+  { 214959, true },
+  { 214970, true },
+  { 214978, true },
   { 214991, true },
-  { 215004, true },
+  { 215005, true },
   { 215018, true },
-  { 215031, true },
-  { 215049, true },
-  { 215058, true },
-  { 215075, true },
+  { 215036, true },
+  { 215045, true },
+  { 215062, true },
+  { 215072, true },
   { 215085, true },
-  { 215098, true },
-  { 215115, true },
-  { 215129, true },
-  { 215138, true },
-  { 215153, true },
+  { 215102, true },
+  { 215116, true },
+  { 215125, true },
+  { 215140, true },
+  { 215154, true },
   { 215167, true },
-  { 215180, true },
-  { 215194, true },
-  { 215202, true },
-  { 215221, true },
-  { 215239, true },
-  { 215259, true },
-  { 215276, true },
-  { 215291, true },
-  { 215306, true },
-  { 215320, true },
-  { 215338, true },
-  { 215354, true },
-  { 215370, true },
-  { 215384, true },
-  { 215400, true },
-  { 215422, true },
-  { 215439, true },
+  { 215181, true },
+  { 215189, true },
+  { 215208, true },
+  { 215226, true },
+  { 215246, true },
+  { 215263, true },
+  { 215278, true },
+  { 215293, true },
+  { 215307, true },
+  { 215325, true },
+  { 215341, true },
+  { 215357, true },
+  { 215371, true },
+  { 215387, true },
+  { 215409, true },
+  { 215426, true },
+  { 215445, true },
   { 215458, true },
-  { 215471, true },
-  { 215485, true },
-  { 215501, false },
-  { 215519, true },
-  { 215534, true },
-  { 215551, true },
-  { 215566, true },
-  { 215583, false },
-  { 215609, true },
-  { 215621, true },
-  { 215636, true },
+  { 215472, true },
+  { 215488, false },
+  { 215506, true },
+  { 215521, true },
+  { 215538, true },
+  { 215553, true },
+  { 215570, false },
+  { 215596, true },
+  { 215608, true },
+  { 215623, true },
+  { 215641, true },
   { 215654, true },
   { 215667, true },
-  { 215680, true },
-  { 215692, true },
-  { 215711, true },
-  { 215726, true },
-  { 215736, true },
-  { 215751, true },
-  { 215767, true },
-  { 215779, true },
-  { 215801, true },
-  { 215814, false },
-  { 215825, true },
-  { 215853, true },
-  { 215870, true },
-  { 215901, true },
-  { 215911, true },
+  { 215679, true },
+  { 215698, true },
+  { 215713, true },
+  { 215723, true },
+  { 215738, true },
+  { 215754, true },
+  { 215766, true },
+  { 215788, true },
+  { 215801, false },
+  { 215812, true },
+  { 215840, true },
+  { 215857, true },
+  { 215888, true },
+  { 215898, true },
+  { 215909, true },
   { 215922, true },
-  { 215935, true },
-  { 215947, true },
-  { 215959, true },
-  { 215973, true },
-  { 215985, true },
-  { 215993, true },
-  { 216001, true },
-  { 216013, true },
-  { 216031, true },
-  { 216042, false },
-  { 216062, true },
-  { 216080, true },
-  { 216100, true },
-  { 216115, true },
-  { 216130, true },
-  { 216147, false },
-  { 216161, true },
-  { 216181, true },
-  { 216201, true },
-  { 216221, true },
-  { 216232, true },
-  { 216257, true },
-  { 216278, true },
-  { 216296, true },
-  { 216311, true },
-  { 216328, true },
-  { 216343, true },
-  { 216359, true },
-  { 216378, true },
+  { 215934, true },
+  { 215946, true },
+  { 215960, true },
+  { 215972, true },
+  { 215980, true },
+  { 215988, true },
+  { 216000, true },
+  { 216018, true },
+  { 216029, false },
+  { 216049, true },
+  { 216067, true },
+  { 216087, true },
+  { 216102, true },
+  { 216117, true },
+  { 216134, false },
+  { 216148, true },
+  { 216168, true },
+  { 216188, true },
+  { 216208, true },
+  { 216219, true },
+  { 216244, true },
+  { 216265, true },
+  { 216283, true },
+  { 216298, true },
+  { 216315, true },
+  { 216330, true },
+  { 216346, true },
+  { 216365, true },
+  { 216390, true },
   { 216403, true },
-  { 216416, true },
-  { 216427, true },
-  { 216438, true },
-  { 216452, false },
-  { 216467, true },
-  { 216480, false },
-  { 216508, true },
+  { 216414, true },
+  { 216425, true },
+  { 216439, false },
+  { 216454, true },
+  { 216467, false },
+  { 216495, true },
+  { 216507, true },
   { 216520, true },
-  { 216533, true },
-  { 216546, false },
-  { 216554, true },
-  { 216564, true },
-  { 216580, true },
-  { 216595, true },
-  { 216613, true },
-  { 216625, true },
-  { 216644, true },
+  { 216533, false },
+  { 216541, true },
+  { 216551, true },
+  { 216567, true },
+  { 216582, true },
+  { 216600, true },
+  { 216612, true },
+  { 216631, true },
+  { 216643, true },
   { 216656, true },
   { 216669, true },
-  { 216682, true },
+  { 216684, true },
   { 216697, true },
-  { 216710, true },
-  { 216732, true },
+  { 216719, true },
+  { 216733, true },
   { 216746, true },
-  { 216759, true },
-  { 216774, true },
+  { 216761, true },
+  { 216775, true },
   { 216788, true },
-  { 216801, true },
-  { 216821, false },
-  { 216838, true },
-  { 216856, true },
+  { 216808, false },
+  { 216825, true },
+  { 216843, true },
+  { 216857, true },
   { 216870, true },
-  { 216883, true },
-  { 216897, true },
-  { 216908, true },
+  { 216884, true },
+  { 216895, true },
+  { 216906, true },
   { 216919, true },
-  { 216932, true },
-  { 216942, true },
-  { 216959, true },
-  { 216967, false },
-  { 216982, true },
-  { 216995, true },
-  { 217010, true },
-  { 217021, true },
-  { 217046, true },
-  { 217082, true },
-  { 217094, true },
-  { 217107, true },
-  { 217122, true },
-  { 217135, true },
-  { 217152, true },
-  { 217174, true },
-  { 217196, true },
-  { 217214, true },
-  { 217227, true },
-  { 217238, true },
-  { 217250, true },
-  { 217261, true },
-  { 217279, true },
-  { 217287, true },
-  { 217320, true },
-  { 217327, true },
-  { 217344, true },
-  { 217360, true },
-  { 217375, true },
-  { 217392, true },
-  { 217402, true },
-  { 217415, true },
-  { 217429, true },
-  { 217439, false },
-  { 217457, true },
-  { 217475, true },
-  { 217496, true },
-  { 217508, true },
-  { 217520, true },
-  { 217531, true },
-  { 217544, true },
-  { 217557, true },
-  { 217573, true },
-  { 217590, true },
-  { 217604, true },
-  { 217618, true },
-  { 217638, true },
-  { 217653, true },
-  { 217667, true },
-  { 217679, true },
-  { 217699, true },
-  { 217718, true },
-  { 217731, true },
-  { 217751, true },
-  { 217762, true },
-  { 217779, true },
-  { 217789, true },
-  { 217798, true },
-  { 217810, true },
-  { 217832, true },
-  { 217843, true },
-  { 217854, true },
-  { 217868, true },
-  { 217887, true },
-  { 217904, true },
-  { 217919, true },
-  { 217934, true },
-  { 217951, true },
-  { 217965, true },
-  { 217979, true },
-  { 217993, true },
-  { 218016, true },
-  { 218036, true },
-  { 218050, true },
-  { 218064, true },
-  { 218078, true },
-  { 218090, true },
-  { 218102, true },
-  { 218117, true },
-  { 218133, true },
-  { 218143, true },
-  { 218157, true },
-  { 218167, true },
-  { 218181, true },
-  { 218190, true },
-  { 218202, true },
-  { 218213, true },
-  { 218224, true },
-  { 218236, true },
-  { 218245, true },
-  { 218254, true },
-  { 218265, true },
-  { 218274, true },
-  { 218288, true },
-  { 218300, true },
-  { 218313, true },
-  { 218329, true },
-  { 218344, true },
-  { 218354, true },
-  { 218367, true },
-  { 218380, true },
-  { 218396, true },
-  { 218417, true },
-  { 218438, true },
-  { 218457, true },
-  { 218467, true },
-  { 218479, true },
-  { 218490, true },
-  { 218513, false },
-  { 218521, true },
-  { 218536, true },
-  { 218550, true },
-  { 218564, true },
-  { 218576, true },
-  { 218599, true },
-  { 218612, true },
-  { 218622, true },
-  { 218630, true },
-  { 218651, true },
-  { 218663, true },
-  { 218674, true },
-  { 218694, true },
-  { 218713, true },
-  { 218724, true },
-  { 218739, true },
-  { 218764, false },
-  { 218792, false },
-  { 218804, true },
-  { 218815, true },
-  { 218831, true },
-  { 218846, true },
-  { 218861, true },
-  { 218872, true },
-  { 218885, true },
-  { 218897, true },
-  { 218913, true },
-  { 218928, true },
-  { 218943, true },
-  { 218959, true },
-  { 218976, true },
-  { 218999, true },
-  { 219018, true },
-  { 219032, true },
-  { 219053, true },
-  { 219073, true },
-  { 219091, true },
-  { 219110, true },
-  { 219128, true },
-  { 219146, true },
-  { 219162, true },
-  { 219176, true },
-  { 219191, true },
-  { 219203, false },
-  { 219217, true },
-  { 219230, true },
-  { 219240, true },
-  { 219256, true },
-  { 219267, true },
-  { 219278, true },
-  { 219289, true },
-  { 219300, true },
-  { 219312, true },
-  { 219330, true },
-  { 219348, true },
-  { 219370, true },
-  { 219384, true },
-  { 219401, true },
-  { 219420, true },
-  { 219438, true },
-  { 219459, true },
-  { 219473, false },
-  { 219485, true },
-  { 219500, true },
-  { 219516, true },
-  { 219534, true },
-  { 219544, true },
-  { 219556, false },
-  { 219567, true },
-  { 219586, false },
-  { 219605, true },
-  { 219620, true },
-  { 219633, false },
-  { 219652, true },
-  { 219663, true },
-  { 219681, true },
-  { 219695, true },
-  { 219720, true },
-  { 219735, true },
-  { 219750, true },
-  { 219768, true },
-  { 219783, true },
-  { 219798, true },
-  { 219815, true },
-  { 219826, true },
-  { 219836, true },
-  { 219848, true },
-  { 219862, true },
-  { 219874, true },
-  { 219889, true },
-  { 219898, true },
-  { 219916, true },
-  { 219927, false },
-  { 219940, true },
-  { 219958, true },
-  { 219973, false },
-  { 219986, true },
-  { 219998, true },
-  { 220019, true },
-  { 220032, true },
-  { 220049, true },
-  { 220069, true },
-  { 220092, true },
-  { 220111, true },
-  { 220122, true },
-  { 220136, true },
-  { 220146, false },
-  { 220158, true },
+  { 216929, true },
+  { 216946, true },
+  { 216954, false },
+  { 216969, true },
+  { 216980, true },
+  { 216993, true },
+  { 217008, true },
+  { 217019, true },
+  { 217044, true },
+  { 217080, true },
+  { 217092, true },
+  { 217105, true },
+  { 217120, true },
+  { 217133, true },
+  { 217150, true },
+  { 217172, true },
+  { 217194, true },
+  { 217212, true },
+  { 217225, true },
+  { 217236, true },
+  { 217248, true },
+  { 217259, true },
+  { 217277, true },
+  { 217285, true },
+  { 217318, true },
+  { 217325, true },
+  { 217342, true },
+  { 217358, true },
+  { 217373, true },
+  { 217390, true },
+  { 217400, true },
+  { 217413, true },
+  { 217427, true },
+  { 217437, false },
+  { 217455, true },
+  { 217473, true },
+  { 217494, true },
+  { 217506, true },
+  { 217518, true },
+  { 217529, true },
+  { 217542, true },
+  { 217555, true },
+  { 217571, true },
+  { 217588, true },
+  { 217602, true },
+  { 217616, true },
+  { 217636, true },
+  { 217651, true },
+  { 217665, true },
+  { 217677, true },
+  { 217697, true },
+  { 217716, true },
+  { 217729, true },
+  { 217749, true },
+  { 217760, true },
+  { 217777, true },
+  { 217787, true },
+  { 217796, true },
+  { 217808, true },
+  { 217830, true },
+  { 217841, true },
+  { 217852, true },
+  { 217866, true },
+  { 217885, true },
+  { 217902, true },
+  { 217917, true },
+  { 217932, true },
+  { 217949, true },
+  { 217963, true },
+  { 217977, true },
+  { 217991, true },
+  { 218014, true },
+  { 218034, true },
+  { 218048, true },
+  { 218062, true },
+  { 218076, true },
+  { 218088, true },
+  { 218100, true },
+  { 218115, true },
+  { 218131, true },
+  { 218141, true },
+  { 218155, true },
+  { 218165, true },
+  { 218179, true },
+  { 218188, true },
+  { 218200, true },
+  { 218211, true },
+  { 218222, true },
+  { 218234, true },
+  { 218243, true },
+  { 218252, true },
+  { 218263, true },
+  { 218272, true },
+  { 218286, true },
+  { 218298, true },
+  { 218311, true },
+  { 218327, true },
+  { 218342, true },
+  { 218352, true },
+  { 218365, true },
+  { 218378, true },
+  { 218394, true },
+  { 218415, true },
+  { 218436, true },
+  { 218455, true },
+  { 218465, true },
+  { 218477, true },
+  { 218488, true },
+  { 218511, false },
+  { 218519, true },
+  { 218534, true },
+  { 218548, true },
+  { 218562, true },
+  { 218574, true },
+  { 218597, true },
+  { 218610, true },
+  { 218620, true },
+  { 218628, true },
+  { 218649, true },
+  { 218661, true },
+  { 218672, true },
+  { 218692, true },
+  { 218711, true },
+  { 218722, true },
+  { 218737, true },
+  { 218762, false },
+  { 218790, false },
+  { 218802, true },
+  { 218813, true },
+  { 218829, true },
+  { 218844, true },
+  { 218859, true },
+  { 218870, true },
+  { 218883, true },
+  { 218895, true },
+  { 218911, true },
+  { 218926, true },
+  { 218941, true },
+  { 218957, true },
+  { 218974, true },
+  { 218997, true },
+  { 219016, true },
+  { 219030, true },
+  { 219051, true },
+  { 219071, true },
+  { 219089, true },
+  { 219108, true },
+  { 219126, true },
+  { 219144, true },
+  { 219160, true },
+  { 219174, true },
+  { 219189, true },
+  { 219201, false },
+  { 219215, true },
+  { 219228, true },
+  { 219238, true },
+  { 219254, true },
+  { 219265, true },
+  { 219276, true },
+  { 219287, true },
+  { 219298, true },
+  { 219310, true },
+  { 219328, true },
+  { 219346, true },
+  { 219368, true },
+  { 219382, true },
+  { 219399, true },
+  { 219418, true },
+  { 219436, true },
+  { 219457, true },
+  { 219471, false },
+  { 219483, true },
+  { 219498, true },
+  { 219514, true },
+  { 219532, true },
+  { 219542, true },
+  { 219554, false },
+  { 219565, true },
+  { 219584, false },
+  { 219603, true },
+  { 219618, true },
+  { 219631, false },
+  { 219650, true },
+  { 219661, true },
+  { 219679, true },
+  { 219693, true },
+  { 219718, true },
+  { 219733, true },
+  { 219748, true },
+  { 219766, true },
+  { 219781, true },
+  { 219796, true },
+  { 219813, true },
+  { 219824, true },
+  { 219834, true },
+  { 219846, true },
+  { 219860, true },
+  { 219872, true },
+  { 219887, true },
+  { 219896, true },
+  { 219914, true },
+  { 219925, false },
+  { 219938, true },
+  { 219955, true },
+  { 219973, true },
+  { 219988, false },
+  { 220001, true },
+  { 220013, true },
+  { 220034, true },
+  { 220047, true },
+  { 220064, true },
+  { 220084, true },
+  { 220107, true },
+  { 220126, true },
+  { 220137, true },
+  { 220151, true },
+  { 220161, false },
   { 220173, true },
-  { 220187, true },
-  { 220197, true },
-  { 220211, true },
-  { 220231, true },
-  { 220254, true },
-  { 220272, true },
-  { 220280, true },
-  { 220291, true },
-  { 220298, true },
+  { 220188, true },
+  { 220202, true },
+  { 220212, true },
+  { 220226, true },
+  { 220246, true },
+  { 220269, true },
+  { 220287, true },
+  { 220295, true },
   { 220306, true },
-  { 220323, true },
+  { 220313, true },
+  { 220321, true },
   { 220338, true },
-  { 220350, true },
+  { 220353, true },
   { 220365, true },
-  { 220382, true },
-  { 220399, true },
-  { 220416, true },
-  { 220427, false },
-  { 220436, true },
-  { 220449, false },
-  { 220466, true },
-  { 220479, true },
-  { 220490, true },
-  { 220500, false },
-  { 220513, true },
-  { 220530, true },
-  { 220545, false },
-  { 220569, false },
-  { 220581, true },
-  { 220606, true },
-  { 220615, true },
-  { 220627, true },
-  { 220647, true },
-  { 220664, true },
-  { 220683, true },
-  { 220693, true },
-  { 220702, true },
-  { 220718, true },
-  { 220737, true },
-  { 220760, true },
-  { 220778, true },
-  { 220794, true },
+  { 220380, true },
+  { 220397, true },
+  { 220414, true },
+  { 220431, true },
+  { 220442, false },
+  { 220451, true },
+  { 220464, false },
+  { 220481, true },
+  { 220494, true },
+  { 220505, true },
+  { 220515, false },
+  { 220528, true },
+  { 220545, true },
+  { 220560, false },
+  { 220584, false },
+  { 220596, true },
+  { 220621, true },
+  { 220630, true },
+  { 220642, true },
+  { 220662, true },
+  { 220679, true },
+  { 220698, true },
+  { 220708, true },
+  { 220717, true },
+  { 220733, true },
+  { 220752, true },
+  { 220775, true },
+  { 220793, true },
   { 220809, true },
   { 220824, true },
   { 220839, true },
-  { 220859, true },
-  { 220872, true },
-  { 220885, true },
-  { 220898, true },
-  { 220907, true },
-  { 220920, true },
-  { 220934, true },
-  { 220948, true },
-  { 220971, true },
-  { 220995, true },
-  { 221006, true },
-  { 221025, true },
-  { 221047, true },
-  { 221073, true },
+  { 220854, true },
+  { 220874, true },
+  { 220887, true },
+  { 220900, true },
+  { 220913, true },
+  { 220922, true },
+  { 220935, true },
+  { 220949, true },
+  { 220963, true },
+  { 220986, true },
+  { 221010, true },
+  { 221021, true },
+  { 221040, true },
+  { 221062, true },
   { 221088, true },
   { 221103, true },
-  { 221117, true },
-  { 221133, true },
-  { 221145, true },
-  { 221168, true },
-  { 221177, true },
-  { 221185, true },
-  { 221196, true },
-  { 221212, true },
-  { 221226, true },
-  { 221238, true },
-  { 221251, true },
-  { 221268, false },
-  { 221286, true },
-  { 221310, true },
-  { 221323, true },
-  { 221334, true },
-  { 221351, true },
-  { 221364, true },
-  { 221375, true },
-  { 221389, true },
-  { 221401, true },
-  { 221411, true },
+  { 221118, true },
+  { 221132, true },
+  { 221148, true },
+  { 221160, true },
+  { 221183, true },
+  { 221192, true },
+  { 221200, true },
+  { 221211, true },
+  { 221227, true },
+  { 221241, true },
+  { 221253, true },
+  { 221266, true },
+  { 221283, false },
+  { 221301, true },
+  { 221325, true },
+  { 221338, true },
+  { 221349, true },
+  { 221366, true },
+  { 221379, true },
+  { 221390, true },
+  { 221404, true },
+  { 221416, true },
   { 221426, true },
-  { 221439, true },
-  { 221455, true },
-  { 221465, false },
-  { 221475, true },
-  { 221488, true },
+  { 221441, true },
+  { 221454, true },
+  { 221470, true },
+  { 221480, false },
+  { 221490, true },
   { 221503, true },
-  { 221513, true },
-  { 221529, true },
-  { 221543, true },
-  { 221555, true },
-  { 221564, true },
+  { 221518, true },
+  { 221528, true },
+  { 221544, true },
+  { 221558, true },
+  { 221570, true },
   { 221579, true },
-  { 221597, true },
-  { 221606, true },
-  { 221626, true },
-  { 221642, true },
-  { 221659, true },
-  { 221672, true },
-  { 221682, true },
-  { 221692, true },
-  { 221706, true },
-  { 221718, true },
-  { 221731, true },
-  { 221748, true },
+  { 221594, true },
+  { 221612, true },
+  { 221621, true },
+  { 221641, true },
+  { 221657, true },
+  { 221674, true },
+  { 221687, true },
+  { 221697, true },
+  { 221707, true },
+  { 221721, true },
+  { 221733, true },
+  { 221746, true },
   { 221763, true },
-  { 221775, true },
-  { 221792, true },
-  { 221806, true },
-  { 221815, true },
-  { 221831, true },
-  { 221844, true },
-  { 221859, false },
-  { 221871, true },
-  { 221884, true },
-  { 221894, true },
-  { 221903, true },
-  { 221915, true },
-  { 221923, true },
-  { 221931, true },
-  { 221939, true },
-  { 221945, true },
-  { 221956, true },
+  { 221778, true },
+  { 221790, true },
+  { 221807, true },
+  { 221821, true },
+  { 221830, true },
+  { 221846, true },
+  { 221859, true },
+  { 221874, false },
+  { 221886, true },
+  { 221899, true },
+  { 221909, true },
+  { 221918, true },
+  { 221930, true },
+  { 221938, true },
+  { 221946, true },
+  { 221954, true },
+  { 221960, true },
   { 221971, true },
-  { 221984, true },
+  { 221986, true },
   { 221999, true },
-  { 222018, true },
-  { 222042, true },
-  { 222055, true },
+  { 222014, true },
+  { 222033, true },
+  { 222057, true },
   { 222070, true },
-  { 222094, true },
-  { 222104, true },
-  { 222116, true },
-  { 222133, true },
-  { 222143, true },
-  { 222159, true },
-  { 222180, true },
-  { 222195, false },
-  { 222218, true },
-  { 222239, true },
-  { 222252, true },
-  { 222265, true },
-  { 222279, true },
-  { 222291, true },
-  { 222310, true },
-  { 222323, true },
-  { 222341, true },
-  { 222365, false },
-  { 222392, true },
-  { 222418, true },
+  { 222085, true },
+  { 222109, true },
+  { 222119, true },
+  { 222131, true },
+  { 222148, true },
+  { 222158, true },
+  { 222174, true },
+  { 222195, true },
+  { 222210, false },
+  { 222233, true },
+  { 222254, true },
+  { 222267, true },
+  { 222280, true },
+  { 222294, true },
+  { 222306, true },
+  { 222325, true },
+  { 222338, true },
+  { 222356, true },
+  { 222380, false },
+  { 222407, true },
   { 222433, true },
-  { 222450, true },
-  { 222466, true },
-  { 222483, true },
-  { 222500, true },
+  { 222448, true },
+  { 222465, true },
+  { 222481, true },
+  { 222498, true },
   { 222515, true },
-  { 222528, true },
-  { 222539, true },
-  { 222550, true },
-  { 222560, true },
-  { 222573, true },
-  { 222591, true },
-  { 222604, true },
-  { 222618, true },
-  { 222628, true },
-  { 222639, true },
-  { 222648, true },
-  { 222669, true },
-  { 222683, false },
-  { 222692, true },
-  { 222699, true },
-  { 222706, true },
+  { 222530, true },
+  { 222543, true },
+  { 222554, true },
+  { 222565, true },
+  { 222575, true },
+  { 222588, true },
+  { 222606, true },
+  { 222619, true },
+  { 222633, true },
+  { 222643, true },
+  { 222654, true },
+  { 222663, true },
+  { 222684, true },
+  { 222698, false },
+  { 222707, true },
   { 222714, true },
-  { 222737, true },
-  { 222750, true },
-  { 222764, true },
-  { 222777, true },
+  { 222721, true },
+  { 222729, true },
+  { 222752, true },
+  { 222765, true },
+  { 222779, true },
   { 222792, true },
-  { 222806, true },
+  { 222807, true },
   { 222821, true },
-  { 222830, true },
-  { 222838, true },
-  { 222851, true },
-  { 222859, true },
-  { 222877, true },
-  { 222889, true },
-  { 222900, true },
-  { 222909, true },
-  { 222930, true },
-  { 222946, true },
-  { 222959, true },
-  { 222970, true },
-  { 222982, true },
-  { 222997, false },
-  { 223010, true },
-  { 223019, true },
-  { 223031, true },
-  { 223042, true },
-  { 223054, true },
-  { 223067, true },
-  { 223080, true },
+  { 222836, true },
+  { 222845, true },
+  { 222853, true },
+  { 222866, true },
+  { 222874, true },
+  { 222892, true },
+  { 222904, true },
+  { 222915, true },
+  { 222924, true },
+  { 222945, true },
+  { 222961, true },
+  { 222974, true },
+  { 222985, true },
+  { 222997, true },
+  { 223012, false },
+  { 223025, true },
+  { 223034, true },
+  { 223046, true },
+  { 223057, true },
+  { 223069, true },
+  { 223082, true },
   { 223095, true },
-  { 223115, true },
-  { 223127, true },
-  { 223137, true },
-  { 223148, true },
-  { 223161, false },
-  { 223168, true },
-  { 223178, true },
-  { 223190, true },
-  { 223206, true },
+  { 223110, true },
+  { 223130, true },
+  { 223142, true },
+  { 223152, true },
+  { 223163, true },
+  { 223176, false },
+  { 223183, true },
+  { 223193, true },
+  { 223205, true },
   { 223221, true },
-  { 223230, true },
-  { 223244, true },
-  { 223264, true },
-  { 223276, true },
-  { 223289, true },
-  { 223303, true },
-  { 223321, true },
-  { 223328, true },
-  { 223345, true },
-  { 223362, true },
-  { 223382, true },
-  { 223400, true },
-  { 223416, false },
-  { 223434, true },
-  { 223453, true },
-  { 223480, true },
-  { 223497, true },
+  { 223236, true },
+  { 223245, true },
+  { 223259, true },
+  { 223279, true },
+  { 223291, true },
+  { 223304, true },
+  { 223318, true },
+  { 223336, true },
+  { 223343, true },
+  { 223360, true },
+  { 223377, true },
+  { 223397, true },
+  { 223415, true },
+  { 223431, false },
+  { 223449, true },
+  { 223468, true },
+  { 223495, true },
   { 223512, true },
-  { 223526, true },
-  { 223542, true },
-  { 223556, true },
-  { 223571, false },
-  { 223590, true },
-  { 223608, true },
-  { 223626, true },
-  { 223644, true },
-  { 223661, true },
-  { 223682, true },
-  { 223701, true },
-  { 223715, true },
-  { 223726, true },
-  { 223734, true },
-  { 223744, true },
+  { 223527, true },
+  { 223541, true },
+  { 223557, true },
+  { 223571, true },
+  { 223586, false },
+  { 223605, true },
+  { 223623, true },
+  { 223641, true },
+  { 223659, true },
+  { 223676, true },
+  { 223697, true },
+  { 223716, true },
+  { 223730, true },
+  { 223741, true },
+  { 223749, true },
   { 223759, true },
-  { 223776, true },
+  { 223774, true },
   { 223791, true },
-  { 223802, true },
-  { 223824, true },
-  { 223837, true },
-  { 223857, true },
-  { 223876, true },
-  { 223902, true },
-  { 223918, true },
-  { 223936, true },
-  { 223954, true },
+  { 223806, true },
+  { 223817, true },
+  { 223839, true },
+  { 223852, true },
+  { 223872, true },
+  { 223891, true },
+  { 223917, true },
+  { 223933, true },
+  { 223951, true },
   { 223969, true },
-  { 223977, true },
-  { 223990, true },
-  { 223998, true },
-  { 224009, true },
-  { 224023, true },
-  { 224037, true },
-  { 224048, true },
-  { 224064, true },
-  { 224081, true },
-  { 224091, true },
-  { 224101, true },
-  { 224122, true },
-  { 224135, true },
-  { 224153, true },
-  { 224166, true },
-  { 224192, true },
-  { 224211, true },
-  { 224227, true },
-  { 224244, true },
-  { 224260, true },
-  { 224283, true },
-  { 224308, true },
-  { 224324, true },
-  { 224336, true },
-  { 224350, true },
-  { 224361, true },
-  { 224374, true },
-  { 224385, true },
+  { 223984, true },
+  { 223992, true },
+  { 224005, true },
+  { 224013, true },
+  { 224024, true },
+  { 224038, true },
+  { 224052, true },
+  { 224063, true },
+  { 224079, true },
+  { 224096, true },
+  { 224106, true },
+  { 224116, true },
+  { 224137, true },
+  { 224150, true },
+  { 224168, true },
+  { 224181, true },
+  { 224207, true },
+  { 224226, true },
+  { 224242, true },
+  { 224259, true },
+  { 224275, true },
+  { 224298, true },
+  { 224323, true },
+  { 224339, true },
+  { 224351, true },
+  { 224365, true },
+  { 224376, true },
+  { 224389, true },
   { 224400, true },
-  { 224410, true },
+  { 224415, true },
   { 224425, true },
-  { 224437, true },
-  { 224455, true },
-  { 224480, true },
-  { 224492, true },
-  { 224504, true },
-  { 224516, true },
-  { 224527, true },
-  { 224539, true },
-  { 224557, true },
-  { 224578, true },
-  { 224602, true },
-  { 224613, true },
-  { 224629, true },
-  { 224641, true },
-  { 224655, true },
+  { 224440, true },
+  { 224452, true },
+  { 224470, true },
+  { 224495, true },
+  { 224507, true },
+  { 224519, true },
+  { 224531, true },
+  { 224542, true },
+  { 224554, true },
+  { 224572, true },
+  { 224593, true },
+  { 224617, true },
+  { 224628, true },
+  { 224644, true },
+  { 224656, true },
   { 224670, true },
-  { 224683, true },
-  { 224699, false },
-  { 224708, true },
-  { 224726, true },
-  { 224740, true },
-  { 224754, true },
-  { 224762, false },
-  { 224774, true },
-  { 224784, true },
-  { 224801, true },
-  { 224811, true },
-  { 224822, true },
-  { 224829, true },
-  { 224840, true },
-  { 224860, true },
-  { 224877, true },
-  { 224889, true },
-  { 224906, true },
-  { 224926, true },
-  { 224937, true },
-  { 224946, false },
-  { 224953, true },
-  { 224964, true },
-  { 224980, true },
-  { 224989, true },
-  { 225004, true },
-  { 225018, true },
-  { 225028, true },
-  { 225049, true },
+  { 224685, true },
+  { 224698, true },
+  { 224714, false },
+  { 224723, true },
+  { 224741, true },
+  { 224755, true },
+  { 224769, true },
+  { 224777, false },
+  { 224789, true },
+  { 224799, true },
+  { 224816, true },
+  { 224826, true },
+  { 224837, true },
+  { 224844, true },
+  { 224855, true },
+  { 224875, true },
+  { 224892, true },
+  { 224904, true },
+  { 224921, true },
+  { 224941, false },
+  { 224956, true },
+  { 224967, true },
+  { 224976, false },
+  { 224983, true },
+  { 224994, true },
+  { 225010, true },
+  { 225019, true },
+  { 225034, true },
+  { 225048, true },
   { 225058, true },
-  { 225076, false },
-  { 225087, true },
-  { 225103, false },
-  { 225116, true },
-  { 225132, true },
-  { 225144, true },
-  { 225158, true },
-  { 225170, true },
-  { 225182, true },
-  { 225202, true },
-  { 225216, true },
-  { 225232, true },
-  { 225246, true },
-  { 225261, true },
-  { 225269, true },
-  { 225284, true },
-  { 225297, true },
-  { 225313, true },
-  { 225326, true },
-  { 225339, true },
-  { 225353, true },
-  { 225375, true },
-  { 225395, true },
-  { 225416, true },
-  { 225441, true },
-  { 225460, true },
-  { 225476, true },
-  { 225504, true },
-  { 225529, true },
-  { 225550, true },
-  { 225579, true },
-  { 225598, true },
-  { 225622, true },
-  { 225632, true },
+  { 225067, true },
+  { 225085, false },
+  { 225096, true },
+  { 225112, false },
+  { 225125, true },
+  { 225141, true },
+  { 225153, true },
+  { 225167, true },
+  { 225179, true },
+  { 225191, true },
+  { 225211, true },
+  { 225225, true },
+  { 225241, true },
+  { 225255, true },
+  { 225270, true },
+  { 225278, true },
+  { 225293, true },
+  { 225306, true },
+  { 225322, true },
+  { 225335, true },
+  { 225348, true },
+  { 225362, true },
+  { 225384, true },
+  { 225404, true },
+  { 225425, true },
+  { 225450, true },
+  { 225469, true },
+  { 225485, true },
+  { 225513, true },
+  { 225538, true },
+  { 225559, true },
+  { 225588, true },
+  { 225607, true },
+  { 225631, true },
   { 225641, true },
-  { 225654, true },
+  { 225650, true },
   { 225663, true },
-  { 225669, true },
-  { 225681, true },
-  { 225698, true },
-  { 225712, true },
-  { 225731, true },
-  { 225745, true },
-  { 225759, false },
-  { 225772, true },
-  { 225785, true },
-  { 225798, true },
-  { 225816, true },
-  { 225837, true },
-  { 225849, true },
-  { 225875, true },
+  { 225672, true },
+  { 225678, true },
+  { 225690, true },
+  { 225707, true },
+  { 225721, true },
+  { 225740, true },
+  { 225754, true },
+  { 225768, false },
+  { 225781, true },
+  { 225794, true },
+  { 225807, true },
+  { 225825, true },
+  { 225846, true },
+  { 225858, true },
   { 225884, true },
-  { 225897, true },
-  { 225907, true },
-  { 225926, true },
-  { 225945, true },
-  { 225965, true },
-  { 225984, true },
-  { 226000, true },
-  { 226020, true },
+  { 225893, true },
+  { 225906, true },
+  { 225916, true },
+  { 225935, true },
+  { 225954, true },
+  { 225974, true },
+  { 225993, true },
+  { 226009, true },
   { 226029, true },
-  { 226040, true },
+  { 226038, true },
   { 226049, true },
-  { 226068, false },
-  { 226084, false },
-  { 226097, false },
-  { 226110, true },
-  { 226121, true },
-  { 226142, true },
-  { 226153, true },
-  { 226172, true },
-  { 226185, true },
-  { 226197, true },
-  { 226210, true },
-  { 226229, true },
-  { 226244, true },
-  { 226258, false },
-  { 226267, true },
-  { 226280, false },
-  { 226292, true },
-  { 226307, true },
-  { 226323, true },
-  { 226337, true },
-  { 226350, true },
-  { 226364, true },
-  { 226388, true },
-  { 226405, true },
-  { 226420, true },
-  { 226436, true },
-  { 226454, true },
-  { 226471, true },
-  { 226488, true },
-  { 226503, true },
-  { 226519, true },
-  { 226532, true },
+  { 226058, true },
+  { 226077, false },
+  { 226093, false },
+  { 226106, false },
+  { 226119, true },
+  { 226130, true },
+  { 226151, true },
+  { 226162, true },
+  { 226181, true },
+  { 226194, true },
+  { 226206, true },
+  { 226219, true },
+  { 226238, true },
+  { 226253, true },
+  { 226267, false },
+  { 226276, true },
+  { 226289, false },
+  { 226301, true },
+  { 226316, true },
+  { 226332, true },
+  { 226346, true },
+  { 226359, true },
+  { 226373, true },
+  { 226397, true },
+  { 226414, true },
+  { 226429, true },
+  { 226445, true },
+  { 226463, true },
+  { 226480, true },
+  { 226497, true },
+  { 226512, true },
+  { 226528, true },
   { 226541, true },
-  { 226554, true },
-  { 226574, true },
-  { 226585, true },
-  { 226599, true },
+  { 226550, true },
+  { 226563, true },
+  { 226583, true },
+  { 226594, true },
   { 226608, true },
   { 226617, true },
-  { 226635, true },
-  { 226651, true },
-  { 226665, true },
-  { 226679, true },
-  { 226692, true },
-  { 226707, true },
-  { 226727, true },
-  { 226744, true },
-  { 226761, true },
-  { 226773, true },
-  { 226789, false },
-  { 226801, true },
-  { 226815, true },
-  { 226829, true },
-  { 226848, true },
-  { 226873, false },
-  { 226889, true },
-  { 226908, true },
-  { 226923, true },
-  { 226947, true },
-  { 226959, true },
-  { 226969, true },
-  { 226980, true },
-  { 226993, true },
-  { 227007, true },
-  { 227029, true },
+  { 226626, true },
+  { 226644, true },
+  { 226660, true },
+  { 226674, true },
+  { 226688, true },
+  { 226701, true },
+  { 226716, true },
+  { 226736, true },
+  { 226753, true },
+  { 226770, true },
+  { 226782, true },
+  { 226798, false },
+  { 226810, true },
+  { 226824, true },
+  { 226838, true },
+  { 226857, true },
+  { 226882, false },
+  { 226898, true },
+  { 226917, true },
+  { 226932, true },
+  { 226956, true },
+  { 226968, true },
+  { 226978, true },
+  { 226989, true },
+  { 227002, true },
+  { 227016, true },
   { 227038, true },
-  { 227067, true },
-  { 227092, true },
-  { 227117, true },
-  { 227146, true },
-  { 227162, true },
+  { 227047, true },
+  { 227076, true },
+  { 227101, true },
+  { 227126, true },
+  { 227155, true },
   { 227171, true },
-  { 227183, true },
-  { 227197, true },
-  { 227211, true },
-  { 227225, true },
-  { 227242, true },
-  { 227255, true },
-  { 227274, true },
-  { 227285, true },
-  { 227298, true },
-  { 227315, true },
+  { 227180, true },
+  { 227192, true },
+  { 227206, true },
+  { 227220, true },
+  { 227234, true },
+  { 227251, true },
+  { 227264, true },
+  { 227283, true },
+  { 227294, true },
+  { 227307, true },
   { 227324, true },
-  { 227342, true },
-  { 227356, false },
-  { 227367, true },
-  { 227380, true },
-  { 227400, false },
-  { 227413, true },
-  { 227423, true },
-  { 227442, true },
-  { 227452, true },
-  { 227465, true },
-  { 227484, true },
-  { 227496, true },
-  { 227518, true },
-  { 227526, true },
-  { 227537, true },
-  { 227548, true },
-  { 227561, true },
-  { 227572, true },
-  { 227582, true },
-  { 227592, true },
-  { 227604, true },
+  { 227333, true },
+  { 227351, true },
+  { 227365, false },
+  { 227376, true },
+  { 227389, true },
+  { 227409, false },
+  { 227422, true },
+  { 227432, true },
+  { 227451, true },
+  { 227461, true },
+  { 227474, true },
+  { 227493, true },
+  { 227505, true },
+  { 227527, true },
+  { 227535, true },
+  { 227546, true },
+  { 227557, true },
+  { 227570, true },
+  { 227581, true },
+  { 227591, true },
+  { 227601, true },
   { 227613, true },
-  { 227625, true },
-  { 227633, true },
-  { 227639, true },
-  { 227645, false },
-  { 227653, true },
+  { 227622, true },
+  { 227634, true },
+  { 227642, true },
+  { 227648, true },
+  { 227654, false },
   { 227662, true },
   { 227671, true },
-  { 227679, true },
-  { 227689, true },
-  { 227697, true },
-  { 227716, true },
-  { 227723, true },
-  { 227748, true },
-  { 227755, true },
-  { 227768, true },
-  { 227782, true },
-  { 227792, true },
-  { 227802, true },
-  { 227821, true },
-  { 227833, true },
-  { 227848, true },
-  { 227859, true },
-  { 227871, true },
-  { 227883, true },
-  { 227896, true },
-  { 227904, true },
-  { 227917, true },
-  { 227929, true },
-  { 227948, true },
-  { 227975, true },
-  { 227986, true },
-  { 228001, true },
-  { 228017, true },
-  { 228039, true },
-  { 228053, true },
-  { 228066, true },
-  { 228079, true },
-  { 228098, true },
-  { 228127, true },
-  { 228143, true },
-  { 228164, false },
-  { 228191, false },
-  { 228207, true },
-  { 228223, true },
-  { 228238, true },
-  { 228254, true },
-  { 228272, true },
-  { 228291, true },
-  { 228300, true },
-  { 228313, true },
-  { 228330, true },
-  { 228345, true },
-  { 228363, true },
-  { 228384, true },
-  { 228397, true },
-  { 228416, true },
-  { 228443, true },
-  { 228462, true },
-  { 228480, true },
-  { 228497, true },
-  { 228520, true },
-  { 228534, true },
-  { 228552, true },
-  { 228570, true },
-  { 228588, true },
-  { 228601, true },
-  { 228613, true },
-  { 228629, true },
-  { 228650, true },
-  { 228660, true },
-  { 228680, true },
-  { 228693, true },
+  { 227680, true },
+  { 227688, true },
+  { 227698, true },
+  { 227706, true },
+  { 227725, true },
+  { 227732, true },
+  { 227757, true },
+  { 227764, true },
+  { 227777, true },
+  { 227791, true },
+  { 227801, true },
+  { 227811, true },
+  { 227830, true },
+  { 227842, true },
+  { 227857, true },
+  { 227868, true },
+  { 227880, true },
+  { 227892, true },
+  { 227905, true },
+  { 227913, true },
+  { 227926, true },
+  { 227938, true },
+  { 227957, true },
+  { 227984, true },
+  { 227995, true },
+  { 228010, true },
+  { 228026, true },
+  { 228048, true },
+  { 228062, true },
+  { 228075, true },
+  { 228088, true },
+  { 228107, true },
+  { 228136, true },
+  { 228157, false },
+  { 228184, false },
+  { 228200, true },
+  { 228216, true },
+  { 228231, true },
+  { 228247, true },
+  { 228265, true },
+  { 228284, true },
+  { 228293, true },
+  { 228306, true },
+  { 228323, true },
+  { 228338, true },
+  { 228356, true },
+  { 228377, true },
+  { 228390, true },
+  { 228409, true },
+  { 228436, true },
+  { 228455, true },
+  { 228473, true },
+  { 228490, true },
+  { 228513, true },
+  { 228527, true },
+  { 228545, true },
+  { 228563, true },
+  { 228579, true },
+  { 228597, true },
+  { 228610, true },
+  { 228622, true },
+  { 228638, true },
+  { 228659, true },
+  { 228669, true },
+  { 228689, true },
   { 228702, true },
-  { 228712, true },
-  { 228725, true },
-  { 228738, true },
-  { 228754, true },
-  { 228767, true },
-  { 228781, true },
-  { 228796, true },
-  { 228808, true },
-  { 228822, true },
-  { 228837, true },
-  { 228849, true },
-  { 228865, false },
-  { 228885, true },
-  { 228901, true },
-  { 228914, true },
-  { 228929, true },
+  { 228711, true },
+  { 228721, true },
+  { 228734, true },
+  { 228747, true },
+  { 228763, true },
+  { 228776, true },
+  { 228790, true },
+  { 228805, true },
+  { 228817, true },
+  { 228831, true },
+  { 228846, true },
+  { 228858, true },
+  { 228874, false },
+  { 228894, true },
+  { 228910, true },
+  { 228923, true },
   { 228938, true },
-  { 228965, true },
-  { 228977, true },
-  { 229010, true },
-  { 229044, true },
-  { 229078, true },
-  { 229093, false },
-  { 229110, true },
-  { 229134, true },
-  { 229153, true },
-  { 229170, true },
-  { 229194, true },
-  { 229207, true },
-  { 229221, true },
-  { 229229, true },
-  { 229240, true },
-  { 229254, true },
-  { 229266, true },
-  { 229275, false },
-  { 229285, true },
-  { 229305, true },
-  { 229319, true },
-  { 229332, true },
-  { 229352, true },
-  { 229370, true },
+  { 228947, true },
+  { 228974, true },
+  { 228986, true },
+  { 229019, true },
+  { 229053, true },
+  { 229087, true },
+  { 229102, false },
+  { 229119, true },
+  { 229143, true },
+  { 229162, true },
+  { 229179, true },
+  { 229203, true },
+  { 229216, true },
+  { 229230, true },
+  { 229238, true },
+  { 229249, true },
+  { 229263, true },
+  { 229275, true },
+  { 229284, false },
+  { 229294, true },
+  { 229314, true },
+  { 229328, true },
+  { 229341, true },
+  { 229361, true },
   { 229379, true },
-  { 229391, true },
-  { 229406, true },
-  { 229422, true },
-  { 229437, true },
-  { 229452, true },
-  { 229463, true },
-  { 229488, true },
-  { 229503, false },
-  { 229520, true },
-  { 229532, false },
-  { 229555, true },
-  { 229580, true },
-  { 229599, true },
-  { 229616, true },
-  { 229633, true },
-  { 229641, true },
-  { 229654, true },
-  { 229665, true },
-  { 229684, true },
-  { 229699, true },
-  { 229721, true },
-  { 229744, true },
-  { 229757, true },
-  { 229775, true },
-  { 229798, true },
-  { 229815, true },
-  { 229825, false },
-  { 229839, true },
-  { 229856, true },
-  { 229868, true },
-  { 229888, true },
-  { 229905, true },
-  { 229915, true },
-  { 229937, true },
-  { 229952, true },
-  { 229965, true },
-  { 229980, true },
-  { 229998, true },
-  { 230009, true },
-  { 230026, false },
-  { 230040, true },
-  { 230056, true },
-  { 230068, true },
-  { 230105, true },
-  { 230124, true },
-  { 230138, true },
-  { 230150, true },
-  { 230165, true },
-  { 230178, true },
-  { 230193, false },
-  { 230205, true },
-  { 230222, false },
-  { 230237, true },
-  { 230250, true },
-  { 230258, true },
-  { 230270, false },
-  { 230282, true },
-  { 230299, true },
-  { 230312, true },
-  { 230328, true },
-  { 230358, true },
-  { 230374, false },
-  { 230382, true },
-  { 230395, true },
-  { 230411, true },
-  { 230424, true },
-  { 230442, true },
-  { 230453, true },
-  { 230469, true },
-  { 230495, true },
-  { 230514, true },
-  { 230527, true },
-  { 230546, true },
-  { 230571, true },
-  { 230588, true },
-  { 230602, true },
-  { 230628, true },
-  { 230643, false },
-  { 230654, true },
-  { 230674, true },
-  { 230687, true },
-  { 230700, true },
-  { 230712, true },
-  { 230731, true },
-  { 230744, true },
-  { 230759, true },
-  { 230770, true },
-  { 230781, true },
-  { 230801, true },
-  { 230811, true },
-  { 230821, true },
-  { 230843, true },
-  { 230863, true },
-  { 230880, true },
-  { 230898, true },
-  { 230911, true },
-  { 230924, true },
-  { 230939, true },
-  { 230950, true },
-  { 230961, true },
-  { 230976, true },
-  { 231000, true },
-  { 231016, true },
-  { 231038, true },
-  { 231049, true },
-  { 231065, true },
-  { 231081, true },
-  { 231094, true },
-  { 231107, true },
-  { 231131, true },
-  { 231146, true },
-  { 231159, true },
-  { 231178, true },
-  { 231188, true },
-  { 231202, true },
-  { 231213, true },
-  { 231230, true },
-  { 231242, true },
-  { 231256, true },
-  { 231269, true },
-  { 231286, true },
-  { 231303, true },
-  { 231315, true },
-  { 231326, true },
-  { 231341, true },
-  { 231358, true },
+  { 229388, true },
+  { 229400, true },
+  { 229415, true },
+  { 229431, true },
+  { 229446, true },
+  { 229461, true },
+  { 229472, true },
+  { 229497, true },
+  { 229512, false },
+  { 229529, true },
+  { 229541, false },
+  { 229564, true },
+  { 229589, true },
+  { 229608, true },
+  { 229625, true },
+  { 229642, true },
+  { 229650, true },
+  { 229663, true },
+  { 229674, true },
+  { 229693, true },
+  { 229708, true },
+  { 229730, true },
+  { 229753, true },
+  { 229766, true },
+  { 229784, true },
+  { 229807, true },
+  { 229824, true },
+  { 229834, false },
+  { 229848, true },
+  { 229865, true },
+  { 229877, true },
+  { 229897, true },
+  { 229914, true },
+  { 229924, true },
+  { 229946, true },
+  { 229961, true },
+  { 229974, true },
+  { 229989, true },
+  { 230007, true },
+  { 230018, true },
+  { 230035, false },
+  { 230049, true },
+  { 230065, true },
+  { 230077, true },
+  { 230114, true },
+  { 230133, true },
+  { 230147, true },
+  { 230159, true },
+  { 230174, true },
+  { 230187, true },
+  { 230202, false },
+  { 230214, true },
+  { 230231, false },
+  { 230246, true },
+  { 230259, true },
+  { 230267, true },
+  { 230279, false },
+  { 230291, true },
+  { 230308, true },
+  { 230321, true },
+  { 230337, true },
+  { 230367, true },
+  { 230383, false },
+  { 230391, true },
+  { 230404, true },
+  { 230420, true },
+  { 230433, true },
+  { 230451, true },
+  { 230462, true },
+  { 230478, true },
+  { 230504, true },
+  { 230523, true },
+  { 230536, true },
+  { 230555, true },
+  { 230580, true },
+  { 230597, true },
+  { 230611, true },
+  { 230637, true },
+  { 230652, false },
+  { 230663, true },
+  { 230683, true },
+  { 230696, true },
+  { 230709, true },
+  { 230721, true },
+  { 230740, true },
+  { 230753, true },
+  { 230768, true },
+  { 230779, true },
+  { 230790, true },
+  { 230810, true },
+  { 230820, true },
+  { 230830, true },
+  { 230852, true },
+  { 230872, true },
+  { 230889, true },
+  { 230907, true },
+  { 230920, true },
+  { 230933, true },
+  { 230948, true },
+  { 230959, true },
+  { 230970, true },
+  { 230985, true },
+  { 231009, true },
+  { 231025, true },
+  { 231047, true },
+  { 231058, true },
+  { 231074, true },
+  { 231090, true },
+  { 231103, true },
+  { 231116, true },
+  { 231140, true },
+  { 231155, true },
+  { 231168, true },
+  { 231187, true },
+  { 231197, true },
+  { 231211, true },
+  { 231222, true },
+  { 231239, true },
+  { 231251, true },
+  { 231265, true },
+  { 231278, true },
+  { 231295, true },
+  { 231312, true },
+  { 231324, true },
+  { 231335, true },
+  { 231350, true },
   { 231367, true },
-  { 231387, true },
-  { 231404, true },
-  { 231419, true },
-  { 231445, true },
-  { 231463, true },
-  { 231473, true },
-  { 231490, true },
-  { 231502, true },
-  { 231519, true },
-  { 231534, true },
-  { 231550, true },
-  { 231566, true },
-  { 231585, true },
-  { 231602, true },
-  { 231619, true },
-  { 231630, true },
-  { 231641, true },
-  { 231653, true },
-  { 231668, true },
-  { 231686, true },
-  { 231699, true },
-  { 231709, true },
+  { 231376, true },
+  { 231396, true },
+  { 231413, true },
+  { 231428, true },
+  { 231454, true },
+  { 231472, true },
+  { 231482, true },
+  { 231499, true },
+  { 231511, true },
+  { 231528, true },
+  { 231543, true },
+  { 231559, true },
+  { 231575, true },
+  { 231594, true },
+  { 231611, true },
+  { 231628, true },
+  { 231639, true },
+  { 231650, true },
+  { 231662, true },
+  { 231677, true },
+  { 231695, true },
+  { 231708, true },
   { 231718, true },
-  { 231731, true },
-  { 231746, true },
-  { 231756, true },
-  { 231768, true },
-  { 231782, false },
-  { 231791, true },
-  { 231801, false },
-  { 231813, true },
-  { 231824, true },
-  { 231841, true },
-  { 231851, true },
-  { 231861, true },
-  { 231872, true },
+  { 231727, true },
+  { 231740, true },
+  { 231755, true },
+  { 231765, true },
+  { 231777, true },
+  { 231791, false },
+  { 231800, true },
+  { 231810, false },
+  { 231822, true },
+  { 231833, true },
+  { 231850, true },
+  { 231860, true },
+  { 231870, true },
   { 231881, true },
-  { 231892, false },
-  { 231905, true },
-  { 231921, true },
-  { 231933, true },
-  { 231944, true },
-  { 231958, false },
-  { 231969, true },
-  { 231992, true },
-  { 232014, true },
-  { 232022, true },
-  { 232032, false },
-  { 232044, true },
-  { 232057, true },
-  { 232065, true },
-  { 232073, true },
-  { 232085, true },
-  { 232100, true },
-  { 232110, true },
-  { 232126, true },
-  { 232139, true },
+  { 231890, true },
+  { 231901, false },
+  { 231914, true },
+  { 231930, true },
+  { 231942, true },
+  { 231953, true },
+  { 231967, false },
+  { 231978, true },
+  { 232001, true },
+  { 232023, true },
+  { 232031, true },
+  { 232041, false },
+  { 232053, true },
+  { 232066, true },
+  { 232074, true },
+  { 232082, true },
+  { 232094, true },
+  { 232109, true },
+  { 232119, true },
+  { 232135, true },
   { 232148, true },
-  { 232165, true },
-  { 232179, true },
-  { 232192, true },
-  { 232207, true },
+  { 232157, true },
+  { 232174, true },
+  { 232188, true },
+  { 232201, true },
   { 232216, true },
-  { 232225, false },
-  { 232234, true },
-  { 232253, true },
-  { 232266, true },
-  { 232281, true },
-  { 232303, true },
-  { 232319, false },
-  { 232331, true },
-  { 232341, true },
-  { 232354, true },
-  { 232370, true },
-  { 232383, true },
-  { 232394, true },
-  { 232402, true },
-  { 232416, true },
-  { 232433, true },
-  { 232446, true },
-  { 232462, true },
-  { 232483, true },
-  { 232502, true },
-  { 232519, true },
-  { 232535, true },
-  { 232555, true },
-  { 232568, true },
-  { 232579, true },
-  { 232593, true },
-  { 232613, true },
-  { 232637, true },
-  { 232660, true },
-  { 232671, true },
-  { 232693, true },
-  { 232718, true },
-  { 232730, false },
-  { 232743, true },
-  { 232761, true },
-  { 232775, true },
-  { 232789, false },
-  { 232810, true },
-  { 232827, true },
-  { 232838, true },
-  { 232848, true },
-  { 232858, true },
-  { 232870, true },
-  { 232882, true },
-  { 232894, true },
-  { 232913, true },
-  { 232939, true },
-  { 232952, true },
-  { 232966, true },
-  { 232983, true },
-  { 233002, true },
-  { 233019, true },
-  { 233037, true },
-  { 233052, true },
-  { 233073, true },
-  { 233094, true },
-  { 233102, false },
-  { 233120, true },
-  { 233134, true },
-  { 233156, true },
-  { 233175, true },
-  { 233187, true },
-  { 233200, true },
-  { 233212, true },
-  { 233233, true },
-  { 233257, true },
-  { 233267, true },
-  { 233282, true },
-  { 233297, true },
-  { 233314, true },
-  { 233336, true },
-  { 233346, true },
-  { 233364, true },
-  { 233380, true },
-  { 233399, true },
-  { 233413, true },
-  { 233430, true },
-  { 233440, true },
-  { 233455, true },
-  { 233471, true },
-  { 233498, true },
-  { 233512, true },
-  { 233528, true },
-  { 233543, true },
-  { 233556, true },
-  { 233565, true },
-  { 233576, true },
-  { 233592, true },
-  { 233608, true },
-  { 233623, true },
-  { 233636, true },
-  { 233649, false },
-  { 233660, true },
-  { 233676, true },
-  { 233688, true },
-  { 233702, true },
-  { 233719, true },
-  { 233734, true },
-  { 233745, true },
-  { 233761, true },
-  { 233773, true },
-  { 233789, true },
-  { 233810, true },
-  { 233833, true },
-  { 233854, true },
-  { 233869, true },
-  { 233879, true },
-  { 233893, true },
-  { 233903, true },
-  { 233912, true },
-  { 233919, true },
-  { 233933, true },
-  { 233953, true },
-  { 233964, true },
-  { 233978, true },
-  { 233991, false },
-  { 234005, true },
-  { 234016, true },
-  { 234026, true },
-  { 234044, true },
-  { 234054, true },
-  { 234071, true },
-  { 234084, true },
-  { 234094, true },
-  { 234105, true },
-  { 234130, true },
-  { 234144, true },
-  { 234155, true },
-  { 234166, true },
-  { 234181, true },
-  { 234197, false },
-  { 234208, false },
-  { 234223, true },
-  { 234238, false },
-  { 234252, false },
-  { 234271, true },
-  { 234282, true },
-  { 234292, true },
-  { 234303, true },
-  { 234323, true },
-  { 234335, true },
-  { 234348, true },
-  { 234358, true },
-  { 234367, false },
-  { 234377, true },
-  { 234388, true },
-  { 234399, true },
-  { 234411, true },
-  { 234424, true },
-  { 234435, true },
-  { 234443, true },
-  { 234453, true },
-  { 234468, true },
-  { 234485, true },
-  { 234502, true },
-  { 234515, true },
-  { 234524, true },
-  { 234531, true },
-  { 234550, true },
-  { 234561, true },
-  { 234580, false },
-  { 234591, true },
-  { 234608, true },
-  { 234625, true },
-  { 234638, true },
-  { 234649, true },
-  { 234660, true },
-  { 234677, true },
-  { 234694, false },
-  { 234709, false },
-  { 234717, true },
-  { 234726, true },
-  { 234746, true },
-  { 234769, false },
-  { 234782, true },
-  { 234793, true },
-  { 234809, false },
-  { 234816, true },
-  { 234826, true },
-  { 234840, true },
-  { 234849, true },
-  { 234863, true },
-  { 234883, false },
-  { 234903, false },
-  { 234915, false },
-  { 234931, true },
-  { 234943, true },
-  { 234955, true },
-  { 234974, true },
-  { 234984, true },
-  { 235008, true },
-  { 235016, true },
-  { 235033, true },
-  { 235049, true },
-  { 235065, true },
-  { 235078, true },
-  { 235087, true },
-  { 235099, true },
-  { 235112, true },
-  { 235127, true },
-  { 235141, true },
-  { 235157, false },
-  { 235172, true },
-  { 235181, true },
-  { 235201, true },
-  { 235212, true },
-  { 235220, true },
-  { 235234, true },
-  { 235247, true },
-  { 235258, true },
-  { 235268, false },
-  { 235278, true },
-  { 235292, true },
-  { 235304, true },
-  { 235318, true },
-  { 235328, true },
-  { 235348, true },
-  { 235367, false },
-  { 235380, true },
-  { 235396, true },
-  { 235418, true },
-  { 235435, true },
-  { 235451, true },
-  { 235465, true },
-  { 235478, true },
-  { 235487, true },
-  { 235496, true },
-  { 235511, true },
-  { 235525, true },
-  { 235535, true },
-  { 235564, true },
-  { 235576, true },
-  { 235588, true },
-  { 235609, true },
-  { 235623, true },
-  { 235640, true },
-  { 235651, true },
-  { 235666, true },
-  { 235680, true },
-  { 235700, true },
-  { 235716, true },
-  { 235728, true },
-  { 235742, true },
-  { 235757, true },
+  { 232225, true },
+  { 232234, false },
+  { 232243, true },
+  { 232262, true },
+  { 232275, true },
+  { 232290, true },
+  { 232312, true },
+  { 232328, true },
+  { 232338, true },
+  { 232351, true },
+  { 232367, true },
+  { 232380, true },
+  { 232391, true },
+  { 232399, true },
+  { 232413, true },
+  { 232430, true },
+  { 232443, true },
+  { 232459, true },
+  { 232480, true },
+  { 232499, true },
+  { 232516, true },
+  { 232532, true },
+  { 232552, true },
+  { 232565, true },
+  { 232576, true },
+  { 232590, true },
+  { 232610, true },
+  { 232634, true },
+  { 232657, true },
+  { 232668, true },
+  { 232690, true },
+  { 232715, true },
+  { 232727, false },
+  { 232740, true },
+  { 232758, true },
+  { 232772, true },
+  { 232786, false },
+  { 232807, true },
+  { 232824, true },
+  { 232835, true },
+  { 232845, true },
+  { 232855, true },
+  { 232867, true },
+  { 232879, true },
+  { 232891, true },
+  { 232910, true },
+  { 232936, true },
+  { 232949, true },
+  { 232963, true },
+  { 232980, true },
+  { 232999, true },
+  { 233016, true },
+  { 233034, true },
+  { 233049, true },
+  { 233070, true },
+  { 233091, true },
+  { 233099, false },
+  { 233117, true },
+  { 233131, true },
+  { 233153, true },
+  { 233172, true },
+  { 233184, true },
+  { 233197, true },
+  { 233209, true },
+  { 233230, true },
+  { 233254, true },
+  { 233264, true },
+  { 233279, true },
+  { 233294, true },
+  { 233311, true },
+  { 233333, true },
+  { 233343, true },
+  { 233361, true },
+  { 233377, true },
+  { 233396, true },
+  { 233410, true },
+  { 233427, true },
+  { 233437, true },
+  { 233452, true },
+  { 233468, true },
+  { 233495, true },
+  { 233509, true },
+  { 233525, true },
+  { 233540, true },
+  { 233553, true },
+  { 233562, true },
+  { 233573, true },
+  { 233589, true },
+  { 233605, true },
+  { 233620, true },
+  { 233633, true },
+  { 233646, false },
+  { 233657, true },
+  { 233673, true },
+  { 233685, true },
+  { 233699, true },
+  { 233716, true },
+  { 233731, true },
+  { 233742, true },
+  { 233758, true },
+  { 233770, true },
+  { 233786, true },
+  { 233807, true },
+  { 233830, true },
+  { 233851, true },
+  { 233866, true },
+  { 233876, true },
+  { 233890, true },
+  { 233900, true },
+  { 233909, true },
+  { 233916, true },
+  { 233930, true },
+  { 233950, true },
+  { 233961, true },
+  { 233975, true },
+  { 233988, false },
+  { 234002, true },
+  { 234013, true },
+  { 234023, true },
+  { 234041, true },
+  { 234051, true },
+  { 234068, true },
+  { 234081, true },
+  { 234091, true },
+  { 234102, true },
+  { 234127, true },
+  { 234141, true },
+  { 234152, true },
+  { 234163, true },
+  { 234178, true },
+  { 234194, false },
+  { 234205, false },
+  { 234220, true },
+  { 234235, false },
+  { 234249, false },
+  { 234268, true },
+  { 234279, true },
+  { 234289, true },
+  { 234300, true },
+  { 234320, true },
+  { 234332, true },
+  { 234345, true },
+  { 234355, true },
+  { 234364, false },
+  { 234374, true },
+  { 234385, true },
+  { 234396, true },
+  { 234408, true },
+  { 234421, true },
+  { 234432, true },
+  { 234440, true },
+  { 234450, true },
+  { 234465, true },
+  { 234482, true },
+  { 234499, true },
+  { 234512, true },
+  { 234521, true },
+  { 234528, true },
+  { 234547, true },
+  { 234558, true },
+  { 234577, false },
+  { 234588, true },
+  { 234605, true },
+  { 234622, true },
+  { 234635, true },
+  { 234646, true },
+  { 234657, true },
+  { 234674, true },
+  { 234691, false },
+  { 234706, false },
+  { 234714, true },
+  { 234723, true },
+  { 234743, true },
+  { 234766, false },
+  { 234779, true },
+  { 234790, true },
+  { 234806, false },
+  { 234813, true },
+  { 234823, true },
+  { 234837, true },
+  { 234846, true },
+  { 234860, true },
+  { 234880, false },
+  { 234900, false },
+  { 234912, false },
+  { 234928, true },
+  { 234940, true },
+  { 234952, true },
+  { 234971, true },
+  { 234981, true },
+  { 235005, true },
+  { 235013, true },
+  { 235030, true },
+  { 235046, true },
+  { 235062, true },
+  { 235075, true },
+  { 235084, true },
+  { 235096, true },
+  { 235109, true },
+  { 235124, true },
+  { 235138, true },
+  { 235154, false },
+  { 235169, true },
+  { 235178, true },
+  { 235198, true },
+  { 235209, true },
+  { 235217, true },
+  { 235231, true },
+  { 235244, true },
+  { 235255, true },
+  { 235265, false },
+  { 235275, true },
+  { 235289, true },
+  { 235301, true },
+  { 235315, true },
+  { 235325, true },
+  { 235344, false },
+  { 235357, true },
+  { 235373, true },
+  { 235395, true },
+  { 235412, true },
+  { 235428, true },
+  { 235442, true },
+  { 235455, true },
+  { 235464, true },
+  { 235473, true },
+  { 235488, true },
+  { 235502, true },
+  { 235512, true },
+  { 235541, true },
+  { 235553, true },
+  { 235565, true },
+  { 235586, true },
+  { 235600, true },
+  { 235617, true },
+  { 235628, true },
+  { 235643, true },
+  { 235657, true },
+  { 235677, true },
+  { 235693, true },
+  { 235705, true },
+  { 235719, true },
+  { 235734, true },
+  { 235748, true },
+  { 235758, true },
   { 235771, true },
-  { 235781, true },
-  { 235794, true },
-  { 235805, true },
-  { 235816, true },
-  { 235832, true },
-  { 235848, true },
-  { 235857, true },
-  { 235867, true },
-  { 235891, true },
-  { 235910, false },
-  { 235922, true },
-  { 235938, true },
-  { 235966, true },
-  { 235998, true },
-  { 236013, true },
-  { 236025, true },
-  { 236036, true },
-  { 236045, true },
-  { 236059, true },
-  { 236072, false },
-  { 236085, true },
-  { 236103, true },
-  { 236117, true },
-  { 236131, true },
-  { 236143, true },
-  { 236161, true },
-  { 236182, true },
-  { 236197, true },
-  { 236213, true },
+  { 235782, true },
+  { 235793, true },
+  { 235809, true },
+  { 235825, true },
+  { 235834, true },
+  { 235844, true },
+  { 235868, false },
+  { 235880, true },
+  { 235896, true },
+  { 235924, true },
+  { 235956, true },
+  { 235971, true },
+  { 235983, true },
+  { 235994, true },
+  { 236003, true },
+  { 236017, true },
+  { 236030, false },
+  { 236043, true },
+  { 236061, true },
+  { 236075, true },
+  { 236089, true },
+  { 236101, true },
+  { 236119, true },
+  { 236140, true },
+  { 236155, true },
+  { 236171, true },
+  { 236188, true },
+  { 236201, false },
+  { 236209, false },
+  { 236221, true },
   { 236230, true },
-  { 236243, false },
-  { 236251, false },
+  { 236240, true },
+  { 236251, true },
   { 236263, true },
-  { 236272, true },
-  { 236282, true },
-  { 236293, true },
+  { 236279, true },
+  { 236295, true },
   { 236305, true },
-  { 236321, true },
-  { 236337, true },
-  { 236347, true },
-  { 236358, false },
+  { 236316, false },
+  { 236328, true },
+  { 236339, true },
+  { 236351, true },
   { 236370, true },
-  { 236381, true },
-  { 236393, true },
-  { 236412, true },
-  { 236422, true },
-  { 236431, true },
+  { 236380, true },
+  { 236389, true },
+  { 236408, true },
+  { 236436, true },
   { 236450, true },
-  { 236478, true },
-  { 236492, true },
-  { 236506, true },
-  { 236525, true },
-  { 236547, true },
-  { 236569, true },
-  { 236591, true },
-  { 236609, true },
+  { 236464, true },
+  { 236483, true },
+  { 236505, true },
+  { 236527, true },
+  { 236549, true },
+  { 236567, true },
+  { 236584, true },
+  { 236600, true },
+  { 236611, true },
   { 236626, true },
   { 236642, true },
-  { 236653, true },
-  { 236668, true },
+  { 236655, false },
+  { 236671, true },
   { 236684, true },
-  { 236697, false },
-  { 236713, true },
-  { 236726, true },
-  { 236744, true },
+  { 236702, true },
+  { 236717, true },
+  { 236731, true },
+  { 236743, true },
   { 236759, true },
-  { 236773, true },
-  { 236785, true },
-  { 236801, true },
-  { 236816, true },
-  { 236836, true },
-  { 236855, true },
+  { 236774, true },
+  { 236794, true },
+  { 236813, true },
+  { 236832, true },
+  { 236845, true },
+  { 236861, true },
   { 236874, true },
-  { 236887, true },
-  { 236903, true },
-  { 236916, true },
-  { 236931, true },
-  { 236947, true },
-  { 236964, true },
-  { 236983, true },
-  { 236994, true },
-  { 237010, true },
-  { 237027, true },
-  { 237040, true },
-  { 237053, true },
-  { 237068, true },
-  { 237085, true },
-  { 237104, true },
-  { 237119, true },
-  { 237132, true },
-  { 237148, true },
-  { 237159, true },
-  { 237172, true },
-  { 237186, true },
-  { 237200, false },
-  { 237216, true },
-  { 237235, true },
-  { 237255, true },
-  { 237275, true },
-  { 237289, true },
-  { 237301, true },
-  { 237316, true },
-  { 237327, true },
-  { 237338, true },
-  { 237354, true },
-  { 237378, true },
+  { 236889, true },
+  { 236905, true },
+  { 236922, true },
+  { 236941, true },
+  { 236952, true },
+  { 236968, true },
+  { 236985, true },
+  { 236998, true },
+  { 237011, true },
+  { 237026, true },
+  { 237043, true },
+  { 237062, true },
+  { 237077, true },
+  { 237090, true },
+  { 237106, true },
+  { 237117, true },
+  { 237130, true },
+  { 237144, true },
+  { 237158, false },
+  { 237174, true },
+  { 237193, true },
+  { 237213, true },
+  { 237233, true },
+  { 237247, true },
+  { 237259, true },
+  { 237274, true },
+  { 237285, true },
+  { 237296, true },
+  { 237312, true },
+  { 237336, true },
+  { 237351, true },
+  { 237367, true },
   { 237393, true },
-  { 237409, true },
-  { 237435, true },
-  { 237452, true },
-  { 237469, true },
-  { 237490, true },
-  { 237507, true },
-  { 237525, true },
-  { 237543, false },
-  { 237562, true },
-  { 237573, true },
-  { 237589, true },
-  { 237603, true },
-  { 237616, true },
-  { 237629, true },
-  { 237642, true },
+  { 237410, true },
+  { 237427, true },
+  { 237448, true },
+  { 237465, true },
+  { 237483, true },
+  { 237501, false },
+  { 237520, true },
+  { 237531, true },
+  { 237547, true },
+  { 237561, true },
+  { 237574, true },
+  { 237587, true },
+  { 237600, true },
+  { 237617, true },
+  { 237632, true },
+  { 237648, true },
   { 237659, true },
-  { 237674, true },
-  { 237690, true },
-  { 237701, true },
+  { 237667, true },
+  { 237676, true },
+  { 237686, true },
+  { 237697, true },
   { 237709, true },
-  { 237718, true },
-  { 237728, true },
-  { 237739, true },
-  { 237751, true },
-  { 237765, true },
-  { 237774, true },
-  { 237791, true },
-  { 237800, true },
-  { 237813, true },
-  { 237832, true },
-  { 237853, true },
-  { 237861, true },
-  { 237880, true },
-  { 237897, false },
-  { 237912, true },
-  { 237925, false },
-  { 237941, false },
-  { 237953, true },
-  { 237968, true },
-  { 237981, true },
-  { 237996, true },
-  { 238016, true },
-  { 238038, false },
-  { 238061, true },
-  { 238079, true },
+  { 237723, true },
+  { 237732, true },
+  { 237749, true },
+  { 237758, true },
+  { 237771, true },
+  { 237790, true },
+  { 237811, true },
+  { 237819, true },
+  { 237838, true },
+  { 237855, false },
+  { 237870, true },
+  { 237883, false },
+  { 237899, false },
+  { 237911, true },
+  { 237926, true },
+  { 237939, true },
+  { 237954, true },
+  { 237974, true },
+  { 237996, false },
+  { 238019, true },
+  { 238037, true },
+  { 238053, true },
+  { 238065, true },
+  { 238083, true },
   { 238095, true },
-  { 238107, true },
-  { 238125, true },
-  { 238137, true },
-  { 238146, true },
-  { 238160, true },
-  { 238168, true },
-  { 238177, true },
-  { 238193, true },
-  { 238203, true },
-  { 238223, true },
-  { 238240, true },
-  { 238254, true },
-  { 238274, true },
-  { 238285, true },
-  { 238298, true },
-  { 238313, true },
-  { 238325, true },
+  { 238104, true },
+  { 238118, true },
+  { 238126, true },
+  { 238135, true },
+  { 238151, true },
+  { 238161, true },
+  { 238181, true },
+  { 238198, true },
+  { 238212, true },
+  { 238232, true },
+  { 238243, true },
+  { 238256, true },
+  { 238271, true },
+  { 238283, true },
+  { 238299, true },
+  { 238312, true },
+  { 238333, true },
   { 238341, true },
-  { 238354, true },
-  { 238375, true },
-  { 238383, true },
-  { 238393, true },
-  { 238410, true },
-  { 238433, true },
-  { 238445, true },
-  { 238454, true },
-  { 238467, true },
-  { 238477, true },
-  { 238488, true },
-  { 238503, true },
-  { 238516, false },
-  { 238526, true },
-  { 238540, true },
-  { 238560, true },
-  { 238573, true },
-  { 238593, false },
-  { 238616, true },
-  { 238629, true },
-  { 238640, true },
-  { 238651, true },
-  { 238661, true },
-  { 238672, true },
-  { 238697, true },
+  { 238351, true },
+  { 238368, true },
+  { 238391, true },
+  { 238403, true },
+  { 238412, true },
+  { 238425, true },
+  { 238435, true },
+  { 238446, true },
+  { 238461, true },
+  { 238474, false },
+  { 238484, true },
+  { 238498, true },
+  { 238518, true },
+  { 238531, true },
+  { 238551, false },
+  { 238574, true },
+  { 238587, true },
+  { 238598, true },
+  { 238609, true },
+  { 238619, true },
+  { 238630, true },
+  { 238655, true },
+  { 238665, true },
+  { 238679, true },
+  { 238693, true },
   { 238707, true },
-  { 238721, true },
-  { 238735, true },
-  { 238749, true },
+  { 238720, true },
+  { 238733, false },
+  { 238748, true },
   { 238762, true },
-  { 238775, false },
-  { 238790, true },
-  { 238804, true },
-  { 238829, true },
-  { 238843, true },
-  { 238855, true },
-  { 238867, true },
-  { 238879, true },
-  { 238893, true },
-  { 238903, false },
-  { 238923, true },
-  { 238933, true },
-  { 238947, true },
-  { 238957, true },
-  { 238970, true },
+  { 238787, true },
+  { 238801, true },
+  { 238813, true },
+  { 238825, true },
+  { 238837, true },
+  { 238851, true },
+  { 238861, false },
+  { 238881, true },
+  { 238891, true },
+  { 238905, true },
+  { 238915, true },
+  { 238928, true },
+  { 238943, true },
+  { 238952, true },
+  { 238962, true },
+  { 238976, true },
   { 238985, true },
   { 238994, true },
-  { 239004, true },
-  { 239018, true },
+  { 239005, true },
+  { 239016, true },
   { 239027, true },
-  { 239036, true },
-  { 239047, true },
-  { 239058, true },
-  { 239069, true },
-  { 239079, true },
-  { 239087, true },
-  { 239095, true },
-  { 239104, false },
-  { 239124, true },
-  { 239139, true },
-  { 239151, true },
-  { 239163, true },
-  { 239175, true },
-  { 239190, true },
-  { 239209, true },
-  { 239229, true },
-  { 239257, true },
-  { 239282, true },
+  { 239037, true },
+  { 239045, true },
+  { 239053, true },
+  { 239062, false },
+  { 239082, true },
+  { 239097, true },
+  { 239109, true },
+  { 239121, true },
+  { 239133, true },
+  { 239148, true },
+  { 239167, true },
+  { 239187, true },
+  { 239215, true },
+  { 239240, true },
+  { 239250, true },
+  { 239263, true },
+  { 239277, true },
   { 239292, true },
-  { 239305, true },
-  { 239319, true },
-  { 239334, true },
-  { 239360, true },
-  { 239377, true },
-  { 239392, true },
-  { 239400, true },
-  { 239415, false },
-  { 239433, true },
-  { 239445, true },
+  { 239318, true },
+  { 239335, true },
+  { 239350, true },
+  { 239358, true },
+  { 239373, false },
+  { 239391, true },
+  { 239403, true },
+  { 239425, true },
+  { 239441, true },
+  { 239456, true },
   { 239467, true },
-  { 239483, true },
-  { 239498, true },
-  { 239509, true },
-  { 239530, true },
-  { 239552, true },
-  { 239566, true },
-  { 239587, true },
-  { 239601, true },
-  { 239618, true },
-  { 239637, true },
-  { 239658, true },
-  { 239677, true },
-  { 239690, true },
+  { 239488, true },
+  { 239510, true },
+  { 239524, true },
+  { 239545, true },
+  { 239559, true },
+  { 239576, true },
+  { 239595, true },
+  { 239616, true },
+  { 239635, true },
+  { 239648, true },
+  { 239668, true },
+  { 239684, true },
   { 239710, true },
-  { 239726, true },
-  { 239752, true },
-  { 239772, true },
-  { 239793, true },
-  { 239810, true },
-  { 239829, true },
-  { 239853, true },
-  { 239872, true },
-  { 239888, true },
-  { 239913, false },
-  { 239939, true },
-  { 239950, true },
-  { 239974, true },
-  { 240000, true },
-  { 240018, true },
-  { 240029, true },
-  { 240051, true },
-  { 240067, true },
+  { 239730, true },
+  { 239751, true },
+  { 239768, true },
+  { 239787, true },
+  { 239811, true },
+  { 239830, true },
+  { 239846, true },
+  { 239871, false },
+  { 239897, true },
+  { 239908, true },
+  { 239932, true },
+  { 239958, true },
+  { 239976, true },
+  { 239987, true },
+  { 240009, true },
+  { 240025, true },
+  { 240042, true },
+  { 240060, true },
+  { 240070, true },
   { 240084, true },
-  { 240102, true },
-  { 240112, true },
-  { 240126, true },
-  { 240142, true },
-  { 240160, true },
-  { 240177, true },
-  { 240199, true },
-  { 240222, true },
-  { 240234, true },
-  { 240253, true },
-  { 240271, true },
-  { 240294, true },
-  { 240307, true },
-  { 240323, true },
-  { 240341, true },
-  { 240359, true },
-  { 240379, true },
-  { 240393, true },
-  { 240411, true },
-  { 240429, true },
-  { 240444, true },
-  { 240461, true },
-  { 240475, true },
-  { 240502, true },
-  { 240520, true },
-  { 240534, true },
-  { 240550, true },
-  { 240568, true },
-  { 240584, true },
-  { 240600, true },
-  { 240613, true },
-  { 240633, true },
-  { 240649, true },
-  { 240667, true },
-  { 240684, true },
-  { 240703, true },
-  { 240716, true },
-  { 240752, true },
-  { 240775, true },
-  { 240795, true },
-  { 240810, true },
-  { 240828, true },
-  { 240845, true },
-  { 240864, true },
-  { 240875, true },
-  { 240897, true },
-  { 240915, true },
-  { 240945, true },
-  { 240961, true },
-  { 240976, true },
-  { 240991, true },
-  { 241002, true },
-  { 241016, true },
-  { 241038, true },
-  { 241052, true },
-  { 241067, true },
-  { 241088, true },
-  { 241101, true },
-  { 241116, true },
-  { 241129, true },
-  { 241152, true },
-  { 241161, true },
-  { 241173, true },
-  { 241195, true },
-  { 241205, true },
-  { 241226, true },
-  { 241250, true },
-  { 241276, true },
-  { 241294, true },
-  { 241305, true },
-  { 241322, true },
-  { 241340, true },
-  { 241355, true },
-  { 241371, true },
-  { 241388, true },
-  { 241402, true },
-  { 241415, true },
-  { 241431, true },
-  { 241450, true },
+  { 240100, true },
+  { 240118, true },
+  { 240135, true },
+  { 240157, true },
+  { 240180, true },
+  { 240192, true },
+  { 240211, true },
+  { 240229, true },
+  { 240252, true },
+  { 240265, true },
+  { 240281, true },
+  { 240299, true },
+  { 240317, true },
+  { 240337, true },
+  { 240351, true },
+  { 240369, true },
+  { 240387, true },
+  { 240402, true },
+  { 240419, true },
+  { 240433, true },
+  { 240460, true },
+  { 240478, true },
+  { 240492, true },
+  { 240508, true },
+  { 240526, true },
+  { 240542, true },
+  { 240558, true },
+  { 240571, true },
+  { 240591, true },
+  { 240607, true },
+  { 240625, true },
+  { 240642, true },
+  { 240661, true },
+  { 240674, true },
+  { 240710, true },
+  { 240733, true },
+  { 240753, true },
+  { 240768, true },
+  { 240786, true },
+  { 240803, true },
+  { 240822, true },
+  { 240833, true },
+  { 240855, true },
+  { 240873, true },
+  { 240903, true },
+  { 240919, true },
+  { 240934, true },
+  { 240949, true },
+  { 240960, true },
+  { 240974, true },
+  { 240996, true },
+  { 241010, true },
+  { 241025, true },
+  { 241046, true },
+  { 241059, true },
+  { 241074, true },
+  { 241087, true },
+  { 241110, true },
+  { 241119, true },
+  { 241141, true },
+  { 241151, true },
+  { 241172, true },
+  { 241196, true },
+  { 241222, true },
+  { 241240, true },
+  { 241251, true },
+  { 241268, true },
+  { 241286, true },
+  { 241301, true },
+  { 241317, true },
+  { 241334, true },
+  { 241348, true },
+  { 241361, true },
+  { 241377, true },
+  { 241396, true },
+  { 241414, true },
+  { 241438, true },
+  { 241451, true },
   { 241468, true },
-  { 241492, true },
-  { 241505, true },
-  { 241522, true },
-  { 241544, true },
-  { 241563, true },
-  { 241583, true },
-  { 241600, false },
-  { 241615, true },
-  { 241633, true },
-  { 241655, true },
+  { 241490, true },
+  { 241509, true },
+  { 241529, true },
+  { 241546, false },
+  { 241561, true },
+  { 241579, true },
+  { 241601, true },
+  { 241617, true },
+  { 241636, true },
+  { 241648, true },
   { 241674, true },
   { 241686, true },
-  { 241712, true },
-  { 241724, true },
-  { 241736, true },
-  { 241752, true },
-  { 241770, true },
-  { 241789, true },
-  { 241809, true },
-  { 241829, true },
-  { 241845, true },
-  { 241864, true },
-  { 241875, true },
-  { 241905, false },
+  { 241698, true },
+  { 241714, true },
+  { 241732, true },
+  { 241751, true },
+  { 241771, true },
+  { 241791, true },
+  { 241807, true },
+  { 241826, true },
+  { 241837, true },
+  { 241867, false },
+  { 241881, true },
+  { 241898, true },
   { 241919, true },
-  { 241936, true },
-  { 241957, true },
-  { 241971, true },
-  { 241989, true },
-  { 242006, true },
-  { 242022, true },
-  { 242032, true },
-  { 242048, true },
-  { 242059, true },
-  { 242071, true },
-  { 242090, true },
-  { 242106, true },
+  { 241933, true },
+  { 241951, true },
+  { 241968, true },
+  { 241984, true },
+  { 241994, true },
+  { 242010, true },
+  { 242021, true },
+  { 242033, true },
+  { 242052, true },
+  { 242068, true },
+  { 242088, true },
+  { 242102, true },
+  { 242115, true },
   { 242126, true },
-  { 242140, true },
-  { 242153, true },
-  { 242164, true },
-  { 242185, true },
-  { 242210, true },
-  { 242238, true },
-  { 242254, true },
-  { 242267, true },
-  { 242284, true },
-  { 242301, false },
-  { 242316, true },
-  { 242341, true },
-  { 242362, true },
-  { 242371, true },
-  { 242381, true },
-  { 242393, true },
+  { 242147, true },
+  { 242172, true },
+  { 242200, true },
+  { 242216, true },
+  { 242229, true },
+  { 242246, true },
+  { 242263, false },
+  { 242278, true },
+  { 242303, true },
+  { 242324, true },
+  { 242333, true },
+  { 242343, true },
+  { 242355, true },
+  { 242370, true },
+  { 242389, true },
   { 242408, true },
-  { 242427, true },
-  { 242446, true },
-  { 242463, true },
-  { 242484, true },
-  { 242501, true },
-  { 242517, false },
-  { 242535, true },
-  { 242552, true },
-  { 242565, true },
-  { 242589, true },
-  { 242607, true },
-  { 242621, true },
-  { 242642, true },
-  { 242657, true },
-  { 242672, true },
-  { 242684, true },
-  { 242709, true },
-  { 242722, true },
+  { 242425, true },
+  { 242442, true },
+  { 242458, false },
+  { 242476, true },
+  { 242493, true },
+  { 242506, true },
+  { 242530, true },
+  { 242548, true },
+  { 242562, true },
+  { 242583, true },
+  { 242598, true },
+  { 242613, true },
+  { 242625, true },
+  { 242650, true },
+  { 242663, true },
+  { 242685, true },
+  { 242695, true },
+  { 242712, true },
+  { 242731, true },
   { 242744, true },
-  { 242754, true },
+  { 242758, true },
   { 242771, true },
-  { 242790, true },
-  { 242803, true },
-  { 242817, true },
-  { 242830, true },
-  { 242854, true },
-  { 242868, true },
-  { 242890, true },
-  { 242923, true },
-  { 242938, true },
-  { 242952, true },
-  { 242961, true },
-  { 242970, true },
-  { 242990, true },
-  { 243004, true },
-  { 243014, true },
-  { 243026, true },
-  { 243042, false },
-  { 243056, true },
-  { 243065, true },
-  { 243076, true },
-  { 243090, true },
-  { 243108, true },
-  { 243123, true },
-  { 243136, true },
-  { 243146, true },
-  { 243161, true },
-  { 243174, true },
-  { 243193, true },
-  { 243213, true },
-  { 243236, true },
-  { 243243, true },
-  { 243259, true },
-  { 243274, true },
-  { 243292, true },
-  { 243304, true },
-  { 243334, true },
-  { 243347, true },
-  { 243360, true },
-  { 243370, true },
-  { 243382, true },
-  { 243396, true },
-  { 243410, true },
-  { 243420, true },
-  { 243435, true },
-  { 243453, true },
-  { 243465, true },
-  { 243478, true },
-  { 243490, true },
-  { 243501, true },
-  { 243520, true },
-  { 243535, true },
-  { 243547, true },
-  { 243559, true },
-  { 243570, true },
-  { 243585, true },
-  { 243596, true },
+  { 242795, true },
+  { 242809, true },
+  { 242831, true },
+  { 242864, true },
+  { 242879, true },
+  { 242893, true },
+  { 242902, true },
+  { 242911, true },
+  { 242931, true },
+  { 242945, true },
+  { 242955, true },
+  { 242967, true },
+  { 242983, false },
+  { 242997, true },
+  { 243006, true },
+  { 243017, true },
+  { 243031, true },
+  { 243049, true },
+  { 243064, true },
+  { 243077, true },
+  { 243087, true },
+  { 243102, true },
+  { 243115, true },
+  { 243134, true },
+  { 243154, true },
+  { 243177, true },
+  { 243184, true },
+  { 243200, true },
+  { 243215, true },
+  { 243233, true },
+  { 243245, true },
+  { 243275, true },
+  { 243288, true },
+  { 243301, true },
+  { 243311, true },
+  { 243323, true },
+  { 243337, true },
+  { 243351, true },
+  { 243361, true },
+  { 243376, true },
+  { 243388, true },
+  { 243401, true },
+  { 243413, true },
+  { 243424, true },
+  { 243443, true },
+  { 243458, true },
+  { 243470, true },
+  { 243482, true },
+  { 243493, true },
+  { 243508, true },
+  { 243519, true },
+  { 243534, true },
+  { 243546, true },
+  { 243562, true },
+  { 243577, true },
+  { 243593, true },
+  { 243602, true },
   { 243611, true },
-  { 243623, true },
-  { 243639, true },
-  { 243654, true },
-  { 243670, true },
-  { 243679, true },
-  { 243688, true },
-  { 243702, true },
-  { 243713, false },
-  { 243728, true },
-  { 243742, true },
-  { 243751, true },
-  { 243767, true },
-  { 243780, true },
-  { 243790, true },
-  { 243803, true },
-  { 243823, true },
-  { 243837, true },
-  { 243850, false },
-  { 243870, true },
-  { 243883, true },
-  { 243897, true },
-  { 243913, true },
-  { 243927, true },
-  { 243938, true },
-  { 243955, true },
-  { 243969, true },
-  { 243981, true },
-  { 243995, true },
-  { 244007, true },
-  { 244019, true },
-  { 244031, true },
-  { 244043, true },
-  { 244053, true },
-  { 244068, true },
-  { 244081, true },
-  { 244098, true },
-  { 244125, true },
-  { 244138, true },
-  { 244152, true },
-  { 244177, true },
-  { 244195, true },
-  { 244207, true },
-  { 244218, true },
-  { 244226, true },
-  { 244238, true },
-  { 244251, true },
-  { 244278, true },
-  { 244287, true },
-  { 244302, true },
-  { 244320, true },
-  { 244327, false },
-  { 244340, true },
-  { 244348, true },
-  { 244358, true },
+  { 243625, true },
+  { 243636, false },
+  { 243651, true },
+  { 243665, true },
+  { 243674, true },
+  { 243690, true },
+  { 243703, true },
+  { 243713, true },
+  { 243726, true },
+  { 243746, true },
+  { 243760, true },
+  { 243773, false },
+  { 243793, true },
+  { 243806, true },
+  { 243820, true },
+  { 243836, true },
+  { 243850, true },
+  { 243861, true },
+  { 243878, true },
+  { 243892, true },
+  { 243904, true },
+  { 243918, true },
+  { 243930, true },
+  { 243942, true },
+  { 243954, true },
+  { 243966, true },
+  { 243976, true },
+  { 243991, true },
+  { 244004, true },
+  { 244021, true },
+  { 244048, true },
+  { 244061, true },
+  { 244075, true },
+  { 244100, true },
+  { 244118, true },
+  { 244130, true },
+  { 244141, true },
+  { 244149, true },
+  { 244161, true },
+  { 244174, true },
+  { 244201, true },
+  { 244210, true },
+  { 244225, true },
+  { 244243, true },
+  { 244250, false },
+  { 244263, true },
+  { 244271, true },
+  { 244281, true },
+  { 244301, true },
+  { 244310, false },
+  { 244318, false },
+  { 244331, true },
+  { 244344, true },
+  { 244353, true },
+  { 244365, true },
   { 244378, true },
-  { 244387, false },
-  { 244395, false },
-  { 244408, true },
-  { 244421, true },
-  { 244430, true },
-  { 244442, true },
-  { 244455, true },
-  { 244463, true },
-  { 244472, true },
-  { 244482, true },
-  { 244492, true },
-  { 244502, true },
-  { 244512, true },
+  { 244386, true },
+  { 244395, true },
+  { 244405, true },
+  { 244415, true },
+  { 244425, true },
+  { 244435, true },
+  { 244445, true },
+  { 244454, true },
+  { 244461, true },
+  { 244473, true },
+  { 244489, true },
+  { 244506, true },
+  { 244515, true },
   { 244522, true },
-  { 244531, true },
-  { 244538, true },
-  { 244550, true },
-  { 244566, true },
-  { 244583, true },
-  { 244592, true },
-  { 244599, true },
-  { 244613, true },
-  { 244630, true },
-  { 244642, true },
-  { 244662, true },
-  { 244671, true },
-  { 244688, true },
-  { 244696, true },
-  { 244703, true },
-  { 244712, true },
-  { 244724, true },
-  { 244738, true },
-  { 244755, true },
-  { 244771, true },
-  { 244787, true },
-  { 244806, true },
-  { 244824, true },
-  { 244842, true },
-  { 244859, true },
-  { 244874, true },
-  { 244889, true },
-  { 244904, true },
-  { 244922, true },
-  { 244939, true },
-  { 244949, true },
+  { 244536, true },
+  { 244553, true },
+  { 244565, true },
+  { 244585, true },
+  { 244594, true },
+  { 244611, true },
+  { 244619, true },
+  { 244626, true },
+  { 244635, true },
+  { 244647, true },
+  { 244661, true },
+  { 244678, true },
+  { 244694, true },
+  { 244710, true },
+  { 244729, true },
+  { 244747, true },
+  { 244765, true },
+  { 244782, true },
+  { 244797, true },
+  { 244812, true },
+  { 244827, true },
+  { 244845, true },
+  { 244862, true },
+  { 244872, true },
+  { 244881, true },
+  { 244891, true },
+  { 244901, true },
+  { 244911, true },
+  { 244923, true },
+  { 244941, true },
   { 244958, true },
-  { 244968, true },
-  { 244978, true },
-  { 244988, true },
-  { 245000, true },
-  { 245018, true },
+  { 244972, true },
+  { 244987, true },
+  { 244999, true },
+  { 245013, true },
+  { 245021, true },
   { 245035, true },
-  { 245049, true },
-  { 245064, true },
+  { 245043, true },
+  { 245053, true },
+  { 245066, true },
   { 245076, true },
-  { 245090, true },
-  { 245098, true },
-  { 245112, true },
-  { 245120, true },
-  { 245130, true },
-  { 245143, true },
-  { 245153, true },
-  { 245168, true },
-  { 245180, true },
-  { 245194, true },
-  { 245203, true },
-  { 245212, true },
-  { 245225, false },
-  { 245258, true },
-  { 245273, true },
-  { 245284, true },
-  { 245307, true },
-  { 245320, true },
-  { 245331, true },
-  { 245345, true },
-  { 245365, true },
-  { 245378, true },
-  { 245392, true },
-  { 245405, true },
-  { 245421, true },
+  { 245091, true },
+  { 245103, true },
+  { 245117, true },
+  { 245126, true },
+  { 245135, true },
+  { 245148, false },
+  { 245181, true },
+  { 245196, true },
+  { 245207, true },
+  { 245230, true },
+  { 245243, true },
+  { 245254, true },
+  { 245268, true },
+  { 245288, true },
+  { 245301, true },
+  { 245315, true },
+  { 245328, true },
+  { 245344, true },
+  { 245354, true },
+  { 245368, true },
+  { 245386, true },
+  { 245400, true },
+  { 245416, true },
   { 245431, true },
-  { 245445, true },
+  { 245453, true },
   { 245463, true },
-  { 245477, true },
-  { 245493, true },
-  { 245508, true },
-  { 245530, true },
-  { 245540, true },
-  { 245552, true },
-  { 245566, true },
-  { 245582, true },
-  { 245594, true },
-  { 245610, true },
-  { 245620, true },
-  { 245633, true },
-  { 245650, true },
-  { 245664, true },
-  { 245672, true },
-  { 245684, true },
+  { 245475, true },
+  { 245489, true },
+  { 245505, true },
+  { 245517, true },
+  { 245533, true },
+  { 245543, true },
+  { 245556, true },
+  { 245573, true },
+  { 245587, true },
+  { 245595, true },
+  { 245607, true },
+  { 245621, true },
+  { 245632, true },
+  { 245640, true },
+  { 245652, false },
+  { 245660, true },
+  { 245671, true },
+  { 245687, true },
   { 245698, true },
-  { 245709, true },
-  { 245717, true },
-  { 245729, false },
+  { 245711, true },
+  { 245723, false },
   { 245737, true },
-  { 245748, true },
-  { 245764, true },
-  { 245775, true },
-  { 245788, true },
-  { 245800, false },
-  { 245814, true },
-  { 245827, true },
-  { 245838, true },
-  { 245848, true },
+  { 245750, true },
+  { 245761, true },
+  { 245771, true },
+  { 245785, true },
+  { 245804, true },
+  { 245815, true },
+  { 245829, true },
+  { 245840, true },
+  { 245851, true },
   { 245862, true },
-  { 245881, true },
-  { 245892, true },
-  { 245906, true },
-  { 245917, true },
-  { 245928, true },
+  { 245873, true },
+  { 245884, true },
+  { 245898, true },
+  { 245910, true },
+  { 245925, true },
   { 245939, true },
-  { 245950, true },
-  { 245961, true },
-  { 245975, true },
-  { 245987, true },
-  { 246002, true },
-  { 246016, true },
-  { 246031, true },
-  { 246044, true },
-  { 246060, true },
-  { 246069, true },
-  { 246078, true },
-  { 246092, true },
-  { 246103, true },
-  { 246114, false },
-  { 246130, true },
-  { 246141, true },
-  { 246152, true },
-  { 246162, true },
-  { 246178, true },
-  { 246185, false },
-  { 246199, true },
-  { 246212, true },
-  { 246221, true },
-  { 246231, true },
-  { 246244, true },
-  { 246254, true },
-  { 246278, true },
-  { 246291, true },
-  { 246301, true },
-  { 246314, false },
-  { 246333, true },
-  { 246347, true },
-  { 246359, true },
-  { 246373, true },
-  { 246394, true },
-  { 246409, true },
-  { 246423, true },
-  { 246435, true },
-  { 246450, false },
-  { 246469, true },
-  { 246479, true },
-  { 246491, true },
-  { 246501, true },
-  { 246513, true },
-  { 246530, true },
-  { 246549, true },
-  { 246558, false },
-  { 246573, true },
-  { 246591, false },
-  { 246603, true },
-  { 246629, true },
-  { 246640, true },
-  { 246661, true },
-  { 246676, true },
-  { 246694, true },
-  { 246710, true },
-  { 246725, true },
-  { 246740, true },
-  { 246755, true },
-  { 246767, true },
-  { 246780, true },
-  { 246790, true },
-  { 246808, true },
-  { 246828, true },
-  { 246847, true },
-  { 246875, true },
-  { 246889, true },
-  { 246908, true },
-  { 246929, true },
-  { 246938, true },
-  { 246962, true },
-  { 246976, true },
-  { 246986, false },
-  { 247005, true },
-  { 247019, true },
-  { 247034, true },
-  { 247051, true },
-  { 247071, true },
-  { 247085, true },
-  { 247095, true },
-  { 247116, true },
+  { 245954, true },
+  { 245967, true },
+  { 245983, true },
+  { 245992, true },
+  { 246001, true },
+  { 246015, true },
+  { 246026, true },
+  { 246037, false },
+  { 246053, true },
+  { 246064, true },
+  { 246075, true },
+  { 246085, true },
+  { 246101, true },
+  { 246108, false },
+  { 246122, true },
+  { 246135, true },
+  { 246144, true },
+  { 246154, true },
+  { 246167, true },
+  { 246177, true },
+  { 246201, true },
+  { 246214, true },
+  { 246224, true },
+  { 246237, false },
+  { 246256, true },
+  { 246270, true },
+  { 246282, true },
+  { 246296, true },
+  { 246317, true },
+  { 246332, true },
+  { 246346, true },
+  { 246358, true },
+  { 246373, false },
+  { 246392, true },
+  { 246402, true },
+  { 246414, true },
+  { 246424, true },
+  { 246436, true },
+  { 246453, true },
+  { 246472, true },
+  { 246481, false },
+  { 246496, true },
+  { 246514, false },
+  { 246526, true },
+  { 246552, true },
+  { 246563, true },
+  { 246584, true },
+  { 246599, true },
+  { 246617, true },
+  { 246633, true },
+  { 246648, true },
+  { 246663, true },
+  { 246678, true },
+  { 246690, true },
+  { 246703, true },
+  { 246713, true },
+  { 246731, true },
+  { 246751, true },
+  { 246770, true },
+  { 246798, true },
+  { 246812, true },
+  { 246831, true },
+  { 246852, true },
+  { 246861, true },
+  { 246885, true },
+  { 246899, true },
+  { 246909, false },
+  { 246928, true },
+  { 246942, true },
+  { 246957, true },
+  { 246974, true },
+  { 246994, true },
+  { 247008, true },
+  { 247018, true },
+  { 247039, true },
+  { 247057, true },
+  { 247070, true },
+  { 247082, true },
+  { 247093, true },
+  { 247108, true },
+  { 247123, true },
   { 247134, true },
-  { 247147, true },
-  { 247168, true },
-  { 247180, true },
-  { 247191, true },
-  { 247206, true },
-  { 247221, true },
-  { 247232, true },
-  { 247253, true },
-  { 247272, true },
-  { 247283, true },
-  { 247312, true },
-  { 247337, true },
-  { 247358, true },
-  { 247365, true },
-  { 247377, true },
-  { 247392, true },
-  { 247408, true },
-  { 247425, true },
-  { 247447, true },
-  { 247457, true },
-  { 247469, true },
-  { 247481, true },
-  { 247498, true },
-  { 247507, true },
-  { 247520, false },
-  { 247533, false },
-  { 247553, true },
+  { 247155, true },
+  { 247174, true },
+  { 247185, true },
+  { 247214, true },
+  { 247239, true },
+  { 247260, true },
+  { 247267, true },
+  { 247279, true },
+  { 247294, true },
+  { 247310, true },
+  { 247327, true },
+  { 247349, true },
+  { 247359, true },
+  { 247371, true },
+  { 247383, true },
+  { 247400, true },
+  { 247409, true },
+  { 247422, false },
+  { 247435, false },
+  { 247455, true },
+  { 247465, true },
+  { 247484, true },
+  { 247505, true },
+  { 247517, true },
+  { 247530, true },
+  { 247547, true },
   { 247563, true },
-  { 247582, true },
-  { 247603, true },
-  { 247615, true },
-  { 247628, true },
-  { 247645, true },
-  { 247661, true },
-  { 247672, true },
-  { 247687, true },
-  { 247705, true },
-  { 247718, true },
-  { 247733, true },
-  { 247746, true },
-  { 247762, true },
-  { 247780, true },
-  { 247792, true },
-  { 247811, true },
-  { 247828, true },
-  { 247839, true },
-  { 247859, true },
-  { 247870, true },
-  { 247889, true },
-  { 247915, true },
-  { 247934, true },
-  { 247953, true },
-  { 247963, true },
-  { 247978, true },
-  { 247990, true },
-  { 248010, true },
-  { 248028, true },
-  { 248045, true },
-  { 248058, true },
-  { 248071, true },
-  { 248084, true },
-  { 248097, true },
-  { 248110, true },
-  { 248134, true },
-  { 248145, true },
-  { 248157, true },
-  { 248172, true },
-  { 248188, true },
-  { 248198, true },
+  { 247574, true },
+  { 247589, true },
+  { 247607, true },
+  { 247620, true },
+  { 247635, true },
+  { 247648, true },
+  { 247664, true },
+  { 247682, true },
+  { 247694, true },
+  { 247713, true },
+  { 247730, true },
+  { 247741, true },
+  { 247761, true },
+  { 247772, true },
+  { 247791, true },
+  { 247817, true },
+  { 247836, true },
+  { 247855, true },
+  { 247865, true },
+  { 247880, true },
+  { 247892, true },
+  { 247912, true },
+  { 247930, true },
+  { 247947, true },
+  { 247960, true },
+  { 247973, true },
+  { 247986, true },
+  { 247999, true },
+  { 248012, true },
+  { 248036, true },
+  { 248047, true },
+  { 248059, true },
+  { 248074, true },
+  { 248090, true },
+  { 248100, true },
+  { 248113, true },
+  { 248131, true },
+  { 248149, true },
+  { 248168, true },
+  { 248180, true },
+  { 248193, true },
   { 248211, true },
-  { 248229, true },
-  { 248247, true },
-  { 248266, true },
-  { 248278, true },
-  { 248291, true },
-  { 248309, true },
-  { 248331, true },
-  { 248344, true },
-  { 248366, true },
-  { 248383, true },
-  { 248399, true },
-  { 248410, true },
-  { 248438, true },
-  { 248463, true },
-  { 248495, true },
-  { 248514, true },
-  { 248534, true },
-  { 248549, true },
-  { 248569, true },
-  { 248582, true },
-  { 248607, true },
-  { 248623, true },
+  { 248233, true },
+  { 248246, true },
+  { 248268, true },
+  { 248285, true },
+  { 248301, true },
+  { 248312, true },
+  { 248340, true },
+  { 248365, true },
+  { 248397, true },
+  { 248416, true },
+  { 248436, true },
+  { 248451, true },
+  { 248471, true },
+  { 248484, true },
+  { 248509, true },
+  { 248525, true },
+  { 248542, true },
+  { 248559, true },
+  { 248571, true },
+  { 248584, true },
+  { 248597, true },
+  { 248622, true },
   { 248640, true },
-  { 248657, true },
-  { 248669, true },
-  { 248682, true },
-  { 248695, true },
-  { 248720, true },
-  { 248738, true },
-  { 248752, true },
-  { 248773, true },
+  { 248654, true },
+  { 248675, true },
+  { 248687, true },
+  { 248702, true },
+  { 248719, true },
+  { 248731, true },
+  { 248750, true },
+  { 248767, true },
   { 248785, true },
   { 248800, true },
-  { 248817, true },
-  { 248829, true },
-  { 248848, true },
-  { 248865, true },
-  { 248883, true },
+  { 248811, true },
+  { 248825, true },
+  { 248844, true },
+  { 248861, true },
+  { 248876, true },
+  { 248886, true },
   { 248898, true },
-  { 248909, true },
-  { 248923, true },
-  { 248942, true },
-  { 248959, true },
-  { 248974, true },
+  { 248918, true },
+  { 248932, true },
+  { 248947, true },
+  { 248961, true },
+  { 248971, true },
   { 248984, true },
-  { 248996, true },
-  { 249016, true },
-  { 249030, true },
-  { 249045, true },
-  { 249059, true },
-  { 249069, true },
-  { 249082, true },
-  { 249101, true },
-  { 249113, true },
-  { 249127, true },
-  { 249136, true },
-  { 249150, true },
+  { 249003, true },
+  { 249015, true },
+  { 249029, true },
+  { 249038, true },
+  { 249052, true },
+  { 249066, true },
+  { 249076, true },
+  { 249088, true },
+  { 249099, true },
+  { 249117, true },
+  { 249129, false },
+  { 249137, true },
+  { 249148, true },
   { 249164, true },
-  { 249174, true },
-  { 249186, true },
-  { 249197, true },
-  { 249215, true },
-  { 249227, false },
-  { 249235, true },
-  { 249246, true },
-  { 249262, true },
-  { 249274, true },
-  { 249285, true },
-  { 249297, true },
-  { 249308, true },
-  { 249320, true },
-  { 249332, true },
-  { 249341, true },
-  { 249351, true },
-  { 249365, true },
-  { 249382, true },
-  { 249396, true },
-  { 249410, true },
+  { 249176, true },
+  { 249187, true },
+  { 249199, true },
+  { 249210, true },
+  { 249222, true },
+  { 249234, true },
+  { 249243, true },
+  { 249253, true },
+  { 249267, true },
+  { 249284, true },
+  { 249298, true },
+  { 249312, true },
+  { 249326, true },
+  { 249344, true },
+  { 249355, true },
+  { 249363, true },
+  { 249379, true },
+  { 249391, true },
+  { 249406, true },
   { 249424, true },
-  { 249442, true },
-  { 249453, true },
-  { 249461, true },
-  { 249477, true },
-  { 249489, true },
-  { 249504, true },
-  { 249522, true },
-  { 249542, true },
-  { 249555, true },
-  { 249563, true },
-  { 249584, true },
-  { 249595, true },
-  { 249610, true },
-  { 249625, false },
-  { 249643, false },
-  { 249664, true },
-  { 249673, true },
-  { 249696, true },
-  { 249713, true },
-  { 249725, true },
-  { 249746, true },
-  { 249772, true },
-  { 249789, true },
-  { 249806, true },
-  { 249826, true },
+  { 249444, true },
+  { 249457, true },
+  { 249465, true },
+  { 249486, true },
+  { 249497, true },
+  { 249512, true },
+  { 249527, false },
+  { 249545, false },
+  { 249566, true },
+  { 249575, true },
+  { 249598, true },
+  { 249615, true },
+  { 249627, true },
+  { 249648, true },
+  { 249674, true },
+  { 249691, true },
+  { 249708, true },
+  { 249728, true },
+  { 249741, true },
+  { 249755, true },
+  { 249777, true },
+  { 249794, true },
+  { 249814, true },
   { 249839, true },
-  { 249853, true },
-  { 249875, true },
-  { 249892, true },
-  { 249912, true },
-  { 249937, true },
-  { 249962, true },
-  { 249988, true },
-  { 250004, true },
-  { 250015, true },
+  { 249864, true },
+  { 249890, true },
+  { 249906, true },
+  { 249917, true },
+  { 249935, true },
+  { 249944, true },
+  { 249954, false },
+  { 249964, true },
+  { 249975, true },
+  { 249997, true },
+  { 250010, true },
+  { 250024, true },
   { 250033, true },
-  { 250042, true },
-  { 250052, false },
-  { 250062, true },
-  { 250073, true },
-  { 250095, true },
-  { 250108, true },
+  { 250046, true },
+  { 250068, true },
+  { 250080, false },
+  { 250094, true },
+  { 250102, true },
+  { 250112, true },
   { 250122, true },
-  { 250131, true },
-  { 250144, true },
-  { 250166, true },
-  { 250178, false },
-  { 250192, true },
-  { 250200, true },
-  { 250210, true },
-  { 250220, true },
-  { 250227, true },
-  { 250238, true },
-  { 250250, true },
-  { 250260, true },
-  { 250267, true },
-  { 250279, true },
-  { 250291, true },
-  { 250302, true },
-  { 250311, true },
-  { 250321, true },
-  { 250331, true },
-  { 250342, true },
-  { 250359, true },
-  { 250370, true },
-  { 250378, true },
-  { 250399, true },
-  { 250412, true },
-  { 250424, true },
-  { 250435, true },
-  { 250449, true },
-  { 250475, true },
-  { 250505, false },
-  { 250519, true },
-  { 250535, true },
-  { 250551, true },
-  { 250564, true },
-  { 250575, true },
-  { 250587, true },
-  { 250602, true },
-  { 250615, true },
-  { 250631, true },
-  { 250652, true },
-  { 250668, true },
-  { 250680, true },
-  { 250690, true },
-  { 250712, true },
-  { 250743, true },
-  { 250760, true },
-  { 250777, true },
-  { 250788, false },
-  { 250799, true },
-  { 250809, true },
-  { 250821, true },
-  { 250833, true },
-  { 250847, true },
-  { 250858, false },
-  { 250871, true },
-  { 250883, false },
-  { 250903, true },
-  { 250913, true },
-  { 250921, false },
-  { 250930, true },
-  { 250943, true },
-  { 250960, true },
-  { 251018, true },
-  { 251064, true },
-  { 251118, true },
-  { 251165, true },
-  { 251214, true },
-  { 251259, true },
-  { 251309, true },
-  { 251363, true },
-  { 251409, true },
-  { 251456, true },
-  { 251510, true },
+  { 250129, true },
+  { 250140, true },
+  { 250152, true },
+  { 250162, true },
+  { 250169, true },
+  { 250181, true },
+  { 250193, true },
+  { 250204, true },
+  { 250213, true },
+  { 250223, true },
+  { 250233, true },
+  { 250244, true },
+  { 250261, true },
+  { 250272, true },
+  { 250280, true },
+  { 250301, true },
+  { 250314, true },
+  { 250326, true },
+  { 250337, true },
+  { 250351, true },
+  { 250377, true },
+  { 250407, false },
+  { 250421, true },
+  { 250437, true },
+  { 250453, true },
+  { 250466, true },
+  { 250477, true },
+  { 250489, true },
+  { 250504, true },
+  { 250517, true },
+  { 250533, true },
+  { 250554, true },
+  { 250570, true },
+  { 250582, true },
+  { 250592, true },
+  { 250614, true },
+  { 250645, true },
+  { 250662, true },
+  { 250679, true },
+  { 250690, false },
+  { 250701, true },
+  { 250711, true },
+  { 250723, true },
+  { 250735, true },
+  { 250749, true },
+  { 250760, false },
+  { 250773, true },
+  { 250785, false },
+  { 250805, true },
+  { 250815, true },
+  { 250823, false },
+  { 250832, true },
+  { 250845, true },
+  { 250862, true },
+  { 250920, true },
+  { 250966, true },
+  { 251020, true },
+  { 251067, true },
+  { 251116, true },
+  { 251161, true },
+  { 251211, true },
+  { 251265, true },
+  { 251311, true },
+  { 251358, true },
+  { 251412, true },
+  { 251439, true },
+  { 251472, true },
+  { 251485, true },
+  { 251498, true },
+  { 251514, true },
   { 251537, true },
-  { 251570, true },
-  { 251583, true },
-  { 251596, true },
-  { 251612, true },
-  { 251635, true },
-  { 251648, true },
-  { 251664, true },
-  { 251674, true },
-  { 251685, false },
-  { 251697, true },
+  { 251550, true },
+  { 251566, true },
+  { 251576, true },
+  { 251587, false },
+  { 251599, true },
+  { 251616, true },
+  { 251626, true },
+  { 251644, true },
+  { 251658, true },
+  { 251676, true },
+  { 251692, true },
+  { 251703, true },
   { 251714, true },
-  { 251724, true },
-  { 251742, true },
+  { 251722, true },
+  { 251732, true },
+  { 251739, true },
+  { 251748, true },
   { 251756, true },
-  { 251774, true },
-  { 251790, true },
-  { 251801, true },
-  { 251812, true },
-  { 251820, true },
-  { 251830, true },
-  { 251837, true },
+  { 251766, true },
+  { 251777, true },
+  { 251784, true },
+  { 251793, true },
+  { 251811, true },
+  { 251827, true },
   { 251846, true },
-  { 251854, true },
-  { 251864, true },
-  { 251875, true },
-  { 251882, true },
-  { 251891, true },
-  { 251909, true },
-  { 251925, true },
+  { 251859, true },
+  { 251873, true },
+  { 251887, true },
+  { 251899, true },
+  { 251912, true },
+  { 251923, true },
   { 251944, true },
-  { 251957, true },
-  { 251971, true },
-  { 251985, true },
-  { 251997, true },
+  { 251954, true },
+  { 251963, true },
+  { 251972, true },
+  { 251979, true },
+  { 251986, true },
   { 252010, true },
-  { 252021, true },
-  { 252042, true },
+  { 252020, true },
+  { 252037, false },
   { 252052, true },
-  { 252061, true },
-  { 252070, true },
-  { 252077, true },
-  { 252084, true },
-  { 252108, true },
-  { 252122, true },
-  { 252132, true },
-  { 252149, false },
-  { 252164, true },
-  { 252176, true },
-  { 252190, true },
-  { 252204, true },
-  { 252215, true },
-  { 252227, true },
-  { 252239, true },
-  { 252246, true },
-  { 252258, true },
-  { 252271, true },
-  { 252281, true },
-  { 252296, true },
-  { 252307, true },
-  { 252323, true },
-  { 252338, true },
-  { 252348, true },
-  { 252367, true },
-  { 252379, true },
-  { 252386, true },
-  { 252402, true },
-  { 252424, true },
-  { 252435, true },
-  { 252450, true },
-  { 252460, true },
-  { 252471, true },
-  { 252483, true },
-  { 252499, true },
-  { 252509, true },
-  { 252516, true },
-  { 252523, true },
-  { 252535, true },
-  { 252546, true },
-  { 252556, true },
-  { 252568, true },
-  { 252578, false },
-  { 252598, false },
-  { 252621, true },
-  { 252645, true },
-  { 252655, false },
-  { 252662, true },
-  { 252673, true },
+  { 252064, true },
+  { 252078, true },
+  { 252092, true },
+  { 252103, true },
+  { 252115, true },
+  { 252127, true },
+  { 252134, true },
+  { 252146, true },
+  { 252156, true },
+  { 252171, true },
+  { 252182, true },
+  { 252198, true },
+  { 252213, true },
+  { 252223, true },
+  { 252242, true },
+  { 252254, true },
+  { 252261, true },
+  { 252277, true },
+  { 252299, true },
+  { 252310, true },
+  { 252325, true },
+  { 252335, true },
+  { 252346, true },
+  { 252358, true },
+  { 252374, true },
+  { 252384, true },
+  { 252391, true },
+  { 252398, true },
+  { 252410, true },
+  { 252421, true },
+  { 252431, true },
+  { 252443, true },
+  { 252453, false },
+  { 252473, false },
+  { 252496, true },
+  { 252520, true },
+  { 252530, false },
+  { 252537, true },
+  { 252548, true },
+  { 252560, true },
+  { 252574, true },
+  { 252588, true },
+  { 252601, true },
+  { 252612, true },
+  { 252628, false },
+  { 252649, true },
+  { 252659, true },
+  { 252670, true },
   { 252685, true },
   { 252699, true },
   { 252713, true },
-  { 252726, true },
-  { 252737, true },
-  { 252753, false },
-  { 252774, true },
-  { 252784, true },
-  { 252795, true },
-  { 252810, true },
-  { 252824, true },
-  { 252838, true },
-  { 252852, true },
-  { 252861, true },
-  { 252876, true },
-  { 252889, true },
-  { 252902, true },
-  { 252916, true },
-  { 252931, true },
-  { 252946, true },
+  { 252727, true },
+  { 252736, true },
+  { 252751, true },
+  { 252764, true },
+  { 252777, true },
+  { 252791, true },
+  { 252806, true },
+  { 252821, true },
+  { 252837, true },
+  { 252851, true },
+  { 252866, true },
+  { 252880, true },
+  { 252896, true },
+  { 252910, true },
+  { 252924, true },
+  { 252942, true },
   { 252962, true },
-  { 252976, true },
-  { 252991, true },
-  { 253005, true },
-  { 253021, true },
-  { 253035, true },
-  { 253049, true },
-  { 253067, true },
-  { 253087, true },
-  { 253106, true },
-  { 253122, true },
-  { 253137, true },
-  { 253151, true },
-  { 253167, true },
-  { 253182, true },
-  { 253196, true },
-  { 253213, true },
-  { 253231, false },
-  { 253243, true },
-  { 253254, true },
-  { 253264, false },
-  { 253288, true },
-  { 253302, false },
-  { 253317, true },
-  { 253331, true },
-  { 253348, true },
-  { 253358, true },
-  { 253373, true },
-  { 253388, true },
-  { 253403, true },
-  { 253418, true },
-  { 253433, true },
+  { 252981, true },
+  { 252997, true },
+  { 253012, true },
+  { 253026, true },
+  { 253042, true },
+  { 253057, true },
+  { 253071, true },
+  { 253088, true },
+  { 253106, false },
+  { 253118, true },
+  { 253134, true },
+  { 253145, true },
+  { 253155, false },
+  { 253179, true },
+  { 253193, false },
+  { 253208, true },
+  { 253222, true },
+  { 253239, true },
+  { 253249, true },
+  { 253264, true },
+  { 253279, true },
+  { 253294, true },
+  { 253309, true },
+  { 253324, true },
+  { 253339, true },
+  { 253357, true },
+  { 253374, true },
+  { 253391, true },
+  { 253414, true },
+  { 253434, true },
   { 253448, true },
-  { 253466, true },
-  { 253483, true },
-  { 253500, true },
-  { 253523, true },
-  { 253543, true },
-  { 253557, true },
-  { 253577, true },
-  { 253595, true },
-  { 253612, true },
-  { 253625, true },
-  { 253638, true },
-  { 253655, true },
-  { 253672, false },
-  { 253689, true },
-  { 253702, true },
-  { 253719, true },
-  { 253732, true },
-  { 253745, true },
-  { 253765, true },
-  { 253783, true },
-  { 253793, true },
-  { 253806, true },
-  { 253820, true },
-  { 253834, false },
-  { 253845, true },
-  { 253862, true },
-  { 253876, true },
-  { 253895, true },
-  { 253918, true },
+  { 253468, true },
+  { 253486, true },
+  { 253503, true },
+  { 253516, true },
+  { 253529, true },
+  { 253546, true },
+  { 253563, false },
+  { 253580, true },
+  { 253593, true },
+  { 253610, true },
+  { 253623, true },
+  { 253636, true },
+  { 253656, true },
+  { 253674, true },
+  { 253684, true },
+  { 253697, true },
+  { 253711, true },
+  { 253725, false },
+  { 253736, true },
+  { 253753, true },
+  { 253767, true },
+  { 253786, true },
+  { 253809, true },
+  { 253837, true },
+  { 253853, true },
+  { 253861, true },
+  { 253873, true },
+  { 253887, false },
+  { 253900, true },
+  { 253914, true },
+  { 253927, true },
+  { 253937, true },
   { 253946, true },
-  { 253962, true },
-  { 253970, true },
-  { 253982, true },
-  { 253996, false },
-  { 254009, true },
-  { 254023, true },
-  { 254036, true },
+  { 253958, true },
+  { 253971, true },
+  { 253987, true },
+  { 253997, true },
+  { 254012, true },
+  { 254020, true },
+  { 254031, true },
   { 254046, true },
-  { 254055, true },
-  { 254067, true },
+  { 254063, true },
+  { 254070, true },
   { 254080, true },
-  { 254096, true },
-  { 254106, true },
-  { 254121, true },
-  { 254129, true },
-  { 254140, true },
-  { 254155, true },
-  { 254172, true },
-  { 254179, true },
-  { 254189, true },
-  { 254199, true },
-  { 254220, true },
-  { 254236, true },
-  { 254255, true },
-  { 254275, true },
-  { 254291, true },
-  { 254306, true },
-  { 254314, true },
-  { 254333, true },
-  { 254344, true },
-  { 254360, true },
-  { 254375, true },
-  { 254385, true },
-  { 254393, true },
-  { 254404, true },
-  { 254417, true },
-  { 254428, true },
-  { 254443, false },
-  { 254463, true },
-  { 254478, true },
-  { 254500, true },
-  { 254510, true },
-  { 254525, true },
+  { 254090, true },
+  { 254111, true },
+  { 254127, true },
+  { 254146, true },
+  { 254166, true },
+  { 254182, true },
+  { 254197, true },
+  { 254205, true },
+  { 254224, true },
+  { 254235, true },
+  { 254251, true },
+  { 254266, true },
+  { 254276, true },
+  { 254284, true },
+  { 254295, true },
+  { 254308, true },
+  { 254319, true },
+  { 254334, false },
+  { 254354, true },
+  { 254369, true },
+  { 254391, true },
+  { 254401, true },
+  { 254416, true },
+  { 254429, true },
+  { 254439, true },
+  { 254451, true },
+  { 254475, true },
+  { 254488, true },
+  { 254501, true },
+  { 254513, true },
+  { 254527, true },
   { 254538, true },
-  { 254548, true },
-  { 254560, true },
-  { 254584, true },
-  { 254597, true },
-  { 254610, true },
+  { 254555, true },
+  { 254571, true },
+  { 254587, true },
+  { 254603, true },
   { 254622, true },
-  { 254636, true },
-  { 254647, true },
-  { 254664, true },
-  { 254680, true },
-  { 254696, true },
-  { 254712, true },
-  { 254731, true },
-  { 254755, true },
-  { 254775, true },
-  { 254786, true },
-  { 254797, true },
-  { 254807, true },
-  { 254818, true },
-  { 254826, false },
-  { 254833, true },
-  { 254841, true },
-  { 254859, true },
-  { 254872, true },
-  { 254883, true },
-  { 254897, true },
+  { 254646, true },
+  { 254666, true },
+  { 254677, true },
+  { 254688, true },
+  { 254698, true },
+  { 254709, true },
+  { 254717, false },
+  { 254724, true },
+  { 254732, true },
+  { 254750, true },
+  { 254763, true },
+  { 254774, true },
+  { 254788, true },
+  { 254803, true },
+  { 254813, true },
+  { 254831, true },
+  { 254845, true },
+  { 254864, true },
+  { 254876, true },
+  { 254903, false },
   { 254912, true },
-  { 254922, true },
-  { 254940, true },
-  { 254954, true },
+  { 254925, false },
+  { 254948, true },
+  { 254959, true },
+  { 254966, true },
   { 254973, true },
-  { 254985, true },
-  { 255012, false },
-  { 255021, true },
-  { 255034, false },
-  { 255057, true },
-  { 255068, true },
-  { 255075, true },
+  { 254984, true },
+  { 254997, true },
+  { 255013, true },
+  { 255026, true },
+  { 255042, true },
+  { 255054, true },
+  { 255072, true },
   { 255082, true },
-  { 255093, true },
-  { 255106, true },
-  { 255122, true },
-  { 255135, true },
-  { 255151, true },
+  { 255099, true },
+  { 255114, true },
+  { 255123, true },
+  { 255134, true },
+  { 255145, true },
   { 255163, true },
-  { 255181, true },
-  { 255191, true },
+  { 255177, true },
+  { 255189, true },
+  { 255198, true },
   { 255208, true },
-  { 255223, true },
+  { 255220, true },
   { 255232, true },
   { 255243, true },
-  { 255254, true },
+  { 255256, true },
   { 255272, true },
-  { 255286, true },
-  { 255298, true },
-  { 255307, true },
-  { 255317, true },
-  { 255329, true },
-  { 255341, true },
-  { 255352, true },
-  { 255365, true },
-  { 255381, true },
-  { 255400, true },
-  { 255419, true },
-  { 255434, true },
-  { 255444, true },
-  { 255463, true },
-  { 255481, true },
-  { 255493, true },
-  { 255512, true },
-  { 255520, false },
-  { 255535, true },
-  { 255542, true },
-  { 255555, true },
+  { 255291, true },
+  { 255310, true },
+  { 255325, true },
+  { 255335, true },
+  { 255354, true },
+  { 255372, true },
+  { 255384, true },
+  { 255403, true },
+  { 255411, false },
+  { 255426, true },
+  { 255433, true },
+  { 255446, true },
+  { 255461, true },
+  { 255473, true },
+  { 255488, true },
+  { 255497, true },
+  { 255508, true },
+  { 255519, true },
+  { 255528, true },
+  { 255537, true },
+  { 255545, true },
+  { 255551, true },
   { 255570, true },
-  { 255582, true },
-  { 255597, true },
-  { 255606, true },
-  { 255617, true },
-  { 255628, true },
-  { 255637, true },
-  { 255646, true },
-  { 255654, true },
-  { 255660, true },
-  { 255679, true },
-  { 255692, true },
-  { 255714, true },
-  { 255732, true },
-  { 255745, true },
-  { 255761, true },
-  { 255777, true },
-  { 255794, true },
-  { 255803, true },
-  { 255817, true },
-  { 255833, true },
-  { 255845, true },
-  { 255856, true },
-  { 255871, true },
-  { 255885, true },
-  { 255900, true },
-  { 255915, true },
-  { 255933, true },
-  { 255945, true },
-  { 255955, true },
-  { 255979, true },
-  { 255999, true },
-  { 256016, true },
-  { 256037, true },
-  { 256050, true },
+  { 255583, true },
+  { 255605, true },
+  { 255623, true },
+  { 255636, true },
+  { 255652, true },
+  { 255668, true },
+  { 255685, true },
+  { 255694, true },
+  { 255708, true },
+  { 255724, true },
+  { 255736, true },
+  { 255747, true },
+  { 255762, true },
+  { 255776, true },
+  { 255791, true },
+  { 255806, true },
+  { 255824, true },
+  { 255836, true },
+  { 255846, true },
+  { 255870, true },
+  { 255890, true },
+  { 255907, true },
+  { 255928, true },
+  { 255941, true },
+  { 255957, true },
+  { 255969, true },
+  { 255983, true },
+  { 256000, true },
+  { 256019, true },
+  { 256029, true },
+  { 256051, true },
   { 256066, true },
-  { 256078, true },
-  { 256092, true },
-  { 256109, true },
+  { 256080, true },
+  { 256095, true },
+  { 256108, true },
+  { 256117, true },
   { 256128, true },
-  { 256138, true },
-  { 256160, true },
-  { 256175, true },
-  { 256189, true },
-  { 256204, true },
+  { 256141, true },
+  { 256152, true },
+  { 256166, true },
+  { 256176, true },
+  { 256191, true },
+  { 256203, true },
   { 256217, true },
-  { 256226, true },
-  { 256237, true },
-  { 256250, true },
-  { 256261, true },
-  { 256275, true },
-  { 256285, true },
-  { 256300, true },
-  { 256312, true },
-  { 256326, true },
-  { 256351, true },
-  { 256366, true },
-  { 256389, false },
-  { 256402, true },
-  { 256414, true },
-  { 256428, true },
-  { 256443, true },
-  { 256452, true },
-  { 256464, true },
-  { 256474, true },
-  { 256488, true },
-  { 256501, true },
-  { 256514, true },
-  { 256533, true },
-  { 256544, true },
-  { 256556, true },
+  { 256242, true },
+  { 256257, true },
+  { 256280, false },
+  { 256293, true },
+  { 256305, true },
+  { 256319, true },
+  { 256334, true },
+  { 256343, true },
+  { 256355, true },
+  { 256365, true },
+  { 256379, true },
+  { 256392, true },
+  { 256405, true },
+  { 256424, true },
+  { 256435, true },
+  { 256447, true },
+  { 256459, true },
+  { 256475, true },
+  { 256493, true },
+  { 256519, true },
+  { 256537, false },
+  { 256550, true },
   { 256568, true },
-  { 256584, true },
-  { 256602, true },
-  { 256628, true },
-  { 256646, false },
+  { 256578, true },
+  { 256588, true },
+  { 256605, true },
+  { 256616, true },
+  { 256631, true },
+  { 256643, true },
   { 256659, true },
+  { 256667, true },
   { 256677, true },
   { 256687, true },
-  { 256697, true },
-  { 256714, true },
+  { 256702, true },
+  { 256715, true },
   { 256725, true },
-  { 256740, true },
-  { 256752, true },
+  { 256737, true },
+  { 256747, true },
+  { 256757, true },
   { 256768, true },
-  { 256776, true },
-  { 256786, true },
-  { 256796, true },
-  { 256811, true },
-  { 256824, true },
-  { 256834, true },
-  { 256846, true },
-  { 256856, true },
-  { 256866, true },
-  { 256877, true },
-  { 256897, true },
-  { 256905, false },
-  { 256926, true },
-  { 256939, true },
-  { 256948, true },
-  { 256962, true },
-  { 256972, true },
-  { 256985, true },
-  { 257001, true },
-  { 257012, false },
-  { 257032, true },
-  { 257042, true },
-  { 257049, true },
-  { 257059, true },
-  { 257069, true },
-  { 257084, true },
-  { 257098, true },
-  { 257115, true },
-  { 257135, true },
-  { 257148, true },
+  { 256788, true },
+  { 256796, false },
+  { 256817, true },
+  { 256830, true },
+  { 256839, true },
+  { 256853, true },
+  { 256863, true },
+  { 256876, true },
+  { 256892, true },
+  { 256903, false },
+  { 256923, true },
+  { 256933, true },
+  { 256940, true },
+  { 256950, true },
+  { 256960, true },
+  { 256975, true },
+  { 256989, true },
+  { 257006, true },
+  { 257026, true },
+  { 257039, true },
+  { 257057, true },
+  { 257073, true },
+  { 257082, true },
+  { 257112, true },
+  { 257138, true },
+  { 257158, true },
   { 257166, true },
-  { 257182, true },
-  { 257191, true },
-  { 257221, true },
-  { 257247, true },
+  { 257185, true },
+  { 257199, true },
+  { 257208, true },
+  { 257223, true },
+  { 257248, true },
   { 257267, true },
-  { 257275, true },
-  { 257294, true },
-  { 257308, true },
-  { 257317, true },
-  { 257332, true },
-  { 257357, true },
-  { 257376, true },
-  { 257386, true },
-  { 257407, true },
-  { 257419, true },
-  { 257434, true },
-  { 257447, true },
-  { 257463, true },
-  { 257475, true },
-  { 257492, true },
-  { 257503, true },
-  { 257520, true },
-  { 257538, true },
-  { 257554, true },
-  { 257574, true },
-  { 257596, true },
-  { 257609, true },
-  { 257619, true },
+  { 257277, true },
+  { 257298, true },
+  { 257310, true },
+  { 257325, true },
+  { 257338, true },
+  { 257354, true },
+  { 257366, true },
+  { 257383, true },
+  { 257394, true },
+  { 257411, true },
+  { 257429, true },
+  { 257445, true },
+  { 257465, true },
+  { 257487, true },
+  { 257500, true },
+  { 257510, true },
+  { 257532, true },
+  { 257553, true },
+  { 257572, true },
+  { 257593, true },
+  { 257606, true },
+  { 257630, true },
   { 257641, true },
-  { 257662, true },
-  { 257681, true },
-  { 257702, true },
+  { 257653, true },
+  { 257665, true },
+  { 257687, true },
+  { 257697, true },
   { 257715, true },
-  { 257739, true },
-  { 257750, true },
-  { 257762, true },
-  { 257774, true },
-  { 257796, true },
-  { 257806, true },
-  { 257824, true },
-  { 257836, true },
-  { 257847, true },
-  { 257860, true },
-  { 257869, true },
+  { 257727, true },
+  { 257738, true },
+  { 257751, true },
+  { 257760, true },
+  { 257773, true },
+  { 257784, true },
+  { 257795, true },
+  { 257805, true },
+  { 257812, true },
+  { 257823, true },
+  { 257837, true },
+  { 257850, false },
+  { 257862, true },
   { 257882, true },
-  { 257893, true },
-  { 257904, true },
-  { 257914, true },
-  { 257921, true },
-  { 257932, true },
-  { 257946, true },
-  { 257959, false },
-  { 257971, true },
-  { 257991, true },
-  { 258004, true },
-  { 258014, true },
-  { 258035, true },
-  { 258045, true },
-  { 258062, true },
-  { 258076, true },
-  { 258093, true },
-  { 258111, true },
-  { 258118, true },
-  { 258136, false },
-  { 258154, false },
-  { 258172, false },
-  { 258189, true },
-  { 258211, true },
-  { 258224, true },
-  { 258237, false },
-  { 258251, true },
+  { 257895, true },
+  { 257905, true },
+  { 257926, true },
+  { 257936, true },
+  { 257953, true },
+  { 257967, true },
+  { 257984, true },
+  { 258002, true },
+  { 258009, true },
+  { 258027, false },
+  { 258045, false },
+  { 258063, false },
+  { 258080, true },
+  { 258102, true },
+  { 258115, true },
+  { 258128, false },
+  { 258142, true },
+  { 258157, true },
+  { 258169, true },
+  { 258190, true },
+  { 258208, false },
+  { 258223, true },
+  { 258248, true },
   { 258266, true },
-  { 258278, true },
-  { 258299, true },
-  { 258317, false },
-  { 258332, true },
-  { 258357, true },
-  { 258375, true },
-  { 258391, true },
-  { 258419, true },
-  { 258434, true },
-  { 258445, true },
-  { 258468, false },
-  { 258486, true },
-  { 258501, true },
-  { 258513, true },
+  { 258282, true },
+  { 258310, true },
+  { 258325, true },
+  { 258336, true },
+  { 258359, false },
+  { 258377, true },
+  { 258392, true },
+  { 258404, true },
+  { 258417, true },
+  { 258446, true },
+  { 258464, true },
+  { 258487, true },
+  { 258497, true },
+  { 258516, true },
   { 258526, true },
-  { 258555, true },
-  { 258573, true },
-  { 258596, true },
-  { 258606, true },
-  { 258625, true },
-  { 258635, true },
-  { 258650, true },
-  { 258661, true },
-  { 258685, false },
-  { 258700, true },
-  { 258718, true },
+  { 258541, true },
+  { 258552, true },
+  { 258576, false },
+  { 258591, true },
+  { 258609, true },
+  { 258624, true },
+  { 258642, true },
+  { 258656, true },
+  { 258671, true },
+  { 258684, true },
+  { 258696, true },
+  { 258719, true },
   { 258733, true },
-  { 258751, true },
-  { 258765, true },
-  { 258780, true },
-  { 258793, true },
-  { 258805, true },
-  { 258828, true },
-  { 258842, true },
-  { 258865, true },
-  { 258877, true },
-  { 258893, true },
-  { 258911, true },
-  { 258925, true },
-  { 258936, true },
-  { 258954, true },
-  { 258962, true },
-  { 258986, false },
-  { 259009, true },
-  { 259029, false },
-  { 259046, true },
-  { 259064, true },
-  { 259084, true },
-  { 259097, true },
-  { 259108, true },
-  { 259121, true },
+  { 258756, true },
+  { 258768, true },
+  { 258784, true },
+  { 258802, true },
+  { 258816, true },
+  { 258827, true },
+  { 258845, true },
+  { 258853, true },
+  { 258877, false },
+  { 258900, true },
+  { 258920, false },
+  { 258937, true },
+  { 258955, true },
+  { 258975, true },
+  { 258988, true },
+  { 258999, true },
+  { 259012, true },
+  { 259029, true },
+  { 259040, true },
+  { 259051, true },
+  { 259073, true },
+  { 259091, false },
+  { 259105, true },
+  { 259124, true },
   { 259138, true },
-  { 259149, true },
-  { 259160, true },
-  { 259182, true },
-  { 259200, false },
-  { 259214, true },
+  { 259156, true },
+  { 259176, true },
+  { 259190, true },
+  { 259199, true },
+  { 259215, true },
   { 259233, true },
-  { 259247, true },
-  { 259265, true },
-  { 259285, true },
-  { 259299, true },
-  { 259308, true },
-  { 259324, true },
-  { 259342, true },
-  { 259357, true },
-  { 259372, true },
-  { 259385, true },
-  { 259397, true },
-  { 259409, true },
-  { 259420, true },
-  { 259431, true },
+  { 259248, true },
+  { 259263, true },
+  { 259276, true },
+  { 259288, true },
+  { 259300, true },
+  { 259311, true },
+  { 259322, true },
+  { 259335, true },
+  { 259348, true },
+  { 259362, true },
+  { 259373, true },
+  { 259384, true },
+  { 259398, true },
+  { 259408, true },
+  { 259417, true },
+  { 259434, true },
   { 259444, true },
-  { 259457, true },
-  { 259471, true },
-  { 259482, true },
-  { 259493, true },
+  { 259454, true },
+  { 259467, true },
+  { 259476, true },
+  { 259486, true },
+  { 259497, true },
   { 259507, true },
-  { 259517, true },
-  { 259526, true },
-  { 259543, true },
-  { 259553, true },
-  { 259563, true },
-  { 259576, true },
-  { 259585, true },
-  { 259595, true },
-  { 259606, true },
-  { 259616, true },
-  { 259624, true },
+  { 259515, true },
+  { 259527, true },
+  { 259535, false },
+  { 259549, true },
+  { 259557, false },
+  { 259577, true },
+  { 259587, true },
+  { 259601, true },
+  { 259615, true },
+  { 259625, true },
   { 259636, true },
-  { 259644, false },
-  { 259658, true },
-  { 259666, false },
-  { 259686, true },
-  { 259696, true },
-  { 259710, true },
-  { 259724, true },
-  { 259734, true },
-  { 259745, true },
-  { 259757, true },
-  { 259769, true },
-  { 259779, true },
-  { 259788, true },
-  { 259799, true },
-  { 259812, true },
-  { 259824, true },
-  { 259836, true },
-  { 259848, true },
-  { 259859, true },
-  { 259873, false },
-  { 259889, true },
-  { 259905, true },
-  { 259920, true },
-  { 259934, true },
-  { 259943, true },
-  { 259955, true },
-  { 259965, true },
-  { 259981, true },
-  { 259996, true },
-  { 260011, true },
-  { 260027, true },
-  { 260042, true },
-  { 260057, true },
-  { 260079, true },
-  { 260091, true },
-  { 260098, true },
-  { 260113, true },
-  { 260124, true },
-  { 260134, true },
-  { 260149, true },
-  { 260163, true },
-  { 260177, true },
-  { 260188, true },
-  { 260201, true },
-  { 260212, true },
-  { 260219, true },
-  { 260229, false },
-  { 260244, true },
-  { 260260, true },
+  { 259648, true },
+  { 259660, true },
+  { 259670, true },
+  { 259679, true },
+  { 259690, true },
+  { 259703, true },
+  { 259715, true },
+  { 259727, true },
+  { 259739, true },
+  { 259750, true },
+  { 259764, true },
+  { 259780, true },
+  { 259795, true },
+  { 259809, true },
+  { 259818, true },
+  { 259830, true },
+  { 259840, true },
+  { 259856, true },
+  { 259871, true },
+  { 259886, true },
+  { 259902, true },
+  { 259917, true },
+  { 259932, true },
+  { 259954, true },
+  { 259966, true },
+  { 259973, true },
+  { 259988, true },
+  { 259999, true },
+  { 260009, true },
+  { 260024, true },
+  { 260038, true },
+  { 260052, true },
+  { 260063, true },
+  { 260076, true },
+  { 260087, true },
+  { 260094, true },
+  { 260104, false },
+  { 260119, true },
+  { 260135, true },
+  { 260144, true },
+  { 260154, true },
+  { 260161, true },
+  { 260173, true },
+  { 260185, true },
+  { 260199, true },
+  { 260222, true },
   { 260269, true },
-  { 260279, true },
-  { 260286, true },
-  { 260298, true },
-  { 260310, true },
-  { 260324, true },
-  { 260347, true },
-  { 260394, true },
-  { 260429, true },
-  { 260465, true },
-  { 260502, true },
-  { 260535, true },
-  { 260573, true },
-  { 260608, true },
-  { 260643, true },
-  { 260683, true },
-  { 260719, true },
-  { 260762, true },
-  { 260788, true },
-  { 260801, true },
-  { 260810, true },
-  { 260820, true },
-  { 260830, true },
-  { 260857, true },
-  { 260866, true },
-  { 260875, true },
-  { 260892, true },
-  { 260909, true },
+  { 260304, true },
+  { 260340, true },
+  { 260377, true },
+  { 260410, true },
+  { 260448, true },
+  { 260483, true },
+  { 260518, true },
+  { 260558, true },
+  { 260594, true },
+  { 260637, true },
+  { 260663, true },
+  { 260676, true },
+  { 260685, true },
+  { 260695, true },
+  { 260705, true },
+  { 260732, true },
+  { 260741, true },
+  { 260750, true },
+  { 260767, true },
+  { 260784, true },
+  { 260796, true },
+  { 260809, true },
+  { 260822, true },
+  { 260849, true },
+  { 260856, true },
+  { 260868, true },
+  { 260879, true },
+  { 260888, true },
+  { 260905, true },
   { 260921, true },
-  { 260934, true },
-  { 260947, true },
-  { 260974, true },
-  { 260981, true },
+  { 260932, true },
+  { 260944, true },
+  { 260956, true },
+  { 260969, true },
   { 260993, true },
-  { 261004, true },
-  { 261013, true },
-  { 261030, true },
-  { 261046, true },
-  { 261057, true },
-  { 261069, true },
-  { 261081, true },
-  { 261094, true },
-  { 261118, true },
-  { 261130, true },
-  { 261141, true },
+  { 261005, true },
+  { 261016, true },
+  { 261024, true },
+  { 261034, true },
+  { 261041, true },
+  { 261061, true },
+  { 261073, true },
+  { 261091, true },
+  { 261103, true },
+  { 261114, true },
+  { 261126, true },
+  { 261137, true },
   { 261149, true },
-  { 261159, true },
-  { 261166, true },
-  { 261186, true },
-  { 261198, true },
-  { 261216, true },
-  { 261228, true },
-  { 261239, true },
-  { 261251, true },
-  { 261262, true },
-  { 261274, true },
-  { 261293, true },
-  { 261303, true },
-  { 261315, true },
-  { 261335, true },
-  { 261357, true },
-  { 261366, true },
+  { 261168, true },
+  { 261178, true },
+  { 261190, true },
+  { 261210, true },
+  { 261232, true },
+  { 261241, true },
+  { 261249, true },
+  { 261258, true },
+  { 261267, true },
+  { 261286, true },
+  { 261300, true },
+  { 261321, true },
+  { 261334, true },
+  { 261346, true },
   { 261374, true },
-  { 261383, true },
-  { 261392, true },
-  { 261411, true },
-  { 261425, true },
+  { 261398, true },
+  { 261410, true },
+  { 261428, true },
   { 261446, true },
-  { 261459, true },
-  { 261471, true },
-  { 261499, true },
-  { 261523, true },
-  { 261535, true },
-  { 261553, true },
-  { 261571, true },
-  { 261584, false },
-  { 261598, true },
-  { 261613, true },
-  { 261628, true },
-  { 261637, true },
-  { 261654, true },
-  { 261675, true },
-  { 261685, true },
-  { 261699, true },
-  { 261707, true },
-  { 261718, true },
-  { 261733, true },
-  { 261749, true },
-  { 261765, true },
-  { 261775, true },
-  { 261786, true },
-  { 261796, true },
-  { 261812, true },
-  { 261823, true },
-  { 261831, true },
-  { 261842, true },
-  { 261854, true },
-  { 261865, true },
-  { 261881, true },
-  { 261894, true },
-  { 261908, true },
-  { 261925, false },
-  { 261941, true },
-  { 261957, false },
-  { 261976, true },
-  { 261986, true },
-  { 262004, true },
-  { 262019, true },
-  { 262041, true },
-  { 262064, true },
+  { 261459, false },
+  { 261473, true },
+  { 261488, true },
+  { 261503, true },
+  { 261512, true },
+  { 261529, true },
+  { 261550, true },
+  { 261560, true },
+  { 261574, true },
+  { 261582, true },
+  { 261593, true },
+  { 261608, true },
+  { 261624, true },
+  { 261640, true },
+  { 261650, true },
+  { 261661, true },
+  { 261671, true },
+  { 261687, true },
+  { 261698, true },
+  { 261706, true },
+  { 261717, true },
+  { 261729, true },
+  { 261740, true },
+  { 261756, true },
+  { 261769, true },
+  { 261783, true },
+  { 261800, false },
+  { 261816, true },
+  { 261832, true },
+  { 261844, false },
+  { 261863, true },
+  { 261873, true },
+  { 261891, true },
+  { 261906, true },
+  { 261928, true },
+  { 261951, true },
+  { 261962, true },
+  { 261972, true },
+  { 261982, true },
+  { 261999, true },
+  { 262009, true },
+  { 262025, true },
+  { 262044, true },
+  { 262059, true },
   { 262075, true },
-  { 262085, true },
-  { 262095, true },
+  { 262092, true },
   { 262112, true },
-  { 262122, true },
-  { 262138, true },
-  { 262157, true },
-  { 262172, true },
-  { 262188, true },
+  { 262129, true },
+  { 262141, true },
+  { 262156, true },
+  { 262170, true },
+  { 262189, true },
   { 262205, true },
-  { 262225, true },
-  { 262242, true },
-  { 262254, true },
-  { 262269, true },
+  { 262214, true },
+  { 262230, true },
+  { 262247, false },
+  { 262259, true },
+  { 262271, true },
   { 262283, true },
+  { 262292, true },
   { 262302, true },
-  { 262318, true },
-  { 262327, true },
-  { 262343, true },
-  { 262360, false },
-  { 262372, true },
-  { 262384, true },
-  { 262396, true },
-  { 262405, true },
-  { 262415, true },
-  { 262432, true },
+  { 262319, true },
+  { 262337, true },
+  { 262348, true },
+  { 262356, true },
+  { 262366, true },
+  { 262381, true },
+  { 262391, true },
+  { 262401, false },
+  { 262408, true },
+  { 262418, true },
+  { 262434, true },
   { 262450, true },
-  { 262461, true },
-  { 262469, true },
-  { 262479, true },
-  { 262494, true },
-  { 262504, true },
-  { 262514, false },
-  { 262521, true },
-  { 262531, true },
-  { 262547, true },
-  { 262563, true },
-  { 262584, true },
-  { 262602, true },
-  { 262622, true },
-  { 262645, true },
-  { 262665, true },
-  { 262681, true },
-  { 262696, true },
-  { 262714, true },
-  { 262725, false },
-  { 262749, true },
-  { 262768, true },
-  { 262781, true },
-  { 262793, true },
-  { 262805, true },
-  { 262816, true },
-  { 262826, false },
-  { 262840, false },
-  { 262853, true },
-  { 262867, true },
-  { 262885, true },
-  { 262908, true },
-  { 262931, true },
-  { 262949, true },
-  { 262962, true },
-  { 262973, true },
-  { 262984, true },
-  { 262998, true },
-  { 263023, true },
-  { 263034, true },
-  { 263067, true },
-  { 263093, true },
-  { 263127, true },
-  { 263150, true },
-  { 263163, true },
-  { 263176, true },
-  { 263192, true },
-  { 263209, true },
-  { 263226, true },
-  { 263238, true },
-  { 263250, true },
-  { 263266, false },
-  { 263286, true },
-  { 263299, false },
-  { 263317, false },
-  { 263340, true },
-  { 263360, true },
-  { 263376, true },
-  { 263390, true },
+  { 262471, true },
+  { 262489, true },
+  { 262509, true },
+  { 262532, true },
+  { 262552, true },
+  { 262568, true },
+  { 262583, true },
+  { 262601, true },
+  { 262612, false },
+  { 262636, true },
+  { 262655, true },
+  { 262668, true },
+  { 262680, true },
+  { 262692, true },
+  { 262703, true },
+  { 262713, false },
+  { 262727, false },
+  { 262740, true },
+  { 262754, true },
+  { 262772, true },
+  { 262795, true },
+  { 262818, true },
+  { 262836, true },
+  { 262849, true },
+  { 262861, true },
+  { 262872, true },
+  { 262883, true },
+  { 262897, true },
+  { 262922, true },
+  { 262933, true },
+  { 262966, true },
+  { 262992, true },
+  { 263026, true },
+  { 263049, true },
+  { 263062, true },
+  { 263075, true },
+  { 263091, true },
+  { 263108, true },
+  { 263125, true },
+  { 263137, true },
+  { 263149, true },
+  { 263165, false },
+  { 263185, true },
+  { 263198, false },
+  { 263216, false },
+  { 263239, true },
+  { 263259, true },
+  { 263275, true },
+  { 263289, true },
+  { 263310, true },
+  { 263325, true },
+  { 263339, false },
+  { 263352, true },
+  { 263367, true },
+  { 263384, true },
+  { 263398, true },
   { 263411, true },
   { 263426, true },
-  { 263440, false },
-  { 263453, true },
-  { 263468, true },
-  { 263485, true },
-  { 263499, true },
-  { 263512, true },
-  { 263527, true },
-  { 263539, true },
-  { 263551, true },
-  { 263567, true },
-  { 263582, false },
-  { 263604, true },
-  { 263624, true },
-  { 263645, true },
-  { 263661, false },
-  { 263673, true },
-  { 263689, true },
-  { 263707, true },
-  { 263719, true },
-  { 263733, true },
-  { 263747, true },
-  { 263764, true },
-  { 263781, true },
-  { 263795, true },
-  { 263805, false },
-  { 263819, true },
-  { 263829, true },
-  { 263850, true },
-  { 263863, true },
-  { 263881, true },
-  { 263897, true },
-  { 263910, true },
-  { 263921, true },
-  { 263934, true },
+  { 263438, true },
+  { 263450, true },
+  { 263466, true },
+  { 263481, false },
+  { 263503, true },
+  { 263523, true },
+  { 263544, true },
+  { 263560, false },
+  { 263572, true },
+  { 263588, true },
+  { 263606, true },
+  { 263618, true },
+  { 263632, true },
+  { 263646, true },
+  { 263663, true },
+  { 263680, true },
+  { 263694, true },
+  { 263704, false },
+  { 263718, true },
+  { 263728, true },
+  { 263749, true },
+  { 263762, true },
+  { 263780, true },
+  { 263796, true },
+  { 263809, true },
+  { 263820, true },
+  { 263833, true },
+  { 263854, true },
+  { 263867, true },
+  { 263887, true },
+  { 263904, true },
+  { 263918, true },
+  { 263928, true },
+  { 263945, true },
   { 263955, true },
-  { 263968, true },
-  { 263988, true },
-  { 264005, true },
-  { 264019, true },
-  { 264029, true },
-  { 264046, true },
-  { 264056, true },
-  { 264072, true },
-  { 264100, true },
-  { 264109, true },
-  { 264119, true },
+  { 263971, true },
+  { 263999, true },
+  { 264008, true },
+  { 264018, true },
+  { 264036, true },
+  { 264044, true },
+  { 264060, true },
+  { 264076, true },
+  { 264092, true },
+  { 264113, true },
+  { 264124, true },
   { 264137, true },
-  { 264145, true },
-  { 264161, true },
-  { 264177, true },
-  { 264193, true },
-  { 264214, true },
-  { 264225, true },
-  { 264238, true },
+  { 264147, true },
+  { 264172, true },
+  { 264187, true },
+  { 264199, true },
+  { 264219, true },
+  { 264233, true },
   { 264248, true },
-  { 264273, true },
-  { 264288, true },
-  { 264300, true },
-  { 264320, true },
-  { 264334, true },
-  { 264349, true },
-  { 264371, true },
-  { 264393, true },
-  { 264413, true },
-  { 264428, true },
-  { 264438, true },
-  { 264451, true },
-  { 264469, true },
+  { 264270, true },
+  { 264292, true },
+  { 264312, true },
+  { 264327, true },
+  { 264337, true },
+  { 264350, true },
+  { 264368, true },
+  { 264383, true },
+  { 264399, true },
+  { 264415, true },
+  { 264431, true },
+  { 264455, true },
+  { 264473, true },
   { 264484, true },
-  { 264500, true },
-  { 264516, true },
-  { 264532, true },
-  { 264556, true },
-  { 264574, true },
-  { 264585, true },
-  { 264600, true },
-  { 264609, true },
-  { 264617, false },
-  { 264627, true },
-  { 264639, true },
-  { 264656, true },
+  { 264499, true },
+  { 264508, true },
+  { 264516, false },
+  { 264526, true },
+  { 264538, true },
+  { 264555, true },
+  { 264567, true },
+  { 264592, true },
+  { 264619, true },
+  { 264635, true },
+  { 264651, true },
   { 264668, true },
-  { 264693, true },
+  { 264689, true },
+  { 264708, true },
   { 264720, true },
-  { 264736, true },
-  { 264752, true },
-  { 264769, true },
-  { 264790, true },
-  { 264809, true },
-  { 264821, true },
-  { 264833, true },
-  { 264847, true },
-  { 264866, true },
-  { 264878, true },
-  { 264890, true },
-  { 264900, true },
-  { 264915, true },
-  { 264927, true },
-  { 264941, true },
-  { 264965, true },
-  { 264977, true },
-  { 265009, true },
-  { 265024, true },
-  { 265045, true },
-  { 265076, true },
-  { 265090, true },
-  { 265115, true },
-  { 265138, true },
-  { 265149, true },
-  { 265161, false },
+  { 264732, true },
+  { 264746, true },
+  { 264765, true },
+  { 264777, true },
+  { 264789, true },
+  { 264799, true },
+  { 264814, true },
+  { 264826, true },
+  { 264840, true },
+  { 264864, true },
+  { 264876, true },
+  { 264908, true },
+  { 264923, true },
+  { 264944, true },
+  { 264975, true },
+  { 264989, true },
+  { 265014, true },
+  { 265037, true },
+  { 265048, true },
+  { 265060, false },
+  { 265075, true },
+  { 265088, true },
+  { 265101, true },
+  { 265114, true },
+  { 265124, true },
+  { 265153, true },
   { 265176, true },
-  { 265189, true },
-  { 265202, true },
-  { 265215, true },
-  { 265225, true },
-  { 265254, true },
-  { 265277, true },
-  { 265301, true },
-  { 265328, true },
-  { 265342, true },
-  { 265365, true },
-  { 265391, true },
-  { 265419, true },
-  { 265450, true },
-  { 265475, true },
-  { 265483, true },
-  { 265490, true },
-  { 265502, true },
+  { 265200, true },
+  { 265227, true },
+  { 265241, true },
+  { 265264, true },
+  { 265290, true },
+  { 265318, true },
+  { 265349, true },
+  { 265374, true },
+  { 265382, true },
+  { 265389, true },
+  { 265401, true },
+  { 265409, true },
+  { 265418, true },
+  { 265430, true },
+  { 265441, true },
+  { 265463, true },
+  { 265476, true },
+  { 265497, true },
   { 265510, true },
-  { 265519, true },
   { 265531, true },
-  { 265542, true },
-  { 265564, true },
-  { 265577, true },
-  { 265598, true },
-  { 265611, true },
-  { 265632, true },
+  { 265550, true },
+  { 265569, true },
+  { 265580, true },
+  { 265593, true },
+  { 265605, true },
+  { 265621, true },
+  { 265635, false },
   { 265651, true },
-  { 265670, true },
-  { 265681, true },
-  { 265694, true },
-  { 265706, true },
-  { 265722, true },
-  { 265736, false },
-  { 265752, true },
-  { 265760, true },
-  { 265775, true },
-  { 265792, true },
-  { 265809, false },
-  { 265824, true },
-  { 265840, true },
-  { 265850, true },
-  { 265862, true },
-  { 265881, true },
-  { 265895, false },
-  { 265904, true },
-  { 265916, true },
-  { 265931, true },
-  { 265944, true },
-  { 265962, true },
-  { 265973, true },
-  { 265988, true },
-  { 266001, true },
-  { 266023, true },
-  { 266040, true },
-  { 266064, true },
-  { 266086, true },
-  { 266108, true },
-  { 266122, true },
-  { 266136, true },
-  { 266143, true },
-  { 266156, true },
-  { 266169, true },
-  { 266186, true },
-  { 266205, true },
-  { 266231, true },
-  { 266243, true },
-  { 266271, true },
-  { 266282, true },
-  { 266308, true },
-  { 266328, true },
-  { 266349, true },
-  { 266359, true },
-  { 266369, false },
-  { 266386, true },
-  { 266398, true },
-  { 266413, true },
-  { 266422, true },
-  { 266438, true },
-  { 266451, true },
-  { 266461, true },
-  { 266475, true },
-  { 266492, true },
-  { 266504, true },
-  { 266517, true },
-  { 266535, true },
-  { 266547, true },
-  { 266558, true },
-  { 266568, true },
-  { 266581, false },
-  { 266597, true },
-  { 266613, true },
-  { 266627, true },
-  { 266640, false },
-  { 266657, true },
-  { 266671, true },
-  { 266685, true },
-  { 266699, true },
-  { 266723, true },
-  { 266736, true },
-  { 266749, true },
-  { 266763, true },
-  { 266777, true },
-  { 266792, true },
-  { 266808, true },
-  { 266823, true },
-  { 266838, true },
-  { 266856, true },
-  { 266867, true },
-  { 266890, true },
-  { 266902, true },
-  { 266914, true },
-  { 266926, true },
-  { 266940, true },
-  { 266959, true },
+  { 265659, true },
+  { 265674, true },
+  { 265691, true },
+  { 265708, false },
+  { 265723, true },
+  { 265739, true },
+  { 265749, true },
+  { 265761, true },
+  { 265780, true },
+  { 265794, false },
+  { 265803, true },
+  { 265815, true },
+  { 265830, true },
+  { 265843, true },
+  { 265861, true },
+  { 265872, true },
+  { 265887, true },
+  { 265900, true },
+  { 265922, true },
+  { 265939, true },
+  { 265963, true },
+  { 265985, true },
+  { 266007, true },
+  { 266021, true },
+  { 266035, true },
+  { 266042, true },
+  { 266055, true },
+  { 266068, true },
+  { 266085, true },
+  { 266104, true },
+  { 266130, true },
+  { 266142, true },
+  { 266170, true },
+  { 266181, true },
+  { 266207, true },
+  { 266227, true },
+  { 266248, true },
+  { 266258, true },
+  { 266268, false },
+  { 266285, true },
+  { 266297, true },
+  { 266312, true },
+  { 266321, true },
+  { 266337, true },
+  { 266350, true },
+  { 266360, true },
+  { 266374, true },
+  { 266391, true },
+  { 266403, true },
+  { 266416, true },
+  { 266434, true },
+  { 266446, true },
+  { 266457, true },
+  { 266467, true },
+  { 266480, false },
+  { 266496, true },
+  { 266512, true },
+  { 266526, true },
+  { 266539, false },
+  { 266556, true },
+  { 266570, true },
+  { 266584, true },
+  { 266598, true },
+  { 266622, true },
+  { 266635, true },
+  { 266648, true },
+  { 266662, true },
+  { 266676, true },
+  { 266691, true },
+  { 266707, true },
+  { 266722, true },
+  { 266737, true },
+  { 266755, true },
+  { 266766, true },
+  { 266789, true },
+  { 266801, true },
+  { 266813, true },
+  { 266825, true },
+  { 266839, true },
+  { 266858, true },
+  { 266876, true },
+  { 266892, true },
+  { 266906, true },
+  { 266921, true },
+  { 266936, true },
+  { 266960, true },
   { 266977, true },
-  { 266993, true },
-  { 267007, true },
-  { 267022, true },
-  { 267037, true },
-  { 267061, true },
-  { 267078, true },
+  { 266995, true },
+  { 267014, true },
+  { 267034, true },
+  { 267049, true },
+  { 267067, true },
+  { 267079, true },
   { 267096, true },
-  { 267115, true },
-  { 267135, true },
+  { 267110, true },
+  { 267127, true },
+  { 267136, true },
   { 267150, true },
-  { 267168, true },
-  { 267180, true },
-  { 267197, true },
-  { 267211, true },
-  { 267228, true },
-  { 267237, true },
-  { 267251, true },
-  { 267260, true },
-  { 267279, false },
-  { 267292, true },
-  { 267304, true },
-  { 267318, true },
-  { 267333, true },
-  { 267351, true },
-  { 267367, true },
-  { 267384, true },
-  { 267396, true },
-  { 267416, false },
+  { 267159, true },
+  { 267178, false },
+  { 267191, true },
+  { 267203, true },
+  { 267217, true },
+  { 267232, true },
+  { 267250, true },
+  { 267266, true },
+  { 267283, true },
+  { 267295, true },
+  { 267315, false },
+  { 267328, true },
+  { 267339, true },
+  { 267360, true },
+  { 267374, true },
+  { 267387, true },
+  { 267405, true },
+  { 267417, true },
   { 267429, true },
-  { 267440, true },
-  { 267461, true },
-  { 267475, true },
+  { 267447, false },
+  { 267466, true },
   { 267488, true },
-  { 267506, true },
-  { 267518, true },
-  { 267530, true },
-  { 267548, false },
+  { 267503, true },
+  { 267522, true },
+  { 267536, true },
+  { 267551, true },
   { 267567, true },
-  { 267589, true },
-  { 267604, true },
-  { 267623, true },
-  { 267637, true },
-  { 267652, true },
-  { 267668, true },
-  { 267689, true },
-  { 267703, true },
-  { 267715, true },
-  { 267727, true },
-  { 267744, true },
-  { 267762, true },
-  { 267773, true },
-  { 267780, true },
-  { 267792, true },
-  { 267806, true },
-  { 267825, true },
-  { 267835, true },
-  { 267843, true },
-  { 267853, true },
-  { 267860, true },
-  { 267875, true },
-  { 267894, true },
-  { 267910, true },
-  { 267933, false },
-  { 267943, true },
-  { 267950, true },
-  { 267961, false },
-  { 267973, true },
-  { 267982, true },
-  { 267996, true },
-  { 268008, true },
-  { 268016, true },
-  { 268023, true },
-  { 268033, true },
-  { 268042, true },
-  { 268054, true },
-  { 268065, true },
-  { 268084, true },
-  { 268094, true },
-  { 268102, false },
-  { 268114, true },
-  { 268127, true },
-  { 268149, true },
-  { 268163, true },
-  { 268175, true },
-  { 268193, true },
-  { 268206, true },
+  { 267588, true },
+  { 267602, true },
+  { 267614, true },
+  { 267626, true },
+  { 267643, true },
+  { 267661, true },
+  { 267672, true },
+  { 267679, true },
+  { 267691, true },
+  { 267705, true },
+  { 267724, true },
+  { 267734, true },
+  { 267742, true },
+  { 267752, true },
+  { 267759, true },
+  { 267774, true },
+  { 267793, true },
+  { 267809, true },
+  { 267832, false },
+  { 267842, true },
+  { 267849, true },
+  { 267860, false },
+  { 267872, true },
+  { 267881, true },
+  { 267895, true },
+  { 267907, true },
+  { 267915, true },
+  { 267922, true },
+  { 267932, true },
+  { 267941, true },
+  { 267953, true },
+  { 267964, true },
+  { 267983, true },
+  { 267993, true },
+  { 268001, false },
+  { 268013, true },
+  { 268026, true },
+  { 268048, true },
+  { 268062, true },
+  { 268074, true },
+  { 268092, true },
+  { 268105, true },
+  { 268121, true },
+  { 268130, false },
+  { 268147, true },
+  { 268165, true },
+  { 268186, true },
+  { 268197, true },
+  { 268208, true },
   { 268222, true },
-  { 268231, false },
-  { 268248, true },
-  { 268266, true },
-  { 268287, true },
-  { 268298, true },
-  { 268309, true },
-  { 268323, true },
-  { 268344, true },
-  { 268356, true },
-  { 268372, true },
-  { 268397, true },
-  { 268423, true },
-  { 268449, true },
-  { 268460, true },
-  { 268470, true },
-  { 268481, true },
-  { 268493, true },
-  { 268506, true },
-  { 268519, true },
-  { 268532, true },
-  { 268542, true },
-  { 268557, true },
-  { 268566, true },
-  { 268580, true },
-  { 268595, true },
-  { 268611, true },
-  { 268631, true },
-  { 268647, true },
+  { 268243, true },
+  { 268255, true },
+  { 268271, true },
+  { 268296, true },
+  { 268322, true },
+  { 268348, true },
+  { 268359, true },
+  { 268369, true },
+  { 268380, true },
+  { 268392, true },
+  { 268405, true },
+  { 268418, true },
+  { 268431, true },
+  { 268441, true },
+  { 268456, true },
+  { 268465, true },
+  { 268479, true },
+  { 268494, true },
+  { 268510, true },
+  { 268530, true },
+  { 268545, true },
+  { 268561, true },
+  { 268571, true },
+  { 268583, true },
+  { 268603, true },
+  { 268625, true },
+  { 268638, true },
   { 268657, true },
-  { 268669, true },
-  { 268689, true },
-  { 268711, true },
-  { 268724, true },
-  { 268743, true },
-  { 268757, true },
-  { 268776, true },
-  { 268788, true },
-  { 268812, false },
-  { 268826, true },
-  { 268839, true },
-  { 268852, true },
-  { 268871, true },
-  { 268893, true },
+  { 268671, true },
+  { 268690, true },
+  { 268702, true },
+  { 268726, false },
+  { 268740, true },
+  { 268753, true },
+  { 268766, true },
+  { 268785, true },
+  { 268807, true },
+  { 268819, true },
+  { 268834, true },
+  { 268855, true },
+  { 268880, true },
   { 268905, true },
-  { 268920, true },
-  { 268935, true },
-  { 268956, true },
-  { 268981, true },
-  { 269006, true },
-  { 269022, true },
-  { 269048, true },
-  { 269076, true },
-  { 269097, true },
-  { 269116, true },
-  { 269129, true },
-  { 269145, true },
-  { 269158, true },
-  { 269170, true },
-  { 269188, true },
-  { 269202, true },
-  { 269221, true },
-  { 269232, true },
-  { 269244, true },
-  { 269254, true },
-  { 269263, true },
-  { 269277, true },
-  { 269294, true },
-  { 269305, true },
+  { 268921, true },
+  { 268947, true },
+  { 268975, true },
+  { 268996, true },
+  { 269015, true },
+  { 269028, true },
+  { 269044, true },
+  { 269057, true },
+  { 269069, true },
+  { 269087, true },
+  { 269101, true },
+  { 269120, true },
+  { 269131, true },
+  { 269143, true },
+  { 269153, true },
+  { 269162, true },
+  { 269176, true },
+  { 269193, true },
+  { 269204, true },
+  { 269215, true },
+  { 269223, true },
+  { 269235, true },
+  { 269248, true },
+  { 269265, true },
+  { 269276, true },
+  { 269285, false },
+  { 269297, true },
   { 269316, true },
-  { 269324, true },
-  { 269336, true },
-  { 269349, true },
-  { 269366, true },
-  { 269377, true },
-  { 269386, false },
-  { 269398, true },
-  { 269417, true },
-  { 269430, true },
-  { 269441, true },
-  { 269452, true },
-  { 269465, true },
-  { 269476, true },
-  { 269489, true },
-  { 269500, true },
-  { 269512, true },
-  { 269522, true },
-  { 269528, true },
-  { 269538, true },
-  { 269558, true },
-  { 269568, true },
-  { 269591, true },
-  { 269616, true },
-  { 269628, false },
-  { 269647, true },
-  { 269655, true },
+  { 269329, true },
+  { 269340, true },
+  { 269351, true },
+  { 269364, true },
+  { 269375, true },
+  { 269388, true },
+  { 269399, true },
+  { 269411, true },
+  { 269421, true },
+  { 269427, true },
+  { 269437, true },
+  { 269457, true },
+  { 269467, true },
+  { 269490, true },
+  { 269515, true },
+  { 269527, false },
+  { 269546, true },
+  { 269554, true },
+  { 269562, true },
+  { 269576, true },
+  { 269588, true },
+  { 269600, true },
+  { 269615, false },
+  { 269628, true },
+  { 269641, true },
+  { 269652, true },
   { 269663, true },
-  { 269677, true },
-  { 269689, true },
-  { 269701, true },
-  { 269716, false },
-  { 269729, true },
-  { 269742, true },
+  { 269672, true },
+  { 269688, true },
+  { 269698, true },
+  { 269712, true },
+  { 269722, true },
+  { 269736, true },
+  { 269743, true },
   { 269753, true },
-  { 269764, true },
-  { 269773, true },
-  { 269789, true },
-  { 269799, true },
+  { 269766, true },
+  { 269783, true },
+  { 269793, true },
+  { 269801, true },
   { 269813, true },
-  { 269823, true },
-  { 269837, true },
+  { 269829, true },
   { 269844, true },
   { 269854, true },
-  { 269867, true },
-  { 269884, true },
-  { 269894, true },
-  { 269902, true },
-  { 269914, true },
-  { 269930, true },
-  { 269945, true },
-  { 269955, true },
-  { 269980, true },
-  { 269992, false },
-  { 270000, true },
-  { 270012, false },
-  { 270023, false },
-  { 270041, false },
-  { 270054, true },
-  { 270069, true },
-  { 270083, true },
-  { 270097, true },
-  { 270114, true },
-  { 270131, true },
-  { 270149, true },
-  { 270167, true },
-  { 270185, true },
-  { 270199, true },
-  { 270213, true },
-  { 270227, true },
-  { 270241, true },
-  { 270255, false },
-  { 270273, false },
-  { 270296, false },
-  { 270317, false },
-  { 270336, true },
-  { 270349, true },
-  { 270365, false },
-  { 270381, false },
-  { 270397, true },
-  { 270419, true },
-  { 270432, false },
-  { 270449, false },
-  { 270466, true },
-  { 270483, false },
-  { 270500, false },
-  { 270514, false },
-  { 270533, false },
-  { 270544, false },
-  { 270556, false },
-  { 270568, false },
-  { 270587, true },
-  { 270605, false },
-  { 270619, true },
+  { 269879, true },
+  { 269891, false },
+  { 269899, true },
+  { 269911, false },
+  { 269922, false },
+  { 269940, false },
+  { 269953, true },
+  { 269968, true },
+  { 269982, true },
+  { 269996, true },
+  { 270013, true },
+  { 270030, true },
+  { 270045, true },
+  { 270063, true },
+  { 270081, true },
+  { 270099, true },
+  { 270113, true },
+  { 270127, true },
+  { 270141, true },
+  { 270155, true },
+  { 270169, false },
+  { 270187, false },
+  { 270210, false },
+  { 270231, false },
+  { 270250, true },
+  { 270263, true },
+  { 270279, false },
+  { 270295, false },
+  { 270311, true },
+  { 270333, true },
+  { 270346, false },
+  { 270363, false },
+  { 270380, true },
+  { 270397, false },
+  { 270414, false },
+  { 270428, false },
+  { 270447, false },
+  { 270458, false },
+  { 270470, false },
+  { 270482, false },
+  { 270501, true },
+  { 270519, false },
+  { 270533, true },
+  { 270549, false },
+  { 270566, false },
+  { 270583, false },
+  { 270598, false },
+  { 270614, true },
   { 270635, false },
-  { 270652, false },
-  { 270669, false },
-  { 270684, false },
-  { 270700, true },
-  { 270721, false },
-  { 270740, false },
-  { 270758, false },
-  { 270778, true },
-  { 270794, false },
-  { 270809, true },
-  { 270824, false },
-  { 270848, true },
-  { 270855, true },
-  { 270874, false },
-  { 270892, false },
-  { 270907, true },
-  { 270927, true },
-  { 270948, false },
-  { 270972, false },
-  { 270991, false },
-  { 271007, false },
-  { 271022, false },
-  { 271035, true },
-  { 271051, false },
-  { 271066, false },
-  { 271080, false },
-  { 271098, true },
-  { 271109, true },
-  { 271116, true },
+  { 270654, false },
+  { 270672, false },
+  { 270692, true },
+  { 270708, false },
+  { 270723, true },
+  { 270738, false },
+  { 270762, true },
+  { 270769, true },
+  { 270788, false },
+  { 270806, false },
+  { 270821, true },
+  { 270841, true },
+  { 270862, false },
+  { 270886, false },
+  { 270905, false },
+  { 270921, false },
+  { 270936, false },
+  { 270949, true },
+  { 270965, false },
+  { 270980, false },
+  { 270994, false },
+  { 271012, true },
+  { 271023, true },
+  { 271030, true },
+  { 271041, true },
+  { 271049, true },
+  { 271057, true },
+  { 271067, true },
+  { 271080, true },
+  { 271097, true },
+  { 271113, true },
   { 271127, true },
   { 271135, true },
-  { 271143, true },
-  { 271153, true },
-  { 271166, true },
-  { 271183, true },
-  { 271199, true },
-  { 271213, true },
-  { 271221, true },
-  { 271232, true },
-  { 271242, true },
+  { 271146, true },
+  { 271156, true },
+  { 271174, true },
+  { 271190, true },
+  { 271195, true },
+  { 271200, true },
+  { 271208, true },
+  { 271216, true },
+  { 271236, true },
+  { 271244, true },
+  { 271253, true },
   { 271260, true },
-  { 271276, true },
-  { 271281, true },
+  { 271279, true },
   { 271286, true },
-  { 271294, true },
-  { 271302, true },
-  { 271322, true },
+  { 271293, true },
+  { 271300, true },
+  { 271309, true },
   { 271330, true },
-  { 271339, true },
-  { 271346, true },
-  { 271365, true },
-  { 271372, true },
-  { 271379, true },
-  { 271386, true },
-  { 271395, true },
-  { 271416, true },
-  { 271436, true },
-  { 271460, true },
-  { 271470, true },
-  { 271483, true },
-  { 271500, true },
-  { 271520, true },
-  { 271526, true },
-  { 271532, true },
-  { 271539, true },
-  { 271551, true },
-  { 271563, true },
+  { 271350, true },
+  { 271374, true },
+  { 271384, true },
+  { 271397, true },
+  { 271414, true },
+  { 271434, true },
+  { 271440, true },
+  { 271446, true },
+  { 271453, true },
+  { 271465, true },
+  { 271477, true },
+  { 271490, true },
+  { 271501, true },
+  { 271516, true },
+  { 271529, true },
+  { 271541, true },
+  { 271552, true },
+  { 271565, false },
   { 271576, true },
   { 271587, true },
-  { 271602, true },
-  { 271615, true },
-  { 271627, true },
-  { 271638, true },
-  { 271651, false },
-  { 271662, true },
-  { 271673, true },
-  { 271681, false },
-  { 271700, true },
-  { 271711, true },
-  { 271722, true },
-  { 271729, true },
-  { 271740, true },
-  { 271751, true },
-  { 271758, true },
+  { 271595, false },
+  { 271614, true },
+  { 271625, true },
+  { 271636, true },
+  { 271643, true },
+  { 271654, true },
+  { 271665, true },
+  { 271672, true },
+  { 271683, true },
+  { 271695, true },
+  { 271714, true },
+  { 271730, true },
+  { 271742, true },
+  { 271753, true },
   { 271769, true },
-  { 271781, true },
-  { 271800, true },
-  { 271816, true },
-  { 271828, true },
+  { 271783, true },
+  { 271798, true },
+  { 271808, true },
+  { 271818, true },
+  { 271829, false },
   { 271839, true },
-  { 271855, true },
-  { 271869, true },
-  { 271884, true },
-  { 271894, true },
-  { 271904, true },
-  { 271915, false },
-  { 271925, true },
-  { 271935, true },
+  { 271849, true },
+  { 271860, true },
+  { 271868, true },
+  { 271876, true },
+  { 271886, true },
+  { 271895, false },
+  { 271909, true },
+  { 271917, true },
+  { 271927, true },
+  { 271938, true },
   { 271946, true },
-  { 271954, true },
-  { 271962, true },
-  { 271972, true },
-  { 271981, false },
-  { 271995, true },
-  { 272003, true },
-  { 272013, true },
-  { 272024, true },
-  { 272032, true },
-  { 272044, true },
-  { 272055, true },
-  { 272066, true },
-  { 272078, true },
+  { 271958, true },
+  { 271969, true },
+  { 271980, true },
+  { 271992, true },
+  { 272000, true },
+  { 272007, true },
+  { 272014, true },
+  { 272021, true },
+  { 272046, true },
+  { 272068, true },
   { 272086, true },
-  { 272093, true },
-  { 272100, true },
-  { 272107, true },
-  { 272132, true },
-  { 272154, true },
-  { 272172, true },
-  { 272198, true },
-  { 272224, true },
-  { 272235, true },
-  { 272251, true },
-  { 272281, true },
-  { 272293, true },
-  { 272312, true },
-  { 272336, true },
-  { 272357, true },
-  { 272383, true },
-  { 272416, true },
-  { 272439, true },
-  { 272458, true },
-  { 272486, true },
-  { 272506, true },
-  { 272524, true },
-  { 272542, true },
-  { 272569, true },
-  { 272594, true },
-  { 272619, true },
-  { 272643, true },
-  { 272683, true },
-  { 272713, true },
-  { 272728, true },
-  { 272739, true },
-  { 272770, true },
-  { 272781, false },
+  { 272112, true },
+  { 272138, true },
+  { 272149, true },
+  { 272165, true },
+  { 272195, true },
+  { 272207, true },
+  { 272226, true },
+  { 272250, true },
+  { 272271, true },
+  { 272297, true },
+  { 272330, true },
+  { 272353, true },
+  { 272372, true },
+  { 272400, true },
+  { 272420, true },
+  { 272438, true },
+  { 272456, true },
+  { 272483, true },
+  { 272508, true },
+  { 272533, true },
+  { 272557, true },
+  { 272597, true },
+  { 272627, true },
+  { 272642, true },
+  { 272653, true },
+  { 272684, true },
+  { 272695, false },
+  { 272716, true },
+  { 272740, true },
+  { 272758, true },
+  { 272784, true },
   { 272802, true },
-  { 272826, true },
-  { 272844, true },
-  { 272870, true },
-  { 272888, true },
-  { 272925, true },
-  { 272945, true },
-  { 272973, true },
-  { 272996, true },
-  { 273024, true },
-  { 273039, true },
-  { 273066, true },
-  { 273086, true },
-  { 273107, true },
-  { 273121, true },
+  { 272839, true },
+  { 272859, true },
+  { 272887, true },
+  { 272910, true },
+  { 272938, true },
+  { 272953, true },
+  { 272980, true },
+  { 273000, true },
+  { 273021, true },
+  { 273035, true },
+  { 273052, true },
+  { 273074, true },
+  { 273099, true },
+  { 273119, true },
   { 273138, true },
-  { 273160, true },
-  { 273185, true },
-  { 273205, true },
-  { 273224, true },
-  { 273266, true },
-  { 273277, true },
-  { 273296, true },
-  { 273319, true },
-  { 273335, true },
-  { 273357, true },
-  { 273391, true },
-  { 273415, true },
-  { 273422, true },
-  { 273429, true },
+  { 273180, true },
+  { 273191, true },
+  { 273210, true },
+  { 273233, true },
+  { 273249, true },
+  { 273271, true },
+  { 273305, true },
+  { 273329, true },
+  { 273336, true },
+  { 273343, true },
+  { 273354, true },
+  { 273360, true },
+  { 273371, true },
+  { 273381, true },
+  { 273397, true },
+  { 273413, true },
+  { 273423, true },
+  { 273433, true },
   { 273440, true },
-  { 273446, true },
-  { 273457, true },
-  { 273467, true },
-  { 273483, true },
-  { 273499, true },
-  { 273509, true },
-  { 273519, true },
-  { 273526, true },
-  { 273533, true },
-  { 273550, true },
-  { 273566, true },
-  { 273579, true },
-  { 273586, true },
-  { 273601, true },
-  { 273615, true },
-  { 273624, true },
-  { 273630, true },
-  { 273644, true },
+  { 273447, true },
+  { 273464, true },
+  { 273480, true },
+  { 273493, true },
+  { 273500, true },
+  { 273515, true },
+  { 273529, true },
+  { 273538, true },
+  { 273544, true },
+  { 273558, true },
+  { 273568, true },
+  { 273578, true },
+  { 273591, true },
+  { 273604, true },
+  { 273611, true },
+  { 273618, true },
+  { 273627, true },
+  { 273634, true },
+  { 273645, true },
   { 273654, true },
-  { 273664, true },
-  { 273677, true },
-  { 273690, true },
-  { 273697, true },
-  { 273706, true },
-  { 273713, true },
-  { 273724, true },
-  { 273733, true },
-  { 273744, true },
-  { 273760, true },
-  { 273773, false },
-  { 273780, true },
-  { 273790, true },
-  { 273798, true },
-  { 273810, true },
-  { 273825, true },
-  { 273834, true },
-  { 273848, true },
-  { 273868, true },
-  { 273878, true },
-  { 273890, true },
-  { 273899, true },
-  { 273909, true },
-  { 273929, true },
+  { 273665, true },
+  { 273681, true },
+  { 273694, false },
+  { 273701, true },
+  { 273711, true },
+  { 273719, true },
+  { 273731, true },
+  { 273741, true },
+  { 273756, true },
+  { 273765, true },
+  { 273779, true },
+  { 273799, true },
+  { 273809, true },
+  { 273821, true },
+  { 273830, true },
+  { 273840, true },
+  { 273860, true },
+  { 273871, true },
+  { 273882, true },
+  { 273896, true },
+  { 273905, true },
+  { 273921, true },
+  { 273928, true },
   { 273940, true },
-  { 273951, true },
+  { 273950, true },
+  { 273957, true },
   { 273965, true },
-  { 273974, true },
-  { 273990, true },
-  { 273997, true },
-  { 274009, true },
-  { 274019, true },
-  { 274026, true },
-  { 274034, true },
-  { 274046, false },
-  { 274057, true },
-  { 274067, false },
-  { 274079, true },
-  { 274093, true },
-  { 274108, true },
-  { 274121, true },
-  { 274137, true },
-  { 274149, true },
-  { 274162, false },
-  { 274172, true },
-  { 274185, true },
-  { 274207, true },
-  { 274219, true },
-  { 274231, true },
-  { 274239, true },
-  { 274248, true },
-  { 274260, true },
-  { 274270, true },
-  { 274280, true },
-  { 274289, true },
-  { 274307, true },
-  { 274322, true },
-  { 274338, false },
-  { 274353, false },
-  { 274366, true },
-  { 274380, true },
-  { 274390, false },
-  { 274399, true },
-  { 274406, true },
-  { 274422, true },
+  { 273977, false },
+  { 273988, true },
+  { 273998, false },
+  { 274010, true },
+  { 274024, true },
+  { 274039, true },
+  { 274052, true },
+  { 274068, true },
+  { 274080, true },
+  { 274093, false },
+  { 274103, true },
+  { 274116, true },
+  { 274138, true },
+  { 274150, true },
+  { 274162, true },
+  { 274170, true },
+  { 274179, true },
+  { 274191, true },
+  { 274201, true },
+  { 274211, true },
+  { 274220, true },
+  { 274238, true },
+  { 274253, true },
+  { 274269, false },
+  { 274284, false },
+  { 274297, true },
+  { 274311, true },
+  { 274321, false },
+  { 274330, true },
+  { 274337, true },
+  { 274353, true },
+  { 274360, true },
+  { 274370, true },
+  { 274378, true },
+  { 274389, true },
+  { 274403, true },
+  { 274418, true },
   { 274429, true },
   { 274439, true },
-  { 274447, true },
-  { 274458, true },
+  { 274450, true },
   { 274472, true },
   { 274487, true },
-  { 274498, true },
-  { 274508, true },
-  { 274519, true },
-  { 274541, true },
-  { 274556, true },
-  { 274563, true },
-  { 274574, true },
-  { 274582, true },
-  { 274592, true },
+  { 274494, true },
+  { 274505, true },
+  { 274513, true },
+  { 274523, true },
+  { 274536, true },
+  { 274554, true },
+  { 274566, false },
+  { 274575, true },
+  { 274589, true },
   { 274605, true },
-  { 274623, true },
-  { 274635, false },
-  { 274644, true },
-  { 274658, true },
-  { 274674, true },
-  { 274691, true },
-  { 274715, true },
-  { 274733, true },
-  { 274746, true },
-  { 274763, true },
-  { 274775, true },
-  { 274786, true },
-  { 274799, true },
-  { 274811, false },
-  { 274826, true },
-  { 274836, true },
-  { 274846, true },
-  { 274858, true },
-  { 274870, true },
-  { 274890, false },
-  { 274900, true },
-  { 274924, true },
-  { 274935, true },
-  { 274943, true },
-  { 274953, true },
-  { 274965, true },
-  { 274978, true },
-  { 274995, true },
-  { 275010, true },
-  { 275026, true },
-  { 275039, true },
-  { 275053, true },
-  { 275069, true },
-  { 275086, true },
-  { 275101, true },
-  { 275116, true },
-  { 275128, true },
-  { 275140, true },
-  { 275154, true },
+  { 274622, true },
+  { 274646, true },
+  { 274664, true },
+  { 274677, true },
+  { 274694, true },
+  { 274706, true },
+  { 274717, true },
+  { 274730, true },
+  { 274742, false },
+  { 274757, true },
+  { 274767, true },
+  { 274777, true },
+  { 274789, true },
+  { 274801, true },
+  { 274821, false },
+  { 274831, true },
+  { 274855, true },
+  { 274866, true },
+  { 274874, true },
+  { 274884, true },
+  { 274896, true },
+  { 274909, true },
+  { 274926, true },
+  { 274941, true },
+  { 274957, true },
+  { 274970, true },
+  { 274984, true },
+  { 275000, true },
+  { 275017, true },
+  { 275032, true },
+  { 275047, true },
+  { 275059, true },
+  { 275071, true },
+  { 275085, true },
+  { 275096, true },
+  { 275106, true },
+  { 275119, true },
+  { 275137, true },
+  { 275150, true },
   { 275165, true },
-  { 275175, true },
-  { 275188, true },
+  { 275178, true },
+  { 275191, true },
   { 275206, true },
-  { 275221, true },
-  { 275234, true },
-  { 275247, true },
-  { 275262, true },
-  { 275274, true },
-  { 275283, true },
-  { 275294, true },
-  { 275316, true },
-  { 275336, true },
-  { 275345, true },
-  { 275353, true },
-  { 275361, true },
-  { 275374, true },
+  { 275218, true },
+  { 275227, true },
+  { 275238, true },
+  { 275260, true },
+  { 275280, true },
+  { 275289, true },
+  { 275297, true },
+  { 275305, true },
+  { 275318, true },
+  { 275331, true },
+  { 275343, true },
+  { 275351, true },
+  { 275366, true },
+  { 275376, true },
   { 275387, true },
-  { 275399, true },
-  { 275407, true },
-  { 275422, true },
-  { 275432, true },
-  { 275443, true },
-  { 275459, true },
-  { 275467, true },
-  { 275480, true },
+  { 275403, true },
+  { 275411, true },
+  { 275424, true },
+  { 275434, true },
+  { 275445, true },
+  { 275455, true },
+  { 275465, true },
+  { 275478, true },
   { 275490, true },
-  { 275501, true },
-  { 275511, true },
-  { 275521, true },
-  { 275534, true },
-  { 275546, true },
-  { 275558, true },
-  { 275569, true },
-  { 275582, true },
-  { 275591, true },
-  { 275601, true },
+  { 275502, true },
+  { 275513, true },
+  { 275526, true },
+  { 275535, true },
+  { 275545, true },
+  { 275554, true },
+  { 275563, true },
+  { 275578, true },
+  { 275597, true },
   { 275610, true },
-  { 275619, true },
-  { 275634, true },
-  { 275653, true },
-  { 275666, true },
-  { 275684, true },
-  { 275697, true },
-  { 275706, true },
-  { 275717, true },
-  { 275731, true },
-  { 275743, true },
-  { 275761, true },
-  { 275774, true },
-  { 275782, true },
-  { 275796, true },
-  { 275806, true },
-  { 275813, true },
+  { 275628, true },
+  { 275641, true },
+  { 275650, true },
+  { 275661, true },
+  { 275675, true },
+  { 275687, true },
+  { 275705, true },
+  { 275718, true },
+  { 275726, true },
+  { 275740, true },
+  { 275750, true },
+  { 275757, true },
+  { 275771, true },
+  { 275779, true },
+  { 275787, true },
+  { 275801, true },
+  { 275817, true },
   { 275827, true },
-  { 275835, true },
-  { 275843, true },
-  { 275857, true },
-  { 275873, true },
-  { 275883, true },
-  { 275892, true },
-  { 275901, true },
-  { 275924, true },
-  { 275937, true },
-  { 275942, true },
+  { 275836, true },
+  { 275845, true },
+  { 275868, true },
+  { 275881, true },
+  { 275886, true },
+  { 275896, true },
+  { 275903, true },
+  { 275910, true },
+  { 275922, false },
+  { 275941, true },
   { 275952, true },
-  { 275959, true },
-  { 275966, true },
-  { 275978, false },
-  { 275997, true },
-  { 276008, true },
-  { 276024, true },
-  { 276039, true },
-  { 276055, true },
-  { 276070, true },
-  { 276083, true },
-  { 276096, true },
-  { 276104, true },
-  { 276127, true },
-  { 276137, true },
-  { 276147, true },
-  { 276162, true },
-  { 276176, true },
-  { 276204, true },
-  { 276217, true },
-  { 276234, true },
-  { 276242, true },
-  { 276251, true },
-  { 276264, true },
-  { 276294, true },
-  { 276305, true },
-  { 276323, true },
-  { 276331, true },
-  { 276355, true },
-  { 276365, true },
-  { 276382, true },
-  { 276394, true },
-  { 276405, true },
-  { 276417, true },
-  { 276430, false },
-  { 276437, true },
-  { 276455, true },
-  { 276464, true },
-  { 276475, true },
-  { 276487, true },
-  { 276494, true },
-  { 276502, true },
-  { 276518, true },
-  { 276540, true },
-  { 276551, false },
-  { 276561, true },
+  { 275968, true },
+  { 275983, true },
+  { 275999, true },
+  { 276014, true },
+  { 276027, true },
+  { 276040, true },
+  { 276048, true },
+  { 276071, true },
+  { 276081, true },
+  { 276091, true },
+  { 276106, true },
+  { 276120, true },
+  { 276148, true },
+  { 276161, true },
+  { 276178, true },
+  { 276186, true },
+  { 276195, true },
+  { 276208, true },
+  { 276238, true },
+  { 276249, true },
+  { 276267, true },
+  { 276275, true },
+  { 276299, true },
+  { 276309, true },
+  { 276326, true },
+  { 276338, true },
+  { 276349, true },
+  { 276361, true },
+  { 276374, false },
+  { 276381, true },
+  { 276399, true },
+  { 276408, true },
+  { 276419, true },
+  { 276431, true },
+  { 276438, true },
+  { 276446, true },
+  { 276462, true },
+  { 276484, true },
+  { 276495, false },
+  { 276505, true },
+  { 276514, true },
+  { 276532, true },
+  { 276558, true },
   { 276570, true },
-  { 276588, true },
-  { 276614, true },
-  { 276626, true },
-  { 276635, true },
-  { 276660, true },
-  { 276687, true },
+  { 276579, true },
+  { 276604, true },
+  { 276631, true },
+  { 276651, true },
+  { 276673, true },
+  { 276684, true },
+  { 276695, true },
   { 276707, true },
-  { 276729, true },
-  { 276740, true },
-  { 276751, true },
-  { 276763, true },
-  { 276776, true },
-  { 276789, true },
-  { 276804, true },
-  { 276822, true },
-  { 276835, true },
-  { 276850, true },
-  { 276866, true },
-  { 276884, true },
+  { 276720, true },
+  { 276733, true },
+  { 276748, true },
+  { 276766, true },
+  { 276779, true },
+  { 276794, true },
+  { 276810, true },
+  { 276828, true },
+  { 276841, true },
+  { 276855, true },
+  { 276865, true },
+  { 276877, true },
+  { 276885, true },
   { 276897, true },
-  { 276911, true },
-  { 276921, true },
+  { 276909, true },
+  { 276922, true },
   { 276933, true },
-  { 276941, true },
-  { 276953, true },
-  { 276965, true },
-  { 276978, true },
-  { 276989, true },
-  { 277002, true },
-  { 277014, true },
-  { 277026, false },
-  { 277036, true },
-  { 277047, true },
-  { 277062, true },
-  { 277075, true },
-  { 277086, true },
-  { 277093, true },
-  { 277103, true },
-  { 277110, true },
+  { 276946, true },
+  { 276958, false },
+  { 276968, true },
+  { 276979, true },
+  { 276994, true },
+  { 277007, true },
+  { 277018, true },
+  { 277025, true },
+  { 277035, true },
+  { 277042, true },
+  { 277056, true },
+  { 277066, true },
+  { 277084, true },
+  { 277096, true },
+  { 277108, true },
   { 277124, true },
-  { 277134, true },
+  { 277137, true },
   { 277152, true },
-  { 277164, true },
-  { 277176, true },
-  { 277192, true },
-  { 277205, true },
-  { 277220, true },
-  { 277233, true },
-  { 277245, true },
-  { 277259, true },
-  { 277272, true },
-  { 277287, true },
-  { 277294, true },
-  { 277305, true },
-  { 277318, true },
-  { 277330, true },
-  { 277339, true },
+  { 277165, true },
+  { 277177, true },
+  { 277191, true },
+  { 277204, true },
+  { 277219, true },
+  { 277226, true },
+  { 277237, true },
+  { 277250, true },
+  { 277262, true },
+  { 277271, true },
+  { 277283, true },
+  { 277312, true },
+  { 277320, true },
+  { 277328, true },
+  { 277343, false },
   { 277351, true },
-  { 277380, true },
-  { 277388, true },
-  { 277396, true },
-  { 277411, false },
+  { 277372, true },
+  { 277383, true },
+  { 277391, true },
+  { 277402, true },
   { 277419, true },
-  { 277440, true },
-  { 277451, true },
-  { 277459, true },
-  { 277470, true },
-  { 277487, true },
-  { 277501, false },
-  { 277513, true },
-  { 277532, true },
-  { 277550, true },
-  { 277561, true },
-  { 277573, true },
-  { 277582, true },
-  { 277592, true },
-  { 277608, true },
-  { 277623, true },
-  { 277635, true },
-  { 277649, true },
-  { 277656, true },
-  { 277662, true },
-  { 277672, true },
-  { 277687, true },
-  { 277699, true },
-  { 277711, true },
-  { 277718, true },
-  { 277729, true },
-  { 277742, true },
+  { 277433, false },
+  { 277445, true },
+  { 277464, true },
+  { 277482, true },
+  { 277493, true },
+  { 277505, true },
+  { 277514, true },
+  { 277524, true },
+  { 277540, true },
+  { 277555, true },
+  { 277567, true },
+  { 277581, true },
+  { 277588, true },
+  { 277594, true },
+  { 277604, true },
+  { 277619, true },
+  { 277631, true },
+  { 277643, true },
+  { 277650, true },
+  { 277661, true },
+  { 277674, true },
+  { 277684, true },
+  { 277708, true },
+  { 277719, true },
+  { 277730, true },
+  { 277741, true },
   { 277752, true },
-  { 277776, true },
-  { 277787, true },
-  { 277798, true },
-  { 277809, true },
-  { 277820, true },
-  { 277831, true },
-  { 277846, true },
-  { 277858, true },
-  { 277882, true },
-  { 277900, true },
-  { 277911, true },
-  { 277922, true },
-  { 277937, true },
-  { 277953, true },
-  { 277962, true },
-  { 277973, true },
+  { 277763, true },
+  { 277778, true },
+  { 277790, true },
+  { 277814, true },
+  { 277832, true },
+  { 277843, true },
+  { 277854, true },
+  { 277869, true },
+  { 277885, true },
+  { 277894, true },
+  { 277905, true },
+  { 277929, true },
+  { 277944, true },
+  { 277956, true },
+  { 277968, true },
+  { 277979, true },
+  { 277989, true },
   { 277997, true },
-  { 278012, true },
-  { 278024, true },
-  { 278036, true },
-  { 278047, true },
-  { 278057, true },
-  { 278065, true },
+  { 278016, true },
+  { 278027, true },
+  { 278037, true },
+  { 278048, true },
+  { 278056, true },
+  { 278070, false },
+  { 278077, true },
   { 278084, true },
-  { 278095, true },
+  { 278096, true },
   { 278105, true },
-  { 278116, true },
-  { 278124, true },
-  { 278138, false },
-  { 278145, true },
-  { 278152, true },
-  { 278164, true },
-  { 278173, true },
-  { 278187, true },
-  { 278197, true },
-  { 278205, true },
-  { 278215, true },
-  { 278228, true },
-  { 278242, true },
-  { 278263, true },
-  { 278277, true },
-  { 278287, true },
-  { 278294, true },
-  { 278305, true },
-  { 278315, true },
-  { 278325, true },
-  { 278335, true },
-  { 278348, true },
-  { 278359, true },
-  { 278367, true },
-  { 278376, true },
-  { 278396, true },
+  { 278119, true },
+  { 278129, true },
+  { 278137, true },
+  { 278147, true },
+  { 278160, true },
+  { 278174, true },
+  { 278195, true },
+  { 278209, true },
+  { 278219, true },
+  { 278226, true },
+  { 278237, true },
+  { 278247, true },
+  { 278257, true },
+  { 278267, true },
+  { 278280, true },
+  { 278291, true },
+  { 278299, true },
+  { 278308, true },
+  { 278328, true },
+  { 278351, true },
+  { 278364, true },
+  { 278377, false },
+  { 278384, true },
+  { 278397, true },
+  { 278409, true },
   { 278419, true },
-  { 278432, true },
-  { 278445, false },
-  { 278452, true },
-  { 278465, true },
-  { 278477, true },
-  { 278487, true },
-  { 278498, true },
-  { 278508, true },
-  { 278516, true },
-  { 278526, true },
-  { 278535, true },
-  { 278542, true },
-  { 278552, true },
+  { 278430, true },
+  { 278440, true },
+  { 278448, true },
+  { 278458, true },
+  { 278467, true },
+  { 278474, true },
+  { 278484, true },
 };
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index c9c10b695339..ebd970bb2799 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -292,6 +292,104 @@ SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
 }
 #endif
 
+void
+SandboxBroker::SetSecurityLevelForGPUProcess(int32_t aSandboxLevel)
+{
+  MOZ_RELEASE_ASSERT(mPolicy, "mPolicy must be set before this call.");
+
+  sandbox::JobLevel jobLevel;
+  sandbox::TokenLevel accessTokenLevel;
+  sandbox::IntegrityLevel initialIntegrityLevel;
+  sandbox::IntegrityLevel delayedIntegrityLevel;
+
+  // The setting of these levels is pretty arbitrary, but they are a useful (if
+  // crude) tool while we are tightening the policy. Gaps are left to try and
+  // avoid changing their meaning.
+  MOZ_RELEASE_ASSERT(aSandboxLevel >= 1, "Should not be called with aSandboxLevel < 1");
+  if (aSandboxLevel >= 2) {
+    jobLevel = sandbox::JOB_NONE;
+    accessTokenLevel = sandbox::USER_LIMITED;
+    initialIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
+    delayedIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
+  } else if (aSandboxLevel == 1) {
+    jobLevel = sandbox::JOB_NONE;
+    accessTokenLevel = sandbox::USER_NON_ADMIN;
+    initialIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
+    delayedIntegrityLevel = sandbox::INTEGRITY_LEVEL_LOW;
+  }
+
+  sandbox::ResultCode result = mPolicy->SetJobLevel(jobLevel,
+                                                    0 /* ui_exceptions */);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "Setting job level failed, have you set memory limit when jobLevel == JOB_NONE?");
+
+  // If the delayed access token is not restricted we don't want the initial one
+  // to be either, because it can interfere with running from a network drive.
+  sandbox::TokenLevel initialAccessTokenLevel =
+    (accessTokenLevel == sandbox::USER_UNPROTECTED ||
+     accessTokenLevel == sandbox::USER_NON_ADMIN)
+    ? sandbox::USER_UNPROTECTED : sandbox::USER_RESTRICTED_SAME_ACCESS;
+
+  result = mPolicy->SetTokenLevel(initialAccessTokenLevel, accessTokenLevel);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "Lockdown level cannot be USER_UNPROTECTED or USER_LAST if initial level was USER_RESTRICTED_SAME_ACCESS");
+
+  result = mPolicy->SetIntegrityLevel(initialIntegrityLevel);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "SetIntegrityLevel should never fail, what happened?");
+  result = mPolicy->SetDelayedIntegrityLevel(delayedIntegrityLevel);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "SetDelayedIntegrityLevel should never fail, what happened?");
+
+  sandbox::MitigationFlags mitigations =
+    sandbox::MITIGATION_BOTTOM_UP_ASLR |
+    sandbox::MITIGATION_HEAP_TERMINATE |
+    sandbox::MITIGATION_SEHOP |
+    sandbox::MITIGATION_DEP_NO_ATL_THUNK |
+    sandbox::MITIGATION_DEP;
+
+  result = mPolicy->SetProcessMitigations(mitigations);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "Invalid flags for SetProcessMitigations.");
+
+  mitigations =
+    sandbox::MITIGATION_STRICT_HANDLE_CHECKS |
+    sandbox::MITIGATION_DLL_SEARCH_ORDER;
+
+  result = mPolicy->SetDelayedProcessMitigations(mitigations);
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "Invalid flags for SetDelayedProcessMitigations.");
+
+  // Add the policy for the client side of a pipe. It is just a file
+  // in the \pipe\ namespace. We restrict it to pipes that start with
+  // "chrome." so the sandboxed process cannot connect to system services.
+  result = mPolicy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
+                            sandbox::TargetPolicy::FILES_ALLOW_ANY,
+                            L"\\??\\pipe\\chrome.*");
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "With these static arguments AddRule should never fail, what happened?");
+
+  // Add the policy for the client side of the crash server pipe.
+  result = mPolicy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
+                            sandbox::TargetPolicy::FILES_ALLOW_ANY,
+                            L"\\??\\pipe\\gecko-crash-server-pipe.*");
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "With these static arguments AddRule should never fail, what happened?");
+
+  // The process needs to be able to duplicate shared memory handles,
+  // which are Section handles, to the broker process and other child processes.
+  result = mPolicy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
+                            sandbox::TargetPolicy::HANDLES_DUP_BROKER,
+                            L"Section");
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "With these static arguments AddRule should never fail, what happened?");
+  result = mPolicy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
+                            sandbox::TargetPolicy::HANDLES_DUP_ANY,
+                            L"Section");
+  MOZ_RELEASE_ASSERT(sandbox::SBOX_ALL_OK == result,
+                     "With these static arguments AddRule should never fail, what happened?");
+}
+
 #define SANDBOX_ENSURE_SUCCESS(result, message) \
   do { \
     MOZ_ASSERT(sandbox::SBOX_ALL_OK == result, message); \
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.h b/security/sandbox/win/src/sandboxbroker/sandboxBroker.h
index 7d3830b34cf7..c95e788a237d 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.h
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.h
@@ -37,6 +37,9 @@ public:
   void SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
                                          base::ChildPrivileges aPrivs);
 #endif
+
+  void SetSecurityLevelForGPUProcess(int32_t aSandboxLevel);
+
   bool SetSecurityLevelForPluginProcess(int32_t aSandboxLevel);
   enum SandboxLevel {
     LockDown,
diff --git a/services/cloudsync/tests/xpcshell/test_bookmarks.js b/services/cloudsync/tests/xpcshell/test_bookmarks.js
index c2918a59da11..adfbdaa8551e 100644
--- a/services/cloudsync/tests/xpcshell/test_bookmarks.js
+++ b/services/cloudsync/tests/xpcshell/test_bookmarks.js
@@ -14,10 +14,19 @@ add_task(function* test_merge_bookmarks_flat() {
     let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
     ok(rootFolder.id, "root folder id is ok");
 
-    let items = [
-      {"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
-      {"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com?1", index:1},
-    ];
+    let items = [{
+      "id": "G_UL4ZhOyX8m",
+      "type": rootFolder.BOOKMARK,
+      "title": "reddit: the front page of the internet 1",
+      "uri": "http://www.reddit.com",
+      index: 2
+    }, {
+      "id": "G_UL4ZhOyX8n",
+      "type": rootFolder.BOOKMARK,
+      "title": "reddit: the front page of the internet 2",
+      "uri": "http://www.reddit.com?1",
+      index: 1
+    }];
     yield rootFolder.mergeRemoteItems(items);
 
     let localItems = yield rootFolder.getLocalItems();
@@ -32,11 +41,23 @@ add_task(function* test_merge_bookmarks_in_folders() {
     let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
     ok(rootFolder.id, "root folder id is ok");
 
-    let items = [
-      {"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
-      {"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, parent:"G_UL4ZhOyX8x", "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com/?a=å%20ä%20ö", index:1},
-      {"id":"G_UL4ZhOyX8x", "type":rootFolder.FOLDER},
-    ];
+    let items = [{
+      "id": "G_UL4ZhOyX8m",
+      "type": rootFolder.BOOKMARK,
+      "title": "reddit: the front page of the internet 1",
+      "uri": "http://www.reddit.com",
+      index: 2
+    }, {
+      "id": "G_UL4ZhOyX8n",
+      "type": rootFolder.BOOKMARK,
+      parent: "G_UL4ZhOyX8x",
+      "title": "reddit: the front page of the internet 2",
+      "uri": "http://www.reddit.com/?a=å%20ä%20ö",
+      index: 1
+    }, {
+      "id": "G_UL4ZhOyX8x",
+      "type": rootFolder.FOLDER
+    }];
     yield rootFolder.mergeRemoteItems(items);
 
     let localItems = yield rootFolder.getLocalItems();
diff --git a/services/cloudsync/tests/xpcshell/test_tabs.js b/services/cloudsync/tests/xpcshell/test_tabs.js
index aa78d3cf3da7..dbc7ff6bba64 100644
--- a/services/cloudsync/tests/xpcshell/test_tabs.js
+++ b/services/cloudsync/tests/xpcshell/test_tabs.js
@@ -17,10 +17,17 @@ add_task(function* test_get_remote_tabs() {
   yield cloudSync.tabs.mergeRemoteTabs({
       id: "001",
       name: "FakeClient",
-    }, [
-      {url:"https://www.google.ca?a=å%20ä%20ö", title:"Google Canada", icon:"https://www.google.ca/favicon.ico", lastUsed:0},
-      {url:"http://www.reddit.com", title:"Reddit", icon:"http://www.reddit.com/favicon.ico", lastUsed:1},
-    ]);
+    }, [{
+      url: "https://www.google.ca?a=å%20ä%20ö",
+      title: "Google Canada",
+      icon: "https://www.google.ca/favicon.ico",
+      lastUsed: 0
+    }, {
+      url: "http://www.reddit.com",
+      title: "Reddit",
+      icon: "http://www.reddit.com/favicon.ico",
+      lastUsed: 1
+    }]);
   ok(cloudSync.tabs.hasRemoteTabs());
 
   clients = yield cloudSync.tabs.getRemoteTabs();
diff --git a/services/common/tests/unit/test_blocklist_certificates.js b/services/common/tests/unit/test_blocklist_certificates.js
index 392bc1b59ece..acefc4515de9 100644
--- a/services/common/tests/unit/test_blocklist_certificates.js
+++ b/services/common/tests/unit/test_blocklist_certificates.js
@@ -169,7 +169,16 @@ function getSampleResponse(req, port) {
         "Server: waitress"
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"settings":{"batch_max_requests":25}, "url":`http://localhost:${port}/v1/`, "documentation":"https://kinto.readthedocs.org/", "version":"1.5.1", "commit":"cbc6f58", "hello":"kinto"})
+      "responseBody": JSON.stringify({
+        "settings": {
+          "batch_max_requests": 25
+        },
+        "url": `http://localhost:${port}/v1/`,
+        "documentation": "https://kinto.readthedocs.org/",
+        "version": "1.5.1",
+        "commit": "cbc6f58",
+        "hello": "kinto"
+      })
     },
     "GET:/v1/buckets/blocklists/collections/certificates/records?_sort=-last_modified": {
       "sampleHeaders": [
@@ -180,7 +189,7 @@ function getSampleResponse(req, port) {
         "Etag: \"1000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{}]})
+      "responseBody": JSON.stringify({"data": [{}]})
     },
     "GET:/v1/buckets/blocklists/collections/certificates/records?_sort=-last_modified&_since=1000": {
       "sampleHeaders": [
@@ -191,11 +200,11 @@ function getSampleResponse(req, port) {
         "Etag: \"3000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "issuerName": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHjAcBgNVBAMTFXRoYXd0ZSBFViBTU0wgQ0EgLSBHMw==",
-        "serialNumber":"CrTHPEE6AZSfI3jysin2bA==",
-        "id":"78cf8900-fdea-4ce5-f8fb-b78710617718",
-        "last_modified":3000
+        "serialNumber": "CrTHPEE6AZSfI3jysin2bA==",
+        "id": "78cf8900-fdea-4ce5-f8fb-b78710617718",
+        "last_modified": 3000
       }]})
     },
     "GET:/v1/buckets/blocklists/collections/certificates/records?_sort=-last_modified&_since=3000": {
@@ -207,16 +216,16 @@ function getSampleResponse(req, port) {
         "Etag: \"4000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
-        "issuerName":"MFkxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKjAoBgNVBAMTIVN0YWF0IGRlciBOZWRlcmxhbmRlbiBPdmVyaGVpZCBDQQ",
-        "serialNumber":"ATFpsA==",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02c",
-        "last_modified":4000
+      "responseBody": JSON.stringify({"data": [{
+        "issuerName": "MFkxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKjAoBgNVBAMTIVN0YWF0IGRlciBOZWRlcmxhbmRlbiBPdmVyaGVpZCBDQQ",
+        "serialNumber": "ATFpsA==",
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02c",
+        "last_modified": 4000
       }, {
-        "subject":"MCIxIDAeBgNVBAMMF0Fub3RoZXIgVGVzdCBFbmQtZW50aXR5",
-        "pubKeyHash":"VCIlmPM9NkgFQtrs4Oa5TeFcDu6MWRTKSNdePEhOgD8=",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02d",
-        "last_modified":4000
+        "subject": "MCIxIDAeBgNVBAMMF0Fub3RoZXIgVGVzdCBFbmQtZW50aXR5",
+        "pubKeyHash": "VCIlmPM9NkgFQtrs4Oa5TeFcDu6MWRTKSNdePEhOgD8=",
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02d",
+        "last_modified": 4000
       }]})
     },
     "GET:/v1/buckets/blocklists/collections/certificates/records?_sort=-last_modified&_since=4000": {
@@ -228,21 +237,21 @@ function getSampleResponse(req, port) {
         "Etag: \"5000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
-        "issuerName":"not a base64 encoded issuer",
-        "serialNumber":"not a base64 encoded serial",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02e",
-        "last_modified":5000
+      "responseBody": JSON.stringify({"data": [{
+        "issuerName": "not a base64 encoded issuer",
+        "serialNumber": "not a base64 encoded serial",
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02e",
+        "last_modified": 5000
       }, {
-        "subject":"not a base64 encoded subject",
-        "pubKeyHash":"not a base64 encoded pubKeyHash",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02f",
-        "last_modified":5000
+        "subject": "not a base64 encoded subject",
+        "pubKeyHash": "not a base64 encoded pubKeyHash",
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02f",
+        "last_modified": 5000
       }, {
-        "subject":"MCIxIDAeBgNVBAMMF0Fub3RoZXIgVGVzdCBFbmQtZW50aXR5",
-        "pubKeyHash":"VCIlmPM9NkgFQtrs4Oa5TeFcDu6MWRTKSNdePEhOgD8=",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02g",
-        "last_modified":5000
+        "subject": "MCIxIDAeBgNVBAMMF0Fub3RoZXIgVGVzdCBFbmQtZW50aXR5",
+        "pubKeyHash": "VCIlmPM9NkgFQtrs4Oa5TeFcDu6MWRTKSNdePEhOgD8=",
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02g",
+        "last_modified": 5000
       }]})
     }
   };
diff --git a/services/common/tests/unit/test_blocklist_clients.js b/services/common/tests/unit/test_blocklist_clients.js
index 9fa1f0427c34..b9f02949bb94 100644
--- a/services/common/tests/unit/test_blocklist_clients.js
+++ b/services/common/tests/unit/test_blocklist_clients.js
@@ -231,7 +231,16 @@ function getSampleResponse(req, port) {
         "Server: waitress"
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"settings":{"batch_max_requests":25}, "url":`http://localhost:${port}/v1/`, "documentation":"https://kinto.readthedocs.org/", "version":"1.5.1", "commit":"cbc6f58", "hello":"kinto"})
+      "responseBody": JSON.stringify({
+        "settings": {
+          "batch_max_requests": 25
+        },
+        "url": `http://localhost:${port}/v1/`,
+        "documentation": "https://kinto.readthedocs.org/",
+        "version": "1.5.1",
+        "commit": "cbc6f58",
+        "hello": "kinto"
+      })
     },
     "GET:/v1/buckets/blocklists/collections/addons/records?_sort=-last_modified": {
       "sampleHeaders": [
@@ -242,7 +251,7 @@ function getSampleResponse(req, port) {
         "Etag: \"3000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "prefs": [],
         "blockID": "i539",
         "last_modified": 3000,
@@ -265,7 +274,7 @@ function getSampleResponse(req, port) {
         "Etag: \"3000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "matchFilename": "NPFFAddOn.dll",
         "blockID": "p28",
         "id": "7b1e0b3c-e390-a817-11b6-a6887f65f56e",
@@ -282,7 +291,7 @@ function getSampleResponse(req, port) {
         "Etag: \"3000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "driverVersionComparator": "LESS_THAN_OR_EQUAL",
         "driverVersion": "8.17.12.5896",
         "vendor": "0x10de",
@@ -304,7 +313,7 @@ function getSampleResponse(req, port) {
         "Etag: \"4000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "prefs": [],
         "blockID": "i808",
         "last_modified": 4000,
@@ -339,7 +348,7 @@ function getSampleResponse(req, port) {
         "Etag: \"4000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "infoURL": "https://get.adobe.com/flashplayer/",
         "blockID": "p1044",
         "matchFilename": "libflashplayer\\.so",
@@ -376,7 +385,7 @@ function getSampleResponse(req, port) {
         "Etag: \"4000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "vendor": "0x8086",
         "blockID": "g204",
         "feature": "WEBGL_MSAA",
diff --git a/services/common/tests/unit/test_blocklist_pinning.js b/services/common/tests/unit/test_blocklist_pinning.js
index 214bf2d484cb..071a926d989e 100644
--- a/services/common/tests/unit/test_blocklist_pinning.js
+++ b/services/common/tests/unit/test_blocklist_pinning.js
@@ -218,7 +218,16 @@ function getSampleResponse(req, port) {
         "Server: waitress"
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"settings":{"batch_max_requests":25}, "url":`http://localhost:${port}/v1/`, "documentation":"https://kinto.readthedocs.org/", "version":"1.5.1", "commit":"cbc6f58", "hello":"kinto"})
+      "responseBody": JSON.stringify({
+        "settings": {
+          "batch_max_requests": 25
+        },
+        "url": `http://localhost:${port}/v1/`,
+        "documentation": "https://kinto.readthedocs.org/",
+        "version": "1.5.1",
+        "commit": "cbc6f58",
+        "hello": "kinto"
+      })
     },
     "GET:/v1/buckets/pinning/collections/pins/records?_sort=-last_modified": {
       "sampleHeaders": [
@@ -229,16 +238,16 @@ function getSampleResponse(req, port) {
         "Etag: \"3000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "pinType": "KeyPin",
         "hostName": "one.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "pins" : ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
+        "pins": ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
                   "M8HztCzM3elUxkcjR2S5P4hhyBNf6lHkmjAHKhpGPWE="],
-        "versions" : [appInfo.version],
-        "id":"78cf8900-fdea-4ce5-f8fb-b78710617718",
-        "last_modified":3000
+        "versions": [appInfo.version],
+        "id": "78cf8900-fdea-4ce5-f8fb-b78710617718",
+        "last_modified": 3000
       }]})
     },
     "GET:/v1/buckets/pinning/collections/pins/records?_sort=-last_modified&_since=3000": {
@@ -250,44 +259,44 @@ function getSampleResponse(req, port) {
         "Etag: \"4000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
+      "responseBody": JSON.stringify({"data": [{
         "pinType": "KeyPin",
         "hostName": "two.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "pins" : ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
+        "pins": ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
                   "M8HztCzM3elUxkcjR2S5P4hhyBNf6lHkmjAHKhpGPWE="],
-        "versions" : [appInfo.version],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02c",
-        "last_modified":4000
+        "versions": [appInfo.version],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02c",
+        "last_modified": 4000
       }, {
         "pinType": "KeyPin",
         "hostName": "three.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "pins" : ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
+        "pins": ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
                   "M8HztCzM3elUxkcjR2S5P4hhyBNf6lHkmjAHKhpGPWE="],
-        "versions" : [appInfo.version, "some other version that won't match"],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02d",
-        "last_modified":4000
+        "versions": [appInfo.version, "some other version that won't match"],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02d",
+        "last_modified": 4000
       }, {
         "pinType": "KeyPin",
         "hostName": "four.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "pins" : ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
+        "pins": ["cUPcTAZWKaASuYWhhneDttWpY3oBAkE3h2+soZS7sWs=",
                   "M8HztCzM3elUxkcjR2S5P4hhyBNf6lHkmjAHKhpGPWE="],
-        "versions" : ["some version that won't match"],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02e",
-        "last_modified":4000
+        "versions": ["some version that won't match"],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02e",
+        "last_modified": 4000
       }, {
         "pinType": "STSPin",
         "hostName": "five.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "versions" : [appInfo.version, "some version that won't match"],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc032",
-        "last_modified":4000
+        "versions": [appInfo.version, "some version that won't match"],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc032",
+        "last_modified": 4000
       }]})
     },
     "GET:/v1/buckets/pinning/collections/pins/records?_sort=-last_modified&_since=4000": {
@@ -299,37 +308,37 @@ function getSampleResponse(req, port) {
         "Etag: \"5000\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{
-        "irrelevant":"this entry looks nothing whatsoever like a pin preload",
+      "responseBody": JSON.stringify({"data": [{
+        "irrelevant": "this entry looks nothing whatsoever like a pin preload",
         "pinType": "KeyPin",
-        "id":"dabafde9-df4a-ddba-2548-748da04cc02f",
-        "last_modified":5000
+        "id": "dabafde9-df4a-ddba-2548-748da04cc02f",
+        "last_modified": 5000
       }, {
-        "irrelevant":"this entry has data of the wrong type",
+        "irrelevant": "this entry has data of the wrong type",
         "pinType": "KeyPin",
         "hostName": 3,
         "includeSubdomains": "nonsense",
         "expires": "more nonsense",
-        "pins" : [1, 2, 3, 4],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc030",
-        "last_modified":5000
+        "pins": [1, 2, 3, 4],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc030",
+        "last_modified": 5000
       }, {
-        "irrelevant":"this entry is missing the actual pins",
+        "irrelevant": "this entry is missing the actual pins",
         "pinType": "KeyPin",
         "hostName": "missingpins.example.com",
         "includeSubdomains": false,
         "expires": new Date().getTime() + 1000000,
-        "versions" : [appInfo.version],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc031",
-        "last_modified":5000
+        "versions": [appInfo.version],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc031",
+        "last_modified": 5000
       }, {
         "pinType": "STSPin",
         "hostName": "five.example.com",
         "includeSubdomains": true,
         "expires": new Date().getTime() + 1000000,
-        "versions" : [appInfo.version, "some version that won't match"],
-        "id":"dabafde9-df4a-ddba-2548-748da04cc032",
-        "last_modified":5000
+        "versions": [appInfo.version, "some version that won't match"],
+        "id": "dabafde9-df4a-ddba-2548-748da04cc032",
+        "last_modified": 5000
       }]})
     }
   };
diff --git a/services/common/tests/unit/test_blocklist_signatures.js b/services/common/tests/unit/test_blocklist_signatures.js
index f84f18bf299e..43528b8c5242 100644
--- a/services/common/tests/unit/test_blocklist_signatures.js
+++ b/services/common/tests/unit/test_blocklist_signatures.js
@@ -255,7 +255,16 @@ add_task(function* test_check_signatures() {
       "Server: waitress"
     ],
     status: {status: 200, statusText: "OK"},
-    responseBody: JSON.stringify({"settings":{"batch_max_requests":25}, "url":`http://localhost:${port}/v1/`, "documentation":"https://kinto.readthedocs.org/", "version":"1.5.1", "commit":"cbc6f58", "hello":"kinto"})
+    responseBody: JSON.stringify({
+      "settings": {
+        "batch_max_requests": 25
+      },
+      "url": `http://localhost:${port}/v1/`,
+      "documentation": "https://kinto.readthedocs.org/",
+      "version": "1.5.1",
+      "commit": "cbc6f58",
+      "hello": "kinto"
+    })
   };
 
   // This is the initial, empty state of the collection. This is only used
@@ -281,7 +290,7 @@ add_task(function* test_check_signatures() {
 
   // Here, we map request method and path to the available responses
   const emptyCollectionResponses = {
-    "GET:/test_blocklist_signatures/test_cert_chain.pem?":[RESPONSE_CERT_CHAIN],
+    "GET:/test_blocklist_signatures/test_cert_chain.pem?": [RESPONSE_CERT_CHAIN],
     "GET:/v1/?": [RESPONSE_SERVER_SETTINGS],
     "GET:/v1/buckets/blocklists/collections/certificates/records?_sort=-last_modified":
       [RESPONSE_EMPTY_INITIAL],
diff --git a/services/common/tests/unit/test_kinto.js b/services/common/tests/unit/test_kinto.js
index 0847e6680a77..a1e9efeb8d74 100644
--- a/services/common/tests/unit/test_kinto.js
+++ b/services/common/tests/unit/test_kinto.js
@@ -19,7 +19,7 @@ function do_get_kinto_sqliteHandle() {
 
 function do_get_kinto_collection(sqliteHandle, collection = "test_collection") {
   let config = {
-    remote:`http://localhost:${server.identity.primaryPort}/v1/`,
+    remote: `http://localhost:${server.identity.primaryPort}/v1/`,
     headers: {Authorization: "Basic " + btoa("user:pass")},
     adapter: FirefoxAdapter,
     adapterOptions: {sqliteHandle},
@@ -378,7 +378,16 @@ function getSampleResponse(req, port) {
         "Server: waitress"
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"settings":{"batch_max_requests":25}, "url":`http://localhost:${port}/v1/`, "documentation":"https://kinto.readthedocs.org/", "version":"1.5.1", "commit":"cbc6f58", "hello":"kinto"})
+      "responseBody": JSON.stringify({
+        "settings": {
+          "batch_max_requests": 25
+        },
+        "url": `http://localhost:${port}/v1/`,
+        "documentation": "https://kinto.readthedocs.org/",
+        "version": "1.5.1",
+        "commit": "cbc6f58",
+        "hello": "kinto"
+      })
     },
     "GET:/v1/buckets/default/collections/test_collection/records?_sort=-last_modified": {
       "sampleHeaders": [
@@ -389,7 +398,14 @@ function getSampleResponse(req, port) {
         "Etag: \"1445606341071\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{"last_modified":1445606341071, "done":false, "id":"68db8313-686e-4fff-835e-07d78ad6f2af", "title":"New test"}]})
+      "responseBody": JSON.stringify({
+        "data": [{
+          "last_modified": 1445606341071,
+          "done": false,
+          "id": "68db8313-686e-4fff-835e-07d78ad6f2af",
+          "title": "New test"
+        }]
+      })
     },
     "GET:/v1/buckets/default/collections/test_collection/records?_sort=-last_modified&_since=1445606341071": {
       "sampleHeaders": [
@@ -400,7 +416,14 @@ function getSampleResponse(req, port) {
         "Etag: \"1445607941223\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{"last_modified":1445607941223, "done":false, "id":"901967b0-f729-4b30-8d8d-499cba7f4b1d", "title":"Another new test"}]})
+      "responseBody": JSON.stringify({
+        "data": [{
+          "last_modified": 1445607941223,
+          "done": false,
+          "id": "901967b0-f729-4b30-8d8d-499cba7f4b1d",
+          "title": "Another new test"
+        }]
+      })
     },
     "GET:/v1/buckets/default/collections/test_collection/records?_sort=-last_modified&_since=1445607941223": {
       "sampleHeaders": [
@@ -411,7 +434,14 @@ function getSampleResponse(req, port) {
         "Etag: \"1445607541265\""
       ],
       "status": {status: 200, statusText: "OK"},
-      "responseBody": JSON.stringify({"data":[{"last_modified":1445607541265, "done":false, "id":"901967b0-f729-4b30-8d8d-499cba7f4b1d", "title":"Modified title"}]})
+      "responseBody": JSON.stringify({
+        "data": [{
+          "last_modified": 1445607541265,
+          "done": false,
+          "id": "901967b0-f729-4b30-8d8d-499cba7f4b1d",
+          "title": "Modified title"
+        }]
+      })
     }
   };
   return responses[`${req.method}:${req.path}?${req.queryString}`] ||
diff --git a/services/common/tests/unit/test_storage_adapter.js b/services/common/tests/unit/test_storage_adapter.js
index 7691e5dc4662..c3c7a5a44024 100644
--- a/services/common/tests/unit/test_storage_adapter.js
+++ b/services/common/tests/unit/test_storage_adapter.js
@@ -43,7 +43,7 @@ function test_collection_operations() {
   add_task(function* test_kinto_create_new_get_existing() {
     let sqliteHandle = yield do_get_kinto_connection();
     let adapter = do_get_kinto_adapter(sqliteHandle);
-    let record = {id:"test-id", foo:"bar"};
+    let record = {id: "test-id", foo: "bar"};
     yield adapter.execute((transaction) => transaction.create(record));
     let newRecord = yield adapter.get("test-id");
     // ensure the record is the same as when it was added
@@ -56,7 +56,7 @@ function test_collection_operations() {
     let sqliteHandle = yield do_get_kinto_connection();
     let adapter = do_get_kinto_adapter(sqliteHandle);
     // create a second record
-    let record = {id:"test-id-2", foo:"baz"};
+    let record = {id: "test-id-2", foo: "baz"};
     yield adapter.execute((transaction) => transaction.create(record));
     let newRecord = yield adapter.get("test-id-2");
     deepEqual(record, newRecord);
@@ -86,8 +86,8 @@ function test_collection_operations() {
   add_task(function* test_kinto_update_get_existing() {
     let sqliteHandle = yield do_get_kinto_connection();
     let adapter = do_get_kinto_adapter(sqliteHandle);
-    let originalRecord = {id:"test-id", foo:"bar"};
-    let updatedRecord = {id:"test-id", foo:"baz"};
+    let originalRecord = {id: "test-id", foo: "bar"};
+    let updatedRecord = {id: "test-id", foo: "baz"};
     yield adapter.clear();
     yield adapter.execute((transaction) => transaction.create(originalRecord));
     yield adapter.execute((transaction) => transaction.update(updatedRecord));
@@ -102,7 +102,7 @@ function test_collection_operations() {
   add_task(function* test_kinto_list() {
     let sqliteHandle = yield do_get_kinto_connection();
     let adapter = do_get_kinto_adapter(sqliteHandle);
-    let originalRecord = {id:"test-id-1", foo:"bar"};
+    let originalRecord = {id: "test-id-1", foo: "bar"};
     let records = yield adapter.list();
     do_check_eq(records.length, 1);
     yield adapter.execute((transaction) => transaction.create(originalRecord));
diff --git a/services/crypto/modules/WeaveCrypto.js b/services/crypto/modules/WeaveCrypto.js
index 12905497e31b..03f4d6cddef9 100644
--- a/services/crypto/modules/WeaveCrypto.js
+++ b/services/crypto/modules/WeaveCrypto.js
@@ -28,14 +28,14 @@ this.WeaveCrypto = function WeaveCrypto() {
 };
 
 WeaveCrypto.prototype = {
-    prefBranch : null,
-    debug      : true,  // services.sync.log.cryptoDebug
+    prefBranch: null,
+    debug: true,  // services.sync.log.cryptoDebug
 
-    observer : {
-        _self : null,
+    observer: {
+        _self: null,
 
-        QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver,
-                                                Ci.nsISupportsWeakReference]),
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+                                               Ci.nsISupportsWeakReference]),
 
         observe(subject, topic, data) {
             let self = this._self;
diff --git a/services/crypto/modules/utils.js b/services/crypto/modules/utils.js
index 3547d110c86d..f14f0f33d125 100644
--- a/services/crypto/modules/utils.js
+++ b/services/crypto/modules/utils.js
@@ -182,7 +182,7 @@ this.CryptoUtils = {
    * The output is an octet string of length dkLen, which you
    * can encode as you wish.
    */
-  pbkdf2Generate : function pbkdf2Generate(P, S, c, dkLen,
+  pbkdf2Generate: function pbkdf2Generate(P, S, c, dkLen,
                        hmacAlg = Ci.nsICryptoHMAC.SHA1, hmacLen = 20) {
 
     // We don't have a default in the algo itself, as NSS does.
diff --git a/services/sync/modules/engines/clients.js b/services/sync/modules/engines/clients.js
index 4b2d1981759c..8a661917a0fe 100644
--- a/services/sync/modules/engines/clients.js
+++ b/services/sync/modules/engines/clients.js
@@ -296,7 +296,7 @@ ClientEngine.prototype = {
   // We assume that clients not present in the FxA Device Manager list have been
   // disconnected and so are stale
   _refreshKnownStaleClients() {
-    this._log.debug('Refreshing the known stale clients list');
+    this._log.debug("Refreshing the known stale clients list");
     let localClients = Object.values(this._store._remoteClients)
                              .filter(client => client.fxaDeviceId) // iOS client records don't have fxaDeviceId
                              .map(client => client.fxaDeviceId);
@@ -304,7 +304,7 @@ ClientEngine.prototype = {
     try {
       fxaClients = Async.promiseSpinningly(this.fxAccounts.getDeviceList()).map(device => device.id);
     } catch (ex) {
-      this._log.error('Could not retrieve the FxA device list', ex);
+      this._log.error("Could not retrieve the FxA device list", ex);
       this._knownStaleFxADeviceIds = [];
       return;
     }
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index 26910b94c8e3..8675baa2a241 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -302,7 +302,7 @@ this.Utils = {
    * N.B., salt should be base64 encoded, even though we have to decode
    * it later!
    */
-  derivePresentableKeyFromPassphrase : function derivePresentableKeyFromPassphrase(passphrase, salt, keyLength, forceJS) {
+  derivePresentableKeyFromPassphrase: function derivePresentableKeyFromPassphrase(passphrase, salt, keyLength, forceJS) {
     let k = CryptoUtils.deriveKeyFromPassphrase(passphrase, salt, keyLength,
                                                 forceJS);
     return Utils.encodeKeyBase32(k);
@@ -312,7 +312,7 @@ this.Utils = {
    * N.B., salt should be base64 encoded, even though we have to decode
    * it later!
    */
-  deriveEncodedKeyFromPassphrase : function deriveEncodedKeyFromPassphrase(passphrase, salt, keyLength, forceJS) {
+  deriveEncodedKeyFromPassphrase: function deriveEncodedKeyFromPassphrase(passphrase, salt, keyLength, forceJS) {
     let k = CryptoUtils.deriveKeyFromPassphrase(passphrase, salt, keyLength,
                                                 forceJS);
     return Utils.base64Key(k);
@@ -323,7 +323,7 @@ this.Utils = {
    * uppercase alphanumeric characters, separated by hyphens.
    * A.K.A. base64-to-base32 encoding.
    */
-  presentEncodedKeyAsSyncKey : function presentEncodedKeyAsSyncKey(encodedKey) {
+  presentEncodedKeyAsSyncKey: function presentEncodedKeyAsSyncKey(encodedKey) {
     return Utils.encodeKeyBase32(atob(encodedKey));
   },
 
@@ -461,13 +461,13 @@ this.Utils = {
     try {
       if (args) {
         return Str.errors.formatStringFromName(error, args, args.length);
-      } else {
-        return Str.errors.GetStringFromName(error);
       }
+      return Str.errors.GetStringFromName(error);
+
     } catch (e) {}
 
     // basically returns "Unknown Error"
-    return Str.errors.GetStringFromName('error.reason.unknown');
+    return Str.errors.GetStringFromName("error.reason.unknown");
   },
 
   /**
diff --git a/services/sync/tests/tps/test_existing_bookmarks.js b/services/sync/tests/tps/test_existing_bookmarks.js
index 937acd3def77..efc3195d6e92 100644
--- a/services/sync/tests/tps/test_existing_bookmarks.js
+++ b/services/sync/tests/tps/test_existing_bookmarks.js
@@ -58,26 +58,26 @@ var bookmarks_after = {
  * Test phases
  */
 
-Phase('phase1', [
+Phase("phase1", [
   [Bookmarks.add, bookmarks_initial],
   [Bookmarks.verify, bookmarks_initial],
   [Sync]
 ]);
 
-Phase('phase2', [
+Phase("phase2", [
   [Bookmarks.add, bookmarks_initial],
   [Bookmarks.verify, bookmarks_initial],
   [Sync]
 ]);
 
-Phase('phase3', [
+Phase("phase3", [
   [Bookmarks.verify, bookmarks_initial],
   [Bookmarks.modify, bookmarks_initial],
   [Bookmarks.verify, bookmarks_after],
   [Sync]
 ]);
 
-Phase('phase4', [
+Phase("phase4", [
   [Sync],
   [Bookmarks.verify, bookmarks_after]
 ]);
diff --git a/services/sync/tests/unit/test_bookmark_engine.js b/services/sync/tests/unit/test_bookmark_engine.js
index 49aabd28b4a1..cf09751f52bd 100644
--- a/services/sync/tests/unit/test_bookmark_engine.js
+++ b/services/sync/tests/unit/test_bookmark_engine.js
@@ -513,22 +513,22 @@ add_task(async function test_mismatched_types() {
 
   let oldRecord = {
     "id": "l1nZZXfB8nC7",
-    "type":"folder",
-    "parentName":"Bookmarks Toolbar",
-    "title":"Innerst i Sneglehode",
-    "description":null,
+    "type": "folder",
+    "parentName": "Bookmarks Toolbar",
+    "title": "Innerst i Sneglehode",
+    "description": null,
     "parentid": "toolbar"
   };
   oldRecord.cleartext = oldRecord;
 
   let newRecord = {
     "id": "l1nZZXfB8nC7",
-    "type":"livemark",
-    "siteUri":"http://sneglehode.wordpress.com/",
-    "feedUri":"http://sneglehode.wordpress.com/feed/",
-    "parentName":"Bookmarks Toolbar",
-    "title":"Innerst i Sneglehode",
-    "description":null,
+    "type": "livemark",
+    "siteUri": "http://sneglehode.wordpress.com/",
+    "feedUri": "http://sneglehode.wordpress.com/feed/",
+    "parentName": "Bookmarks Toolbar",
+    "title": "Innerst i Sneglehode",
+    "description": null,
     "children":
       ["HCRq40Rnxhrd", "YeyWCV1RVsYw", "GCceVZMhvMbP", "sYi2hevdArlF",
        "vjbZlPlSyGY8", "UtjUhVyrpeG6", "rVq8WMG2wfZI", "Lx0tcy43ZKhZ",
diff --git a/services/sync/tests/unit/test_bookmark_livemarks.js b/services/sync/tests/unit/test_bookmark_livemarks.js
index caddef4b7fcc..3ccdbbaab78a 100644
--- a/services/sync/tests/unit/test_bookmark_livemarks.js
+++ b/services/sync/tests/unit/test_bookmark_livemarks.js
@@ -21,14 +21,14 @@ var record631361 = {
   index: 150,
   modified: 1296768176.49,
   payload:
-  {"id":"M5bwUKK8hPyF",
-   "type":"livemark",
-   "siteUri":"http://www.bbc.co.uk/go/rss/int/news/-/news/",
-   "feedUri":"http://fxfeeds.mozilla.com/en-US/firefox/headlines.xml",
-   "parentName":"Bookmarks Toolbar",
-   "parentid":"toolbar",
-   "title":"Latest Headlines",
-   "description":"",
+  {"id": "M5bwUKK8hPyF",
+   "type": "livemark",
+   "siteUri": "http://www.bbc.co.uk/go/rss/int/news/-/news/",
+   "feedUri": "http://fxfeeds.mozilla.com/en-US/firefox/headlines.xml",
+   "parentName": "Bookmarks Toolbar",
+   "parentid": "toolbar",
+   "title": "Latest Headlines",
+   "description": "",
    "children":
      ["7oBdEZB-8BMO", "SUd1wktMNCTB", "eZe4QWzo1BcY", "YNBhGwhVnQsN",
       "92Aw2SMEkFg0", "uw0uKqrVFwd-", "x7mx2P3--8FJ", "d-jVF8UuC9Ye",
diff --git a/services/sync/tests/unit/test_bookmark_repair.js b/services/sync/tests/unit/test_bookmark_repair.js
index 089a1b04bdd3..0b7b58df4e33 100644
--- a/services/sync/tests/unit/test_bookmark_repair.js
+++ b/services/sync/tests/unit/test_bookmark_repair.js
@@ -74,7 +74,7 @@ async function promiseValidationDone(expected) {
   actual.sort((a, b) => String(a.name).localeCompare(b.name));
   expected.sort((a, b) => String(a.name).localeCompare(b.name));
   deepEqual(actual, expected);
-};
+}
 
 async function cleanup(server) {
   bookmarksEngine._store.wipe();
@@ -166,8 +166,8 @@ add_task(async function test_bookmark_repair_integration() {
     // sync again - we should have a few problems...
     _("Sync again to trigger repair");
     validationPromise = promiseValidationDone([
-      {"name":"missingChildren","count":1},
-      {"name":"structuralDifferences","count":1},
+      {"name": "missingChildren", "count": 1},
+      {"name": "structuralDifferences", "count": 1},
     ]);
     Service.sync();
     await validationPromise;
@@ -396,8 +396,8 @@ add_task(async function test_repair_client_missing() {
     // sync again - we should have a few problems...
     _("Syncing again.");
     validationPromise = promiseValidationDone([
-      {"name":"clientMissing","count":1},
-      {"name":"structuralDifferences","count":1},
+      {"name": "clientMissing", "count": 1},
+      {"name": "structuralDifferences", "count": 1},
     ]);
     Service.sync();
     await validationPromise;
@@ -480,8 +480,8 @@ add_task(async function test_repair_server_missing() {
     // sync again - we should have a few problems...
     _("Syncing again.");
     validationPromise = promiseValidationDone([
-      {"name":"serverMissing","count":1},
-      {"name":"missingChildren","count":1},
+      {"name": "serverMissing", "count": 1},
+      {"name": "missingChildren", "count": 1},
     ]);
     Service.sync();
     await validationPromise;
@@ -567,9 +567,9 @@ add_task(async function test_repair_server_deleted() {
     // sync again - we should have a few problems...
     _("Syncing again.");
     validationPromise = promiseValidationDone([
-      {"name":"serverDeleted","count":1},
-      {"name":"deletedChildren","count":1},
-      {"name":"orphans","count":1}
+      {"name": "serverDeleted", "count": 1},
+      {"name": "deletedChildren", "count": 1},
+      {"name": "orphans", "count": 1}
     ]);
     Service.sync();
     await validationPromise;
diff --git a/services/sync/tests/unit/test_bookmark_repair_requestor.js b/services/sync/tests/unit/test_bookmark_repair_requestor.js
index a840ccfa1cb8..8c2a19513407 100644
--- a/services/sync/tests/unit/test_bookmark_repair_requestor.js
+++ b/services/sync/tests/unit/test_bookmark_repair_requestor.js
@@ -496,17 +496,17 @@ add_task(async function test_requestor_already_repairing_continue() {
     { method: "started",
       object: "repair",
       value: undefined,
-      extra: { flowID: flowID, numIDs: "3" },
+      extra: { flowID, numIDs: "3" },
     },
     { method: "request",
       object: "repair",
       value: "upload",
-      extra: { flowID: flowID, numIDs: "3", deviceID: "client-a" },
+      extra: { flowID, numIDs: "3", deviceID: "client-a" },
     },
     { method: "aborted",
       object: "repair",
       value: undefined,
-      extra: { flowID: flowID, numIDs: "3", reason: "other clients repairing" },
+      extra: { flowID, numIDs: "3", reason: "other clients repairing" },
     }
   ];
 
diff --git a/services/sync/tests/unit/test_errorhandler_2.js b/services/sync/tests/unit/test_errorhandler_2.js
index 3b48b6a227c3..f26f2a1f8124 100644
--- a/services/sync/tests/unit/test_errorhandler_2.js
+++ b/services/sync/tests/unit/test_errorhandler_2.js
@@ -947,7 +947,7 @@ add_task(async function test_engine_applyFailed() {
   engine.enabled = true;
   delete engine.exception;
   engine.sync = function sync() {
-    Svc.Obs.notify("weave:engine:sync:applied", {newFailed:1}, "catapult");
+    Svc.Obs.notify("weave:engine:sync:applied", {newFailed: 1}, "catapult");
   };
 
   Svc.Prefs.set("log.appender.file.logOnError", true);
diff --git a/services/sync/tps/extensions/tps/components/tps-cmdline.js b/services/sync/tps/extensions/tps/components/tps-cmdline.js
index 45038421d4cc..8d0f1c84a4f2 100644
--- a/services/sync/tps/extensions/tps/components/tps-cmdline.js
+++ b/services/sync/tps/extensions/tps/components/tps-cmdline.js
@@ -25,23 +25,23 @@ function TPSCmdLineHandler() {}
 
 TPSCmdLineHandler.prototype = {
   classDescription: "TPSCmdLineHandler",
-  classID         : TPS_CMDLINE_CLSID,
-  contractID      : TPS_CMDLINE_CONTRACTID,
+  classID: TPS_CMDLINE_CLSID,
+  contractID: TPS_CMDLINE_CONTRACTID,
 
   QueryInterface: XPCOMUtils.generateQI([nsISupports,
                                          nsICommandLineHandler,
                                          nsICmdLineHandler]),   /* nsISupports */
 
   /* nsICmdLineHandler */
-  commandLineArgument : "-tps",
-  prefNameForStartup : "general.startup.tps",
-  helpText : "Run TPS tests with the given test file.",
-  handlesArgs : true,
-  defaultArgs : "",
-  openWindowWithArgs : true,
+  commandLineArgument: "-tps",
+  prefNameForStartup: "general.startup.tps",
+  helpText: "Run TPS tests with the given test file.",
+  handlesArgs: true,
+  defaultArgs: "",
+  openWindowWithArgs: true,
 
   /* nsICommandLineHandler */
-  handle : function handler_handle(cmdLine) {
+  handle: function handler_handle(cmdLine) {
     let options = {};
 
     let uristr = cmdLine.handleFlagWithParam("tps", false);
@@ -72,10 +72,10 @@ TPSCmdLineHandler.prototype = {
     // cmdLine.preventDefault = true;
   },
 
-  helpInfo : "  --tps <file>              Run TPS tests with the given test file.\n" +
-             "  --tpsphase <phase>        Run the specified phase in the TPS test.\n" +
-             "  --tpslogfile <file>       Logfile for TPS output.\n" +
-             "  --ignore-unused-engines   Don't load engines not used in tests.\n",
+  helpInfo: "  --tps <file>              Run TPS tests with the given test file.\n" +
+            "  --tpsphase <phase>        Run the specified phase in the TPS test.\n" +
+            "  --tpslogfile <file>       Logfile for TPS output.\n" +
+            "  --ignore-unused-engines   Don't load engines not used in tests.\n",
 };
 
 
diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 5439ff514d59..2d7a8d0b493c 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -5,7 +5,7 @@ dependencies = [
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "rust-webvr 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -63,7 +63,7 @@ dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -154,7 +154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -225,7 +225,7 @@ version = "0.0.1"
 dependencies = [
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
 ]
@@ -281,7 +281,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.15.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -296,12 +296,12 @@ dependencies = [
 name = "canvas_traits"
 version = "0.0.1"
 dependencies = [
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)",
 ]
@@ -453,7 +453,7 @@ dependencies = [
  "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "servo_rand 0.0.1",
@@ -496,7 +496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -511,22 +511,22 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.11.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cssparser-macros"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -615,7 +615,7 @@ dependencies = [
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -632,7 +632,7 @@ dependencies = [
  "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_url 0.0.1",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -676,7 +676,7 @@ dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -841,7 +841,7 @@ dependencies = [
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -937,7 +937,7 @@ name = "geckoservo"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -980,7 +980,7 @@ dependencies = [
  "net_traits 0.0.1",
  "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "range 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_atoms 0.0.1",
@@ -1013,7 +1013,7 @@ dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "range 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1205,7 +1205,7 @@ dependencies = [
  "cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1283,7 +1283,7 @@ dependencies = [
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1359,7 +1359,7 @@ dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
@@ -1379,7 +1379,7 @@ dependencies = [
  "script_layout_interface 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.18.0",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
@@ -1666,10 +1666,10 @@ name = "msg"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)",
 ]
@@ -1703,7 +1703,7 @@ dependencies = [
  "openssl 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "parse-hosts 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile_traits 0.0.1",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo-websocket 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1768,7 +1768,7 @@ dependencies = [
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "servo_url 0.0.1",
@@ -1869,7 +1869,7 @@ dependencies = [
  "libloading 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2064,7 +2064,7 @@ dependencies = [
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile_traits 0.0.1",
  "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
@@ -2089,7 +2089,7 @@ dependencies = [
  "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
  "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)",
@@ -2136,7 +2136,7 @@ dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2191,7 +2191,7 @@ dependencies = [
  "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libloading 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2244,7 +2244,7 @@ dependencies = [
  "caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "deny_public_fields 0.0.1",
  "devtools_traits 0.0.1",
  "dom_struct 0.0.1",
@@ -2286,7 +2286,7 @@ dependencies = [
  "script_plugins 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.18.0",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_atoms 0.0.1",
  "servo_config 0.0.1",
@@ -2314,7 +2314,7 @@ dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2370,7 +2370,7 @@ dependencies = [
  "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile_traits 0.0.1",
  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
@@ -2385,7 +2385,7 @@ name = "selectors"
 version = "0.18.0"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2399,7 +2399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "0.9.11"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2428,7 +2428,7 @@ dependencies = [
  "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2573,7 +2573,7 @@ dependencies = [
  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
@@ -2627,7 +2627,7 @@ version = "0.0.1"
 dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_rand 0.0.1",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2698,7 +2698,7 @@ dependencies = [
  "lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2735,7 +2735,7 @@ dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2757,7 +2757,7 @@ dependencies = [
  "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.18.0",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_atoms 0.0.1",
  "servo_config 0.0.1",
@@ -2774,7 +2774,7 @@ name = "style_tests"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever-atoms 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2793,11 +2793,11 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2806,7 +2806,7 @@ name = "stylo_tests"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "geckoservo 0.0.1",
@@ -3073,7 +3073,7 @@ name = "url_serde"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3105,7 +3105,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3168,7 +3168,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.35.0"
-source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554"
+source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3196,10 +3196,11 @@ dependencies = [
 [[package]]
 name = "webrender_traits"
 version = "0.35.0"
-source = "git+https://github.com/servo/webrender#04eeee4593c11a0d9c934722896c67aa5ddd9554"
+source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3207,7 +3208,7 @@ dependencies = [
  "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3358,8 +3359,8 @@ dependencies = [
 "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624"
 "checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f"
 "checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d"
-"checksum cssparser 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35e3e110221f306501253d8d34857040de365ce2d92ac0abb2f06dedc845d9d0"
-"checksum cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95"
+"checksum cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"
+"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum dbus 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47f881971824401c27bc1ff9f641d54ac66e0f409631806fa7be8cad8e6be450"
 "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
@@ -3500,7 +3501,7 @@ dependencies = [
 "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
 "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
-"checksum serde 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a702319c807c016e51f672e5c77d6f0b46afddd744b5e437d6b8436b888b458f"
+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
 "checksum serde_codegen_internals 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d52006899f910528a10631e5b727973fe668f3228109d1707ccf5bad5490b6e"
 "checksum serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f15ea24bd037b2d64646b4d934fa99c649be66e3f7b29fb595a5543b212b1452"
 "checksum serde_json 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)" = "dbc45439552eb8fb86907a2c41c1fd0ef97458efb87ff7f878db466eb581824e"
diff --git a/servo/components/canvas/Cargo.toml b/servo/components/canvas/Cargo.toml
index aef66941282c..e24510fec729 100644
--- a/servo/components/canvas/Cargo.toml
+++ b/servo/components/canvas/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure"}
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 gleam = "0.4"
 ipc-channel = "0.7"
diff --git a/servo/components/canvas_traits/Cargo.toml b/servo/components/canvas_traits/Cargo.toml
index 83c7f0a1f5c1..512e3366e89d 100644
--- a/servo/components/canvas_traits/Cargo.toml
+++ b/servo/components/canvas_traits/Cargo.toml
@@ -10,7 +10,7 @@ name = "canvas_traits"
 path = "lib.rs"
 
 [dependencies]
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
diff --git a/servo/components/gfx/platform/macos/font_template.rs b/servo/components/gfx/platform/macos/font_template.rs
index 3cd5fecdb013..d731347d798e 100644
--- a/servo/components/gfx/platform/macos/font_template.rs
+++ b/servo/components/gfx/platform/macos/font_template.rs
@@ -18,6 +18,7 @@ use std::fs::File;
 use std::io::{Read, Error as IoError};
 use std::ops::Deref;
 use std::sync::Mutex;
+use webrender_traits::NativeFontHandle;
 
 /// Platform specific font representation for mac.
 /// The identifier is a PostScript font name. The
@@ -106,8 +107,8 @@ impl FontTemplateData {
     }
 
     /// Returns the native font that underlies this font template, if applicable.
-    pub fn native_font(&self) -> Option<CGFont> {
-        self.ctfont(0.0).map(|ctfont| ctfont.copy_to_CGFont())
+    pub fn native_font(&self) -> Option<NativeFontHandle> {
+        self.ctfont(0.0).map(|ctfont| NativeFontHandle(ctfont.copy_to_CGFont()))
     }
 }
 
diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml
index 68e5462cbc70..cdeb2f09103e 100644
--- a/servo/components/layout/Cargo.toml
+++ b/servo/components/layout/Cargo.toml
@@ -14,7 +14,7 @@ app_units = "0.4"
 atomic_refcell = "0.1"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 fnv = "1.0"
 gfx = {path = "../gfx"}
diff --git a/servo/components/layout/block.rs b/servo/components/layout/block.rs
index db74ab640747..7bbeb7a79ee3 100644
--- a/servo/components/layout/block.rs
+++ b/servo/components/layout/block.rs
@@ -325,22 +325,20 @@ impl CandidateBSizeIterator {
             (LengthOrPercentageOrAuto::Percentage(percent), Some(block_container_block_size)) => {
                 MaybeAuto::Specified(block_container_block_size.scale_by(percent))
             }
-            (LengthOrPercentageOrAuto::Calc(calc), Some(block_container_block_size)) => {
-                MaybeAuto::Specified(calc.length() + block_container_block_size.scale_by(calc.percentage()))
+            (LengthOrPercentageOrAuto::Calc(calc), _) => {
+                MaybeAuto::from_option(calc.to_computed(block_container_block_size))
             }
             (LengthOrPercentageOrAuto::Percentage(_), None) |
-            (LengthOrPercentageOrAuto::Auto, _) |
-            (LengthOrPercentageOrAuto::Calc(_), _) => MaybeAuto::Auto,
+            (LengthOrPercentageOrAuto::Auto, _) => MaybeAuto::Auto,
             (LengthOrPercentageOrAuto::Length(length), _) => MaybeAuto::Specified(length),
         };
         let max_block_size = match (fragment.style.max_block_size(), block_container_block_size) {
             (LengthOrPercentageOrNone::Percentage(percent), Some(block_container_block_size)) => {
                 Some(block_container_block_size.scale_by(percent))
             }
-            (LengthOrPercentageOrNone::Calc(calc), Some(block_container_block_size)) => {
-                Some(block_container_block_size.scale_by(calc.percentage()) + calc.length())
+            (LengthOrPercentageOrNone::Calc(calc), _) => {
+                calc.to_computed(block_container_block_size)
             }
-            (LengthOrPercentageOrNone::Calc(_), _) |
             (LengthOrPercentageOrNone::Percentage(_), None) |
             (LengthOrPercentageOrNone::None, _) => None,
             (LengthOrPercentageOrNone::Length(length), _) => Some(length),
@@ -349,10 +347,9 @@ impl CandidateBSizeIterator {
             (LengthOrPercentage::Percentage(percent), Some(block_container_block_size)) => {
                 block_container_block_size.scale_by(percent)
             }
-            (LengthOrPercentage::Calc(calc), Some(block_container_block_size)) => {
-                calc.length() + block_container_block_size.scale_by(calc.percentage())
+            (LengthOrPercentage::Calc(calc), _) => {
+                calc.to_computed(block_container_block_size).unwrap_or(Au(0))
             }
-            (LengthOrPercentage::Calc(calc), None) => calc.length(),
             (LengthOrPercentage::Percentage(_), None) => Au(0),
             (LengthOrPercentage::Length(length), _) => length,
         };
@@ -1169,15 +1166,14 @@ impl BlockFlow {
         let content_block_size = self.fragment.style().content_block_size();
 
         match (content_block_size, containing_block_size) {
-            (LengthOrPercentageOrAuto::Calc(calc), Some(container_size)) => {
-                Some(container_size.scale_by(calc.percentage()) + calc.length())
+            (LengthOrPercentageOrAuto::Calc(calc), _) => {
+                calc.to_computed(containing_block_size)
             }
             (LengthOrPercentageOrAuto::Length(length), _) => Some(length),
             (LengthOrPercentageOrAuto::Percentage(percent), Some(container_size)) => {
                 Some(container_size.scale_by(percent))
             }
             (LengthOrPercentageOrAuto::Percentage(_), None) |
-            (LengthOrPercentageOrAuto::Calc(_), None) |
             (LengthOrPercentageOrAuto::Auto, None) => {
                 None
             }
diff --git a/servo/components/layout/flex.rs b/servo/components/layout/flex.rs
index 5fd9459ab02e..cf77455afa88 100644
--- a/servo/components/layout/flex.rs
+++ b/servo/components/layout/flex.rs
@@ -53,9 +53,9 @@ impl AxisSize {
                 }
             }
             LengthOrPercentageOrAuto::Calc(calc) => {
-                match content_size {
-                    Some(size) => AxisSize::Definite(size.scale_by(calc.percentage())),
-                    None => AxisSize::Infinite
+                match calc.to_computed(content_size) {
+                    Some(length) => AxisSize::Definite(length),
+                    None => AxisSize::Infinite,
                 }
             }
             LengthOrPercentageOrAuto::Auto => {
@@ -79,10 +79,8 @@ fn from_flex_basis(flex_basis: LengthOrPercentageOrAutoOrContent,
             MaybeAuto::Specified(size.scale_by(percent)),
         (LengthOrPercentageOrAutoOrContent::Percentage(_), None) =>
             MaybeAuto::Auto,
-        (LengthOrPercentageOrAutoOrContent::Calc(calc), Some(size)) =>
-            MaybeAuto::Specified(calc.length() + size.scale_by(calc.percentage())),
-        (LengthOrPercentageOrAutoOrContent::Calc(_), None) =>
-            MaybeAuto::Auto,
+        (LengthOrPercentageOrAutoOrContent::Calc(calc), _) =>
+            MaybeAuto::from_option(calc.to_computed(containing_length)),
         (LengthOrPercentageOrAutoOrContent::Content, _) =>
             MaybeAuto::Auto,
         (LengthOrPercentageOrAutoOrContent::Auto, Some(size)) =>
diff --git a/servo/components/layout/model.rs b/servo/components/layout/model.rs
index 8382c9af7d0a..a6d64e557ac3 100644
--- a/servo/components/layout/model.rs
+++ b/servo/components/layout/model.rs
@@ -408,12 +408,20 @@ impl MaybeAuto {
                 MaybeAuto::Specified(containing_length.scale_by(percent))
             }
             LengthOrPercentageOrAuto::Calc(calc) => {
-                MaybeAuto::Specified(calc.length() + containing_length.scale_by(calc.percentage()))
+                MaybeAuto::from_option(calc.to_computed(Some(containing_length)))
             }
             LengthOrPercentageOrAuto::Length(length) => MaybeAuto::Specified(length)
         }
     }
 
+    #[inline]
+    pub fn from_option(au: Option<Au>) -> MaybeAuto {
+        match au {
+            Some(l) => MaybeAuto::Specified(l),
+            _ => MaybeAuto::Auto,
+        }
+    }
+
     #[inline]
     pub fn specified_or_default(&self, default: Au) -> Au {
         match *self {
@@ -455,8 +463,7 @@ pub fn specified_or_none(length: LengthOrPercentageOrNone, containing_length: Au
     match length {
         LengthOrPercentageOrNone::None => None,
         LengthOrPercentageOrNone::Percentage(percent) => Some(containing_length.scale_by(percent)),
-        LengthOrPercentageOrNone::Calc(calc) =>
-            Some(containing_length.scale_by(calc.percentage()) + calc.length()),
+        LengthOrPercentageOrNone::Calc(calc) => calc.to_computed(Some(containing_length)),
         LengthOrPercentageOrNone::Length(length) => Some(length),
     }
 }
diff --git a/servo/components/layout/webrender_helpers.rs b/servo/components/layout/webrender_helpers.rs
index 9756ea6d1d68..92012d71cb73 100644
--- a/servo/components/layout/webrender_helpers.rs
+++ b/servo/components/layout/webrender_helpers.rs
@@ -258,10 +258,12 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                         };
                         if !slice.glyphs.is_whitespace() {
                             let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
+                            let x = (origin.x + glyph_offset.x).to_f32_px();
+                            let y = (origin.y + glyph_offset.y).to_f32_px();
+                            let point = webrender_traits::LayoutPoint::new(x, y);
                             let glyph = webrender_traits::GlyphInstance {
                                 index: glyph.id(),
-                                point: Point2D::new((origin.x + glyph_offset.x).to_f32_px(),
-                                                    (origin.y + glyph_offset.y).to_f32_px()),
+                                point: point,
                             };
                             glyphs.push(glyph);
                         }
diff --git a/servo/components/layout_thread/lib.rs b/servo/components/layout_thread/lib.rs
index c7f3471753af..c17d3bd9b486 100644
--- a/servo/components/layout_thread/lib.rs
+++ b/servo/components/layout_thread/lib.rs
@@ -110,7 +110,7 @@ use style::context::{QuirksMode, ReflowGoal, SharedStyleContext};
 use style::context::{StyleSystemOptions, ThreadLocalStyleContextCreationInfo};
 use style::data::StoredRestyleHint;
 use style::dom::{ShowSubtree, ShowSubtreeDataAndPrimaryValues, TElement, TNode};
-use style::error_reporting::StdoutErrorReporter;
+use style::error_reporting::{NullReporter, RustLogReporter};
 use style::logical_geometry::LogicalPoint;
 use style::media_queries::{Device, MediaList, MediaType};
 use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION, STORE_OVERFLOW};
@@ -1587,7 +1587,7 @@ fn get_ua_stylesheets() -> Result<UserAgentStylesheets, &'static str> {
             MediaList::empty(),
             shared_lock.clone(),
             None,
-            &StdoutErrorReporter))
+            &NullReporter))
     }
 
     let shared_lock = SharedRwLock::new();
@@ -1600,7 +1600,7 @@ fn get_ua_stylesheets() -> Result<UserAgentStylesheets, &'static str> {
     for &(ref contents, ref url) in &opts::get().user_stylesheets {
         user_or_user_agent_stylesheets.push(Stylesheet::from_bytes(
             &contents, url.clone(), None, None, Origin::User, MediaList::empty(),
-            shared_lock.clone(), None, &StdoutErrorReporter));
+            shared_lock.clone(), None, &RustLogReporter));
     }
 
     let quirks_mode_stylesheet = try!(parse_ua_stylesheet(&shared_lock, "quirks-mode.css"));
diff --git a/servo/components/msg/Cargo.toml b/servo/components/msg/Cargo.toml
index 3e873e4d3ad0..836190b1ef68 100644
--- a/servo/components/msg/Cargo.toml
+++ b/servo/components/msg/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
-cssparser = "0.12.1"
+cssparser = "0.13"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 serde = "0.9"
diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml
index 37d5d7d6224b..f145e8f65b0e 100644
--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@@ -35,7 +35,7 @@ byteorder = "1.0"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"
 cookie = "0.6"
-cssparser = "0.12.1"
+cssparser = "0.13"
 deny_public_fields = {path = "../deny_public_fields"}
 devtools_traits = {path = "../devtools_traits"}
 dom_struct = {path = "../dom_struct"}
diff --git a/servo/components/script/dom/bindings/codegen/CodegenRust.py b/servo/components/script/dom/bindings/codegen/CodegenRust.py
index a54ea0c3c979..e7a0541c4dac 100644
--- a/servo/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/servo/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1850,6 +1850,7 @@ class CGImports(CGWrapper):
                 'unused_imports',
                 'unused_variables',
                 'unused_assignments',
+                'unused_mut',
             ]
 
         def componentTypes(type):
diff --git a/servo/components/script/dom/dissimilaroriginlocation.rs b/servo/components/script/dom/dissimilaroriginlocation.rs
index b4cd2d84e5d2..7ea2e3efc3cd 100644
--- a/servo/components/script/dom/dissimilaroriginlocation.rs
+++ b/servo/components/script/dom/dissimilaroriginlocation.rs
@@ -12,6 +12,7 @@ use dom::bindings::str::DOMString;
 use dom::bindings::str::USVString;
 use dom::dissimilaroriginwindow::DissimilarOriginWindow;
 use dom_struct::dom_struct;
+use servo_url::MutableOrigin;
 
 /// Represents a dissimilar-origin `Location` that exists in another script thread.
 ///
@@ -43,6 +44,11 @@ impl DissimilarOriginLocation {
                            window,
                            DissimilarOriginLocationBinding::Wrap)
     }
+
+    #[allow(dead_code)]
+    pub fn origin(&self) -> &MutableOrigin {
+        self.window.origin()
+    }
 }
 
 impl DissimilarOriginLocationMethods for DissimilarOriginLocation {
diff --git a/servo/components/script/dom/dissimilaroriginwindow.rs b/servo/components/script/dom/dissimilaroriginwindow.rs
index 0f3cbd06df0c..4188f51f0e5f 100644
--- a/servo/components/script/dom/dissimilaroriginwindow.rs
+++ b/servo/components/script/dom/dissimilaroriginwindow.rs
@@ -19,6 +19,7 @@ use js::jsval::{JSVal, UndefinedValue};
 use msg::constellation_msg::PipelineId;
 use script_traits::ScriptMsg as ConstellationMsg;
 use servo_url::ImmutableOrigin;
+use servo_url::MutableOrigin;
 use servo_url::ServoUrl;
 
 /// Represents a dissimilar-origin `Window` that exists in another script thread.
@@ -56,12 +57,18 @@ impl DissimilarOriginWindow {
                                                     global_to_clone_from.constellation_chan().clone(),
                                                     global_to_clone_from.scheduler_chan().clone(),
                                                     global_to_clone_from.resource_threads().clone(),
-                                                    timer_event_chan),
+                                                    timer_event_chan,
+                                                    global_to_clone_from.origin().clone()),
             browsing_context: JS::from_ref(browsing_context),
             location: MutNullableJS::new(None),
         };
         unsafe { DissimilarOriginWindowBinding::Wrap(cx, win) }
     }
+
+    #[allow(dead_code)]
+    pub fn origin(&self) -> &MutableOrigin {
+        self.globalscope.origin()
+    }
 }
 
 impl DissimilarOriginWindowMethods for DissimilarOriginWindow {
diff --git a/servo/components/script/dom/domrectlist.rs b/servo/components/script/dom/domrectlist.rs
deleted file mode 100644
index a7d99b99448f..000000000000
--- a/servo/components/script/dom/domrectlist.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use dom::bindings::codegen::Bindings::DOMRectListBinding;
-use dom::bindings::codegen::Bindings::DOMRectListBinding::DOMRectListMethods;
-use dom::bindings::js::{JS, Root};
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::domrect::DOMRect;
-use dom::window::Window;
-use dom_struct::dom_struct;
-
-#[dom_struct]
-pub struct DOMRectList {
-    reflector_: Reflector,
-    rects: Vec<JS<DOMRect>>,
-}
-
-impl DOMRectList {
-    fn new_inherited<T>(rects: T) -> DOMRectList
-        where T: Iterator<Item = Root<DOMRect>>
-    {
-        DOMRectList {
-            reflector_: Reflector::new(),
-            rects: rects.map(|r| JS::from_ref(&*r)).collect(),
-        }
-    }
-
-    pub fn new<T>(window: &Window, rects: T) -> Root<DOMRectList>
-        where T: Iterator<Item = Root<DOMRect>>
-    {
-        reflect_dom_object(box DOMRectList::new_inherited(rects),
-                           window,
-                           DOMRectListBinding::Wrap)
-    }
-}
-
-impl DOMRectListMethods for DOMRectList {
-    // https://drafts.fxtf.org/geometry/#dom-domrectlist-length
-    fn Length(&self) -> u32 {
-        self.rects.len() as u32
-    }
-
-    // https://drafts.fxtf.org/geometry/#dom-domrectlist-item
-    fn Item(&self, index: u32) -> Option<Root<DOMRect>> {
-        let rects = &self.rects;
-        if index < rects.len() as u32 {
-            Some(Root::from_ref(&*rects[index as usize]))
-        } else {
-            None
-        }
-    }
-
-    // check-tidy: no specs after this line
-    fn IndexedGetter(&self, index: u32) -> Option<Root<DOMRect>> {
-        self.Item(index)
-    }
-}
diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs
index aafee25867c8..7b56b6c6e813 100644
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@@ -34,7 +34,6 @@ use dom::create::create_element;
 use dom::document::{Document, LayoutDocumentHelpers};
 use dom::documentfragment::DocumentFragment;
 use dom::domrect::DOMRect;
-use dom::domrectlist::DOMRectList;
 use dom::domtokenlist::DOMTokenList;
 use dom::event::Event;
 use dom::eventtarget::EventTarget;
@@ -1632,17 +1631,16 @@ impl ElementMethods for Element {
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-getclientrects
-    fn GetClientRects(&self) -> Root<DOMRectList> {
+    fn GetClientRects(&self) -> Vec<Root<DOMRect>> {
         let win = window_from_node(self);
         let raw_rects = self.upcast::<Node>().content_boxes();
-        let rects = raw_rects.iter().map(|rect| {
+        raw_rects.iter().map(|rect| {
             DOMRect::new(win.upcast(),
                          rect.origin.x.to_f64_px(),
                          rect.origin.y.to_f64_px(),
                          rect.size.width.to_f64_px(),
                          rect.size.height.to_f64_px())
-        });
-        DOMRectList::new(&win, rects)
+        }).collect()
     }
 
     // https://drafts.csswg.org/cssom-view/#dom-element-getboundingclientrect
diff --git a/servo/components/script/dom/globalscope.rs b/servo/components/script/dom/globalscope.rs
index 73ba61e4557d..931d1f576aa8 100644
--- a/servo/components/script/dom/globalscope.rs
+++ b/servo/components/script/dom/globalscope.rs
@@ -38,7 +38,7 @@ use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort};
 use script_thread::{MainThreadScriptChan, RunnableWrapper, ScriptThread};
 use script_traits::{MsDuration, ScriptMsg as ConstellationMsg, TimerEvent};
 use script_traits::{TimerEventId, TimerSchedulerMsg, TimerSource};
-use servo_url::ServoUrl;
+use servo_url::{MutableOrigin, ServoUrl};
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
@@ -92,6 +92,9 @@ pub struct GlobalScope {
     resource_threads: ResourceThreads,
 
     timers: OneshotTimers,
+
+    /// The origin of the globalscope
+    origin: MutableOrigin,
 }
 
 impl GlobalScope {
@@ -103,7 +106,8 @@ impl GlobalScope {
             constellation_chan: IpcSender<ConstellationMsg>,
             scheduler_chan: IpcSender<TimerSchedulerMsg>,
             resource_threads: ResourceThreads,
-            timer_event_chan: IpcSender<TimerEvent>)
+            timer_event_chan: IpcSender<TimerEvent>,
+            origin: MutableOrigin)
             -> Self {
         GlobalScope {
             eventtarget: EventTarget::new_inherited(),
@@ -120,6 +124,7 @@ impl GlobalScope {
             in_error_reporting_mode: Default::default(),
             resource_threads: resource_threads,
             timers: OneshotTimers::new(timer_event_chan, scheduler_chan),
+            origin: origin,
         }
     }
 
@@ -238,6 +243,11 @@ impl GlobalScope {
         self.pipeline_id
     }
 
+    /// Get the origin for this global scope
+    pub fn origin(&self) -> &MutableOrigin {
+        &self.origin
+    }
+
     /// Get the [base url](https://html.spec.whatwg.org/multipage/#api-base-url)
     /// for this global scope.
     pub fn api_base_url(&self) -> ServoUrl {
diff --git a/servo/components/script/dom/location.rs b/servo/components/script/dom/location.rs
index 399e37487220..cac2322be825 100644
--- a/servo/components/script/dom/location.rs
+++ b/servo/components/script/dom/location.rs
@@ -13,7 +13,7 @@ use dom::globalscope::GlobalScope;
 use dom::urlhelper::UrlHelper;
 use dom::window::Window;
 use dom_struct::dom_struct;
-use servo_url::ServoUrl;
+use servo_url::{MutableOrigin, ServoUrl};
 
 #[dom_struct]
 pub struct Location {
@@ -60,6 +60,11 @@ impl Location {
     pub fn reload_without_origin_check(&self) {
         self.window.load_url(self.get_url(), true, true, None);
     }
+
+    #[allow(dead_code)]
+    pub fn origin(&self) -> &MutableOrigin {
+        self.window.origin()
+    }
 }
 
 impl LocationMethods for Location {
diff --git a/servo/components/script/dom/mod.rs b/servo/components/script/dom/mod.rs
index 83efe407f3e9..70d1f30bd4ab 100644
--- a/servo/components/script/dom/mod.rs
+++ b/servo/components/script/dom/mod.rs
@@ -272,7 +272,6 @@ pub mod dompoint;
 pub mod dompointreadonly;
 pub mod domquad;
 pub mod domrect;
-pub mod domrectlist;
 pub mod domrectreadonly;
 pub mod domstringmap;
 pub mod domtokenlist;
diff --git a/servo/components/script/dom/webidls/DOMRectList.webidl b/servo/components/script/dom/webidls/DOMRectList.webidl
deleted file mode 100644
index dfb33639c93a..000000000000
--- a/servo/components/script/dom/webidls/DOMRectList.webidl
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// http://dev.w3.org/fxtf/geometry/#DOMRectList
-[NoInterfaceObject, Exposed=(Window,Worker)]
-//[ArrayClass]
-interface DOMRectList {
-  readonly attribute unsigned long length;
-  getter DOMRect? item(unsigned long index);
-};
diff --git a/servo/components/script/dom/webidls/Element.webidl b/servo/components/script/dom/webidls/Element.webidl
index 1662dda36d64..c099b2a04ae7 100644
--- a/servo/components/script/dom/webidls/Element.webidl
+++ b/servo/components/script/dom/webidls/Element.webidl
@@ -81,7 +81,8 @@ interface Element : Node {
 
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-element-interface
 partial interface Element {
-  DOMRectList getClientRects();
+  sequence<DOMRect> getClientRects();
+  [NewObject]
   DOMRect getBoundingClientRect();
 
   void scroll(optional ScrollToOptions options);
diff --git a/servo/components/script/dom/webidls/Range.webidl b/servo/components/script/dom/webidls/Range.webidl
index c40f2ecb161a..1daf2d8182f4 100644
--- a/servo/components/script/dom/webidls/Range.webidl
+++ b/servo/components/script/dom/webidls/Range.webidl
@@ -82,6 +82,7 @@ partial interface Range {
 
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-range-interface
 partial interface Range {
-  // DOMRectList? getClientRects();
+  // sequence<DOMRect> getClientRects();
+  // [NewObject]
   // DOMRect getBoundingClientRect();
 };
diff --git a/servo/components/script/dom/window.rs b/servo/components/script/dom/window.rs
index df7fe995c1fd..eaba1ded928e 100644
--- a/servo/components/script/dom/window.rs
+++ b/servo/components/script/dom/window.rs
@@ -85,7 +85,7 @@ use servo_atoms::Atom;
 use servo_config::opts;
 use servo_config::prefs::PREFS;
 use servo_geometry::{f32_rect_to_au_rect, max_rect};
-use servo_url::{Host, ImmutableOrigin, ServoUrl};
+use servo_url::{Host, MutableOrigin, ImmutableOrigin, ServoUrl};
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use std::cell::Cell;
@@ -286,6 +286,10 @@ impl Window {
         }
     }
 
+    pub fn origin(&self) -> &MutableOrigin {
+        self.globalscope.origin()
+    }
+
     pub fn get_cx(&self) -> *mut JSContext {
         self.js_runtime.borrow().as_ref().unwrap().cx()
     }
@@ -1749,6 +1753,7 @@ impl Window {
                id: PipelineId,
                parent_info: Option<(PipelineId, FrameType)>,
                window_size: Option<WindowSizeData>,
+               origin: MutableOrigin,
                webvr_thread: Option<IpcSender<WebVRMsg>>)
                -> Root<Window> {
         let layout_rpc: Box<LayoutRPC + Send> = {
@@ -1771,7 +1776,8 @@ impl Window {
                     constellation_chan,
                     scheduler_chan,
                     resource_threads,
-                    timer_event_chan),
+                    timer_event_chan,
+                    origin),
             script_chan: script_chan,
             dom_manipulation_task_source: dom_task_source,
             user_interaction_task_source: user_task_source,
diff --git a/servo/components/script/dom/workerglobalscope.rs b/servo/components/script/dom/workerglobalscope.rs
index 948d72c251b8..fd1f03db1e34 100644
--- a/servo/components/script/dom/workerglobalscope.rs
+++ b/servo/components/script/dom/workerglobalscope.rs
@@ -37,7 +37,7 @@ use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort};
 use script_thread::RunnableWrapper;
 use script_traits::{TimerEvent, TimerEventId};
 use script_traits::WorkerGlobalScopeInit;
-use servo_url::ServoUrl;
+use servo_url::{MutableOrigin, ServoUrl};
 use std::default::Default;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -59,6 +59,7 @@ pub fn prepare_workerscope_init(global: &GlobalScope,
             scheduler_chan: global.scheduler_chan().clone(),
             worker_id: global.get_next_worker_id(),
             pipeline_id: global.pipeline_id(),
+            origin: global.origin().immutable().clone(),
         };
 
     init
@@ -109,7 +110,8 @@ impl WorkerGlobalScope {
                     init.constellation_chan,
                     init.scheduler_chan,
                     init.resource_threads,
-                    timer_event_chan),
+                    timer_event_chan,
+                    MutableOrigin::new(init.origin)),
             worker_id: init.worker_id,
             worker_url: worker_url,
             closing: closing,
diff --git a/servo/components/script/script_thread.rs b/servo/components/script/script_thread.rs
index 92537fa7abe5..96167cec236c 100644
--- a/servo/components/script/script_thread.rs
+++ b/servo/components/script/script_thread.rs
@@ -1784,6 +1784,7 @@ impl ScriptThread {
                                  incomplete.pipeline_id,
                                  incomplete.parent_info,
                                  incomplete.window_size,
+                                 incomplete.origin.clone(),
                                  self.webvr_thread.clone());
 
         // Initialize the browsing context for the window.
diff --git a/servo/components/script_layout_interface/Cargo.toml b/servo/components/script_layout_interface/Cargo.toml
index 9db6a37eea02..2df1a3f3205e 100644
--- a/servo/components/script_layout_interface/Cargo.toml
+++ b/servo/components/script_layout_interface/Cargo.toml
@@ -13,7 +13,7 @@ path = "lib.rs"
 app_units = "0.4"
 atomic_refcell = "0.1"
 canvas_traits = {path = "../canvas_traits"}
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
diff --git a/servo/components/script_traits/lib.rs b/servo/components/script_traits/lib.rs
index da5191f73bdc..ed0e09468acc 100644
--- a/servo/components/script_traits/lib.rs
+++ b/servo/components/script_traits/lib.rs
@@ -777,6 +777,8 @@ pub struct WorkerGlobalScopeInit {
     pub worker_id: WorkerId,
     /// The pipeline id
     pub pipeline_id: PipelineId,
+    /// The origin
+    pub origin: ImmutableOrigin,
 }
 
 /// Common entities representing a network load origin
diff --git a/servo/components/selectors/Cargo.toml b/servo/components/selectors/Cargo.toml
index 4410ea922a8c..9e5e9df6f35a 100644
--- a/servo/components/selectors/Cargo.toml
+++ b/servo/components/selectors/Cargo.toml
@@ -18,7 +18,7 @@ path = "lib.rs"
 [dependencies]
 bitflags = "0.7"
 matches = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 fnv = "1.0"
 precomputed-hash = "0.1"
 smallvec = "0.3"
diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
index 06649f36eeb7..54f476b0e737 100644
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@@ -29,7 +29,7 @@ bitflags = "0.7"
 bit-vec = "0.4.3"
 byteorder = "1.0"
 cfg-if = "0.1.0"
-cssparser = "0.12.1"
+cssparser = "0.13.1"
 encoding = {version = "0.2", optional = true}
 euclid = "0.11"
 fnv = "1.0"
diff --git a/servo/components/style/build_gecko.rs b/servo/components/style/build_gecko.rs
index 92d512ee75c9..00aac6d8526f 100644
--- a/servo/components/style/build_gecko.rs
+++ b/servo/components/style/build_gecko.rs
@@ -624,6 +624,7 @@ mod bindings {
             .whitelisted_function("Gecko_.*");
         let structs_types = [
             "mozilla::css::URLValue",
+            "mozilla::Side",
             "RawGeckoAnimationPropertySegment",
             "RawGeckoComputedTiming",
             "RawGeckoDocument",
diff --git a/servo/components/style/error_reporting.rs b/servo/components/style/error_reporting.rs
index fb41a777e31c..a7458ecd7940 100644
--- a/servo/components/style/error_reporting.rs
+++ b/servo/components/style/error_reporting.rs
@@ -24,11 +24,15 @@ pub trait ParseErrorReporter : Sync + Send {
                     line_number_offset: u64);
 }
 
-/// An error reporter that reports the errors to the `info` log channel.
+/// An error reporter that uses [the `log` crate](https://github.com/rust-lang-nursery/log)
+/// at `info` level.
 ///
-/// TODO(emilio): The name of this reporter is a lie, and should be renamed!
-pub struct StdoutErrorReporter;
-impl ParseErrorReporter for StdoutErrorReporter {
+/// This logging is silent by default, and can be enabled with a `RUST_LOG=style=info`
+/// environment variable.
+/// (See [`env_logger`](https://rust-lang-nursery.github.io/log/env_logger/).)
+pub struct RustLogReporter;
+
+impl ParseErrorReporter for RustLogReporter {
     fn report_error(&self,
                     input: &mut Parser,
                     position: SourcePosition,
@@ -42,3 +46,17 @@ impl ParseErrorReporter for StdoutErrorReporter {
         }
     }
 }
+
+/// Error reporter which silently forgets errors
+pub struct NullReporter;
+
+impl ParseErrorReporter for NullReporter {
+    fn report_error(&self,
+            _: &mut Parser,
+            _: SourcePosition,
+            _: &str,
+            _: &UrlExtraData,
+            _: u64) {
+        // do nothing
+    }
+}
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index e87336669d5c..95b7ab82ac5d 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -235,8 +235,12 @@ impl ToCss for NonTSPseudoClass {
                     $(NonTSPseudoClass::$s_name(ref s) => {
                         write!(dest, ":{}(", $s_css)?;
                         {
+                            // FIXME(emilio): Avoid the extra allocation!
                             let mut css = CssStringWriter::new(dest);
-                            css.write_str(&String::from_utf16(&s).unwrap())?;
+
+                            // Discount the null char in the end from the
+                            // string.
+                            css.write_str(&String::from_utf16(&s[..s.len() - 1]).unwrap())?;
                         }
                         return dest.write_str(")")
                     }, )*
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 8ac1ac48d5d5..6c72aa0b3d58 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -21,7 +21,7 @@ use data::ElementData;
 use dom::{self, AnimationRules, DescendantsBit, LayoutIterator, NodeInfo, TElement, TNode, UnsafeNode};
 use dom::{OpaqueNode, PresentationalHintsSynthetizer};
 use element_state::ElementState;
-use error_reporting::StdoutErrorReporter;
+use error_reporting::RustLogReporter;
 use font_metrics::{FontMetricsProvider, FontMetricsQueryResult};
 use gecko::global_style_data::GLOBAL_STYLE_DATA;
 use gecko::selector_parser::{SelectorImpl, NonTSPseudoClass, PseudoElement};
@@ -324,7 +324,7 @@ impl<'le> GeckoElement<'le> {
     /// Parse the style attribute of an element.
     pub fn parse_style_attribute(value: &str,
                                  url_data: &UrlExtraData) -> PropertyDeclarationBlock {
-        parse_style_attribute(value, url_data, &StdoutErrorReporter)
+        parse_style_attribute(value, url_data, &RustLogReporter)
     }
 
     fn flags(&self) -> u32 {
@@ -683,7 +683,7 @@ impl<'le> TElement for GeckoElement<'le> {
             *HasArcFFI::arc_as_borrowed(v)
         );
 
-        let parent_element = if pseudo.is_some() {
+        let parent_element = if pseudo.is_none() {
             self.parent_element()
         } else {
             Some(*self)
diff --git a/servo/components/style/gecko_bindings/bindings.rs b/servo/components/style/gecko_bindings/bindings.rs
index e855aa2819e0..c663df920120 100644
--- a/servo/components/style/gecko_bindings/bindings.rs
+++ b/servo/components/style/gecko_bindings/bindings.rs
@@ -4,6 +4,7 @@ pub use nsstring::{nsACString, nsAString, nsString};
 type nsACString_internal = nsACString;
 type nsAString_internal = nsAString;
 use gecko_bindings::structs::mozilla::css::URLValue;
+use gecko_bindings::structs::mozilla::Side;
 use gecko_bindings::structs::RawGeckoAnimationPropertySegment;
 use gecko_bindings::structs::RawGeckoComputedTiming;
 use gecko_bindings::structs::RawGeckoDocument;
@@ -719,6 +720,21 @@ extern "C" {
                                               *const ::std::os::raw::c_char,
                                           aLength: u32) -> bool;
 }
+extern "C" {
+    pub fn Gecko_EnsureMozBorderColors(aBorder: *mut nsStyleBorder);
+}
+extern "C" {
+    pub fn Gecko_ClearMozBorderColors(aBorder: *mut nsStyleBorder,
+                                      aSide: Side);
+}
+extern "C" {
+    pub fn Gecko_AppendMozBorderColors(aBorder: *mut nsStyleBorder,
+                                       aSide: Side, aColor: nscolor);
+}
+extern "C" {
+    pub fn Gecko_CopyMozBorderColors(aDest: *mut nsStyleBorder,
+                                     aSrc: *const nsStyleBorder, aSide: Side);
+}
 extern "C" {
     pub fn Gecko_FontFamilyList_Clear(aList: *mut FontFamilyList);
 }
diff --git a/servo/components/style/gecko_bindings/structs_debug.rs b/servo/components/style/gecko_bindings/structs_debug.rs
index 56899329401f..5f3b90654b3c 100644
--- a/servo/components/style/gecko_bindings/structs_debug.rs
+++ b/servo/components/style/gecko_bindings/structs_debug.rs
@@ -4010,26 +4010,27 @@ pub mod root {
             mozHandlerBlocked = 59,
             mozHandlerCrashed = 60,
             mozMathIncrementScriptLevel = 61,
-            required = 62,
-            optional = 63,
-            valid = 64,
-            invalid = 65,
-            inRange = 66,
-            outOfRange = 67,
-            defaultPseudo = 68,
-            placeholderShown = 69,
-            mozReadOnly = 70,
-            mozReadWrite = 71,
-            mozSubmitInvalid = 72,
-            mozUIInvalid = 73,
-            mozUIValid = 74,
-            mozMeterOptimum = 75,
-            mozMeterSubOptimum = 76,
-            mozMeterSubSubOptimum = 77,
-            mozPlaceholder = 78,
-            Count = 79,
-            NotPseudo = 80,
-            MAX = 81,
+            mozAutofill = 62,
+            required = 63,
+            optional = 64,
+            valid = 65,
+            invalid = 66,
+            inRange = 67,
+            outOfRange = 68,
+            defaultPseudo = 69,
+            placeholderShown = 70,
+            mozReadOnly = 71,
+            mozReadWrite = 72,
+            mozSubmitInvalid = 73,
+            mozUIInvalid = 74,
+            mozUIValid = 75,
+            mozMeterOptimum = 76,
+            mozMeterSubOptimum = 77,
+            mozMeterSubSubOptimum = 78,
+            mozPlaceholder = 79,
+            Count = 80,
+            NotPseudo = 81,
+            MAX = 82,
         }
         pub const SERVO_PREF_ENABLED_align_content: bool = false;
         pub const SERVO_PREF_ENABLED_align_items: bool = false;
@@ -4660,6 +4661,24 @@ pub mod root {
             pub type IntRect = [u32; 4usize];
             pub type Matrix4x4 = [u32; 16usize];
             #[repr(C)]
+            #[derive(Debug, Copy)]
+            pub struct FontVariation {
+                pub _bindgen_opaque_blob: [u32; 2usize],
+            }
+            #[test]
+            fn bindgen_test_layout_FontVariation() {
+                assert_eq!(::std::mem::size_of::<FontVariation>() , 8usize ,
+                           concat ! (
+                           "Size of: " , stringify ! ( FontVariation ) ));
+                assert_eq! (::std::mem::align_of::<FontVariation>() , 4usize ,
+                            concat ! (
+                            "Alignment of " , stringify ! ( FontVariation )
+                            ));
+            }
+            impl Clone for FontVariation {
+                fn clone(&self) -> Self { *self }
+            }
+            #[repr(C)]
             #[derive(Debug, Copy, Clone)]
             pub struct SourceSurface([u8; 0]);
             #[repr(C)]
@@ -9319,6 +9338,24 @@ pub mod root {
     }
     pub type FILE = root::_IO_FILE;
     pub type va_list = root::__builtin_va_list;
+    #[repr(C)]
+    #[derive(Debug, Copy)]
+    pub struct InfallibleAllocPolicy {
+        pub _address: u8,
+    }
+    #[test]
+    fn bindgen_test_layout_InfallibleAllocPolicy() {
+        assert_eq!(::std::mem::size_of::<InfallibleAllocPolicy>() , 1usize ,
+                   concat ! (
+                   "Size of: " , stringify ! ( InfallibleAllocPolicy ) ));
+        assert_eq! (::std::mem::align_of::<InfallibleAllocPolicy>() , 1usize ,
+                    concat ! (
+                    "Alignment of " , stringify ! ( InfallibleAllocPolicy )
+                    ));
+    }
+    impl Clone for InfallibleAllocPolicy {
+        fn clone(&self) -> Self { *self }
+    }
     /**
  * MozRefCountType is Mozilla's reference count type.
  *
@@ -9611,6 +9648,7 @@ pub mod root {
             = 2152924160,
         NS_ERROR_DOM_INVALID_ACCESS_XHR_TIMEOUT_AND_RESPONSETYPE_UNSUPPORTED_FOR_SYNC
             = 2152924161,
+        NS_ERROR_DOM_JS_DECODING_ERROR = 2152924162,
         NS_SUCCESS_DOM_NO_OPERATION = 5439489,
         NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW = 5439490,
         NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE = 5439491,
@@ -12548,7 +12586,7 @@ pub mod root {
         pub mStyleAttrStyleSheet: root::RefPtr<root::nsHTMLCSSStyleSheet>,
         pub mImageTracker: root::RefPtr<root::mozilla::dom::ImageTracker>,
         pub mActivityObservers: root::nsAutoPtr<()>,
-        pub mLinksToUpdate: [u64; 6usize],
+        pub mLinksToUpdate: [u64; 3usize],
         pub mAnimationController: root::RefPtr<root::nsSMILAnimationController>,
         pub mPropertyTable: root::nsPropertyTable,
         pub mExtraPropertyTables: root::nsTArray<root::nsAutoPtr<root::nsPropertyTable>>,
@@ -12612,7 +12650,7 @@ pub mod root {
         pub mXPathEvaluator: root::RefPtr<root::mozilla::dom::XPathEvaluator>,
         pub mAnonymousContents: root::nsTArray<root::RefPtr<root::mozilla::dom::AnonymousContent>>,
         pub mBlockDOMContentLoaded: u32,
-        pub mDOMMediaQueryLists: root::PRCList,
+        pub mDOMMediaQueryLists: root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>,
         pub mUseCounters: [u64; 2usize],
         pub mChildDocumentUseCounters: [u64; 2usize],
         pub mNotifiedPageForUseCounter: [u64; 2usize],
@@ -12896,9 +12934,10 @@ pub mod root {
     #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct nsIDocument_FrameRequest([u8; 0]);
+    pub const nsIDocument_kSegmentSize: usize = 128;
     #[test]
     fn bindgen_test_layout_nsIDocument() {
-        assert_eq!(::std::mem::size_of::<nsIDocument>() , 912usize , concat !
+        assert_eq!(::std::mem::size_of::<nsIDocument>() , 896usize , concat !
                    ( "Size of: " , stringify ! ( nsIDocument ) ));
         assert_eq! (::std::mem::align_of::<nsIDocument>() , 8usize , concat !
                     ( "Alignment of " , stringify ! ( nsIDocument ) ));
@@ -16987,33 +17026,6 @@ pub mod root {
         fn clone(&self) -> Self { *self }
     }
     #[repr(C)]
-    #[derive(Debug, Copy)]
-    pub struct PRCListStr {
-        pub next: *mut root::PRCList,
-        pub prev: *mut root::PRCList,
-    }
-    #[test]
-    fn bindgen_test_layout_PRCListStr() {
-        assert_eq!(::std::mem::size_of::<PRCListStr>() , 16usize , concat ! (
-                   "Size of: " , stringify ! ( PRCListStr ) ));
-        assert_eq! (::std::mem::align_of::<PRCListStr>() , 8usize , concat ! (
-                    "Alignment of " , stringify ! ( PRCListStr ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const PRCListStr ) ) . next as * const _ as
-                    usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! ( PRCListStr ) , "::"
-                    , stringify ! ( next ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const PRCListStr ) ) . prev as * const _ as
-                    usize } , 8usize , concat ! (
-                    "Alignment of field: " , stringify ! ( PRCListStr ) , "::"
-                    , stringify ! ( prev ) ));
-    }
-    impl Clone for PRCListStr {
-        fn clone(&self) -> Self { *self }
-    }
-    pub type PRCList = root::PRCListStr;
-    #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct gfxUserFontSet([u8; 0]);
     #[repr(C)]
@@ -17076,6 +17088,21 @@ pub mod root {
         CORS_ANONYMOUS = 2,
         CORS_USE_CREDENTIALS = 3,
     }
+    pub const imgIRequest_CATEGORY_FRAME_INIT: root::imgIRequest__bindgen_ty_3
+              =
+        imgIRequest__bindgen_ty_3::CATEGORY_FRAME_INIT;
+    pub const imgIRequest_CATEGORY_SIZE_QUERY: root::imgIRequest__bindgen_ty_3
+              =
+        imgIRequest__bindgen_ty_3::CATEGORY_SIZE_QUERY;
+    pub const imgIRequest_CATEGORY_DISPLAY: root::imgIRequest__bindgen_ty_3 =
+        imgIRequest__bindgen_ty_3::CATEGORY_DISPLAY;
+    #[repr(u32)]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+    pub enum imgIRequest__bindgen_ty_3 {
+        CATEGORY_FRAME_INIT = 1,
+        CATEGORY_SIZE_QUERY = 2,
+        CATEGORY_DISPLAY = 4,
+    }
     #[test]
     fn bindgen_test_layout_imgIRequest() {
         assert_eq!(::std::mem::size_of::<imgIRequest>() , 8usize , concat ! (
@@ -17725,33 +17752,7 @@ pub mod root {
                     gfxFontFeatureValueSet ) , "::" , stringify ! (
                     mFontFeatureValues ) ));
     }
-    #[repr(C)]
-    #[derive(Debug, Copy)]
-    pub struct gfxFontVariation {
-        pub mTag: u32,
-        pub mValue: f32,
-    }
-    #[test]
-    fn bindgen_test_layout_gfxFontVariation() {
-        assert_eq!(::std::mem::size_of::<gfxFontVariation>() , 8usize , concat
-                   ! ( "Size of: " , stringify ! ( gfxFontVariation ) ));
-        assert_eq! (::std::mem::align_of::<gfxFontVariation>() , 4usize ,
-                    concat ! (
-                    "Alignment of " , stringify ! ( gfxFontVariation ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const gfxFontVariation ) ) . mTag as *
-                    const _ as usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! ( gfxFontVariation )
-                    , "::" , stringify ! ( mTag ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const gfxFontVariation ) ) . mValue as *
-                    const _ as usize } , 4usize , concat ! (
-                    "Alignment of field: " , stringify ! ( gfxFontVariation )
-                    , "::" , stringify ! ( mValue ) ));
-    }
-    impl Clone for gfxFontVariation {
-        fn clone(&self) -> Self { *self }
-    }
+    pub type gfxFontVariation = root::mozilla::gfx::FontVariation;
     #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct gfxFontStyle([u8; 0]);
@@ -17786,7 +17787,7 @@ pub mod root {
         pub alternateValues: root::nsTArray<root::gfxAlternateValue>,
         pub featureValueLookup: root::RefPtr<root::gfxFontFeatureValueSet>,
         pub fontFeatureSettings: root::nsTArray<root::gfxFontFeature>,
-        pub fontVariationSettings: root::nsTArray<root::gfxFontVariation>,
+        pub fontVariationSettings: root::nsTArray<root::mozilla::gfx::FontVariation>,
         pub languageOverride: u32,
     }
     #[test]
@@ -23514,6 +23515,7 @@ pub mod root {
         pub mCORSMode: i32,
         pub mReferrerPolicy: root::imgRequest_ReferrerPolicy,
         pub mImageErrorCode: root::nsresult,
+        pub mBoostCategoriesRequested: u32,
         pub mMutex: root::mozilla::Mutex,
         pub mProgressTracker: root::RefPtr<root::mozilla::image::ProgressTracker>,
         pub mImage: root::RefPtr<root::mozilla::image::Image>,
@@ -28166,6 +28168,19 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_42() {
+        assert_eq!(::std::mem::size_of::<root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>>()
+                   , 24usize , concat ! (
+                   "Size of template specialization: " , stringify ! (
+                   root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>
+                   ) ));
+        assert_eq!(::std::mem::align_of::<root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>>()
+                   , 8usize , concat ! (
+                   "Alignment of template specialization: " , stringify ! (
+                   root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>
+                   ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_43() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::Element>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28176,7 +28191,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::Element> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_43() {
+    fn __bindgen_test_layout_template_44() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::mozilla::dom::Element>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28189,7 +28204,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_44() {
+    fn __bindgen_test_layout_template_45() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIObserver>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28200,7 +28215,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIObserver> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_45() {
+    fn __bindgen_test_layout_template_46() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::nsCOMPtr<root::nsIObserver>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28211,7 +28226,7 @@ pub mod root {
                    root::nsTArray<root::nsCOMPtr<root::nsIObserver>> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_46() {
+    fn __bindgen_test_layout_template_47() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsIDocument>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28222,7 +28237,7 @@ pub mod root {
                    root::already_AddRefed<root::nsIDocument> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_47() {
+    fn __bindgen_test_layout_template_48() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsContentList>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28233,7 +28248,7 @@ pub mod root {
                    root::already_AddRefed<root::nsContentList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_48() {
+    fn __bindgen_test_layout_template_49() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsINode>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28244,7 +28259,18 @@ pub mod root {
                    root::already_AddRefed<root::nsINode> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_49() {
+    fn __bindgen_test_layout_template_50() {
+        assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::mozilla::dom::Link>>()
+                   , 8usize , concat ! (
+                   "Size of template specialization: " , stringify ! (
+                   root::nsCOMPtr<root::mozilla::dom::Link> ) ));
+        assert_eq!(::std::mem::align_of::<root::nsCOMPtr<root::mozilla::dom::Link>>()
+                   , 8usize , concat ! (
+                   "Alignment of template specialization: " , stringify ! (
+                   root::nsCOMPtr<root::mozilla::dom::Link> ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_51() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIWeakReference>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28255,7 +28281,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIWeakReference> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_50() {
+    fn __bindgen_test_layout_template_52() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28264,7 +28290,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_51() {
+    fn __bindgen_test_layout_template_53() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::nsRect>>() ,
                    8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28275,7 +28301,7 @@ pub mod root {
                    root::nsTArray<root::nsRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_52() {
+    fn __bindgen_test_layout_template_54() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsBidi>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28286,7 +28312,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsBidi> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_53() {
+    fn __bindgen_test_layout_template_55() {
         assert_eq!(::std::mem::size_of::<[u64; 29usize]>() , 232usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -28297,7 +28323,7 @@ pub mod root {
                    [u64; 29usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_54() {
+    fn __bindgen_test_layout_template_56() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28308,7 +28334,7 @@ pub mod root {
                    root::nsTArray<*mut root::nsIContent> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_55() {
+    fn __bindgen_test_layout_template_57() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::dom::CSSValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28319,7 +28345,7 @@ pub mod root {
                    root::already_AddRefed<root::mozilla::dom::CSSValue> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_56() {
+    fn __bindgen_test_layout_template_58() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::mozilla::dom::TimeoutManager>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28332,7 +28358,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_57() {
+    fn __bindgen_test_layout_template_59() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsISupports>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28343,7 +28369,7 @@ pub mod root {
                    root::already_AddRefed<root::nsISupports> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_58() {
+    fn __bindgen_test_layout_template_60() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIRunnable>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28354,7 +28380,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIRunnable> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_59() {
+    fn __bindgen_test_layout_template_61() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsIContent>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28365,7 +28391,7 @@ pub mod root {
                    root::already_AddRefed<root::nsIContent> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_60() {
+    fn __bindgen_test_layout_template_62() {
         assert_eq!(::std::mem::size_of::<[u64; 6usize]>() , 48usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28376,7 +28402,7 @@ pub mod root {
                    [u64; 6usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_61() {
+    fn __bindgen_test_layout_template_63() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::nsINode>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28387,28 +28413,6 @@ pub mod root {
                    root::mozilla::OwningNonNull<root::nsINode> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_62() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_63() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_64() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
@@ -28421,14 +28425,14 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_65() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
                    (
                    "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
+                   [u32; 2usize] ) ));
     }
     #[test]
     fn __bindgen_test_layout_template_66() {
@@ -28443,6 +28447,17 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_67() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_68() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28453,26 +28468,15 @@ pub mod root {
                    [u32; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_68() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_69() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
                    (
                    "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
+                   [u32; 2usize] ) ));
     }
     #[test]
     fn __bindgen_test_layout_template_70() {
@@ -28487,6 +28491,28 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_71() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_72() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_73() {
         assert_eq!(::std::mem::size_of::<u32>() , 4usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u32 )
                    ));
@@ -28495,28 +28521,6 @@ pub mod root {
                    u32 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_72() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_73() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_74() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
@@ -28529,6 +28533,28 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_75() {
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_76() {
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_77() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<f64>>() , 8usize ,
                    concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28539,7 +28565,7 @@ pub mod root {
                    root::nsTArray<f64> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_76() {
+    fn __bindgen_test_layout_template_78() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMIntersectionObserverEntry>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28552,7 +28578,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_77() {
+    fn __bindgen_test_layout_template_79() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::mozilla::dom::DOMIntersectionObserverEntry>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28565,7 +28591,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_78() {
+    fn __bindgen_test_layout_template_80() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::ProfilerBacktrace,
                                                root::ProfilerBacktraceDestructor>>()
                    , 8usize , concat ! (
@@ -28582,7 +28608,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_79() {
+    fn __bindgen_test_layout_template_81() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FontFamilyName>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28593,7 +28619,7 @@ pub mod root {
                    root::nsTArray<root::mozilla::FontFamilyName> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_80() {
+    fn __bindgen_test_layout_template_82() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<::std::os::raw::c_uint>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28604,7 +28630,7 @@ pub mod root {
                    root::nsTArray<::std::os::raw::c_uint> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_81() {
+    fn __bindgen_test_layout_template_83() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FramePropertyTable_PropertyValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28617,7 +28643,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_82() {
+    fn __bindgen_test_layout_template_84() {
         assert_eq!(::std::mem::size_of::<root::nsPtrHashKey<root::nsIFrame>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28628,7 +28654,7 @@ pub mod root {
                    root::nsPtrHashKey<root::nsIFrame> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_83() {
+    fn __bindgen_test_layout_template_85() {
         assert_eq!(::std::mem::size_of::<[u64; 6usize]>() , 48usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28639,7 +28665,7 @@ pub mod root {
                    [u64; 6usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_84() {
+    fn __bindgen_test_layout_template_86() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::mozilla::EffectCompositor_AnimationStyleRuleProcessor>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28652,7 +28678,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_85() {
+    fn __bindgen_test_layout_template_87() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::ProxyBehaviour>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28663,7 +28689,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::ProxyBehaviour> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_86() {
+    fn __bindgen_test_layout_template_88() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::URLExtraData>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28674,7 +28700,7 @@ pub mod root {
                    root::already_AddRefed<root::mozilla::URLExtraData> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_87() {
+    fn __bindgen_test_layout_template_89() {
         assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 24usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28685,7 +28711,7 @@ pub mod root {
                    root::nsMainThreadPtrHolder<root::nsIURI> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_88() {
+    fn __bindgen_test_layout_template_90() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValueList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28696,7 +28722,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsCSSValueList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_89() {
+    fn __bindgen_test_layout_template_91() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValueList,
                                                root::mozilla::DefaultDelete<root::nsCSSValueList>>>()
                    , 8usize , concat ! (
@@ -28713,7 +28739,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_90() {
+    fn __bindgen_test_layout_template_92() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValuePairList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28726,7 +28752,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_91() {
+    fn __bindgen_test_layout_template_93() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValuePairList,
                                                root::mozilla::DefaultDelete<root::nsCSSValuePairList>>>()
                    , 8usize , concat ! (
@@ -28743,7 +28769,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_92() {
+    fn __bindgen_test_layout_template_94() {
         assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28754,7 +28780,7 @@ pub mod root {
                    [u64; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_93() {
+    fn __bindgen_test_layout_template_95() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28763,7 +28789,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_94() {
+    fn __bindgen_test_layout_template_96() {
         assert_eq!(::std::mem::size_of::<[u32; 3usize]>() , 12usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28774,7 +28800,7 @@ pub mod root {
                    [u32; 3usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_95() {
+    fn __bindgen_test_layout_template_97() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsStyleImageRequest>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28785,7 +28811,7 @@ pub mod root {
                    root::already_AddRefed<root::nsStyleImageRequest> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_96() {
+    fn __bindgen_test_layout_template_98() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsStyleSides>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28796,7 +28822,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsStyleSides> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_97() {
+    fn __bindgen_test_layout_template_99() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsStyleSides,
                                                root::mozilla::DefaultDelete<root::nsStyleSides>>>()
                    , 8usize , concat ! (
@@ -28813,7 +28839,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_98() {
+    fn __bindgen_test_layout_template_100() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::CachedBorderImageData>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28826,7 +28852,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_99() {
+    fn __bindgen_test_layout_template_101() {
         assert_eq!(::std::mem::size_of::<root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr>>()
                    , 32usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28837,7 +28863,7 @@ pub mod root {
                    root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_100() {
+    fn __bindgen_test_layout_template_102() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::std::pair<::nsstring::nsStringRepr,
                                                      ::nsstring::nsStringRepr>>>()
                    , 8usize , concat ! (
@@ -28852,7 +28878,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_101() {
+    fn __bindgen_test_layout_template_103() {
         assert_eq!(::std::mem::size_of::<[u64; 18usize]>() , 144usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -28863,7 +28889,7 @@ pub mod root {
                    [u64; 18usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_102() {
+    fn __bindgen_test_layout_template_104() {
         assert_eq!(::std::mem::size_of::<root::mozilla::BaseTimeDuration<root::mozilla::StickyTimeDurationValueCalculator>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28876,7 +28902,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_103() {
+    fn __bindgen_test_layout_template_105() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::DisplayItemClip_RoundedRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28889,7 +28915,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_104() {
+    fn __bindgen_test_layout_template_106() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28900,7 +28926,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::DOMRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_105() {
+    fn __bindgen_test_layout_template_107() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28909,7 +28935,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_106() {
+    fn __bindgen_test_layout_template_108() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28920,7 +28946,7 @@ pub mod root {
                    root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_107() {
+    fn __bindgen_test_layout_template_109() {
         assert_eq!(::std::mem::size_of::<root::nsAutoPtr<root::nsMediaQuery>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
diff --git a/servo/components/style/gecko_bindings/structs_release.rs b/servo/components/style/gecko_bindings/structs_release.rs
index f463825a2d48..9b3be9962bb5 100644
--- a/servo/components/style/gecko_bindings/structs_release.rs
+++ b/servo/components/style/gecko_bindings/structs_release.rs
@@ -3962,26 +3962,27 @@ pub mod root {
             mozHandlerBlocked = 59,
             mozHandlerCrashed = 60,
             mozMathIncrementScriptLevel = 61,
-            required = 62,
-            optional = 63,
-            valid = 64,
-            invalid = 65,
-            inRange = 66,
-            outOfRange = 67,
-            defaultPseudo = 68,
-            placeholderShown = 69,
-            mozReadOnly = 70,
-            mozReadWrite = 71,
-            mozSubmitInvalid = 72,
-            mozUIInvalid = 73,
-            mozUIValid = 74,
-            mozMeterOptimum = 75,
-            mozMeterSubOptimum = 76,
-            mozMeterSubSubOptimum = 77,
-            mozPlaceholder = 78,
-            Count = 79,
-            NotPseudo = 80,
-            MAX = 81,
+            mozAutofill = 62,
+            required = 63,
+            optional = 64,
+            valid = 65,
+            invalid = 66,
+            inRange = 67,
+            outOfRange = 68,
+            defaultPseudo = 69,
+            placeholderShown = 70,
+            mozReadOnly = 71,
+            mozReadWrite = 72,
+            mozSubmitInvalid = 73,
+            mozUIInvalid = 74,
+            mozUIValid = 75,
+            mozMeterOptimum = 76,
+            mozMeterSubOptimum = 77,
+            mozMeterSubSubOptimum = 78,
+            mozPlaceholder = 79,
+            Count = 80,
+            NotPseudo = 81,
+            MAX = 82,
         }
         pub const SERVO_PREF_ENABLED_align_content: bool = false;
         pub const SERVO_PREF_ENABLED_align_items: bool = false;
@@ -4611,6 +4612,24 @@ pub mod root {
             pub type IntRect = [u32; 4usize];
             pub type Matrix4x4 = [u32; 16usize];
             #[repr(C)]
+            #[derive(Debug, Copy)]
+            pub struct FontVariation {
+                pub _bindgen_opaque_blob: [u32; 2usize],
+            }
+            #[test]
+            fn bindgen_test_layout_FontVariation() {
+                assert_eq!(::std::mem::size_of::<FontVariation>() , 8usize ,
+                           concat ! (
+                           "Size of: " , stringify ! ( FontVariation ) ));
+                assert_eq! (::std::mem::align_of::<FontVariation>() , 4usize ,
+                            concat ! (
+                            "Alignment of " , stringify ! ( FontVariation )
+                            ));
+            }
+            impl Clone for FontVariation {
+                fn clone(&self) -> Self { *self }
+            }
+            #[repr(C)]
             #[derive(Debug, Copy, Clone)]
             pub struct SourceSurface([u8; 0]);
             #[repr(C)]
@@ -8922,6 +8941,24 @@ pub mod root {
         }
     }
     pub type va_list = root::__builtin_va_list;
+    #[repr(C)]
+    #[derive(Debug, Copy)]
+    pub struct InfallibleAllocPolicy {
+        pub _address: u8,
+    }
+    #[test]
+    fn bindgen_test_layout_InfallibleAllocPolicy() {
+        assert_eq!(::std::mem::size_of::<InfallibleAllocPolicy>() , 1usize ,
+                   concat ! (
+                   "Size of: " , stringify ! ( InfallibleAllocPolicy ) ));
+        assert_eq! (::std::mem::align_of::<InfallibleAllocPolicy>() , 1usize ,
+                    concat ! (
+                    "Alignment of " , stringify ! ( InfallibleAllocPolicy )
+                    ));
+    }
+    impl Clone for InfallibleAllocPolicy {
+        fn clone(&self) -> Self { *self }
+    }
     /**
  * MozRefCountType is Mozilla's reference count type.
  *
@@ -9214,6 +9251,7 @@ pub mod root {
             = 2152924160,
         NS_ERROR_DOM_INVALID_ACCESS_XHR_TIMEOUT_AND_RESPONSETYPE_UNSUPPORTED_FOR_SYNC
             = 2152924161,
+        NS_ERROR_DOM_JS_DECODING_ERROR = 2152924162,
         NS_SUCCESS_DOM_NO_OPERATION = 5439489,
         NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW = 5439490,
         NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE = 5439491,
@@ -12083,7 +12121,7 @@ pub mod root {
         pub mStyleAttrStyleSheet: root::RefPtr<root::nsHTMLCSSStyleSheet>,
         pub mImageTracker: root::RefPtr<root::mozilla::dom::ImageTracker>,
         pub mActivityObservers: root::nsAutoPtr<()>,
-        pub mLinksToUpdate: [u64; 5usize],
+        pub mLinksToUpdate: [u64; 3usize],
         pub mAnimationController: root::RefPtr<root::nsSMILAnimationController>,
         pub mPropertyTable: root::nsPropertyTable,
         pub mExtraPropertyTables: root::nsTArray<root::nsAutoPtr<root::nsPropertyTable>>,
@@ -12142,7 +12180,7 @@ pub mod root {
         pub mXPathEvaluator: root::RefPtr<root::mozilla::dom::XPathEvaluator>,
         pub mAnonymousContents: root::nsTArray<root::RefPtr<root::mozilla::dom::AnonymousContent>>,
         pub mBlockDOMContentLoaded: u32,
-        pub mDOMMediaQueryLists: root::PRCList,
+        pub mDOMMediaQueryLists: root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>,
         pub mUseCounters: [u64; 2usize],
         pub mChildDocumentUseCounters: [u64; 2usize],
         pub mNotifiedPageForUseCounter: [u64; 2usize],
@@ -12426,9 +12464,10 @@ pub mod root {
     #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct nsIDocument_FrameRequest([u8; 0]);
+    pub const nsIDocument_kSegmentSize: usize = 128;
     #[test]
     fn bindgen_test_layout_nsIDocument() {
-        assert_eq!(::std::mem::size_of::<nsIDocument>() , 880usize , concat !
+        assert_eq!(::std::mem::size_of::<nsIDocument>() , 872usize , concat !
                    ( "Size of: " , stringify ! ( nsIDocument ) ));
         assert_eq! (::std::mem::align_of::<nsIDocument>() , 8usize , concat !
                     ( "Alignment of " , stringify ! ( nsIDocument ) ));
@@ -16429,33 +16468,6 @@ pub mod root {
         fn clone(&self) -> Self { *self }
     }
     #[repr(C)]
-    #[derive(Debug, Copy)]
-    pub struct PRCListStr {
-        pub next: *mut root::PRCList,
-        pub prev: *mut root::PRCList,
-    }
-    #[test]
-    fn bindgen_test_layout_PRCListStr() {
-        assert_eq!(::std::mem::size_of::<PRCListStr>() , 16usize , concat ! (
-                   "Size of: " , stringify ! ( PRCListStr ) ));
-        assert_eq! (::std::mem::align_of::<PRCListStr>() , 8usize , concat ! (
-                    "Alignment of " , stringify ! ( PRCListStr ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const PRCListStr ) ) . next as * const _ as
-                    usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! ( PRCListStr ) , "::"
-                    , stringify ! ( next ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const PRCListStr ) ) . prev as * const _ as
-                    usize } , 8usize , concat ! (
-                    "Alignment of field: " , stringify ! ( PRCListStr ) , "::"
-                    , stringify ! ( prev ) ));
-    }
-    impl Clone for PRCListStr {
-        fn clone(&self) -> Self { *self }
-    }
-    pub type PRCList = root::PRCListStr;
-    #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct gfxUserFontSet([u8; 0]);
     #[repr(C)]
@@ -16518,6 +16530,21 @@ pub mod root {
         CORS_ANONYMOUS = 2,
         CORS_USE_CREDENTIALS = 3,
     }
+    pub const imgIRequest_CATEGORY_FRAME_INIT: root::imgIRequest__bindgen_ty_3
+              =
+        imgIRequest__bindgen_ty_3::CATEGORY_FRAME_INIT;
+    pub const imgIRequest_CATEGORY_SIZE_QUERY: root::imgIRequest__bindgen_ty_3
+              =
+        imgIRequest__bindgen_ty_3::CATEGORY_SIZE_QUERY;
+    pub const imgIRequest_CATEGORY_DISPLAY: root::imgIRequest__bindgen_ty_3 =
+        imgIRequest__bindgen_ty_3::CATEGORY_DISPLAY;
+    #[repr(u32)]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+    pub enum imgIRequest__bindgen_ty_3 {
+        CATEGORY_FRAME_INIT = 1,
+        CATEGORY_SIZE_QUERY = 2,
+        CATEGORY_DISPLAY = 4,
+    }
     #[test]
     fn bindgen_test_layout_imgIRequest() {
         assert_eq!(::std::mem::size_of::<imgIRequest>() , 8usize , concat ! (
@@ -17159,33 +17186,7 @@ pub mod root {
                     gfxFontFeatureValueSet ) , "::" , stringify ! (
                     mFontFeatureValues ) ));
     }
-    #[repr(C)]
-    #[derive(Debug, Copy)]
-    pub struct gfxFontVariation {
-        pub mTag: u32,
-        pub mValue: f32,
-    }
-    #[test]
-    fn bindgen_test_layout_gfxFontVariation() {
-        assert_eq!(::std::mem::size_of::<gfxFontVariation>() , 8usize , concat
-                   ! ( "Size of: " , stringify ! ( gfxFontVariation ) ));
-        assert_eq! (::std::mem::align_of::<gfxFontVariation>() , 4usize ,
-                    concat ! (
-                    "Alignment of " , stringify ! ( gfxFontVariation ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const gfxFontVariation ) ) . mTag as *
-                    const _ as usize } , 0usize , concat ! (
-                    "Alignment of field: " , stringify ! ( gfxFontVariation )
-                    , "::" , stringify ! ( mTag ) ));
-        assert_eq! (unsafe {
-                    & ( * ( 0 as * const gfxFontVariation ) ) . mValue as *
-                    const _ as usize } , 4usize , concat ! (
-                    "Alignment of field: " , stringify ! ( gfxFontVariation )
-                    , "::" , stringify ! ( mValue ) ));
-    }
-    impl Clone for gfxFontVariation {
-        fn clone(&self) -> Self { *self }
-    }
+    pub type gfxFontVariation = root::mozilla::gfx::FontVariation;
     #[repr(C)]
     #[derive(Debug, Copy, Clone)]
     pub struct gfxFontStyle([u8; 0]);
@@ -17220,7 +17221,7 @@ pub mod root {
         pub alternateValues: root::nsTArray<root::gfxAlternateValue>,
         pub featureValueLookup: root::RefPtr<root::gfxFontFeatureValueSet>,
         pub fontFeatureSettings: root::nsTArray<root::gfxFontFeature>,
-        pub fontVariationSettings: root::nsTArray<root::gfxFontVariation>,
+        pub fontVariationSettings: root::nsTArray<root::mozilla::gfx::FontVariation>,
         pub languageOverride: u32,
     }
     #[test]
@@ -22855,6 +22856,7 @@ pub mod root {
         pub mCORSMode: i32,
         pub mReferrerPolicy: root::imgRequest_ReferrerPolicy,
         pub mImageErrorCode: root::nsresult,
+        pub mBoostCategoriesRequested: u32,
         pub mMutex: root::mozilla::Mutex,
         pub mProgressTracker: root::RefPtr<root::mozilla::image::ProgressTracker>,
         pub mImage: root::RefPtr<root::mozilla::image::Image>,
@@ -27507,6 +27509,19 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_42() {
+        assert_eq!(::std::mem::size_of::<root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>>()
+                   , 24usize , concat ! (
+                   "Size of template specialization: " , stringify ! (
+                   root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>
+                   ) ));
+        assert_eq!(::std::mem::align_of::<root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>>()
+                   , 8usize , concat ! (
+                   "Alignment of template specialization: " , stringify ! (
+                   root::mozilla::LinkedList<root::mozilla::dom::MediaQueryList>
+                   ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_43() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::Element>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27517,7 +27532,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::Element> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_43() {
+    fn __bindgen_test_layout_template_44() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::mozilla::dom::Element>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27530,7 +27545,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_44() {
+    fn __bindgen_test_layout_template_45() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIObserver>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27541,7 +27556,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIObserver> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_45() {
+    fn __bindgen_test_layout_template_46() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::nsCOMPtr<root::nsIObserver>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27552,7 +27567,7 @@ pub mod root {
                    root::nsTArray<root::nsCOMPtr<root::nsIObserver>> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_46() {
+    fn __bindgen_test_layout_template_47() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsIDocument>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27563,7 +27578,7 @@ pub mod root {
                    root::already_AddRefed<root::nsIDocument> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_47() {
+    fn __bindgen_test_layout_template_48() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsContentList>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27574,7 +27589,7 @@ pub mod root {
                    root::already_AddRefed<root::nsContentList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_48() {
+    fn __bindgen_test_layout_template_49() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsINode>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27585,7 +27600,18 @@ pub mod root {
                    root::already_AddRefed<root::nsINode> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_49() {
+    fn __bindgen_test_layout_template_50() {
+        assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::mozilla::dom::Link>>()
+                   , 8usize , concat ! (
+                   "Size of template specialization: " , stringify ! (
+                   root::nsCOMPtr<root::mozilla::dom::Link> ) ));
+        assert_eq!(::std::mem::align_of::<root::nsCOMPtr<root::mozilla::dom::Link>>()
+                   , 8usize , concat ! (
+                   "Alignment of template specialization: " , stringify ! (
+                   root::nsCOMPtr<root::mozilla::dom::Link> ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_51() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIWeakReference>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27596,7 +27622,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIWeakReference> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_50() {
+    fn __bindgen_test_layout_template_52() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -27605,7 +27631,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_51() {
+    fn __bindgen_test_layout_template_53() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::nsRect>>() ,
                    8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27616,7 +27642,7 @@ pub mod root {
                    root::nsTArray<root::nsRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_52() {
+    fn __bindgen_test_layout_template_54() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsBidi>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27627,7 +27653,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsBidi> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_53() {
+    fn __bindgen_test_layout_template_55() {
         assert_eq!(::std::mem::size_of::<[u64; 28usize]>() , 224usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -27638,7 +27664,7 @@ pub mod root {
                    [u64; 28usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_54() {
+    fn __bindgen_test_layout_template_56() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::nsIContent>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27649,7 +27675,7 @@ pub mod root {
                    root::nsTArray<*mut root::nsIContent> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_55() {
+    fn __bindgen_test_layout_template_57() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::dom::CSSValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27660,7 +27686,7 @@ pub mod root {
                    root::already_AddRefed<root::mozilla::dom::CSSValue> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_56() {
+    fn __bindgen_test_layout_template_58() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::mozilla::dom::TimeoutManager>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27673,7 +27699,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_57() {
+    fn __bindgen_test_layout_template_59() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsISupports>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27684,7 +27710,7 @@ pub mod root {
                    root::already_AddRefed<root::nsISupports> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_58() {
+    fn __bindgen_test_layout_template_60() {
         assert_eq!(::std::mem::size_of::<root::nsCOMPtr<root::nsIRunnable>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27695,7 +27721,7 @@ pub mod root {
                    root::nsCOMPtr<root::nsIRunnable> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_59() {
+    fn __bindgen_test_layout_template_61() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsIContent>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27706,7 +27732,7 @@ pub mod root {
                    root::already_AddRefed<root::nsIContent> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_60() {
+    fn __bindgen_test_layout_template_62() {
         assert_eq!(::std::mem::size_of::<[u64; 5usize]>() , 40usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27717,7 +27743,7 @@ pub mod root {
                    [u64; 5usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_61() {
+    fn __bindgen_test_layout_template_63() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::nsINode>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27728,28 +27754,6 @@ pub mod root {
                    root::mozilla::OwningNonNull<root::nsINode> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_62() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_63() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_64() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
@@ -27762,14 +27766,14 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_65() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
                    (
                    "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
+                   [u32; 2usize] ) ));
     }
     #[test]
     fn __bindgen_test_layout_template_66() {
@@ -27784,6 +27788,17 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_67() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_68() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27794,26 +27809,15 @@ pub mod root {
                    [u32; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_68() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_69() {
-        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
                    (
                    "Alignment of template specialization: " , stringify ! (
-                   [u32; 4usize] ) ));
+                   [u32; 2usize] ) ));
     }
     #[test]
     fn __bindgen_test_layout_template_70() {
@@ -27828,6 +27832,28 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_71() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_72() {
+        assert_eq!(::std::mem::size_of::<[u32; 4usize]>() , 16usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 4usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 4usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_73() {
         assert_eq!(::std::mem::size_of::<u32>() , 4usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u32 )
                    ));
@@ -27836,28 +27862,6 @@ pub mod root {
                    u32 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_72() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
-    fn __bindgen_test_layout_template_73() {
-        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
-                   (
-                   "Size of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
-                   (
-                   "Alignment of template specialization: " , stringify ! (
-                   [u32; 2usize] ) ));
-    }
-    #[test]
     fn __bindgen_test_layout_template_74() {
         assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
                    (
@@ -27870,6 +27874,28 @@ pub mod root {
     }
     #[test]
     fn __bindgen_test_layout_template_75() {
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_76() {
+        assert_eq!(::std::mem::size_of::<[u32; 2usize]>() , 8usize , concat !
+                   (
+                   "Size of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+        assert_eq!(::std::mem::align_of::<[u32; 2usize]>() , 4usize , concat !
+                   (
+                   "Alignment of template specialization: " , stringify ! (
+                   [u32; 2usize] ) ));
+    }
+    #[test]
+    fn __bindgen_test_layout_template_77() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<f64>>() , 8usize ,
                    concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27880,7 +27906,7 @@ pub mod root {
                    root::nsTArray<f64> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_76() {
+    fn __bindgen_test_layout_template_78() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMIntersectionObserverEntry>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27893,7 +27919,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_77() {
+    fn __bindgen_test_layout_template_79() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::mozilla::dom::DOMIntersectionObserverEntry>>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27906,7 +27932,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_78() {
+    fn __bindgen_test_layout_template_80() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::ProfilerBacktrace,
                                                root::ProfilerBacktraceDestructor>>()
                    , 8usize , concat ! (
@@ -27923,7 +27949,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_79() {
+    fn __bindgen_test_layout_template_81() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FontFamilyName>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27934,7 +27960,7 @@ pub mod root {
                    root::nsTArray<root::mozilla::FontFamilyName> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_80() {
+    fn __bindgen_test_layout_template_82() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<::std::os::raw::c_uint>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27945,7 +27971,7 @@ pub mod root {
                    root::nsTArray<::std::os::raw::c_uint> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_81() {
+    fn __bindgen_test_layout_template_83() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::FramePropertyTable_PropertyValue>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27958,7 +27984,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_82() {
+    fn __bindgen_test_layout_template_84() {
         assert_eq!(::std::mem::size_of::<root::nsPtrHashKey<root::nsIFrame>>()
                    , 16usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27969,7 +27995,7 @@ pub mod root {
                    root::nsPtrHashKey<root::nsIFrame> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_83() {
+    fn __bindgen_test_layout_template_85() {
         assert_eq!(::std::mem::size_of::<[u64; 5usize]>() , 40usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -27980,7 +28006,7 @@ pub mod root {
                    [u64; 5usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_84() {
+    fn __bindgen_test_layout_template_86() {
         assert_eq!(::std::mem::size_of::<root::mozilla::OwningNonNull<root::mozilla::EffectCompositor_AnimationStyleRuleProcessor>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -27993,7 +28019,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_85() {
+    fn __bindgen_test_layout_template_87() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::ProxyBehaviour>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28004,7 +28030,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::ProxyBehaviour> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_86() {
+    fn __bindgen_test_layout_template_88() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::mozilla::URLExtraData>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28015,7 +28041,7 @@ pub mod root {
                    root::already_AddRefed<root::mozilla::URLExtraData> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_87() {
+    fn __bindgen_test_layout_template_89() {
         assert_eq!(::std::mem::size_of::<root::nsMainThreadPtrHolder<root::nsIURI>>()
                    , 24usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28026,7 +28052,7 @@ pub mod root {
                    root::nsMainThreadPtrHolder<root::nsIURI> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_88() {
+    fn __bindgen_test_layout_template_90() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValueList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28037,7 +28063,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsCSSValueList> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_89() {
+    fn __bindgen_test_layout_template_91() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValueList,
                                                root::mozilla::DefaultDelete<root::nsCSSValueList>>>()
                    , 8usize , concat ! (
@@ -28054,7 +28080,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_90() {
+    fn __bindgen_test_layout_template_92() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsCSSValuePairList>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28067,7 +28093,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_91() {
+    fn __bindgen_test_layout_template_93() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsCSSValuePairList,
                                                root::mozilla::DefaultDelete<root::nsCSSValuePairList>>>()
                    , 8usize , concat ! (
@@ -28084,7 +28110,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_92() {
+    fn __bindgen_test_layout_template_94() {
         assert_eq!(::std::mem::size_of::<[u64; 2usize]>() , 16usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28095,7 +28121,7 @@ pub mod root {
                    [u64; 2usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_93() {
+    fn __bindgen_test_layout_template_95() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28104,7 +28130,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_94() {
+    fn __bindgen_test_layout_template_96() {
         assert_eq!(::std::mem::size_of::<[u32; 3usize]>() , 12usize , concat !
                    (
                    "Size of template specialization: " , stringify ! (
@@ -28115,7 +28141,7 @@ pub mod root {
                    [u32; 3usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_95() {
+    fn __bindgen_test_layout_template_97() {
         assert_eq!(::std::mem::size_of::<root::already_AddRefed<root::nsStyleImageRequest>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28126,7 +28152,7 @@ pub mod root {
                    root::already_AddRefed<root::nsStyleImageRequest> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_96() {
+    fn __bindgen_test_layout_template_98() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::nsStyleSides>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28137,7 +28163,7 @@ pub mod root {
                    root::mozilla::DefaultDelete<root::nsStyleSides> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_97() {
+    fn __bindgen_test_layout_template_99() {
         assert_eq!(::std::mem::size_of::<root::mozilla::UniquePtr<root::nsStyleSides,
                                                root::mozilla::DefaultDelete<root::nsStyleSides>>>()
                    , 8usize , concat ! (
@@ -28154,7 +28180,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_98() {
+    fn __bindgen_test_layout_template_100() {
         assert_eq!(::std::mem::size_of::<root::mozilla::DefaultDelete<root::CachedBorderImageData>>()
                    , 1usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28167,7 +28193,7 @@ pub mod root {
                    ));
     }
     #[test]
-    fn __bindgen_test_layout_template_99() {
+    fn __bindgen_test_layout_template_101() {
         assert_eq!(::std::mem::size_of::<root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr>>()
                    , 32usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28178,7 +28204,7 @@ pub mod root {
                    root::std::pair<::nsstring::nsStringRepr, ::nsstring::nsStringRepr> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_100() {
+    fn __bindgen_test_layout_template_102() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::std::pair<::nsstring::nsStringRepr,
                                                      ::nsstring::nsStringRepr>>>()
                    , 8usize , concat ! (
@@ -28193,7 +28219,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_101() {
+    fn __bindgen_test_layout_template_103() {
         assert_eq!(::std::mem::size_of::<[u64; 18usize]>() , 144usize , concat
                    ! (
                    "Size of template specialization: " , stringify ! (
@@ -28204,7 +28230,7 @@ pub mod root {
                    [u64; 18usize] ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_102() {
+    fn __bindgen_test_layout_template_104() {
         assert_eq!(::std::mem::size_of::<root::mozilla::BaseTimeDuration<root::mozilla::StickyTimeDurationValueCalculator>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28217,7 +28243,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_103() {
+    fn __bindgen_test_layout_template_105() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<root::mozilla::DisplayItemClip_RoundedRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28230,7 +28256,7 @@ pub mod root {
                    ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_104() {
+    fn __bindgen_test_layout_template_106() {
         assert_eq!(::std::mem::size_of::<root::RefPtr<root::mozilla::dom::DOMRect>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28241,7 +28267,7 @@ pub mod root {
                    root::RefPtr<root::mozilla::dom::DOMRect> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_105() {
+    fn __bindgen_test_layout_template_107() {
         assert_eq!(::std::mem::size_of::<u64>() , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! ( u64 )
                    ));
@@ -28250,7 +28276,7 @@ pub mod root {
                    u64 ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_106() {
+    fn __bindgen_test_layout_template_108() {
         assert_eq!(::std::mem::size_of::<root::nsTArray<*mut root::mozilla::css::DocumentRule>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
@@ -28261,7 +28287,7 @@ pub mod root {
                    root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
     }
     #[test]
-    fn __bindgen_test_layout_template_107() {
+    fn __bindgen_test_layout_template_109() {
         assert_eq!(::std::mem::size_of::<root::nsAutoPtr<root::nsMediaQuery>>()
                    , 8usize , concat ! (
                    "Size of template specialization: " , stringify ! (
diff --git a/servo/components/style/keyframes.rs b/servo/components/style/keyframes.rs
index 542481b287c3..d7e3485fc7d8 100644
--- a/servo/components/style/keyframes.rs
+++ b/servo/components/style/keyframes.rs
@@ -8,6 +8,7 @@
 
 use cssparser::{AtRuleParser, Parser, QualifiedRuleParser, RuleListParser};
 use cssparser::{DeclarationListParser, DeclarationParser, parse_one_rule};
+use error_reporting::NullReporter;
 use parser::{LengthParsingMode, ParserContext, log_css_error};
 use properties::{Importance, PropertyDeclaration, PropertyDeclarationBlock, PropertyId};
 use properties::{PropertyDeclarationId, LonghandId, ParsedDeclaration};
@@ -18,7 +19,7 @@ use shared_lock::{SharedRwLock, SharedRwLockReadGuard, Locked, ToCssWithGuard};
 use std::fmt;
 use std::sync::Arc;
 use style_traits::ToCss;
-use stylesheets::{CssRuleType, MemoryHoleReporter, Stylesheet, VendorPrefix};
+use stylesheets::{CssRuleType, Stylesheet, VendorPrefix};
 
 /// A number from 0 to 1, indicating the percentage of the animation when this
 /// keyframe should run.
@@ -125,7 +126,7 @@ impl Keyframe {
     /// Parse a CSS keyframe.
     pub fn parse(css: &str, parent_stylesheet: &Stylesheet)
                  -> Result<Arc<Locked<Self>>, ()> {
-        let error_reporter = MemoryHoleReporter;
+        let error_reporter = NullReporter;
         let context = ParserContext::new(parent_stylesheet.origin,
                                          &parent_stylesheet.url_data,
                                          &error_reporter,
diff --git a/servo/components/style/properties/data.py b/servo/components/style/properties/data.py
index 895c1b12a908..c935e00a79f6 100644
--- a/servo/components/style/properties/data.py
+++ b/servo/components/style/properties/data.py
@@ -135,7 +135,7 @@ def arg_to_bool(arg):
 
 
 class Longhand(object):
-    def __init__(self, style_struct, name, spec=None, animation_type=None, derived_from=None, keyword=None,
+    def __init__(self, style_struct, name, spec=None, animation_value_type=None, derived_from=None, keyword=None,
                  predefined_type=None, custom_cascade=False, experimental=False, internal=False,
                  need_clone=False, need_index=False, gecko_ffi_name=None, depend_on_viewport_size=False,
                  allowed_in_keyframe_block=True, complex_color=False, cast_type='u8',
@@ -176,14 +176,13 @@ class Longhand(object):
 
         # This is done like this since just a plain bool argument seemed like
         # really random.
-        if animation_type is None:
-            raise TypeError("animation_type should be specified for (" + name + ")")
-        animation_types = ["none", "normal", "discrete"]
-        if animation_type not in animation_types:
-            raise TypeError("animation_type should be one of (" + str(animation_types) + ")")
-        self.animation_type = animation_type
+        if animation_value_type is None:
+            raise TypeError("animation_value_type should be specified for (" + name + ")")
+        self.animation_value_type = animation_value_type
 
-        self.animatable = animation_type != "none"
+        self.animatable = animation_value_type != "none"
+        self.is_animatable_with_computed_value = animation_value_type == "ComputedValue" \
+            or animation_value_type == "discrete"
         if self.logical:
             # Logical properties will be animatable (i.e. the animation type is
             # discrete). For now, it is still non-animatable.
diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
index aae2b58b6990..3c2ab7280be8 100644
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -827,9 +827,13 @@ fn static_assert() {
                                      for y in ["color", "style", "width"]] +
                                     ["border-{0}-radius".format(x.ident.replace("_", "-"))
                                      for x in CORNERS]) %>
+
+<% skip_moz_border_color_longhands = " ".join("-moz-border-{0}-colors".format(x.ident)
+                                              for x in SIDES) %>
 <%self:impl_trait style_struct_name="Border"
                   skip_longhands="${skip_border_longhands} border-image-source border-image-outset
-                                  border-image-repeat border-image-width border-image-slice"
+                                  border-image-repeat border-image-width border-image-slice
+                                  ${skip_moz_border_color_longhands}"
                   skip_additionals="*">
 
     % for side in SIDES:
@@ -880,6 +884,42 @@ fn static_assert() {
     pub fn border_${side.ident}_has_nonzero_width(&self) -> bool {
         self.gecko.mComputedBorder.${side.ident} != 0
     }
+
+    #[allow(non_snake_case)]
+    pub fn set__moz_border_${side.ident}_colors(&mut self,
+                                                v: longhands::_moz_border_${side.ident}_colors::computed_value::T) {
+        match v.0 {
+            None => {
+                unsafe {
+                    bindings::Gecko_ClearMozBorderColors(&mut self.gecko,
+                                                         structs::Side::eSide${to_camel_case(side.ident)});
+                }
+            },
+            Some(ref colors) => {
+                unsafe {
+                    bindings::Gecko_EnsureMozBorderColors(&mut self.gecko);
+                    bindings::Gecko_ClearMozBorderColors(&mut self.gecko,
+                                                         structs::Side::eSide${to_camel_case(side.ident)});
+                }
+                for color in colors {
+                    let c = color_to_nscolor_zero_currentcolor(*color);
+                    unsafe {
+                        bindings::Gecko_AppendMozBorderColors(&mut self.gecko,
+                                                              structs::Side::eSide${to_camel_case(side.ident)},
+                                                              c);
+                    }
+                }
+            }
+        }
+    }
+
+    #[allow(non_snake_case)]
+    pub fn copy__moz_border_${side.ident}_colors_from(&mut self, other: &Self) {
+        unsafe {
+            bindings::Gecko_CopyMozBorderColors(&mut self.gecko, &other.gecko,
+                                                structs::Side::eSide${to_camel_case(side.ident)});
+        }
+    }
     % endfor
 
     % for corner in CORNERS:
@@ -2994,6 +3034,50 @@ fn static_assert() {
         self.gecko.mClipFlags = other.gecko.mClipFlags;
     }
 
+    pub fn clone_clip(&self) -> longhands::clip::computed_value::T {
+        use gecko_bindings::structs::NS_STYLE_CLIP_AUTO;
+        use gecko_bindings::structs::NS_STYLE_CLIP_BOTTOM_AUTO;
+        use gecko_bindings::structs::NS_STYLE_CLIP_LEFT_AUTO;
+        use gecko_bindings::structs::NS_STYLE_CLIP_RIGHT_AUTO;
+        use gecko_bindings::structs::NS_STYLE_CLIP_TOP_AUTO;
+        use values::computed::{ClipRect, ClipRectOrAuto};
+        use values::Either;
+
+        if self.gecko.mClipFlags == NS_STYLE_CLIP_AUTO as u8 {
+            ClipRectOrAuto::auto()
+        } else {
+            let left = if self.gecko.mClipFlags & NS_STYLE_CLIP_LEFT_AUTO as u8 != 0 {
+                debug_assert!(self.gecko.mClip.x == 0);
+                None
+            } else {
+                Some(Au(self.gecko.mClip.x))
+            };
+
+            let top = if self.gecko.mClipFlags & NS_STYLE_CLIP_TOP_AUTO as u8 != 0 {
+                debug_assert!(self.gecko.mClip.y == 0);
+                None
+            } else {
+                Some(Au(self.gecko.mClip.y))
+            };
+
+            let bottom = if self.gecko.mClipFlags & NS_STYLE_CLIP_BOTTOM_AUTO as u8 != 0 {
+                debug_assert!(self.gecko.mClip.height == 1 << 30); // NS_MAXSIZE
+                None
+            } else {
+                Some(Au(self.gecko.mClip.y + self.gecko.mClip.height))
+            };
+
+            let right = if self.gecko.mClipFlags & NS_STYLE_CLIP_RIGHT_AUTO as u8 != 0 {
+                debug_assert!(self.gecko.mClip.width == 1 << 30); // NS_MAXSIZE
+                None
+            } else {
+                Some(Au(self.gecko.mClip.x + self.gecko.mClip.width))
+            };
+
+            Either::First(ClipRect { top: top, right: right, bottom: bottom, left: left, })
+        }
+    }
+
     pub fn set_filter(&mut self, v: longhands::filter::computed_value::T) {
         use properties::longhands::filter::computed_value::Filter::*;
         use gecko_bindings::structs::nsCSSShadowArray;
diff --git a/servo/components/style/properties/helpers/animated_properties.mako.rs b/servo/components/style/properties/helpers/animated_properties.mako.rs
index 2816db15a36b..ed2e10b3a546 100644
--- a/servo/components/style/properties/helpers/animated_properties.mako.rs
+++ b/servo/components/style/properties/helpers/animated_properties.mako.rs
@@ -134,7 +134,7 @@ impl TransitionProperty {
     pub fn is_discrete(&self) -> bool {
         match *self {
             % for prop in data.longhands:
-                % if prop.animation_type == "discrete":
+                % if prop.animation_value_type == "discrete":
                     TransitionProperty::${prop.camel_case} => true,
                 % endif
             % endfor
@@ -324,7 +324,7 @@ impl AnimatedProperty {
                 % if prop.animatable:
                     AnimatedProperty::${prop.camel_case}(ref from, ref to) => {
                         // https://w3c.github.io/web-animations/#discrete-animation-type
-                        % if prop.animation_type == "discrete":
+                        % if prop.animation_value_type == "discrete":
                             let value = if progress < 0.5 { *from } else { *to };
                         % else:
                             let value = match from.interpolate(to, progress) {
@@ -384,7 +384,11 @@ pub enum AnimationValue {
     % for prop in data.longhands:
         % if prop.animatable:
             /// ${prop.name}
-            ${prop.camel_case}(longhands::${prop.ident}::computed_value::T),
+            % if prop.is_animatable_with_computed_value:
+                ${prop.camel_case}(longhands::${prop.ident}::computed_value::T),
+            % else:
+                ${prop.camel_case}(${prop.animation_value_type}),
+            % endif
         % endif
     % endfor
 }
@@ -400,9 +404,17 @@ impl AnimationValue {
                     AnimationValue::${prop.camel_case}(ref from) => {
                         PropertyDeclaration::${prop.camel_case}(
                             % if prop.boxed:
-                                Box::new(longhands::${prop.ident}::SpecifiedValue::from_computed_value(from)))
-                            % else:
-                                longhands::${prop.ident}::SpecifiedValue::from_computed_value(from))
+                            Box::new(
+                            % endif
+                                longhands::${prop.ident}::SpecifiedValue::from_computed_value(
+                                % if prop.is_animatable_with_computed_value:
+                                    from
+                                % else:
+                                    &from.into()
+                                % endif
+                                ))
+                            % if prop.boxed:
+                            )
                             % endif
                     }
                 % endif
@@ -413,7 +425,7 @@ impl AnimationValue {
     /// Construct an AnimationValue from a property declaration
     pub fn from_declaration(decl: &PropertyDeclaration, context: &mut Context,
                             initial: &ComputedValues) -> Option<Self> {
-        use error_reporting::StdoutErrorReporter;
+        use error_reporting::RustLogReporter;
         use properties::LonghandId;
         use properties::DeclaredValue;
 
@@ -426,7 +438,13 @@ impl AnimationValue {
                     longhands::system_font::resolve_system_font(sf, context);
                 }
             % endif
-                Some(AnimationValue::${prop.camel_case}(val.to_computed_value(context)))
+                Some(AnimationValue::${prop.camel_case}(
+                % if prop.is_animatable_with_computed_value:
+                    val.to_computed_value(context)
+                % else:
+                    From::from(&val.to_computed_value(context))
+                % endif
+                ))
             },
             % endif
             % endfor
@@ -454,6 +472,9 @@ impl AnimationValue {
                                 inherit_struct.clone_${prop.ident}()
                             },
                         };
+                        % if not prop.is_animatable_with_computed_value:
+                            let computed = From::from(&computed);
+                        % endif
                         Some(AnimationValue::${prop.camel_case}(computed))
                     },
                     % endif
@@ -467,7 +488,7 @@ impl AnimationValue {
             },
             PropertyDeclaration::WithVariables(id, ref variables) => {
                 let custom_props = context.style().custom_properties();
-                let reporter = StdoutErrorReporter;
+                let reporter = RustLogReporter;
                 match id {
                     % for prop in data.longhands:
                     % if prop.animatable:
@@ -514,7 +535,12 @@ impl AnimationValue {
                 % if prop.animatable:
                     TransitionProperty::${prop.camel_case} => {
                         AnimationValue::${prop.camel_case}(
+                        % if prop.is_animatable_with_computed_value:
                             computed_values.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}())
+                        % else:
+                            From::from(&computed_values.get_${prop.style_struct.ident.strip("_")}()
+                                                                  .clone_${prop.ident}()))
+                        % endif
                     }
                 % endif
             % endfor
@@ -531,7 +557,7 @@ impl Interpolate for AnimationValue {
                     (&AnimationValue::${prop.camel_case}(ref from),
                      &AnimationValue::${prop.camel_case}(ref to)) => {
                         // https://w3c.github.io/web-animations/#discrete-animation-type
-                        % if prop.animation_type == "discrete":
+                        % if prop.animation_value_type == "discrete":
                             if progress < 0.5 {
                                 Ok(AnimationValue::${prop.camel_case}(*from))
                             } else {
@@ -976,114 +1002,89 @@ impl Interpolate for ClipRect {
     }
 }
 
-/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
-impl Interpolate for TextShadow {
-    #[inline]
-    fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
-        Ok(TextShadow {
-            offset_x: try!(self.offset_x.interpolate(&other.offset_x, progress)),
-            offset_y: try!(self.offset_y.interpolate(&other.offset_y, progress)),
-            blur_radius: try!(self.blur_radius.interpolate(&other.blur_radius, progress)),
-            color: try!(self.color.interpolate(&other.color, progress)),
-        })
+<%def name="impl_interpolate_for_shadow(item, transparent_color)">
+    impl Interpolate for ${item} {
+        #[inline]
+        fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
+            % if "Box" in item:
+            // It can't be interpolated if inset does not match.
+            if self.inset != other.inset {
+                return Err(());
+            }
+            % endif
+
+            let x = try!(self.offset_x.interpolate(&other.offset_x, progress));
+            let y = try!(self.offset_y.interpolate(&other.offset_y, progress));
+            let color = try!(self.color.interpolate(&other.color, progress));
+            let blur = try!(self.blur_radius.interpolate(&other.blur_radius, progress));
+            % if "Box" in item:
+            let spread = try!(self.spread_radius.interpolate(&other.spread_radius, progress));
+            % endif
+
+            Ok(${item} {
+                offset_x: x,
+                offset_y: y,
+                blur_radius: blur,
+                color: color,
+                % if "Box" in item:
+                spread_radius: spread,
+                inset: self.inset,
+                % endif
+            })
+        }
     }
-}
 
-/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
-impl Interpolate for TextShadowList {
-    #[inline]
-    fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
-        let zero = TextShadow {
-            offset_x: Au(0),
-            offset_y: Au(0),
-            blur_radius: Au(0),
-            color: CSSParserColor::RGBA(RGBA::transparent()),
-        };
-
-        let max_len = cmp::max(self.0.len(), other.0.len());
-        let mut result = Vec::with_capacity(max_len);
-
-        for i in 0..max_len {
-            let shadow = match (self.0.get(i), other.0.get(i)) {
-                (Some(shadow), Some(other))
-                    => try!(shadow.interpolate(other, progress)),
-                (Some(shadow), None) => {
-                    shadow.interpolate(&zero, progress).unwrap()
-                }
-                (None, Some(shadow)) => {
-                    zero.interpolate(&shadow, progress).unwrap()
-                }
-                (None, None) => unreachable!(),
+    /// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
+    impl Interpolate for ${item}List {
+        #[inline]
+        fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
+            // The inset value must change
+            % if "Box" in item:
+            let mut zero = ${item} {
+            % else:
+            let zero = ${item} {
+            % endif
+                offset_x: Au(0),
+                offset_y: Au(0),
+                blur_radius: Au(0),
+                color: ${transparent_color},
+                % if "Box" in item:
+                spread_radius: Au(0),
+                inset: false,
+                % endif
             };
-            result.push(shadow);
+
+            let max_len = cmp::max(self.0.len(), other.0.len());
+            let mut result = Vec::with_capacity(max_len);
+
+            for i in 0..max_len {
+                let shadow = match (self.0.get(i), other.0.get(i)) {
+                    (Some(shadow), Some(other))
+                        => try!(shadow.interpolate(other, progress)),
+                    (Some(shadow), None) => {
+                        % if "Box" in item:
+                        zero.inset = shadow.inset;
+                        % endif
+                        shadow.interpolate(&zero, progress).unwrap()
+                    }
+                    (None, Some(shadow)) => {
+                        % if "Box" in item:
+                        zero.inset = shadow.inset;
+                        % endif
+                        zero.interpolate(&shadow, progress).unwrap()
+                    }
+                    (None, None) => unreachable!(),
+                };
+                result.push(shadow);
+            }
+
+            Ok(${item}List(result))
         }
-
-        Ok(TextShadowList(result))
     }
-}
+</%def>
 
-
-impl Interpolate for BoxShadowList {
-    #[inline]
-    fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
-        // The inset value must change
-        let mut zero = BoxShadow {
-            offset_x: Au(0),
-            offset_y: Au(0),
-            spread_radius: Au(0),
-            blur_radius: Au(0),
-            color: CSSParserColor::RGBA(RGBA::transparent()),
-            inset: false,
-        };
-
-        let max_len = cmp::max(self.0.len(), other.0.len());
-        let mut result = Vec::with_capacity(max_len);
-
-        for i in 0..max_len {
-            let shadow = match (self.0.get(i), other.0.get(i)) {
-                (Some(shadow), Some(other))
-                    => try!(shadow.interpolate(other, progress)),
-                (Some(shadow), None) => {
-                    zero.inset = shadow.inset;
-                    shadow.interpolate(&zero, progress).unwrap()
-                }
-                (None, Some(shadow)) => {
-                    zero.inset = shadow.inset;
-                    zero.interpolate(&shadow, progress).unwrap()
-                }
-                (None, None) => unreachable!(),
-            };
-            result.push(shadow);
-        }
-
-        Ok(BoxShadowList(result))
-    }
-}
-
-/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
-impl Interpolate for BoxShadow {
-    #[inline]
-    fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
-        if self.inset != other.inset {
-            return Err(());
-        }
-
-        let x = try!(self.offset_x.interpolate(&other.offset_x, progress));
-        let y = try!(self.offset_y.interpolate(&other.offset_y, progress));
-        let color = try!(self.color.interpolate(&other.color, progress));
-        let spread = try!(self.spread_radius.interpolate(&other.spread_radius, progress));
-        let blur = try!(self.blur_radius.interpolate(&other.blur_radius, progress));
-
-        Ok(BoxShadow {
-            offset_x: x,
-            offset_y: y,
-            blur_radius: blur,
-            spread_radius: spread,
-            color: color,
-            inset: self.inset,
-        })
-    }
-}
+${impl_interpolate_for_shadow('BoxShadow', 'CSSParserColor::RGBA(RGBA::transparent())',)}
+${impl_interpolate_for_shadow('TextShadow', 'CSSParserColor::RGBA(RGBA::transparent())',)}
 
 impl Interpolate for LengthOrNone {
     fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
@@ -2041,6 +2042,114 @@ impl<T, U> Interpolate for Either<T, U>
     }
 }
 
+impl <'a> From<<&'a IntermediateRGBA> for RGBA {
+    fn from(extended_rgba: &IntermediateRGBA) -> RGBA {
+        // RGBA::from_floats clamps each component values.
+        RGBA::from_floats(extended_rgba.red,
+                          extended_rgba.green,
+                          extended_rgba.blue,
+                          extended_rgba.alpha)
+    }
+}
+
+impl <'a> From<<&'a RGBA> for IntermediateRGBA {
+    fn from(rgba: &RGBA) -> IntermediateRGBA {
+        IntermediateRGBA::new(rgba.red_f32(),
+                              rgba.green_f32(),
+                              rgba.blue_f32(),
+                              rgba.alpha_f32())
+    }
+}
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+/// Unlike RGBA, each component value may exceed the range [0.0, 1.0].
+pub struct IntermediateRGBA {
+    /// The red component.
+    pub red: f32,
+    /// The green component.
+    pub green: f32,
+    /// The blue component.
+    pub blue: f32,
+    /// The alpha component.
+    pub alpha: f32,
+}
+
+impl IntermediateRGBA {
+    /// Returns a transparent color.
+    #[inline]
+    pub fn transparent() -> Self {
+        Self::new(0., 0., 0., 0.)
+    }
+
+    /// Returns a new color.
+    #[inline]
+    pub fn new(red: f32, green: f32, blue: f32, alpha: f32) -> Self {
+        IntermediateRGBA { red: red, green: green, blue: blue, alpha: alpha }
+    }
+}
+
+/// Unlike Interpolate for RGBA we don't clamp any component values.
+impl Interpolate for IntermediateRGBA {
+    #[inline]
+    fn interpolate(&self, other: &IntermediateRGBA, progress: f64) -> Result<Self, ()> {
+        let alpha = try!(self.alpha.interpolate(&other.alpha, progress));
+        if alpha == 0. {
+            // Ideally we should return color value that only alpha component is
+            // 0, but this is what current gecko does.
+            Ok(IntermediateRGBA::transparent())
+        } else {
+            let red = try!((self.red * self.alpha)
+                            .interpolate(&(other.red * other.alpha), progress))
+                            * 1. / alpha;
+            let green = try!((self.green * self.alpha)
+                             .interpolate(&(other.green * other.alpha), progress))
+                             * 1. / alpha;
+            let blue = try!((self.blue * self.alpha)
+                             .interpolate(&(other.blue * other.alpha), progress))
+                             * 1. / alpha;
+            Ok(IntermediateRGBA::new(red, green, blue, alpha))
+        }
+    }
+}
+
+impl<'a> From<<&'a Either<CSSParserColor, Auto>> for Either<IntermediateColor, Auto> {
+    fn from(from: &Either<CSSParserColor, Auto>) -> Either<IntermediateColor, Auto> {
+        match *from {
+            Either::First(ref from) =>
+                match *from {
+                    CSSParserColor::RGBA(ref color) =>
+                        Either::First(IntermediateColor::IntermediateRGBA(
+                            IntermediateRGBA::new(color.red_f32(),
+                                                  color.green_f32(),
+                                                  color.blue_f32(),
+                                                  color.alpha_f32()))),
+                    CSSParserColor::CurrentColor =>
+                        Either::First(IntermediateColor::CurrentColor),
+                },
+            Either::Second(Auto) => Either::Second(Auto),
+        }
+    }
+}
+
+impl<'a> From<<&'a Either<IntermediateColor, Auto>> for Either<CSSParserColor, Auto> {
+    fn from(from: &Either<IntermediateColor, Auto>) -> Either<CSSParserColor, Auto> {
+        match *from {
+            Either::First(ref from) =>
+                match *from {
+                    IntermediateColor::IntermediateRGBA(ref color) =>
+                        Either::First(CSSParserColor::RGBA(RGBA::from_floats(color.red,
+                                                                             color.green,
+                                                                             color.blue,
+                                                                             color.alpha))),
+                    IntermediateColor::CurrentColor =>
+                        Either::First(CSSParserColor::CurrentColor),
+                },
+            Either::Second(Auto) => Either::Second(Auto),
+        }
+    }
+}
+
 
 /// We support ComputeDistance for an API in gecko to test the transition per property.
 impl ComputeDistance for AnimationValue {
@@ -2048,7 +2157,7 @@ impl ComputeDistance for AnimationValue {
         match (self, other) {
             % for prop in data.longhands:
                 % if prop.animatable:
-                    % if prop.animation_type == "normal":
+                    % if prop.animation_value_type != "discrete":
                         (&AnimationValue::${prop.camel_case}(ref from),
                          &AnimationValue::${prop.camel_case}(ref to)) => {
                             from.compute_distance(to)
@@ -2230,6 +2339,48 @@ impl ComputeDistance for CSSParserColor {
     }
 }
 
+impl ComputeDistance for IntermediateRGBA {
+    #[inline]
+    fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
+        self.compute_squared_distance(other).map(|sq| sq.sqrt())
+    }
+
+    #[inline]
+    fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
+        let start = [ self.alpha,
+                      self.red * self.alpha,
+                      self.green * self.alpha,
+                      self.blue * self.alpha ];
+        let end = [ other.alpha,
+                    other.red * other.alpha,
+                    other.green * other.alpha,
+                    other.blue * other.alpha ];
+        let diff = start.iter().zip(&end)
+                               .fold(0.0f64, |n, (&a, &b)| {
+                                   let diff = (a - b) as f64;
+                                   n + diff * diff
+                               });
+        Ok(diff)
+    }
+}
+
+impl ComputeDistance for IntermediateColor {
+    #[inline]
+    fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
+        self.compute_squared_distance(other).map(|sq| sq.sqrt())
+    }
+
+    #[inline]
+    fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
+        match (*self, *other) {
+            (IntermediateColor::IntermediateRGBA(ref this), IntermediateColor::IntermediateRGBA(ref other)) => {
+                this.compute_squared_distance(other)
+            },
+            _ => Ok(0.0),
+        }
+    }
+}
+
 impl ComputeDistance for CalcLengthOrPercentage {
     #[inline]
     fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
@@ -2509,7 +2660,7 @@ impl ComputeDistance for ClipRect {
     }
 }
 
-impl ComputeDistance for TextShadow {
+impl ComputeDistance for IntermediateTextShadow {
     #[inline]
     fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
         self.compute_squared_distance(other).map(|sd| sd.sqrt())
@@ -2525,7 +2676,7 @@ impl ComputeDistance for TextShadow {
     }
 }
 
-impl ComputeDistance for TextShadowList {
+impl ComputeDistance for IntermediateTextShadowList {
     #[inline]
     fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
         self.compute_squared_distance(other).map(|sd| sd.sqrt())
@@ -2533,11 +2684,11 @@ impl ComputeDistance for TextShadowList {
 
     #[inline]
     fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
-        let zero = TextShadow {
+        let zero = IntermediateTextShadow {
             offset_x: Au(0),
             offset_y: Au(0),
             blur_radius: Au(0),
-            color: CSSParserColor::RGBA(RGBA::transparent()),
+            color: IntermediateColor::IntermediateRGBA(IntermediateRGBA::transparent()),
         };
 
         let max_len = cmp::max(self.0.len(), other.0.len());
@@ -2558,7 +2709,7 @@ impl ComputeDistance for TextShadowList {
     }
 }
 
-impl ComputeDistance for BoxShadow {
+impl ComputeDistance for IntermediateBoxShadow {
     #[inline]
     fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
         self.compute_squared_distance(other).map(|sd| sd.sqrt())
@@ -2578,7 +2729,7 @@ impl ComputeDistance for BoxShadow {
     }
 }
 
-impl ComputeDistance for BoxShadowList {
+impl ComputeDistance for IntermediateBoxShadowList {
     #[inline]
     fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
         self.compute_squared_distance(other).map(|sd| sd.sqrt())
@@ -2587,12 +2738,12 @@ impl ComputeDistance for BoxShadowList {
     #[inline]
     fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
         // The inset value must change
-        let mut zero = BoxShadow {
+        let mut zero = IntermediateBoxShadow {
             offset_x: Au(0),
             offset_y: Au(0),
             spread_radius: Au(0),
             blur_radius: Au(0),
-            color: CSSParserColor::RGBA(RGBA::transparent()),
+            color: IntermediateColor::IntermediateRGBA(IntermediateRGBA::transparent()),
             inset: false,
         };
 
@@ -2651,3 +2802,122 @@ impl<T, U> ComputeDistance for Either<T, U>
         }
     }
 }
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+#[allow(missing_docs)]
+pub enum IntermediateColor {
+    CurrentColor,
+    IntermediateRGBA(IntermediateRGBA),
+}
+
+impl Interpolate for IntermediateColor {
+    #[inline]
+    fn interpolate(&self, other: &Self, progress: f64) -> Result<Self, ()> {
+        match (*self, *other) {
+            (IntermediateColor::IntermediateRGBA(ref this), IntermediateColor::IntermediateRGBA(ref other)) => {
+                this.interpolate(other, progress).map(IntermediateColor::IntermediateRGBA)
+            }
+            // FIXME: Bug 1345709: Implement currentColor animations.
+            _ => Err(()),
+        }
+    }
+}
+
+impl <'a> From<<&'a CSSParserColor> for IntermediateColor {
+    fn from(color: &CSSParserColor) -> IntermediateColor {
+        match *color {
+            CSSParserColor::RGBA(ref color) =>
+                IntermediateColor::IntermediateRGBA(IntermediateRGBA::new(color.red_f32(),
+                                                                          color.green_f32(),
+                                                                          color.blue_f32(),
+                                                                          color.alpha_f32())),
+            CSSParserColor::CurrentColor => IntermediateColor::CurrentColor,
+        }
+    }
+}
+
+impl <'a> From<<&'a IntermediateColor> for CSSParserColor {
+    fn from(color: &IntermediateColor) -> CSSParserColor {
+        match *color {
+            IntermediateColor::IntermediateRGBA(ref color) =>
+                CSSParserColor::RGBA(RGBA::from_floats(color.red,
+                                                       color.green,
+                                                       color.blue,
+                                                       color.alpha)),
+            IntermediateColor::CurrentColor => CSSParserColor::CurrentColor,
+        }
+    }
+}
+
+<%def name="impl_intermediate_type_for_shadow(type)">
+    #[derive(Copy, Clone, Debug, PartialEq)]
+    #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+    #[allow(missing_docs)]
+    /// Intermediate type for box-shadow and text-shadow.
+    /// The difference between normal shadow type is that this type uses
+    /// IntermediateColor instead of ParserColor.
+    pub struct Intermediate${type}Shadow {
+        pub offset_x: Au,
+        pub offset_y: Au,
+        pub blur_radius: Au,
+        pub color: IntermediateColor,
+        % if type == "Box":
+        pub spread_radius: Au,
+        pub inset: bool,
+        % endif
+    }
+
+    #[derive(Clone, Debug, PartialEq)]
+    #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+    #[allow(missing_docs)]
+    /// Intermediate type for box-shadow list and text-shadow list.
+    pub struct Intermediate${type}ShadowList(pub Vec<Intermediate${type}Shadow>);
+
+    impl <'a> From<<&'a Intermediate${type}ShadowList> for ${type}ShadowList {
+        fn from(shadow_list: &Intermediate${type}ShadowList) -> ${type}ShadowList {
+            ${type}ShadowList(shadow_list.0.iter().map(|s| s.into()).collect())
+        }
+    }
+
+    impl <'a> From<<&'a ${type}ShadowList> for Intermediate${type}ShadowList {
+        fn from(shadow_list: &${type}ShadowList) -> Intermediate${type}ShadowList {
+            Intermediate${type}ShadowList(shadow_list.0.iter().map(|s| s.into()).collect())
+        }
+    }
+
+    impl <'a> From<<&'a Intermediate${type}Shadow> for ${type}Shadow {
+        fn from(shadow: &Intermediate${type}Shadow) -> ${type}Shadow {
+            ${type}Shadow {
+                offset_x: shadow.offset_x,
+                offset_y: shadow.offset_y,
+                blur_radius: shadow.blur_radius,
+                color: (&shadow.color).into(),
+                % if type == "Box":
+                spread_radius: shadow.spread_radius,
+                inset: shadow.inset,
+                % endif
+            }
+        }
+    }
+
+    impl <'a> From<<&'a ${type}Shadow> for Intermediate${type}Shadow {
+        fn from(shadow: &${type}Shadow) -> Intermediate${type}Shadow {
+            Intermediate${type}Shadow {
+                offset_x: shadow.offset_x,
+                offset_y: shadow.offset_y,
+                blur_radius: shadow.blur_radius,
+                color: (&shadow.color).into(),
+                % if type == "Box":
+                spread_radius: shadow.spread_radius,
+                inset: shadow.inset,
+                % endif
+            }
+        }
+    }
+    ${impl_interpolate_for_shadow('Intermediate%sShadow' % type,
+                                  'IntermediateColor::IntermediateRGBA(IntermediateRGBA::transparent())')}
+</%def>
+
+${impl_intermediate_type_for_shadow('Box')}
+${impl_intermediate_type_for_shadow('Text')}
diff --git a/servo/components/style/properties/longhand/background.mako.rs b/servo/components/style/properties/longhand/background.mako.rs
index 2c085cfe9b91..96119dd2c02f 100644
--- a/servo/components/style/properties/longhand/background.mako.rs
+++ b/servo/components/style/properties/longhand/background.mako.rs
@@ -10,9 +10,9 @@ ${helpers.predefined_type("background-color", "CSSColor",
     "::cssparser::Color::RGBA(::cssparser::RGBA::transparent())",
     initial_specified_value="SpecifiedValue::transparent()",
     spec="https://drafts.csswg.org/css-backgrounds/#background-color",
-    animation_type="normal", complex_color=True)}
+    animation_value_type="IntermediateColor", complex_color=True)}
 
-<%helpers:vector_longhand name="background-image" animation_type="none"
+<%helpers:vector_longhand name="background-image" animation_value_type="none"
                           spec="https://drafts.csswg.org/css-backgrounds/#the-background-image"
                           has_uncacheable_values="${product == 'gecko'}">
     use std::fmt;
@@ -89,7 +89,7 @@ ${helpers.predefined_type("background-color", "CSSColor",
     }
 </%helpers:vector_longhand>
 
-<%helpers:vector_longhand name="background-position-x" animation_type="normal"
+<%helpers:vector_longhand name="background-position-x" animation_value_type="ComputedValue"
                           spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-x"
                           delegate_animate="True">
     use std::fmt;
@@ -140,7 +140,7 @@ ${helpers.predefined_type("background-color", "CSSColor",
     }
 </%helpers:vector_longhand>
 
-<%helpers:vector_longhand name="background-position-y" animation_type="normal"
+<%helpers:vector_longhand name="background-position-y" animation_value_type="ComputedValue"
                           spec="https://drafts.csswg.org/css-backgrounds-4/#propdef-background-position-y"
                           delegate_animate="True">
     use std::fmt;
@@ -192,7 +192,7 @@ ${helpers.predefined_type("background-color", "CSSColor",
     }
 </%helpers:vector_longhand>
 
-<%helpers:vector_longhand name="background-repeat" animation_type="none"
+<%helpers:vector_longhand name="background-repeat" animation_value_type="none"
                           spec="https://drafts.csswg.org/css-backgrounds/#the-background-repeat">
     use std::fmt;
     use style_traits::ToCss;
@@ -308,22 +308,22 @@ ${helpers.single_keyword("background-attachment",
                          "scroll fixed" + (" local" if product == "gecko" else ""),
                          vector=True,
                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-attachment",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.single_keyword("background-clip",
                          "border-box padding-box content-box",
                          extra_gecko_values="text",
                          vector=True, extra_prefixes="webkit",
                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-clip",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.single_keyword("background-origin",
                          "padding-box border-box content-box",
                          vector=True, extra_prefixes="webkit",
                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-origin",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
-<%helpers:vector_longhand name="background-size" animation_type="normal" extra_prefixes="webkit"
+<%helpers:vector_longhand name="background-size" animation_value_type="ComputedValue" extra_prefixes="webkit"
                           spec="https://drafts.csswg.org/css-backgrounds/#the-background-size">
     use cssparser::Token;
     use std::ascii::AsciiExt;
@@ -528,5 +528,5 @@ ${helpers.single_keyword("background-blend-mode",
                          """normal multiply screen overlay darken lighten color-dodge
                             color-burn hard-light soft-light difference exclusion hue
                             saturation color luminosity""",
-                         vector=True, products="gecko", animation_type="none",
+                         vector=True, products="gecko", animation_value_type="none",
                          spec="https://drafts.fxtf.org/compositing/#background-blend-mode")}
diff --git a/servo/components/style/properties/longhand/border.mako.rs b/servo/components/style/properties/longhand/border.mako.rs
index 5c5670b79776..64c64c700fb8 100644
--- a/servo/components/style/properties/longhand/border.mako.rs
+++ b/servo/components/style/properties/longhand/border.mako.rs
@@ -20,7 +20,7 @@
                               "::cssparser::Color::CurrentColor",
                               alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-color"),
                               spec=maybe_logical_spec(side, "color"),
-                              animation_type="normal", logical = side[1])}
+                              animation_value_type="IntermediateColor", logical = side[1])}
 % endfor
 
 % for side in ALL_SIDES:
@@ -29,14 +29,14 @@
                               need_clone=True,
                               alias=maybe_moz_logical_alias(product, side, "-moz-border-%s-style"),
                               spec=maybe_logical_spec(side, "style"),
-                              animation_type="none", logical = side[1])}
+                              animation_value_type="none", logical = side[1])}
 % endfor
 
 ${helpers.gecko_keyword_conversion(Keyword('border-style',
                                    "none solid double dotted dashed hidden groove ridge inset outset"),
                                    type="::values::specified::BorderStyle")}
 % for side in ALL_SIDES:
-    <%helpers:longhand name="border-${side[0]}-width" animation_type="normal" logical="${side[1]}"
+    <%helpers:longhand name="border-${side[0]}-width" animation_value_type="ComputedValue" logical="${side[1]}"
                        alias="${maybe_moz_logical_alias(product, side, '-moz-border-%s-width')}"
                        spec="${maybe_logical_spec(side, 'width')}">
         use app_units::Au;
@@ -70,14 +70,138 @@ ${helpers.gecko_keyword_conversion(Keyword('border-style',
                               "parse", extra_prefixes="webkit",
                               spec="https://drafts.csswg.org/css-backgrounds/#border-%s-radius" % corner,
                               boxed=True,
-                              animation_type="normal")}
+                              animation_value_type="ComputedValue")}
+% endfor
+
+/// -moz-border-*-colors: color, string, enum, none, inherit/initial
+/// These non-spec properties are just for Gecko (Stylo) internal use.
+% for side in PHYSICAL_SIDES:
+    <%helpers:longhand name="-moz-border-${side}-colors" animation_value_type="none"
+                       spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-border-*-colors)"
+                       products="gecko">
+        use std::fmt;
+        use style_traits::ToCss;
+        use values::HasViewportPercentage;
+        use values::specified::CSSColor;
+        no_viewport_percentage!(SpecifiedValue);
+
+        pub mod computed_value {
+            use values::computed::CSSColor;
+            #[derive(Debug, Clone, PartialEq)]
+            #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+            pub struct T(pub Option<Vec<CSSColor>>);
+        }
+
+        #[derive(Debug, Clone, PartialEq)]
+        #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+        pub enum SpecifiedValue {
+            None,
+            Colors(Vec<CSSColor>),
+        }
+
+        impl ToCss for computed_value::T {
+            fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+                match self.0 {
+                    None => return dest.write_str("none"),
+                    Some(ref vec) => {
+                        let mut first = true;
+                        for ref color in vec {
+                            if !first {
+                                try!(dest.write_str(" "));
+                            }
+                            first = false;
+                            try!(color.to_css(dest))
+                        }
+                        Ok(())
+                    }
+                }
+            }
+        }
+
+        impl ToCss for SpecifiedValue {
+            fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+                match *self {
+                    SpecifiedValue::None => return dest.write_str("none"),
+                    SpecifiedValue::Colors(ref vec) => {
+                        let mut first = true;
+                        for ref color in vec {
+                            if !first {
+                                try!(dest.write_str(" "));
+                            }
+                            first = false;
+                            try!(color.to_css(dest))
+                        }
+                        Ok(())
+                    }
+                }
+            }
+        }
+
+        #[inline] pub fn get_initial_value() -> computed_value::T {
+            computed_value::T(None)
+        }
+
+        #[inline] pub fn get_initial_specified_value() -> SpecifiedValue {
+            SpecifiedValue::None
+        }
+
+        impl ToComputedValue for SpecifiedValue {
+            type ComputedValue = computed_value::T;
+
+            #[inline]
+            fn to_computed_value(&self, context: &Context) -> computed_value::T {
+                match *self {
+                    SpecifiedValue::Colors(ref vec) => {
+                        computed_value::T(Some(vec.iter()
+                                                  .map(|c| c.to_computed_value(context))
+                                                  .collect()))
+                    },
+                    SpecifiedValue::None => {
+                        computed_value::T(None)
+                    }
+                }
+            }
+            #[inline]
+            fn from_computed_value(computed: &computed_value::T) -> Self {
+                match *computed {
+                    computed_value::T(Some(ref vec)) => {
+                        SpecifiedValue::Colors(vec.iter()
+                                                  .map(|c| ToComputedValue::from_computed_value((c)))
+                                                  .collect())
+                    },
+                    computed_value::T(None) => {
+                        SpecifiedValue::None
+                    }
+                }
+            }
+        }
+
+        #[inline]
+        pub fn parse(context: &ParserContext, input: &mut Parser)
+                     -> Result<SpecifiedValue, ()> {
+            if input.try(|input| input.expect_ident_matching("none")).is_ok() {
+                return Ok(SpecifiedValue::None)
+            }
+
+            let mut result = Vec::new();
+            while let Ok(value) = input.try(|i| CSSColor::parse(context, i)) {
+                result.push(value);
+            }
+
+            if !result.is_empty() {
+                Ok(SpecifiedValue::Colors(result))
+            } else {
+                Err(())
+            }
+        }
+    </%helpers:longhand>
 % endfor
 
 ${helpers.single_keyword("box-decoration-break", "slice clone",
                          gecko_enum_prefix="StyleBoxDecorationBreak",
                          gecko_inexhaustive=True,
                          spec="https://drafts.csswg.org/css-break/#propdef-box-decoration-break",
-                         products="gecko", animation_type="none")}
+                         products="gecko", animation_value_type="none")}
 
 ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
                          gecko_ffi_name="mFloatEdge",
@@ -85,9 +209,9 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
                          gecko_inexhaustive=True,
                          products="gecko",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-float-edge)",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
-<%helpers:longhand name="border-image-source" animation_type="none" boxed="True"
+<%helpers:longhand name="border-image-source" animation_value_type="none" boxed="True"
                    spec="https://drafts.csswg.org/css-backgrounds/#border-image-source">
     use std::fmt;
     use style_traits::ToCss;
@@ -163,7 +287,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="border-image-outset" animation_type="none"
+<%helpers:longhand name="border-image-outset" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-backgrounds/#border-image-outset">
     use std::fmt;
     use style_traits::ToCss;
@@ -279,7 +403,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="border-image-repeat" animation_type="none"
+<%helpers:longhand name="border-image-repeat" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-backgrounds/#border-image-repeat">
     use std::fmt;
     use style_traits::ToCss;
@@ -357,7 +481,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="border-image-width" animation_type="none"
+<%helpers:longhand name="border-image-width" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-backgrounds/#border-image-width">
     use std::fmt;
     use style_traits::ToCss;
@@ -557,7 +681,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="border-image-slice" boxed="True" animation_type="none"
+<%helpers:longhand name="border-image-slice" boxed="True" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-backgrounds/#border-image-slice">
     use std::fmt;
     use style_traits::ToCss;
diff --git a/servo/components/style/properties/longhand/box.mako.rs b/servo/components/style/properties/longhand/box.mako.rs
index e07e974fe829..73adf4aa3351 100644
--- a/servo/components/style/properties/longhand/box.mako.rs
+++ b/servo/components/style/properties/longhand/box.mako.rs
@@ -12,7 +12,7 @@
 // TODO(SimonSapin): don't parse `inline-table`, since we don't support it
 <%helpers:longhand name="display"
                    need_clone="True"
-                   animation_type="none"
+                   animation_value_type="none"
                    custom_cascade="${product == 'servo'}"
                    spec="https://drafts.csswg.org/css-display/#propdef-display">
     <%
@@ -101,13 +101,13 @@
 ${helpers.single_keyword("-moz-top-layer", "none top",
                          gecko_constant_prefix="NS_STYLE_TOP_LAYER",
                          gecko_ffi_name="mTopLayer", need_clone=True,
-                         products="gecko", animation_type="none", internal=True,
+                         products="gecko", animation_value_type="none", internal=True,
                          spec="Internal (not web-exposed)")}
 
 ${helpers.single_keyword("position", "static absolute relative fixed",
                          need_clone="True",
                          extra_gecko_values="sticky",
-                         animation_type="none",
+                         animation_value_type="none",
                          flags="CREATES_STACKING_CONTEXT ABSPOS_CB",
                          spec="https://drafts.csswg.org/css-position/#position-property")}
 
@@ -116,7 +116,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
                                   // https://drafts.csswg.org/css-logical-props/#float-clear
                                   extra_specified="inline-start inline-end"
                                   needs_conversion="True"
-                                  animation_type="none"
+                                  animation_value_type="none"
                                   need_clone="True"
                                   gecko_enum_prefix="StyleFloat"
                                   gecko_inexhaustive="True"
@@ -157,7 +157,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
                                   // https://drafts.csswg.org/css-logical-props/#float-clear
                                   extra_specified="inline-start inline-end"
                                   needs_conversion="True"
-                                  animation_type="none"
+                                  animation_value_type="none"
                                   gecko_enum_prefix="StyleClear"
                                   gecko_ffi_name="mBreakType"
                                   spec="https://www.w3.org/TR/CSS2/visuren.html#flow-control">
@@ -192,7 +192,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
 </%helpers:single_keyword_computed>
 
 <%helpers:longhand name="-servo-display-for-hypothetical-box"
-                   animation_type="none"
+                   animation_value_type="none"
                    derived_from="display"
                    products="servo"
                    spec="Internal (not web-exposed)">
@@ -211,7 +211,7 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
 
 </%helpers:longhand>
 
-<%helpers:longhand name="vertical-align" animation_type="normal"
+<%helpers:longhand name="vertical-align" animation_value_type="ComputedValue"
                    spec="https://www.w3.org/TR/CSS2/visudet.html#propdef-vertical-align">
     use std::fmt;
     use style_traits::ToCss;
@@ -342,24 +342,24 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
 // CSS 2.1, Section 11 - Visual effects
 
 ${helpers.single_keyword("-servo-overflow-clip-box", "padding-box content-box",
-    products="servo", animation_type="none", internal=True,
+    products="servo", animation_value_type="none", internal=True,
     spec="Internal, not web-exposed, \
           may be standardized in the future (https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-clip-box)")}
 
 ${helpers.single_keyword("overflow-clip-box", "padding-box content-box",
-    products="gecko", animation_type="none", internal=True,
+    products="gecko", animation_value_type="none", internal=True,
     spec="Internal, not web-exposed, \
           may be standardized in the future (https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-clip-box)")}
 
 // FIXME(pcwalton, #2742): Implement scrolling for `scroll` and `auto`.
 ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
                          extra_gecko_values="clip",
-                         need_clone=True, animation_type="none",
+                         need_clone=True, animation_value_type="none",
                          gecko_constant_prefix="NS_STYLE_OVERFLOW",
                          spec="https://drafts.csswg.org/css-overflow/#propdef-overflow-x")}
 
 // FIXME(pcwalton, #2742): Implement scrolling for `scroll` and `auto`.
-<%helpers:longhand name="overflow-y" need_clone="True" animation_type="none"
+<%helpers:longhand name="overflow-y" need_clone="True" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-overflow/#propdef-overflow-y">
     use super::overflow_x;
 
@@ -406,7 +406,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="transition-duration"
                           need_index="True"
-                          animation_type="none"
+                          animation_value_type="none"
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-transitions/#propdef-transition-duration">
     use values::specified::Time;
@@ -437,7 +437,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 // TODO(pcwalton): Lots more timing functions.
 <%helpers:vector_longhand name="transition-timing-function"
                           need_index="True"
-                          animation_type="none"
+                          animation_value_type="none"
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function">
     use self::computed_value::StartEnd;
@@ -729,7 +729,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 <%helpers:vector_longhand name="transition-property"
                           allow_empty="True"
                           need_index="True"
-                          animation_type="none"
+                          animation_value_type="none"
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-transitions/#propdef-transition-property">
 
@@ -762,7 +762,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="transition-delay"
                           need_index="True"
-                          animation_type="none"
+                          animation_value_type="none"
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-transitions/#propdef-transition-delay">
     pub use properties::longhands::transition_duration::single_value::SpecifiedValue;
@@ -773,7 +773,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="animation-name"
                           need_index="True"
-                          animation_type="none",
+                          animation_value_type="none",
                           extra_prefixes="moz webkit"
                           allowed_in_keyframe_block="False"
                           spec="https://drafts.csswg.org/css-animations/#propdef-animation-name">
@@ -854,7 +854,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="animation-duration"
                           need_index="True"
-                          animation_type="none",
+                          animation_value_type="none",
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-animations/#propdef-animation-duration",
                           allowed_in_keyframe_block="False">
@@ -866,7 +866,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="animation-timing-function"
                           need_index="True"
-                          animation_type="none",
+                          animation_value_type="none",
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-animations/#propdef-animation-timing-function",
                           allowed_in_keyframe_block="True">
@@ -879,7 +879,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 
 <%helpers:vector_longhand name="animation-iteration-count"
                           need_index="True"
-                          animation_type="none",
+                          animation_value_type="none",
                           extra_prefixes="moz webkit"
                           spec="https://drafts.csswg.org/css-animations/#propdef-animation-iteration-count",
                           allowed_in_keyframe_block="False">
@@ -948,7 +948,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
 ${helpers.single_keyword("animation-direction",
                          "normal reverse alternate alternate-reverse",
                          need_index=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          vector=True,
                          gecko_enum_prefix="PlaybackDirection",
                          custom_consts=animation_direction_custom_consts,
@@ -962,7 +962,7 @@ ${helpers.single_keyword("animation-play-state",
                          "running paused",
                          need_clone=True,
                          need_index=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          vector=True,
                          extra_prefixes="moz webkit",
                          spec="https://drafts.csswg.org/css-animations/#propdef-animation-play-state",
@@ -971,7 +971,7 @@ ${helpers.single_keyword("animation-play-state",
 ${helpers.single_keyword("animation-fill-mode",
                          "none forwards backwards both",
                          need_index=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          vector=True,
                          gecko_enum_prefix="FillMode",
                          extra_prefixes="moz webkit",
@@ -980,7 +980,7 @@ ${helpers.single_keyword("animation-fill-mode",
 
 <%helpers:vector_longhand name="animation-delay"
                           need_index="True"
-                          animation_type="none",
+                          animation_value_type="none",
                           extra_prefixes="moz webkit",
                           spec="https://drafts.csswg.org/css-animations/#propdef-animation-delay",
                           allowed_in_keyframe_block="False">
@@ -990,7 +990,7 @@ ${helpers.single_keyword("animation-fill-mode",
     pub use properties::longhands::transition_duration::single_value::SpecifiedValue;
 </%helpers:vector_longhand>
 
-<%helpers:longhand products="gecko" name="scroll-snap-points-y" animation_type="none"
+<%helpers:longhand products="gecko" name="scroll-snap-points-y" animation_value_type="none"
                    spec="Nonstandard (https://www.w3.org/TR/2015/WD-css-snappoints-1-20150326/#scroll-snap-points)">
     use std::fmt;
     use style_traits::ToCss;
@@ -1085,7 +1085,7 @@ ${helpers.single_keyword("animation-fill-mode",
     }
 </%helpers:longhand>
 
-<%helpers:longhand products="gecko" name="scroll-snap-points-x" animation_type="none"
+<%helpers:longhand products="gecko" name="scroll-snap-points-x" animation_value_type="none"
                    spec="Nonstandard (https://www.w3.org/TR/2015/WD-css-snappoints-1-20150326/#scroll-snap-points)">
     pub use super::scroll_snap_points_y::SpecifiedValue;
     pub use super::scroll_snap_points_y::computed_value;
@@ -1100,7 +1100,7 @@ ${helpers.predefined_type("scroll-snap-destination",
                           products="gecko",
                           boxed="True",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
 ${helpers.predefined_type("scroll-snap-coordinate",
                           "Position",
@@ -1108,14 +1108,14 @@ ${helpers.predefined_type("scroll-snap-coordinate",
                           vector=True,
                           products="gecko",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-destination)",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           allow_empty=True,
                           delegate_animate=True)}
 
 
 
 <%helpers:longhand name="transform" extra_prefixes="webkit"
-                   animation_type="normal"
+                   animation_value_type="ComputedValue"
                    flags="CREATES_STACKING_CONTEXT FIXPOS_CB"
                    spec="https://drafts.csswg.org/css-transforms/#propdef-transform">
     use app_units::Au;
@@ -2031,16 +2031,16 @@ ${helpers.single_keyword("scroll-behavior",
                          "auto smooth",
                          products="gecko",
                          spec="https://drafts.csswg.org/cssom-view/#propdef-scroll-behavior",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.single_keyword("scroll-snap-type-x",
                          "none mandatory proximity",
                          products="gecko",
                          gecko_constant_prefix="NS_STYLE_SCROLL_SNAP_TYPE",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-type-x)",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
-<%helpers:longhand products="gecko" name="scroll-snap-type-y" animation_type="none"
+<%helpers:longhand products="gecko" name="scroll-snap-type-y" animation_value_type="none"
                    spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-snap-type-x)">
     pub use super::scroll_snap_type_x::SpecifiedValue;
     pub use super::scroll_snap_type_x::computed_value;
@@ -2055,26 +2055,26 @@ ${helpers.single_keyword("isolation",
                          products="gecko",
                          spec="https://drafts.fxtf.org/compositing/#isolation",
                          flags="CREATES_STACKING_CONTEXT",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 // TODO add support for logical values recto and verso
 ${helpers.single_keyword("page-break-after",
                          "auto always avoid left right",
                          products="gecko",
                          spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-after",
-                         animation_type="none")}
+                         animation_value_type="none")}
 ${helpers.single_keyword("page-break-before",
                          "auto always avoid left right",
                          products="gecko",
                          spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-before",
-                         animation_type="none")}
+                         animation_value_type="none")}
 ${helpers.single_keyword("page-break-inside",
                          "auto avoid",
                          products="gecko",
                          gecko_ffi_name="mBreakInside",
                          gecko_constant_prefix="NS_STYLE_PAGE_BREAK",
                          spec="https://drafts.csswg.org/css2/page.html#propdef-page-break-inside",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 // CSS Basic User Interface Module Level 3
 // http://dev.w3.org/csswg/css-ui
@@ -2083,7 +2083,7 @@ ${helpers.single_keyword("resize",
                          "none both horizontal vertical",
                          products="gecko",
                          spec="https://drafts.csswg.org/css-ui/#propdef-resize",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 
 ${helpers.predefined_type("perspective",
@@ -2094,9 +2094,11 @@ ${helpers.predefined_type("perspective",
                           spec="https://drafts.csswg.org/css-transforms/#perspective",
                           extra_prefixes="moz webkit",
                           flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
-<%helpers:longhand name="perspective-origin" boxed="True" animation_type="normal" extra_prefixes="moz webkit"
+<%helpers:longhand name="perspective-origin" boxed="True"
+                   animation_value_type="ComputedValue"
+                   extra_prefixes="moz webkit"
                    spec="https://drafts.csswg.org/css-transforms/#perspective-origin-property">
     use std::fmt;
     use style_traits::ToCss;
@@ -2176,14 +2178,14 @@ ${helpers.single_keyword("backface-visibility",
                          "visible hidden",
                          spec="https://drafts.csswg.org/css-transforms/#backface-visibility-property",
                          extra_prefixes="moz webkit",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.single_keyword("transform-box",
                          "border-box fill-box view-box",
                          gecko_enum_prefix="StyleGeometryBox",
                          products="gecko",
                          spec="https://drafts.csswg.org/css-transforms/#transform-box",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 // `auto` keyword is not supported in gecko yet.
 ${helpers.single_keyword("transform-style",
@@ -2192,9 +2194,9 @@ ${helpers.single_keyword("transform-style",
                          spec="https://drafts.csswg.org/css-transforms/#transform-style-property",
                          extra_prefixes="moz webkit",
                          flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
-<%helpers:longhand name="transform-origin" animation_type="normal" extra_prefixes="moz webkit" boxed="True"
+<%helpers:longhand name="transform-origin" animation_value_type="ComputedValue" extra_prefixes="moz webkit" boxed="True"
                    spec="https://drafts.csswg.org/css-transforms/#transform-origin-property">
     use app_units::Au;
     use std::fmt;
@@ -2320,7 +2322,7 @@ ${helpers.single_keyword("transform-style",
 // FIXME: `size` and `content` values are not implemented and `strict` is implemented
 // like `content`(layout style paint) in gecko. We should implement `size` and `content`,
 // also update the glue once they are implemented in gecko.
-<%helpers:longhand name="contain" animation_type="none" products="gecko" need_clone="True"
+<%helpers:longhand name="contain" animation_value_type="none" products="gecko" need_clone="True"
                    spec="https://drafts.csswg.org/css-contain/#contain-property">
     use std::fmt;
     use style_traits::ToCss;
@@ -2420,7 +2422,7 @@ ${helpers.single_keyword("appearance",
                          products="gecko",
                          spec="https://drafts.csswg.org/css-ui-4/#appearance-switching",
                          alias="-webkit-appearance",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 // Non-standard
 ${helpers.single_keyword("-moz-appearance",
@@ -2450,11 +2452,11 @@ ${helpers.single_keyword("-moz-appearance",
                          gecko_constant_prefix="NS_THEME",
                          products="gecko",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-appearance)",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.predefined_type("-moz-binding", "UrlOrNone", "Either::Second(None_)",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           gecko_ffi_name="mBinding",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-binding)",
                           disable_when_testing="True")}
@@ -2465,9 +2467,9 @@ ${helpers.single_keyword("-moz-orient",
                           gecko_ffi_name="mOrient",
                           gecko_enum_prefix="StyleOrient",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-orient)",
-                          animation_type="none")}
+                          animation_value_type="none")}
 
-<%helpers:longhand name="will-change" products="gecko" animation_type="none"
+<%helpers:longhand name="will-change" products="gecko" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-will-change/#will-change">
     use cssparser::serialize_identifier;
     use std::fmt;
@@ -2531,7 +2533,7 @@ ${helpers.single_keyword("-moz-orient",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="shape-outside" products="gecko" animation_type="none" boxed="True"
+<%helpers:longhand name="shape-outside" products="gecko" animation_value_type="none" boxed="True"
                    spec="https://drafts.csswg.org/css-shapes/#shape-outside-property">
     use std::fmt;
     use style_traits::ToCss;
diff --git a/servo/components/style/properties/longhand/color.mako.rs b/servo/components/style/properties/longhand/color.mako.rs
index 0474bcb837d6..4fae6d6e33f3 100644
--- a/servo/components/style/properties/longhand/color.mako.rs
+++ b/servo/components/style/properties/longhand/color.mako.rs
@@ -8,7 +8,8 @@
 
 <% from data import to_rust_ident %>
 
-<%helpers:longhand name="color" need_clone="True" animation_type="normal"
+<%helpers:longhand name="color" need_clone="True"
+                   animation_value_type="IntermediateRGBA"
                    spec="https://drafts.csswg.org/css-color/#color">
     use cssparser::RGBA;
     use std::fmt;
diff --git a/servo/components/style/properties/longhand/column.mako.rs b/servo/components/style/properties/longhand/column.mako.rs
index fef81ca9ac4e..64d8c86b7f42 100644
--- a/servo/components/style/properties/longhand/column.mako.rs
+++ b/servo/components/style/properties/longhand/column.mako.rs
@@ -12,7 +12,7 @@ ${helpers.predefined_type("column-width",
                           initial_specified_value="Either::Second(Auto)",
                           parse_method="parse_non_negative_length",
                           extra_prefixes="moz",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           experimental=True,
                           spec="https://drafts.csswg.org/css-multicol/#propdef-column-width")}
 
@@ -23,7 +23,7 @@ ${helpers.predefined_type("column-count",
                           parse_method="parse_positive",
                           initial_specified_value="Either::Second(Auto)",
                           experimental="True",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           extra_prefixes="moz",
                           spec="https://drafts.csswg.org/css-multicol/#propdef-column-count")}
 
@@ -33,15 +33,15 @@ ${helpers.predefined_type("column-gap",
                           parse_method='parse_non_negative_length',
                           extra_prefixes="moz",
                           experimental=True,
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           spec="https://drafts.csswg.org/css-multicol/#propdef-column-gap")}
 
 ${helpers.single_keyword("column-fill", "balance auto", extra_prefixes="moz",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-multicol/#propdef-column-fill")}
 
 // https://drafts.csswg.org/css-multicol-1/#propdef-column-rule-width
-<%helpers:longhand name="column-rule-width" products="gecko" animation_type="normal" extra_prefixes="moz"
+<%helpers:longhand name="column-rule-width" products="gecko" animation_value_type="ComputedValue" extra_prefixes="moz"
                    spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-width">
     use app_units::Au;
     use std::fmt;
@@ -75,18 +75,18 @@ ${helpers.single_keyword("column-fill", "balance auto", extra_prefixes="moz",
 ${helpers.predefined_type("column-rule-color", "CSSColor",
                           "::cssparser::Color::CurrentColor",
                           initial_specified_value="specified::CSSColor::currentcolor()",
-                          products="gecko", animation_type="normal", extra_prefixes="moz",
+                          products="gecko", animation_value_type="IntermediateColor", extra_prefixes="moz",
                           complex_color=True, need_clone=True,
                           spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-color")}
 
 // It's not implemented in servo or gecko yet.
 ${helpers.single_keyword("column-span", "none all",
-                         products="none", animation_type="none",
+                         products="none", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-multicol/#propdef-column-span")}
 
 ${helpers.single_keyword("column-rule-style",
                          "none hidden dotted dashed solid double groove ridge inset outset",
                          products="gecko", extra_prefixes="moz",
                          gecko_constant_prefix="NS_STYLE_BORDER_STYLE",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-style")}
diff --git a/servo/components/style/properties/longhand/counters.mako.rs b/servo/components/style/properties/longhand/counters.mako.rs
index 6d0c26808da1..c8dc8ebb4ce6 100644
--- a/servo/components/style/properties/longhand/counters.mako.rs
+++ b/servo/components/style/properties/longhand/counters.mako.rs
@@ -6,7 +6,7 @@
 
 <% data.new_style_struct("Counters", inherited=False, gecko_name="Content") %>
 
-<%helpers:longhand name="content" boxed="True" animation_type="none"
+<%helpers:longhand name="content" boxed="True" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-content/#propdef-content">
     use cssparser::Token;
     use std::ascii::AsciiExt;
@@ -235,7 +235,7 @@
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="counter-increment" animation_type="none"
+<%helpers:longhand name="counter-increment" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-lists/#propdef-counter-increment">
     use std::fmt;
     use style_traits::ToCss;
@@ -362,7 +362,7 @@
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="counter-reset" animation_type="none"
+<%helpers:longhand name="counter-reset" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-lists-3/#propdef-counter-reset">
     pub use super::counter_increment::{SpecifiedValue, computed_value, get_initial_value};
     use super::counter_increment::parse_common;
diff --git a/servo/components/style/properties/longhand/effects.mako.rs b/servo/components/style/properties/longhand/effects.mako.rs
index efc7b48088e4..7fde2f816e28 100644
--- a/servo/components/style/properties/longhand/effects.mako.rs
+++ b/servo/components/style/properties/longhand/effects.mako.rs
@@ -10,12 +10,13 @@
 ${helpers.predefined_type("opacity",
                           "Opacity",
                           "1.0",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           flags="CREATES_STACKING_CONTEXT",
                           spec="https://drafts.csswg.org/css-color/#opacity")}
 
 <%helpers:vector_longhand name="box-shadow" allow_empty="True"
-                          animation_type="normal" extra_prefixes="webkit"
+                          animation_value_type="IntermediateBoxShadowList"
+                          extra_prefixes="webkit"
                           spec="https://drafts.csswg.org/css-backgrounds/#box-shadow">
     use cssparser;
     use std::fmt;
@@ -77,16 +78,15 @@ ${helpers.predefined_type("opacity",
     }
 </%helpers:vector_longhand>
 
-// FIXME: This prop should be animatable
 ${helpers.predefined_type("clip",
                           "ClipRectOrAuto",
                           "computed::ClipRectOrAuto::auto()",
-                          animation_type="none",
+                          animation_value_type="ComputedValue",
                           boxed="True",
                           spec="https://drafts.fxtf.org/css-masking/#clip-property")}
 
 // FIXME: This prop should be animatable
-<%helpers:longhand name="filter" animation_type="none" extra_prefixes="webkit"
+<%helpers:longhand name="filter" animation_value_type="none" extra_prefixes="webkit"
                    flags="CREATES_STACKING_CONTEXT FIXPOS_CB"
                    spec="https://drafts.fxtf.org/filters/#propdef-filter">
     //pub use self::computed_value::T as SpecifiedValue;
@@ -524,6 +524,6 @@ ${helpers.single_keyword("mix-blend-mode",
                          """normal multiply screen overlay darken lighten color-dodge
                             color-burn hard-light soft-light difference exclusion hue
                             saturation color luminosity""", gecko_constant_prefix="NS_STYLE_BLEND",
-                         animation_type="none",
+                         animation_value_type="none",
                          flags="CREATES_STACKING_CONTEXT",
                          spec="https://drafts.fxtf.org/compositing/#propdef-mix-blend-mode")}
diff --git a/servo/components/style/properties/longhand/font.mako.rs b/servo/components/style/properties/longhand/font.mako.rs
index 66ea134733da..b3e166b052d9 100644
--- a/servo/components/style/properties/longhand/font.mako.rs
+++ b/servo/components/style/properties/longhand/font.mako.rs
@@ -62,7 +62,7 @@
     }
 </%def>
 
-<%helpers:longhand name="font-family" animation_type="none" need_index="True"  boxed="${product == 'gecko'}"
+<%helpers:longhand name="font-family" animation_value_type="none" need_index="True"  boxed="${product == 'gecko'}"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-family">
     use properties::longhands::system_font::SystemFont;
     use self::computed_value::{FontFamily, FamilyName};
@@ -333,7 +333,7 @@ ${helpers.single_keyword_system("font-style",
                                 gecko_constant_prefix="NS_FONT_STYLE",
                                 gecko_ffi_name="mFont.style",
                                 spec="https://drafts.csswg.org/css-fonts/#propdef-font-style",
-                                animation_type="none")}
+                                animation_value_type="none")}
 
 
 <% font_variant_caps_custom_consts= { "small-caps": "SMALLCAPS",
@@ -349,9 +349,9 @@ ${helpers.single_keyword_system("font-variant-caps",
                                gecko_ffi_name="mFont.variantCaps",
                                spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-caps",
                                custom_consts=font_variant_caps_custom_consts,
-                               animation_type="none")}
+                               animation_value_type="none")}
 
-<%helpers:longhand name="font-weight" need_clone="True" animation_type="normal"
+<%helpers:longhand name="font-weight" need_clone="True" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-weight">
     use std::fmt;
     use style_traits::ToCss;
@@ -549,7 +549,7 @@ ${helpers.single_keyword_system("font-variant-caps",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="font-size" need_clone="True" animation_type="normal"
+<%helpers:longhand name="font-size" need_clone="True" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-size">
     use app_units::Au;
     use properties::longhands::system_font::SystemFont;
@@ -934,7 +934,7 @@ ${helpers.single_keyword_system("font-variant-caps",
     }
 </%helpers:longhand>
 
-<%helpers:longhand products="gecko" name="font-size-adjust" animation_type="normal"
+<%helpers:longhand products="gecko" name="font-size-adjust" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-size-adjust">
     use properties::longhands::system_font::SystemFont;
     use std::fmt;
@@ -1076,7 +1076,7 @@ ${helpers.single_keyword_system("font-variant-caps",
     }
 </%helpers:longhand>
 
-<%helpers:longhand products="gecko" name="font-synthesis" animation_type="none"
+<%helpers:longhand products="gecko" name="font-synthesis" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-synthesis">
     use std::fmt;
     use style_traits::ToCss;
@@ -1148,7 +1148,7 @@ ${helpers.single_keyword_system("font-stretch",
                                 gecko_constant_prefix="NS_FONT_STRETCH",
                                 cast_type='i16',
                                 spec="https://drafts.csswg.org/css-fonts/#propdef-font-stretch",
-                                animation_type="none")}
+                                animation_value_type="none")}
 
 ${helpers.single_keyword_system("font-kerning",
                                 "auto none normal",
@@ -1156,11 +1156,11 @@ ${helpers.single_keyword_system("font-kerning",
                                 gecko_ffi_name="mFont.kerning",
                                 gecko_constant_prefix="NS_FONT_KERNING",
                                 spec="https://drafts.csswg.org/css-fonts/#propdef-font-stretch",
-                                animation_type="none")}
+                                animation_value_type="none")}
 
 /// FIXME: Implement proper handling of each values.
 /// https://github.com/servo/servo/issues/15957
-<%helpers:longhand name="font-variant-alternates" products="gecko" animation_type="none"
+<%helpers:longhand name="font-variant-alternates" products="gecko" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-alternates">
     use properties::longhands::system_font::SystemFont;
     use std::fmt;
@@ -1296,7 +1296,7 @@ macro_rules! exclusive_value {
     }
 }
 
-<%helpers:longhand name="font-variant-east-asian" products="gecko" animation_type="none"
+<%helpers:longhand name="font-variant-east-asian" products="gecko" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-east-asian">
     use properties::longhands::system_font::SystemFont;
     use std::fmt;
@@ -1437,7 +1437,7 @@ macro_rules! exclusive_value {
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="font-variant-ligatures" products="gecko" animation_type="none"
+<%helpers:longhand name="font-variant-ligatures" products="gecko" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-ligatures">
     use properties::longhands::system_font::SystemFont;
     use std::fmt;
@@ -1588,7 +1588,7 @@ macro_rules! exclusive_value {
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="font-variant-numeric" products="gecko" animation_type="none"
+<%helpers:longhand name="font-variant-numeric" products="gecko" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-numeric">
     use properties::longhands::system_font::SystemFont;
     use std::fmt;
@@ -1738,9 +1738,9 @@ ${helpers.single_keyword_system("font-variant-position",
                                 gecko_ffi_name="mFont.variantPosition",
                                 gecko_constant_prefix="NS_FONT_VARIANT_POSITION",
                                 spec="https://drafts.csswg.org/css-fonts/#propdef-font-variant-position",
-                                animation_type="none")}
+                                animation_value_type="none")}
 
-<%helpers:longhand name="font-feature-settings" products="none" animation_type="none" extra_prefixes="moz"
+<%helpers:longhand name="font-feature-settings" products="none" animation_value_type="none" extra_prefixes="moz"
                    spec="https://drafts.csswg.org/css-fonts/#propdef-font-feature-settings">
     use std::fmt;
     use style_traits::ToCss;
@@ -1850,7 +1850,7 @@ ${helpers.single_keyword_system("font-variant-position",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="font-language-override" products="gecko" animation_type="none"
+<%helpers:longhand name="font-language-override" products="gecko" animation_value_type="none"
                    extra_prefixes="moz" boxed="True"
                    spec="https://drafts.csswg.org/css-fonts-3/#propdef-font-language-override">
     use properties::longhands::system_font::SystemFont;
@@ -1990,7 +1990,7 @@ ${helpers.single_keyword_system("font-variant-position",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="-x-lang" products="gecko" animation_type="none" internal="True"
+<%helpers:longhand name="-x-lang" products="gecko" animation_value_type="none" internal="True"
                    spec="Internal (not web-exposed)">
     use values::HasViewportPercentage;
     use values::computed::ComputedValueAsSpecified;
@@ -2027,7 +2027,7 @@ ${helpers.single_keyword_system("font-variant-position",
 </%helpers:longhand>
 
 // MathML properties
-<%helpers:longhand name="-moz-script-size-multiplier" products="gecko" animation_type="none"
+<%helpers:longhand name="-moz-script-size-multiplier" products="gecko" animation_value_type="none"
                    predefined_type="Number" gecko_ffi_name="mScriptSizeMultiplier"
                    spec="Internal (not web-exposed)"
                    internal="True" disable_when_testing="True">
@@ -2053,7 +2053,7 @@ ${helpers.single_keyword_system("font-variant-position",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="-moz-script-level" products="gecko" animation_type="none"
+<%helpers:longhand name="-moz-script-level" products="gecko" animation_value_type="none"
                    predefined_type="Integer" gecko_ffi_name="mScriptLevel"
                    spec="Internal (not web-exposed)"
                    internal="True" disable_when_testing="True" need_clone="True">
@@ -2136,7 +2136,7 @@ ${helpers.single_keyword("-moz-math-display",
                          gecko_ffi_name="mMathDisplay",
                          products="gecko",
                          spec="Internal (not web-exposed)",
-                         animation_type="none",
+                         animation_value_type="none",
                          need_clone="True")}
 
 ${helpers.single_keyword("-moz-math-variant",
@@ -2148,10 +2148,10 @@ ${helpers.single_keyword("-moz-math-variant",
                          gecko_ffi_name="mMathVariant",
                          products="gecko",
                          spec="Internal (not web-exposed)",
-                         animation_type="none",
+                         animation_value_type="none",
                          needs_conversion=True)}
 
-<%helpers:longhand name="-moz-script-min-size" products="gecko" animation_type="none"
+<%helpers:longhand name="-moz-script-min-size" products="gecko" animation_value_type="none"
                    predefined_type="Length" gecko_ffi_name="mScriptMinSize"
                    spec="Internal (not web-exposed)"
                    internal="True" disable_when_testing="True">
diff --git a/servo/components/style/properties/longhand/inherited_box.mako.rs b/servo/components/style/properties/longhand/inherited_box.mako.rs
index f919a95d4068..01ee640f8525 100644
--- a/servo/components/style/properties/longhand/inherited_box.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_box.mako.rs
@@ -11,7 +11,7 @@ ${helpers.single_keyword("visibility",
                          "visible hidden",
                          extra_gecko_values="collapse",
                          gecko_ffi_name="mVisible",
-                         animation_type="normal",
+                         animation_value_type="ComputedValue",
                          spec="https://drafts.csswg.org/css-box/#propdef-visibility")}
 
 // CSS Writing Modes Level 3
@@ -24,10 +24,10 @@ ${helpers.single_keyword("writing-mode",
                                               tb=vertical-rl   tb-rl=vertical-rl",
                          experimental=True,
                          need_clone=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-writing-modes/#propdef-writing-mode")}
 
-${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animation_type="none",
+${helpers.single_keyword("direction", "ltr rtl", need_clone=True, animation_value_type="none",
                          spec="https://drafts.csswg.org/css-writing-modes/#propdef-direction",
                          needs_conversion=True)}
 
@@ -36,14 +36,14 @@ ${helpers.single_keyword("text-orientation",
                          extra_gecko_aliases="sideways-right=sideways",
                          products="gecko",
                          need_clone=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-writing-modes/#propdef-text-orientation")}
 
 // CSS Color Module Level 4
 // https://drafts.csswg.org/css-color/
 ${helpers.single_keyword("color-adjust",
                          "economy exact", products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-color/#propdef-color-adjust")}
 
 <% image_rendering_custom_consts = { "crisp-edges": "CRISPEDGES",
@@ -55,13 +55,13 @@ ${helpers.single_keyword("image-rendering",
                          extra_gecko_values="optimizespeed optimizequality -moz-crisp-edges",
                          extra_servo_values="pixelated crisp-edges",
                          custom_consts=image_rendering_custom_consts,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-images/#propdef-image-rendering")}
 
 // Image Orientation
 <%helpers:longhand name="image-orientation"
                    products="gecko"
-                   animation_type="none"
+                   animation_value_type="none"
     spec="https://drafts.csswg.org/css-images/#propdef-image-orientation, \
       /// additional values in https://developer.mozilla.org/en-US/docs/Web/CSS/image-orientation">
     use std::fmt;
@@ -202,7 +202,7 @@ ${helpers.single_keyword("image-rendering",
 <%helpers:longhand name="-servo-under-display-none"
                    derived_from="display"
                    products="servo"
-                   animation_type="none"
+                   animation_value_type="none"
                    spec="Nonstandard (internal layout use only)">
     use std::fmt;
     use style_traits::ToCss;
diff --git a/servo/components/style/properties/longhand/inherited_svg.mako.rs b/servo/components/style/properties/longhand/inherited_svg.mako.rs
index a11796fcdb94..480f4a7adfb1 100644
--- a/servo/components/style/properties/longhand/inherited_svg.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_svg.mako.rs
@@ -17,51 +17,51 @@
 ${helpers.single_keyword("text-anchor",
                          "start middle end",
                          products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG/text.html#TextAnchorProperty")}
 
 // Section 11 - Painting: Filling, Stroking and Marker Symbols
 ${helpers.single_keyword("color-interpolation",
                          "srgb auto linearrgb",
                          products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperty")}
 
 ${helpers.single_keyword("color-interpolation-filters", "linearrgb auto srgb",
                          products="gecko",
                          gecko_constant_prefix="NS_STYLE_COLOR_INTERPOLATION",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationFiltersProperty")}
 
 ${helpers.predefined_type(
     "fill", "SVGPaint",
     "::values::computed::SVGPaint::black()",
     products="gecko",
-    animation_type="none",
+    animation_value_type="none",
     boxed=True,
     spec="https://www.w3.org/TR/SVG2/painting.html#SpecifyingFillPaint")}
 
 ${helpers.predefined_type("fill-opacity", "Opacity", "1.0",
-                          products="gecko", animation_type="none",
+                          products="gecko", animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG11/painting.html#FillOpacityProperty")}
 
 ${helpers.single_keyword("fill-rule", "nonzero evenodd",
                          gecko_enum_prefix="StyleFillRule",
                          gecko_inexhaustive=True,
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#FillRuleProperty")}
 
 ${helpers.single_keyword("shape-rendering",
                          "auto optimizespeed crispedges geometricprecision",
                          products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#ShapeRenderingProperty")}
 
 ${helpers.predefined_type(
     "stroke", "SVGPaint",
     "Default::default()",
     products="gecko",
-    animation_type="none",
+    animation_value_type="none",
     boxed=True,
     spec="https://www.w3.org/TR/SVG2/painting.html#SpecifyingStrokePaint")}
 
@@ -70,24 +70,24 @@ ${helpers.predefined_type(
     "computed::LengthOrPercentage::one()",
     "parse_numbers_are_pixels_non_negative",
     products="gecko",
-    animation_type="normal",
+    animation_value_type="ComputedValue",
     spec="https://www.w3.org/TR/SVG2/painting.html#StrokeWidth")}
 
 ${helpers.single_keyword("stroke-linecap", "butt round square",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#StrokeLinecapProperty")}
 
 ${helpers.single_keyword("stroke-linejoin", "miter round bevel",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#StrokeLinejoinProperty")}
 
 ${helpers.predefined_type("stroke-miterlimit", "Number", "4.0",
                           "parse_at_least_one", products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty")}
 
 ${helpers.predefined_type("stroke-opacity", "Opacity", "1.0",
-                          products="gecko", animation_type="none",
+                          products="gecko", animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG11/painting.html#StrokeOpacityProperty")}
 
 ${helpers.predefined_type("stroke-dasharray",
@@ -97,7 +97,7 @@ ${helpers.predefined_type("stroke-dasharray",
                           vector="True",
                           allow_empty="True",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           space_separated_allowed="True",
                           spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")}
 
@@ -106,7 +106,7 @@ ${helpers.predefined_type(
     "computed::LengthOrPercentage::zero()",
     "parse_numbers_are_pixels",
     products="gecko",
-    animation_type="normal",
+    animation_value_type="ComputedValue",
     spec="https://www.w3.org/TR/SVG2/painting.html#StrokeDashing")}
 
 // Section 14 - Clipping, Masking and Compositing
@@ -114,26 +114,26 @@ ${helpers.single_keyword("clip-rule", "nonzero evenodd",
                          products="gecko",
                          gecko_enum_prefix="StyleFillRule",
                          gecko_inexhaustive=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/masking.html#ClipRuleProperty")}
 
 ${helpers.predefined_type("marker-start", "UrlOrNone", "Either::Second(None_)",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")}
 
 ${helpers.predefined_type("marker-mid", "UrlOrNone", "Either::Second(None_)",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")}
 
 ${helpers.predefined_type("marker-end", "UrlOrNone", "Either::Second(None_)",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG2/painting.html#VertexMarkerProperties")}
 
 <%helpers:longhand name="paint-order"
-                   animation_type="none"
+                   animation_value_type="none"
                    products="gecko"
                    spec="https://www.w3.org/TR/SVG2/painting.html#PaintOrder">
 
diff --git a/servo/components/style/properties/longhand/inherited_table.mako.rs b/servo/components/style/properties/longhand/inherited_table.mako.rs
index c202d0abe62e..3069482976ed 100644
--- a/servo/components/style/properties/longhand/inherited_table.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_table.mako.rs
@@ -8,19 +8,19 @@
 
 ${helpers.single_keyword("border-collapse", "separate collapse",
                          gecko_constant_prefix="NS_STYLE_BORDER",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-tables/#propdef-border-collapse")}
 ${helpers.single_keyword("empty-cells", "show hide",
                          gecko_constant_prefix="NS_STYLE_TABLE_EMPTY_CELLS",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-tables/#propdef-empty-cells")}
 ${helpers.single_keyword("caption-side", "top bottom",
                          extra_gecko_values="right left top-outside bottom-outside",
                          needs_conversion="True",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-tables/#propdef-caption-side")}
 
-<%helpers:longhand name="border-spacing" animation_type="none" boxed="True"
+<%helpers:longhand name="border-spacing" animation_value_type="none" boxed="True"
                    spec="https://drafts.csswg.org/css-tables/#propdef-border-spacing">
     use app_units::Au;
     use std::fmt;
diff --git a/servo/components/style/properties/longhand/inherited_text.mako.rs b/servo/components/style/properties/longhand/inherited_text.mako.rs
index 0b1cf0a0229e..f47178e9c76e 100644
--- a/servo/components/style/properties/longhand/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_text.mako.rs
@@ -6,7 +6,7 @@
 <% from data import Keyword %>
 <% data.new_style_struct("InheritedText", inherited=True, gecko_name="Text") %>
 
-<%helpers:longhand name="line-height" animation_type="normal"
+<%helpers:longhand name="line-height" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css2/visudet.html#propdef-line-height">
     use std::fmt;
     use style_traits::ToCss;
@@ -165,25 +165,25 @@
 ${helpers.single_keyword("text-transform",
                          "none capitalize uppercase lowercase",
                          extra_gecko_values="full-width",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-text/#propdef-text-transform")}
 
 ${helpers.single_keyword("hyphens", "manual none auto",
                          gecko_enum_prefix="StyleHyphens",
-                         products="gecko", animation_type="none", extra_prefixes="moz",
+                         products="gecko", animation_value_type="none", extra_prefixes="moz",
                          spec="https://drafts.csswg.org/css-text/#propdef-hyphens")}
 
 // TODO: Support <percentage>
 ${helpers.single_keyword("-moz-text-size-adjust", "auto none",
                          gecko_constant_prefix="NS_STYLE_TEXT_SIZE_ADJUST",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-size-adjust/#adjustment-control",
                          alias="-webkit-text-size-adjust")}
 
 ${helpers.predefined_type("text-indent",
                           "LengthOrPercentage",
                           "computed::LengthOrPercentage::Length(Au(0))",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           spec="https://drafts.csswg.org/css-text/#propdef-text-indent")}
 
 // Also known as "word-wrap" (which is more popular because of IE), but this is the preferred
@@ -191,7 +191,7 @@ ${helpers.predefined_type("text-indent",
 ${helpers.single_keyword("overflow-wrap",
                          "normal break-word",
                          gecko_constant_prefix="NS_STYLE_OVERFLOWWRAP",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap",
                          alias="word-wrap")}
 
@@ -199,7 +199,7 @@ ${helpers.single_keyword("overflow-wrap",
 ${helpers.single_keyword("word-break",
                          "normal break-all keep-all",
                          gecko_constant_prefix="NS_STYLE_WORDBREAK",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-text/#propdef-word-break")}
 
 // TODO(pcwalton): Support `text-justify: distribute`.
@@ -208,7 +208,7 @@ ${helpers.single_keyword("word-break",
                                   extra_gecko_values="inter-character"
                                   extra_specified="${'distribute' if product == 'gecko' else ''}"
                                   gecko_enum_prefix="StyleTextJustify"
-                                  animation_type="none"
+                                  animation_value_type="none"
                                   spec="https://drafts.csswg.org/css-text/#propdef-text-justify">
     use values::HasViewportPercentage;
     no_viewport_percentage!(SpecifiedValue);
@@ -248,11 +248,11 @@ ${helpers.single_keyword("text-align-last",
                          "auto start end left right center justify",
                          products="gecko",
                          gecko_constant_prefix="NS_STYLE_TEXT_ALIGN",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-text/#propdef-text-align-last")}
 
 // TODO make this a shorthand and implement text-align-last/text-align-all
-<%helpers:longhand name="text-align" animation_type="none" need_clone="True"
+<%helpers:longhand name="text-align" animation_value_type="none" need_clone="True"
                    spec="https://drafts.csswg.org/css-text/#propdef-text-align">
     use values::computed::ComputedValueAsSpecified;
     use values::HasViewportPercentage;
@@ -406,7 +406,7 @@ ${helpers.single_keyword("text-align-last",
     % endif
 </%helpers:longhand>
 
-<%helpers:longhand name="letter-spacing" animation_type="normal"
+<%helpers:longhand name="letter-spacing" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-text/#propdef-letter-spacing">
     use std::fmt;
     use style_traits::ToCss;
@@ -492,7 +492,7 @@ ${helpers.single_keyword("text-align-last",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="word-spacing" animation_type="normal"
+<%helpers:longhand name="word-spacing" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-text/#propdef-word-spacing">
     use std::fmt;
     use style_traits::ToCss;
@@ -581,7 +581,7 @@ ${helpers.single_keyword("text-align-last",
 <%helpers:longhand name="-servo-text-decorations-in-effect"
                    derived_from="display text-decoration"
                    need_clone="True" products="servo"
-                   animation_type="none"
+                   animation_value_type="none"
                    spec="Nonstandard (Internal property used by Servo)">
     use cssparser::RGBA;
     use std::fmt;
@@ -669,7 +669,7 @@ ${helpers.single_keyword("text-align-last",
                                   extra_gecko_values="-moz-pre-space"
                                   gecko_constant_prefix="NS_STYLE_WHITESPACE"
                                   needs_conversion="True"
-                                  animation_type="none"
+                                  animation_value_type="none"
                                   spec="https://drafts.csswg.org/css-text/#propdef-white-space">
     use values::computed::ComputedValueAsSpecified;
     use values::HasViewportPercentage;
@@ -711,7 +711,8 @@ ${helpers.single_keyword("text-align-last",
     % endif
 </%helpers:single_keyword_computed>
 
-<%helpers:longhand name="text-shadow" animation_type="normal"
+<%helpers:longhand name="text-shadow"
+                   animation_value_type="IntermediateTextShadowList",
                    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-shadow">
     use cssparser;
     use std::fmt;
@@ -921,7 +922,8 @@ ${helpers.single_keyword("text-align-last",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="text-emphasis-style" products="gecko" need_clone="True" boxed="True" animation_type="none"
+<%helpers:longhand name="text-emphasis-style" products="gecko" need_clone="True" boxed="True"
+                   animation_value_type="none"
                    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-style">
     use computed_values::writing_mode::T as writing_mode;
     use std::fmt;
@@ -1129,7 +1131,7 @@ ${helpers.single_keyword("text-align-last",
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="text-emphasis-position" animation_type="none" products="gecko"
+<%helpers:longhand name="text-emphasis-position" animation_value_type="none" products="gecko"
                    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-position">
     use std::fmt;
     use values::computed::ComputedValueAsSpecified;
@@ -1204,7 +1206,7 @@ ${helpers.single_keyword("text-align-last",
 ${helpers.predefined_type("text-emphasis-color", "CSSColor",
                           "::cssparser::Color::CurrentColor",
                           initial_specified_value="specified::CSSColor::currentcolor()",
-                          products="gecko", animation_type="normal",
+                          products="gecko", animation_value_type="IntermediateColor",
                           complex_color=True, need_clone=True,
                           spec="https://drafts.csswg.org/css-text-decor/#propdef-text-emphasis-color")}
 
@@ -1213,7 +1215,7 @@ ${helpers.predefined_type(
     "-moz-tab-size", "LengthOrNumber",
     "::values::Either::Second(8.0)",
     "parse_non_negative",
-    products="gecko", animation_type="none",
+    products="gecko", animation_value_type="none",
     spec="https://drafts.csswg.org/css-text-3/#tab-size-property")}
 
 
@@ -1222,7 +1224,7 @@ ${helpers.predefined_type(
 ${helpers.predefined_type(
     "-webkit-text-fill-color", "CSSColor",
     "CSSParserColor::CurrentColor",
-    products="gecko", animation_type="normal",
+    products="gecko", animation_value_type="IntermediateColor",
     complex_color=True, need_clone=True,
     spec="https://compat.spec.whatwg.org/#the-webkit-text-fill-color")}
 
@@ -1230,11 +1232,11 @@ ${helpers.predefined_type(
     "-webkit-text-stroke-color", "CSSColor",
     "CSSParserColor::CurrentColor",
     initial_specified_value="specified::CSSColor::currentcolor()",
-    products="gecko", animation_type="normal",
+    products="gecko", animation_value_type="IntermediateColor",
     complex_color=True, need_clone=True,
     spec="https://compat.spec.whatwg.org/#the-webkit-text-stroke-color")}
 
-<%helpers:longhand products="gecko" name="-webkit-text-stroke-width" animation_type="none"
+<%helpers:longhand products="gecko" name="-webkit-text-stroke-width" animation_value_type="none"
                    spec="https://compat.spec.whatwg.org/#the-webkit-text-stroke-width">
     use app_units::Au;
     use std::fmt;
@@ -1266,22 +1268,22 @@ ${helpers.predefined_type(
 // CSS Ruby Layout Module Level 1
 // https://drafts.csswg.org/css-ruby/
 ${helpers.single_keyword("ruby-align", "space-around start center space-between",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-ruby/#ruby-align-property")}
 
 ${helpers.single_keyword("ruby-position", "over under",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-ruby/#ruby-position-property")}
 
 // CSS Writing Modes Module Level 3
 // https://drafts.csswg.org/css-writing-modes-3/
 
 ${helpers.single_keyword("text-combine-upright", "none all",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-writing-modes-3/#text-combine-upright")}
 
 // SVG 1.1: Section 11 - Painting: Filling, Stroking and Marker Symbols
 ${helpers.single_keyword("text-rendering",
                          "auto optimizespeed optimizelegibility geometricprecision",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://www.w3.org/TR/SVG11/painting.html#TextRenderingProperty")}
diff --git a/servo/components/style/properties/longhand/list.mako.rs b/servo/components/style/properties/longhand/list.mako.rs
index 514e3bd6133d..cf9cc65122db 100644
--- a/servo/components/style/properties/longhand/list.mako.rs
+++ b/servo/components/style/properties/longhand/list.mako.rs
@@ -6,7 +6,7 @@
 
 <% data.new_style_struct("List", inherited=True) %>
 
-${helpers.single_keyword("list-style-position", "outside inside", animation_type="none",
+${helpers.single_keyword("list-style-position", "outside inside", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-lists/#propdef-list-style-position")}
 
 // TODO(pcwalton): Implement the full set of counter styles per CSS-COUNTER-STYLES [1] 6.1:
@@ -34,14 +34,14 @@ ${helpers.single_keyword("list-style-type", """
     """,
     gecko_constant_prefix="NS_STYLE_LIST_STYLE",
     needs_conversion="True",
-    animation_type="none",
+    animation_value_type="none",
     spec="https://drafts.csswg.org/css-lists/#propdef-list-style-type")}
 
 ${helpers.predefined_type("list-style-image", "UrlOrNone", "Either::Second(None_)",
-                          initial_specified_value="Either::Second(None_)", animation_type="none",
+                          initial_specified_value="Either::Second(None_)", animation_value_type="none",
                           spec="https://drafts.csswg.org/css-lists/#propdef-list-style-image")}
 
-<%helpers:longhand name="quotes" animation_type="none"
+<%helpers:longhand name="quotes" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-content/#propdef-quotes">
     use cssparser::Token;
     use std::borrow::Cow;
@@ -118,7 +118,7 @@ ${helpers.predefined_type("list-style-image", "UrlOrNone", "Either::Second(None_
 ${helpers.predefined_type("-moz-image-region",
                           "ClipRectOrAuto",
                           "computed::ClipRectOrAuto::auto()",
-                          animation_type="none",
+                          animation_value_type="none",
                           products="gecko",
                           boxed="True",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-image-region)")}
diff --git a/servo/components/style/properties/longhand/margin.mako.rs b/servo/components/style/properties/longhand/margin.mako.rs
index e9a0f2f0a4cf..1fe4e7cca615 100644
--- a/servo/components/style/properties/longhand/margin.mako.rs
+++ b/servo/components/style/properties/longhand/margin.mako.rs
@@ -15,6 +15,6 @@
     ${helpers.predefined_type("margin-%s" % side[0], "LengthOrPercentageOrAuto",
                               "computed::LengthOrPercentageOrAuto::Length(Au(0))",
                               alias=maybe_moz_logical_alias(product, side, "-moz-margin-%s"),
-                              animation_type="normal", logical = side[1], spec = spec,
+                              animation_value_type="ComputedValue", logical = side[1], spec = spec,
                               allowed_in_page_rule=True)}
 % endfor
diff --git a/servo/components/style/properties/longhand/outline.mako.rs b/servo/components/style/properties/longhand/outline.mako.rs
index 810e3ed41c1d..fcfebe6a00e8 100644
--- a/servo/components/style/properties/longhand/outline.mako.rs
+++ b/servo/components/style/properties/longhand/outline.mako.rs
@@ -12,10 +12,10 @@
 // TODO(pcwalton): `invert`
 ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::CurrentColor",
                           initial_specified_value="specified::CSSColor::currentcolor()",
-                          animation_type="normal", complex_color=True, need_clone=True,
+                          animation_value_type="IntermediateColor", complex_color=True, need_clone=True,
                           spec="https://drafts.csswg.org/css-ui/#propdef-outline-color")}
 
-<%helpers:longhand name="outline-style" need_clone="True" animation_type="none"
+<%helpers:longhand name="outline-style" need_clone="True" animation_value_type="none"
                    spec="https://drafts.csswg.org/css-ui/#propdef-outline-style">
 
     use std::fmt;
@@ -64,7 +64,7 @@ ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::Curr
     }
 </%helpers:longhand>
 
-<%helpers:longhand name="outline-width" animation_type="normal"
+<%helpers:longhand name="outline-width" animation_value_type="ComputedValue"
                    spec="https://drafts.csswg.org/css-ui/#propdef-outline-width">
     use app_units::Au;
     use std::fmt;
@@ -124,9 +124,10 @@ ${helpers.predefined_type("outline-color", "CSSColor", "computed::CSSColor::Curr
         "computed::BorderRadiusSize::zero()",
         "parse", products="gecko",
         boxed=True,
-        animation_type="none",
+        animation_value_type="none",
         spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-outline-radius)")}
 % endfor
 
-${helpers.predefined_type("outline-offset", "Length", "Au(0)", products="servo gecko", animation_type="normal",
+${helpers.predefined_type("outline-offset", "Length", "Au(0)", products="servo gecko",
+                          animation_value_type="ComputedValue",
                           spec="https://drafts.csswg.org/css-ui/#propdef-outline-offset")}
diff --git a/servo/components/style/properties/longhand/padding.mako.rs b/servo/components/style/properties/longhand/padding.mako.rs
index 6f2596088ff3..593deb769ac5 100644
--- a/servo/components/style/properties/longhand/padding.mako.rs
+++ b/servo/components/style/properties/longhand/padding.mako.rs
@@ -16,7 +16,7 @@
                               "computed::LengthOrPercentage::Length(Au(0))",
                               "parse_non_negative",
                               alias=maybe_moz_logical_alias(product, side, "-moz-padding-%s"),
-                              animation_type="normal",
+                              animation_value_type="ComputedValue",
                               logical = side[1],
                               spec = spec)}
 % endfor
diff --git a/servo/components/style/properties/longhand/pointing.mako.rs b/servo/components/style/properties/longhand/pointing.mako.rs
index 78f5809e58a7..7a4af51c8cad 100644
--- a/servo/components/style/properties/longhand/pointing.mako.rs
+++ b/servo/components/style/properties/longhand/pointing.mako.rs
@@ -6,7 +6,7 @@
 
 <% data.new_style_struct("Pointing", inherited=True, gecko_name="UserInterface") %>
 
-<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_type="none"
+<%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_value_type="none"
   spec="https://drafts.csswg.org/css-ui/#cursor">
     pub use self::computed_value::T as SpecifiedValue;
     use values::HasViewportPercentage;
@@ -147,7 +147,7 @@
 // NB: `pointer-events: auto` (and use of `pointer-events` in anything that isn't SVG, in fact)
 // is nonstandard, slated for CSS4-UI.
 // TODO(pcwalton): SVG-only values.
-${helpers.single_keyword("pointer-events", "auto none", animation_type="none",
+${helpers.single_keyword("pointer-events", "auto none", animation_value_type="none",
                          extra_gecko_values="visiblepainted visiblefill visiblestroke visible painted fill stroke",
                          spec="https://www.w3.org/TR/SVG11/interact.html#PointerEventsProperty")}
 
@@ -155,14 +155,14 @@ ${helpers.single_keyword("-moz-user-input", "auto none enabled disabled",
                          products="gecko", gecko_ffi_name="mUserInput",
                          gecko_enum_prefix="StyleUserInput",
                          gecko_inexhaustive=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-input)")}
 
 ${helpers.single_keyword("-moz-user-modify", "read-only read-write write-only",
                          products="gecko", gecko_ffi_name="mUserModify",
                          gecko_enum_prefix="StyleUserModify",
                          needs_conversion=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-modify)")}
 
 ${helpers.single_keyword("-moz-user-focus",
@@ -170,13 +170,13 @@ ${helpers.single_keyword("-moz-user-focus",
                          products="gecko", gecko_ffi_name="mUserFocus",
                          gecko_enum_prefix="StyleUserFocus",
                          gecko_inexhaustive=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-user-focus)")}
 
 ${helpers.predefined_type("caret-color",
                           "ColorOrAuto",
                           "Either::Second(Auto)",
                           spec="https://drafts.csswg.org/css-ui/#caret-color",
-                          animation_type="normal",
+                          animation_value_type="Either<IntermediateColor, Auto>",
                           boxed=True,
                           products="gecko")}
diff --git a/servo/components/style/properties/longhand/position.mako.rs b/servo/components/style/properties/longhand/position.mako.rs
index eedab26f4524..3f995b108739 100644
--- a/servo/components/style/properties/longhand/position.mako.rs
+++ b/servo/components/style/properties/longhand/position.mako.rs
@@ -13,21 +13,21 @@
     ${helpers.predefined_type(side, "LengthOrPercentageOrAuto",
                               "computed::LengthOrPercentageOrAuto::Auto",
                               spec="https://www.w3.org/TR/CSS2/visuren.html#propdef-%s" % side,
-                              animation_type="normal")}
+                              animation_value_type="ComputedValue")}
 % endfor
 // offset-* logical properties, map to "top" / "left" / "bottom" / "right"
 % for side in LOGICAL_SIDES:
     ${helpers.predefined_type("offset-%s" % side, "LengthOrPercentageOrAuto",
                               "computed::LengthOrPercentageOrAuto::Auto",
                               spec="https://drafts.csswg.org/css-logical-props/#propdef-offset-%s" % side,
-                              animation_type="normal", logical=True)}
+                              animation_value_type="ComputedValue", logical=True)}
 % endfor
 
 ${helpers.predefined_type("z-index", "IntegerOrAuto",
                           "Either::Second(Auto)",
                           spec="https://www.w3.org/TR/CSS2/visuren.html#z-index",
                           flags="CREATES_STACKING_CONTEXT",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
 
 // CSS Flexible Box Layout Module Level 1
@@ -36,25 +36,25 @@ ${helpers.predefined_type("z-index", "IntegerOrAuto",
 // Flex container properties
 ${helpers.single_keyword("flex-direction", "row row-reverse column column-reverse",
                          spec="https://drafts.csswg.org/css-flexbox/#flex-direction-property",
-                         extra_prefixes="webkit", animation_type="none")}
+                         extra_prefixes="webkit", animation_value_type="none")}
 
 ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse",
                          spec="https://drafts.csswg.org/css-flexbox/#flex-wrap-property",
-                         extra_prefixes="webkit", animation_type="none")}
+                         extra_prefixes="webkit", animation_value_type="none")}
 
 % if product == "servo":
     // FIXME: Update Servo to support the same Syntax as Gecko.
     ${helpers.single_keyword("justify-content", "flex-start stretch flex-end center space-between space-around",
                              extra_prefixes="webkit",
                              spec="https://drafts.csswg.org/css-align/#propdef-justify-content",
-                             animation_type="none")}
+                             animation_value_type="none")}
 % else:
     ${helpers.predefined_type(name="justify-content",
                               type="AlignJustifyContent",
                               initial_value="specified::AlignJustifyContent::normal()",
                               spec="https://drafts.csswg.org/css-align/#propdef-justify-content",
                               extra_prefixes="webkit",
-                              animation_type="none")}
+                              animation_value_type="none")}
 % endif
 
 % if product == "servo":
@@ -62,33 +62,33 @@ ${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse",
     ${helpers.single_keyword("align-content", "stretch flex-start flex-end center space-between space-around",
                              extra_prefixes="webkit",
                              spec="https://drafts.csswg.org/css-align/#propdef-align-content",
-                             animation_type="none")}
+                             animation_value_type="none")}
 
     ${helpers.single_keyword("align-items",
                              "stretch flex-start flex-end center baseline",
                              extra_prefixes="webkit",
                              spec="https://drafts.csswg.org/css-flexbox/#align-items-property",
-                             animation_type="discrete")}
+                             animation_value_type="discrete")}
 % else:
     ${helpers.predefined_type(name="align-content",
                               type="AlignJustifyContent",
                               initial_value="specified::AlignJustifyContent::normal()",
                               spec="https://drafts.csswg.org/css-align/#propdef-align-content",
                               extra_prefixes="webkit",
-                              animation_type="none")}
+                              animation_value_type="none")}
 
     ${helpers.predefined_type(name="align-items",
                               type="AlignItems",
                               initial_value="specified::AlignItems::normal()",
                               spec="https://drafts.csswg.org/css-align/#propdef-align-items",
                               extra_prefixes="webkit",
-                              animation_type="discrete")}
+                              animation_value_type="discrete")}
 
     ${helpers.predefined_type(name="justify-items",
                               type="JustifyItems",
                               initial_value="specified::JustifyItems::auto()",
                               spec="https://drafts.csswg.org/css-align/#propdef-justify-items",
-                              animation_type="none")}
+                              animation_value_type="none")}
 % endif
 
 // Flex item properties
@@ -96,13 +96,13 @@ ${helpers.predefined_type("flex-grow", "Number",
                           "0.0", "parse_non_negative",
                           spec="https://drafts.csswg.org/css-flexbox/#flex-grow-property",
                           extra_prefixes="webkit",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
 ${helpers.predefined_type("flex-shrink", "Number",
                           "1.0", "parse_non_negative",
                           spec="https://drafts.csswg.org/css-flexbox/#flex-shrink-property",
                           extra_prefixes="webkit",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
 // https://drafts.csswg.org/css-align/#align-self-property
 % if product == "servo":
@@ -111,26 +111,26 @@ ${helpers.predefined_type("flex-shrink", "Number",
                              need_clone=True,
                              extra_prefixes="webkit",
                              spec="https://drafts.csswg.org/css-flexbox/#propdef-align-self",
-                             animation_type="none")}
+                             animation_value_type="none")}
 % else:
     ${helpers.predefined_type(name="align-self",
                               type="AlignJustifySelf",
                               initial_value="specified::AlignJustifySelf::auto()",
                               spec="https://drafts.csswg.org/css-align/#align-self-property",
                               extra_prefixes="webkit",
-                              animation_type="none")}
+                              animation_value_type="none")}
 
     ${helpers.predefined_type(name="justify-self",
                               type="AlignJustifySelf",
                               initial_value="specified::AlignJustifySelf::auto()",
                               spec="https://drafts.csswg.org/css-align/#justify-self-property",
-                              animation_type="none")}
+                              animation_value_type="none")}
 % endif
 
 // https://drafts.csswg.org/css-flexbox/#propdef-order
 ${helpers.predefined_type("order", "Integer", "0",
                           extra_prefixes="webkit",
-                          animation_type="normal",
+                          animation_value_type="ComputedValue",
                           spec="https://drafts.csswg.org/css-flexbox/#order-property")}
 
 // FIXME: Gecko doesn't support content value yet.
@@ -143,7 +143,7 @@ ${helpers.predefined_type("flex-basis",
                           "parse_non_negative",
                           spec="https://drafts.csswg.org/css-flexbox/#flex-basis-property",
                           extra_prefixes="webkit",
-                          animation_type="normal" if product == "gecko" else "none")}
+                          animation_value_type="ComputedValue" if product == "gecko" else "none")}
 
 % for (size, logical) in ALL_SIZES:
     <%
@@ -157,7 +157,7 @@ ${helpers.predefined_type("flex-basis",
                               "computed::LengthOrPercentageOrAuto::Auto",
                               "parse_non_negative",
                               spec=spec % size,
-                              animation_type="normal", logical = logical)}
+                              animation_value_type="ComputedValue", logical = logical)}
     % if product == "gecko":
         % for min_max in ["min", "max"]:
             <%
@@ -171,7 +171,8 @@ ${helpers.predefined_type("flex-basis",
             // Keyword values are only valid in the inline direction; they must
             // be replaced with auto/none in block.
             <%helpers:longhand name="${min_max}-${size}" spec="${spec % ('%s-%s' % (min_max, size))}"
-                               animation_type="normal" logical="${logical}" predefined_type="${MinMax}Length">
+                               animation_value_type="ComputedValue"
+                               logical="${logical}" predefined_type="${MinMax}Length">
 
                 use std::fmt;
                 use style_traits::ToCss;
@@ -253,13 +254,13 @@ ${helpers.predefined_type("flex-basis",
                                   "computed::LengthOrPercentage::Length(Au(0))",
                                   "parse_non_negative",
                                   spec=spec % ("min-%s" % size),
-                                  animation_type="normal", logical = logical)}
+                                  animation_value_type="ComputedValue", logical = logical)}
         ${helpers.predefined_type("max-%s" % size,
                                   "LengthOrPercentageOrNone",
                                   "computed::LengthOrPercentageOrNone::None",
                                   "parse_non_negative",
                                   spec=spec % ("min-%s" % size),
-                                  animation_type="normal", logical = logical)}
+                                  animation_value_type="ComputedValue", logical = logical)}
     % endif
 % endfor
 
@@ -267,10 +268,10 @@ ${helpers.single_keyword("box-sizing",
                          "content-box border-box",
                          extra_prefixes="moz webkit",
                          spec="https://drafts.csswg.org/css-ui/#propdef-box-sizing",
-                         animation_type="none")}
+                         animation_value_type="none")}
 
 ${helpers.single_keyword("object-fit", "fill contain cover none scale-down",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-images/#propdef-object-fit")}
 
 ${helpers.predefined_type("object-position",
@@ -279,21 +280,21 @@ ${helpers.predefined_type("object-position",
                           products="gecko",
                           boxed="True",
                           spec="https://drafts.csswg.org/css-images-3/#the-object-position",
-                          animation_type="normal")}
+                          animation_value_type="ComputedValue")}
 
 % for kind in ["row", "column"]:
     ${helpers.predefined_type("grid-%s-gap" % kind,
                               "LengthOrPercentage",
                               "computed::LengthOrPercentage::Length(Au(0))",
                               spec="https://drafts.csswg.org/css-grid/#propdef-grid-%s-gap" % kind,
-                              animation_type="normal",
+                              animation_value_type="ComputedValue",
                               products="gecko")}
 
     % for range in ["start", "end"]:
         ${helpers.predefined_type("grid-%s-%s" % (kind, range),
                                   "GridLine",
                                   "Default::default()",
-                                  animation_type="none",
+                                  animation_value_type="none",
                                   spec="https://drafts.csswg.org/css-grid/#propdef-grid-%s-%s" % (kind, range),
                                   products="gecko",
                                   boxed=True)}
@@ -304,7 +305,7 @@ ${helpers.predefined_type("object-position",
     ${helpers.predefined_type("grid-auto-%ss" % kind,
                               "TrackSize",
                               "Default::default()",
-                              animation_type="none",
+                              animation_value_type="none",
                               spec="https://drafts.csswg.org/css-grid/#propdef-grid-auto-%ss" % kind,
                               products="gecko",
                               boxed=True)}
@@ -313,7 +314,7 @@ ${helpers.predefined_type("object-position",
 <%helpers:longhand name="grid-auto-flow"
         spec="https://drafts.csswg.org/css-grid/#propdef-grid-auto-flow"
         products="gecko"
-        animation_type="none">
+        animation_value_type="none">
     use std::fmt;
     use style_traits::ToCss;
     use values::HasViewportPercentage;
diff --git a/servo/components/style/properties/longhand/svg.mako.rs b/servo/components/style/properties/longhand/svg.mako.rs
index ddcf86c35f67..eb9f9156a42c 100644
--- a/servo/components/style/properties/longhand/svg.mako.rs
+++ b/servo/components/style/properties/longhand/svg.mako.rs
@@ -11,11 +11,11 @@ ${helpers.single_keyword("dominant-baseline",
                  """auto use-script no-change reset-size ideographic alphabetic hanging
                     mathematical central middle text-after-edge text-before-edge""",
                  products="gecko",
-                 animation_type="none",
+                 animation_value_type="none",
                  spec="https://www.w3.org/TR/SVG11/text.html#DominantBaselineProperty")}
 
 ${helpers.single_keyword("vector-effect", "none non-scaling-stroke",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://www.w3.org/TR/SVGTiny12/painting.html#VectorEffectProperty")}
 
 // Section 13 - Gradients and Patterns
@@ -24,12 +24,12 @@ ${helpers.predefined_type(
     "stop-color", "CSSColor",
     "CSSParserColor::RGBA(RGBA::new(0, 0, 0, 255))",
     products="gecko",
-    animation_type="none",
+    animation_value_type="none",
     spec="https://www.w3.org/TR/SVGTiny12/painting.html#StopColorProperty")}
 
 ${helpers.predefined_type("stop-opacity", "Opacity", "1.0",
                           products="gecko",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="https://www.w3.org/TR/SVGTiny12/painting.html#propdef-stop-opacity")}
 
 // Section 15 - Filter Effects
@@ -38,27 +38,27 @@ ${helpers.predefined_type(
     "flood-color", "CSSColor",
     "CSSParserColor::RGBA(RGBA::new(0, 0, 0, 255))",
     products="gecko",
-    animation_type="none",
+    animation_value_type="none",
     spec="https://www.w3.org/TR/SVG/filters.html#FloodColorProperty")}
 
 ${helpers.predefined_type("flood-opacity", "Opacity",
-                          "1.0", products="gecko", animation_type="none",
+                          "1.0", products="gecko", animation_value_type="none",
                           spec="https://www.w3.org/TR/SVG/filters.html#FloodOpacityProperty")}
 
 ${helpers.predefined_type(
     "lighting-color", "CSSColor",
     "CSSParserColor::RGBA(RGBA::new(255, 255, 255, 255))",
     products="gecko",
-    animation_type="none",
+    animation_value_type="none",
     spec="https://www.w3.org/TR/SVG/filters.html#LightingColorProperty")}
 
 // CSS Masking Module Level 1
 // https://drafts.fxtf.org/css-masking
 ${helpers.single_keyword("mask-type", "luminance alpha",
-                         products="gecko", animation_type="none",
+                         products="gecko", animation_value_type="none",
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-type")}
 
-<%helpers:longhand name="clip-path" animation_type="none" products="gecko" boxed="True"
+<%helpers:longhand name="clip-path" animation_value_type="none" products="gecko" boxed="True"
                    flags="CREATES_STACKING_CONTEXT"
                    spec="https://drafts.fxtf.org/css-masking/#propdef-clip-path">
     use std::fmt;
@@ -91,10 +91,10 @@ ${helpers.single_keyword("mask-mode",
                          "match-source alpha luminance",
                          vector=True,
                          products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-mode")}
 
-<%helpers:vector_longhand name="mask-repeat" products="gecko" animation_type="none" extra_prefixes="webkit"
+<%helpers:vector_longhand name="mask-repeat" products="gecko" animation_value_type="none" extra_prefixes="webkit"
                           spec="https://drafts.fxtf.org/css-masking/#propdef-mask-repeat">
     pub use properties::longhands::background_repeat::single_value::parse;
     pub use properties::longhands::background_repeat::single_value::SpecifiedValue;
@@ -113,7 +113,8 @@ ${helpers.single_keyword("mask-mode",
     }
 </%helpers:vector_longhand>
 
-<%helpers:vector_longhand name="mask-position-x" products="gecko" animation_type="normal" extra_prefixes="webkit"
+<%helpers:vector_longhand name="mask-position-x" products="gecko"
+                          animation_value_type="ComputedValue" extra_prefixes="webkit"
                           spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position">
     pub use properties::longhands::background_position_x::single_value::get_initial_value;
     pub use properties::longhands::background_position_x::single_value::get_initial_position_value;
@@ -141,7 +142,8 @@ ${helpers.single_keyword("mask-mode",
     }
 </%helpers:vector_longhand>
 
-<%helpers:vector_longhand name="mask-position-y" products="gecko" animation_type="normal" extra_prefixes="webkit"
+<%helpers:vector_longhand name="mask-position-y" products="gecko"
+                          animation_value_type="ComputedValue" extra_prefixes="webkit"
                           spec="https://drafts.fxtf.org/css-masking/#propdef-mask-position">
     pub use properties::longhands::background_position_y::single_value::get_initial_value;
     pub use properties::longhands::background_position_y::single_value::get_initial_position_value;
@@ -175,7 +177,7 @@ ${helpers.single_keyword("mask-clip",
                          vector=True,
                          products="gecko",
                          extra_prefixes="webkit",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-clip")}
 
 ${helpers.single_keyword("mask-origin",
@@ -184,10 +186,10 @@ ${helpers.single_keyword("mask-origin",
                          vector=True,
                          products="gecko",
                          extra_prefixes="webkit",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-origin")}
 
-<%helpers:longhand name="mask-size" products="gecko" animation_type="normal" extra_prefixes="webkit"
+<%helpers:longhand name="mask-size" products="gecko" animation_value_type="ComputedValue" extra_prefixes="webkit"
                    spec="https://drafts.fxtf.org/css-masking/#propdef-mask-size">
     use properties::longhands::background_size;
     pub use ::properties::longhands::background_size::SpecifiedValue;
@@ -209,10 +211,10 @@ ${helpers.single_keyword("mask-composite",
                          vector=True,
                          products="gecko",
                          extra_prefixes="webkit",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.fxtf.org/css-masking/#propdef-mask-composite")}
 
-<%helpers:vector_longhand name="mask-image" products="gecko" animation_type="none" extra_prefixes="webkit"
+<%helpers:vector_longhand name="mask-image" products="gecko" animation_value_type="none" extra_prefixes="webkit"
                           has_uncacheable_values="${product == 'gecko'}"
                           flags="CREATES_STACKING_CONTEXT",
                           spec="https://drafts.fxtf.org/css-masking/#propdef-mask-image">
diff --git a/servo/components/style/properties/longhand/table.mako.rs b/servo/components/style/properties/longhand/table.mako.rs
index 9dfbb920d1e3..3b1c8709a94d 100644
--- a/servo/components/style/properties/longhand/table.mako.rs
+++ b/servo/components/style/properties/longhand/table.mako.rs
@@ -7,12 +7,12 @@
 <% data.new_style_struct("Table", inherited=False) %>
 
 ${helpers.single_keyword("table-layout", "auto fixed",
-                         gecko_ffi_name="mLayoutStrategy", animation_type="none",
+                         gecko_ffi_name="mLayoutStrategy", animation_value_type="none",
                          spec="https://drafts.csswg.org/css-tables/#propdef-table-layout")}
 
 <%helpers:longhand name="-x-span" products="gecko"
                    spec="Internal-only (for `<col span>` pres attr)"
-                   animation_type="none"
+                   animation_value_type="none"
                    internal="True">
     use values::HasViewportPercentage;
     use values::computed::ComputedValueAsSpecified;
diff --git a/servo/components/style/properties/longhand/text.mako.rs b/servo/components/style/properties/longhand/text.mako.rs
index 1cfc28037869..4d29e2b0e774 100644
--- a/servo/components/style/properties/longhand/text.mako.rs
+++ b/servo/components/style/properties/longhand/text.mako.rs
@@ -12,7 +12,7 @@
                                              Method("has_overline", "bool"),
                                              Method("has_line_through", "bool")]) %>
 
-<%helpers:longhand name="text-overflow" animation_type="none" boxed="True"
+<%helpers:longhand name="text-overflow" animation_value_type="none" boxed="True"
                    spec="https://drafts.csswg.org/css-ui/#propdef-text-overflow">
     use std::fmt;
     use style_traits::ToCss;
@@ -97,13 +97,13 @@
 
 ${helpers.single_keyword("unicode-bidi",
                          "normal embed isolate bidi-override isolate-override plaintext",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-writing-modes/#propdef-unicode-bidi")}
 
 // FIXME: This prop should be animatable.
 <%helpers:longhand name="text-decoration-line"
                    custom_cascade="${product == 'servo'}"
-                   animation_type="none"
+                   animation_value_type="none"
                    spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-line">
     use std::fmt;
     use style_traits::ToCss;
@@ -219,7 +219,7 @@ ${helpers.single_keyword("unicode-bidi",
 ${helpers.single_keyword("text-decoration-style",
                          "solid double dotted dashed wavy -moz-none",
                          products="gecko",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-style")}
 
 ${helpers.predefined_type(
@@ -228,11 +228,11 @@ ${helpers.predefined_type(
     initial_specified_value="specified::CSSColor::currentcolor()",
     complex_color=True,
     products="gecko",
-    animation_type="normal",
+    animation_value_type="IntermediateColor",
     spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color")}
 
 <%helpers:longhand name="initial-letter"
-                   animation_type="none"
+                   animation_value_type="none"
                    products="gecko"
                    spec="https://drafts.csswg.org/css-inline/#sizing-drop-initials">
     use std::fmt;
diff --git a/servo/components/style/properties/longhand/ui.mako.rs b/servo/components/style/properties/longhand/ui.mako.rs
index 4bc32c6cc9d0..dff6e846050f 100644
--- a/servo/components/style/properties/longhand/ui.mako.rs
+++ b/servo/components/style/properties/longhand/ui.mako.rs
@@ -13,7 +13,7 @@
 // we should probably remove from gecko (https://bugzilla.mozilla.org/show_bug.cgi?id=1328331)
 ${helpers.single_keyword("ime-mode", "auto normal active disabled inactive",
                          products="gecko", gecko_ffi_name="mIMEMode",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-ui/#input-method-editor")}
 
 ${helpers.single_keyword("-moz-user-select", "auto text none all element elements" +
@@ -22,11 +22,11 @@ ${helpers.single_keyword("-moz-user-select", "auto text none all element element
                          alias="-webkit-user-select",
                          gecko_ffi_name="mUserSelect",
                          gecko_enum_prefix="StyleUserSelect",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="https://drafts.csswg.org/css-ui-4/#propdef-user-select")}
 
 ${helpers.single_keyword("-moz-window-dragging", "default drag no-drag", products="gecko",
                          gecko_ffi_name="mWindowDragging",
                          gecko_enum_prefix="StyleWindowDragging",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="None (Nonstandard Firefox-only property)")}
diff --git a/servo/components/style/properties/longhand/xul.mako.rs b/servo/components/style/properties/longhand/xul.mako.rs
index b59c36f002d5..e86e3fc9ee17 100644
--- a/servo/components/style/properties/longhand/xul.mako.rs
+++ b/servo/components/style/properties/longhand/xul.mako.rs
@@ -12,20 +12,20 @@ ${helpers.single_keyword("-moz-box-align", "stretch start center baseline end",
                          products="gecko", gecko_ffi_name="mBoxAlign",
                          gecko_enum_prefix="StyleBoxAlign",
                          gecko_inexhaustive=True,
-                         animation_type="none",
+                         animation_value_type="none",
                          alias="-webkit-box-align",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-align)")}
 
 ${helpers.single_keyword("-moz-box-direction", "normal reverse",
                          products="gecko", gecko_ffi_name="mBoxDirection",
                          gecko_enum_prefix="StyleBoxDirection",
-                         animation_type="none",
+                         animation_value_type="none",
                          alias="-webkit-box-direction",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-direction)")}
 
 ${helpers.predefined_type("-moz-box-flex", "Number", "0.0", "parse_non_negative",
                           products="gecko", gecko_ffi_name="mBoxFlex",
-                          animation_type="none",
+                          animation_value_type="none",
                           alias="-webkit-box-flex",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex)")}
 
@@ -33,21 +33,21 @@ ${helpers.single_keyword("-moz-box-orient", "horizontal vertical",
                          products="gecko", gecko_ffi_name="mBoxOrient",
                          extra_gecko_aliases="inline-axis=horizontal block-axis=vertical",
                          gecko_enum_prefix="StyleBoxOrient",
-                         animation_type="none",
+                         animation_value_type="none",
                          alias="-webkit-box-orient",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-orient)")}
 
 ${helpers.single_keyword("-moz-box-pack", "start center end justify",
                          products="gecko", gecko_ffi_name="mBoxPack",
                          gecko_enum_prefix="StyleBoxPack",
-                         animation_type="none",
+                         animation_value_type="none",
                          alias="-webkit-box-pack",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)")}
 
 ${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore",
                          products="gecko", gecko_ffi_name="mStretchStack",
                          gecko_constant_prefix="NS_STYLE_STACK_SIZING",
-                         animation_type="none",
+                         animation_value_type="none",
                          spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-stack-sizing)")}
 
 ${helpers.predefined_type("-moz-box-ordinal-group", "Integer", "0",
@@ -55,5 +55,5 @@ ${helpers.predefined_type("-moz-box-ordinal-group", "Integer", "0",
                           products="gecko",
                           alias="-webkit-box-ordinal-group",
                           gecko_ffi_name="mBoxOrdinal",
-                          animation_type="none",
+                          animation_value_type="none",
                           spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-box-ordinal-group)")}
diff --git a/servo/components/style/properties/properties.mako.rs b/servo/components/style/properties/properties.mako.rs
index 439829b8f253..9f486772f4c3 100644
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -841,7 +841,7 @@ impl PropertyId {
 
         // FIXME(https://github.com/rust-lang/rust/issues/33156): remove this enum and use PropertyId
         // when stable Rust allows destructors in statics.
-        enum StaticId {
+        pub enum StaticId {
             Longhand(LonghandId),
             Shorthand(ShorthandId),
         }
diff --git a/servo/components/style/properties/shorthand/border.mako.rs b/servo/components/style/properties/shorthand/border.mako.rs
index 1ee9d3ff8da8..35afe6232057 100644
--- a/servo/components/style/properties/shorthand/border.mako.rs
+++ b/servo/components/style/properties/shorthand/border.mako.rs
@@ -14,7 +14,7 @@ ${helpers.four_sides_shorthand("border-style", "border-%s-style",
 
 <%helpers:shorthand name="border-width" sub_properties="${
         ' '.join('border-%s-width' % side
-                 for side in ['top', 'right', 'bottom', 'left'])}"
+                 for side in PHYSICAL_SIDES)}"
     spec="https://drafts.csswg.org/css-backgrounds/#border-width">
     use super::parse_four_sides;
     use parser::Parse;
@@ -23,7 +23,7 @@ ${helpers.four_sides_shorthand("border-style", "border-%s-style",
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
         let (top, right, bottom, left) = try!(parse_four_sides(input, |i| specified::BorderWidth::parse(context, i)));
         Ok(Longhands {
-            % for side in ["top", "right", "bottom", "left"]:
+            % for side in PHYSICAL_SIDES:
                 ${to_rust_ident('border-%s-width' % side)}: ${side},
             % endfor
         })
@@ -31,7 +31,7 @@ ${helpers.four_sides_shorthand("border-style", "border-%s-style",
 
     impl<'a> ToCss for LonghandsToSerialize<'a>  {
         fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            % for side in ["top", "right", "bottom", "left"]:
+            % for side in PHYSICAL_SIDES:
                 let ${side} = self.border_${side}_width.clone();
             % endfor
 
@@ -124,22 +124,32 @@ pub fn parse_border(context: &ParserContext, input: &mut Parser)
 
 <%helpers:shorthand name="border"
     sub_properties="${' '.join('border-%s-%s' % (side, prop)
-        for side in ['top', 'right', 'bottom', 'left']
+        for side in PHYSICAL_SIDES
         for prop in ['color', 'style', 'width'])}
         ${' '.join('border-image-%s' % name
-        for name in ['outset', 'repeat', 'slice', 'source', 'width'])}"
+        for name in ['outset', 'repeat', 'slice', 'source', 'width'])}
+        ${' '.join('-moz-border-%s-colors' % side
+        for side in PHYSICAL_SIDES) if product == 'gecko' else ''}"
     spec="https://drafts.csswg.org/css-backgrounds/#border">
 
+    % if product == "gecko":
+        use properties::longhands::{_moz_border_top_colors, _moz_border_right_colors,
+                                    _moz_border_bottom_colors, _moz_border_left_colors};
+    % endif
+
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
         use properties::longhands::{border_image_outset, border_image_repeat, border_image_slice};
         use properties::longhands::{border_image_source, border_image_width};
 
         let (color, style, width) = try!(super::parse_border(context, input));
         Ok(Longhands {
-            % for side in ["top", "right", "bottom", "left"]:
+            % for side in PHYSICAL_SIDES:
                 border_${side}_color: color.clone(),
                 border_${side}_style: style,
                 border_${side}_width: width.clone(),
+                % if product == "gecko":
+                    _moz_border_${side}_colors: _moz_border_${side}_colors::get_initial_specified_value(),
+                % endif
             % endfor
 
             // The ‘border’ shorthand resets ‘border-image’ to its initial value.
diff --git a/servo/components/style/stylesheets.rs b/servo/components/style/stylesheets.rs
index 8d2c59744b50..b5ac86188d61 100644
--- a/servo/components/style/stylesheets.rs
+++ b/servo/components/style/stylesheets.rs
@@ -8,9 +8,9 @@
 
 use {Atom, Prefix, Namespace};
 use cssparser::{AtRuleParser, Parser, QualifiedRuleParser};
-use cssparser::{AtRuleType, RuleListParser, SourcePosition, Token, parse_one_rule};
+use cssparser::{AtRuleType, RuleListParser, Token, parse_one_rule};
 use cssparser::ToCss as ParserToCss;
-use error_reporting::ParseErrorReporter;
+use error_reporting::{ParseErrorReporter, NullReporter};
 #[cfg(feature = "servo")]
 use font_face::FontFaceRuleData;
 use font_face::parse_font_face_block;
@@ -321,20 +321,6 @@ pub enum CssRuleType {
     Viewport            = 15,
 }
 
-/// Error reporter which silently forgets errors
-pub struct MemoryHoleReporter;
-
-impl ParseErrorReporter for MemoryHoleReporter {
-    fn report_error(&self,
-            _: &mut Parser,
-            _: SourcePosition,
-            _: &str,
-            _: &UrlExtraData,
-            _: u64) {
-        // do nothing
-    }
-}
-
 #[allow(missing_docs)]
 pub enum SingleRuleParseError {
     Syntax,
@@ -418,7 +404,7 @@ impl CssRule {
                  state: Option<State>,
                  loader: Option<&StylesheetLoader>)
                  -> Result<(Self, State), SingleRuleParseError> {
-        let error_reporter = MemoryHoleReporter;
+        let error_reporter = NullReporter;
         let mut namespaces = parent_stylesheet.namespaces.write();
         let context = ParserContext::new(parent_stylesheet.origin,
                                          &parent_stylesheet.url_data,
diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs
index 8b698ab692d7..38dbe24b4c17 100644
--- a/servo/components/style/stylist.rs
+++ b/servo/components/style/stylist.rs
@@ -10,7 +10,7 @@ use {Atom, LocalName};
 use bit_vec::BitVec;
 use data::ComputedStyle;
 use dom::{AnimationRules, PresentationalHintsSynthetizer, TElement};
-use error_reporting::StdoutErrorReporter;
+use error_reporting::RustLogReporter;
 use font_metrics::FontMetricsProvider;
 use keyframes::KeyframesAnimation;
 use media_queries::Device;
@@ -415,7 +415,7 @@ impl Stylist {
                                 parent.map(|p| &**p),
                                 parent.map(|p| &**p),
                                 None,
-                                &StdoutErrorReporter,
+                                &RustLogReporter,
                                 font_metrics,
                                 cascade_flags);
         ComputedStyle::new(rule_node, Arc::new(computed))
@@ -533,7 +533,7 @@ impl Stylist {
                                 Some(&**parent),
                                 Some(&**parent),
                                 None,
-                                &StdoutErrorReporter,
+                                &RustLogReporter,
                                 font_metrics,
                                 CascadeFlags::empty());
 
@@ -863,7 +863,7 @@ impl Stylist {
                                      Some(parent_style),
                                      Some(parent_style),
                                      None,
-                                     &StdoutErrorReporter,
+                                     &RustLogReporter,
                                      &metrics,
                                      CascadeFlags::empty()))
     }
diff --git a/servo/components/style/values/computed/length.rs b/servo/components/style/values/computed/length.rs
index be5f70e0807d..d636390c0219 100644
--- a/servo/components/style/values/computed/length.rs
+++ b/servo/components/style/values/computed/length.rs
@@ -76,6 +76,16 @@ impl CalcLengthOrPercentage {
     pub fn percentage(&self) -> CSSFloat {
         self.percentage.unwrap_or(0.)
     }
+
+    /// If there are special rules for computing percentages in a value (e.g. the height property),
+    /// they apply whenever a calc() expression contains percentages.
+    pub fn to_computed(&self, container_len: Option<Au>) -> Option<Au> {
+        match (container_len, self.percentage) {
+            (Some(len), Some(percent)) => Some(self.length + len.scale_by(percent)),
+            (_, None) => Some(self.length),
+            _ => None,
+        }
+    }
 }
 
 impl From<LengthOrPercentage> for CalcLengthOrPercentage {
diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs
index 7897b7815042..3181f5d67b67 100644
--- a/servo/components/style/values/specified/length.rs
+++ b/servo/components/style/values/specified/length.rs
@@ -1160,8 +1160,12 @@ impl LengthOrPercentage {
                 NoCalcLength::parse_dimension(context, value.value, unit).map(LengthOrPercentage::Length),
             Token::Percentage(ref value) if num_context.is_ok(value.unit_value) =>
                 Ok(LengthOrPercentage::Percentage(Percentage(value.unit_value))),
-            Token::Number(ref value) if value.value == 0. =>
-                Ok(LengthOrPercentage::zero()),
+            Token::Number(ref value) => {
+                if value.value != 0. && !context.length_parsing_mode.allows_unitless_lengths() {
+                    return Err(())
+                }
+                Ok(LengthOrPercentage::Length(NoCalcLength::Absolute(AbsoluteLength::Px(value.value))))
+            }
             Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
                 let calc = try!(input.parse_nested_block(|i| {
                     CalcLengthOrPercentage::parse_length_or_percentage(context, i)
@@ -1284,8 +1288,14 @@ impl LengthOrPercentageOrAuto {
                 NoCalcLength::parse_dimension(context, value.value, unit).map(LengthOrPercentageOrAuto::Length),
             Token::Percentage(ref value) if num_context.is_ok(value.unit_value) =>
                 Ok(LengthOrPercentageOrAuto::Percentage(Percentage(value.unit_value))),
-            Token::Number(ref value) if value.value == 0. =>
-                Ok(Self::zero()),
+            Token::Number(ref value) if value.value == 0. => {
+                if value.value != 0. && !context.length_parsing_mode.allows_unitless_lengths() {
+                    return Err(())
+                }
+                Ok(LengthOrPercentageOrAuto::Length(
+                    NoCalcLength::Absolute(AbsoluteLength::Px(value.value))
+                ))
+            }
             Token::Ident(ref value) if value.eq_ignore_ascii_case("auto") =>
                 Ok(LengthOrPercentageOrAuto::Auto),
             Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
@@ -1363,8 +1373,14 @@ impl LengthOrPercentageOrNone {
                 NoCalcLength::parse_dimension(context, value.value, unit).map(LengthOrPercentageOrNone::Length),
             Token::Percentage(ref value) if num_context.is_ok(value.unit_value) =>
                 Ok(LengthOrPercentageOrNone::Percentage(Percentage(value.unit_value))),
-            Token::Number(ref value) if value.value == 0. =>
-                Ok(LengthOrPercentageOrNone::Length(NoCalcLength::zero())),
+            Token::Number(ref value) if value.value == 0. => {
+                if value.value != 0. && !context.length_parsing_mode.allows_unitless_lengths() {
+                    return Err(())
+                }
+                Ok(LengthOrPercentageOrNone::Length(
+                    NoCalcLength::Absolute(AbsoluteLength::Px(value.value))
+                ))
+            }
             Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => {
                 let calc = try!(input.parse_nested_block(|i| {
                     CalcLengthOrPercentage::parse_length_or_percentage(context, i)
diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index f61d92029e83..3acba6598204 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -15,7 +15,7 @@ servo = ["heapsize", "heapsize_derive", "serde", "serde_derive",
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 heapsize = {version = "0.3.0", optional = true}
 heapsize_derive = {version = "0.1", optional = true}
diff --git a/servo/ports/geckolib/Cargo.toml b/servo/ports/geckolib/Cargo.toml
index 8148aa27ab92..6cb93fa3466a 100644
--- a/servo/ports/geckolib/Cargo.toml
+++ b/servo/ports/geckolib/Cargo.toml
@@ -16,7 +16,7 @@ gecko_debug = ["style/gecko_debug"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
 libc = "0.2"
 log = {version = "0.3.5", features = ["release_max_level_info"]}
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index fc28f1cedf5c..01dd54823d5c 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -18,7 +18,7 @@ use style::context::{ThreadLocalStyleContext, ThreadLocalStyleContextCreationInf
 use style::data::{ElementData, ElementStyles, RestyleData};
 use style::dom::{AnimationOnlyDirtyDescendants, DirtyDescendants};
 use style::dom::{ShowSubtreeData, TElement, TNode};
-use style::error_reporting::StdoutErrorReporter;
+use style::error_reporting::RustLogReporter;
 use style::font_metrics::get_metrics_provider_for_product;
 use style::gecko::data::{PerDocumentStyleData, PerDocumentStyleDataImpl};
 use style::gecko::global_style_data::{GLOBAL_STYLE_DATA, GlobalStyleData};
@@ -157,7 +157,7 @@ fn create_shared_context<'a>(global_style_data: &GlobalStyleData,
         running_animations: per_doc_data.running_animations.clone(),
         expired_animations: per_doc_data.expired_animations.clone(),
         // FIXME(emilio): Stop boxing here.
-        error_reporter: Box::new(StdoutErrorReporter),
+        error_reporter: Box::new(RustLogReporter),
         local_context_creation_data: Mutex::new(local_context_data),
         timer: Timer::new(),
         // FIXME Find the real QuirksMode information for this document
@@ -511,7 +511,7 @@ pub extern "C" fn Servo_StyleSheet_Empty(mode: SheetParsingMode) -> RawServoStyl
     Arc::new(Stylesheet::from_str(
         "", unsafe { dummy_url_data() }.clone(), origin,
         Arc::new(shared_lock.wrap(MediaList::empty())),
-        shared_lock, None, &StdoutErrorReporter, 0u64)
+        shared_lock, None, &RustLogReporter, 0u64)
     ).into_strong()
 }
 
@@ -554,7 +554,7 @@ pub extern "C" fn Servo_StyleSheet_FromUTF8Bytes(loader: *mut Loader,
 
     Arc::new(Stylesheet::from_str(
         input, url_data.clone(), origin, media,
-        shared_lock, loader, &StdoutErrorReporter, 0u64)
+        shared_lock, loader, &RustLogReporter, 0u64)
     ).into_strong()
 }
 
@@ -582,7 +582,7 @@ pub extern "C" fn Servo_StyleSheet_ClearAndUpdate(stylesheet: RawServoStyleSheet
 
     let sheet = Stylesheet::as_arc(&stylesheet);
     Stylesheet::update_from_str(&sheet, input, url_data,
-                                loader, &StdoutErrorReporter);
+                                loader, &RustLogReporter);
 }
 
 #[no_mangle]
@@ -1005,7 +1005,7 @@ pub extern "C" fn Servo_ParseProperty(property: nsCSSPropertyID, value: *const n
     let value = unsafe { value.as_ref().unwrap().as_str_unchecked() };
 
     let url_data = unsafe { RefPtr::from_ptr_ref(&data) };
-    let reporter = StdoutErrorReporter;
+    let reporter = RustLogReporter;
     let context = ParserContext::new(Origin::Author, url_data, &reporter,
                                      Some(CssRuleType::Style), LengthParsingMode::Default);
 
@@ -1028,7 +1028,7 @@ pub extern "C" fn Servo_ParseEasing(easing: *const nsAString,
     use style::properties::longhands::transition_timing_function;
 
     let url_data = unsafe { RefPtr::from_ptr_ref(&data) };
-    let reporter = StdoutErrorReporter;
+    let reporter = RustLogReporter;
     let context = ParserContext::new(Origin::Author, url_data, &reporter,
                                      Some(CssRuleType::Style), LengthParsingMode::Default);
     let easing = unsafe { (*easing).to_string() };
@@ -1170,7 +1170,7 @@ fn set_property(declarations: RawServoDeclarationBlockBorrowed, property_id: Pro
         structs::LengthParsingMode::Default => LengthParsingMode::Default,
         structs::LengthParsingMode::SVG => LengthParsingMode::SVG,
     };
-    if let Ok(parsed) = parse_one_declaration(property_id, value, url_data, &StdoutErrorReporter,
+    if let Ok(parsed) = parse_one_declaration(property_id, value, url_data, &RustLogReporter,
                                               length_parsing_mode) {
         let importance = if is_important { Importance::Important } else { Importance::Normal };
         write_locked_arc(declarations, |decls: &mut PropertyDeclarationBlock| {
@@ -1263,7 +1263,7 @@ pub extern "C" fn Servo_MediaList_SetText(list: RawServoMediaListBorrowed, text:
     let text = unsafe { text.as_ref().unwrap().as_str_unchecked() };
     let mut parser = Parser::new(&text);
     let url_data = unsafe { dummy_url_data() };
-    let reporter = StdoutErrorReporter;
+    let reporter = RustLogReporter;
     let context = ParserContext::new_for_cssom(url_data, &reporter, Some(CssRuleType::Media),
                                                LengthParsingMode::Default);
      write_locked_arc(list, |list: &mut MediaList| {
@@ -1294,7 +1294,7 @@ pub extern "C" fn Servo_MediaList_AppendMedium(list: RawServoMediaListBorrowed,
                                                new_medium: *const nsACString) {
     let new_medium = unsafe { new_medium.as_ref().unwrap().as_str_unchecked() };
     let url_data = unsafe { dummy_url_data() };
-    let reporter = StdoutErrorReporter;
+    let reporter = RustLogReporter;
     let context = ParserContext::new_for_cssom(url_data, &reporter, Some(CssRuleType::Media),
                                                LengthParsingMode::Default);
     write_locked_arc(list, |list: &mut MediaList| {
@@ -1307,7 +1307,7 @@ pub extern "C" fn Servo_MediaList_DeleteMedium(list: RawServoMediaListBorrowed,
                                                old_medium: *const nsACString) -> bool {
     let old_medium = unsafe { old_medium.as_ref().unwrap().as_str_unchecked() };
     let url_data = unsafe { dummy_url_data() };
-    let reporter = StdoutErrorReporter;
+    let reporter = RustLogReporter;
     let context = ParserContext::new_for_cssom(url_data, &reporter, Some(CssRuleType::Media),
                                                LengthParsingMode::Default);
     write_locked_arc(list, |list: &mut MediaList| list.delete_medium(&context, old_medium))
@@ -1659,7 +1659,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetBackgroundImage(declarations:
 
     let url_data = unsafe { RefPtr::from_ptr_ref(&raw_extra_data) };
     let string = unsafe { (*value).to_string() };
-    let error_reporter = StdoutErrorReporter;
+    let error_reporter = RustLogReporter;
     let context = ParserContext::new(Origin::Author, url_data, &error_reporter,
                                      Some(CssRuleType::Style), LengthParsingMode::Default);
     if let Ok(url) = SpecifiedUrl::parse_from_string(string.into(), &context) {
@@ -1699,7 +1699,7 @@ pub extern "C" fn Servo_CSSSupports2(property: *const nsACString, value: *const
     let value = unsafe { value.as_ref().unwrap().as_str_unchecked() };
 
     let url_data = unsafe { dummy_url_data() };
-    parse_one_declaration(id, &value, url_data, &StdoutErrorReporter, LengthParsingMode::Default).is_ok()
+    parse_one_declaration(id, &value, url_data, &RustLogReporter, LengthParsingMode::Default).is_ok()
 }
 
 #[no_mangle]
@@ -1709,7 +1709,7 @@ pub extern "C" fn Servo_CSSSupports(cond: *const nsACString) -> bool {
     let cond = parse_condition_or_declaration(&mut input);
     if let Ok(cond) = cond {
         let url_data = unsafe { dummy_url_data() };
-        let reporter = StdoutErrorReporter;
+        let reporter = RustLogReporter;
         let context = ParserContext::new_for_cssom(url_data, &reporter, Some(CssRuleType::Style),
                                                    LengthParsingMode::Default);
         cond.eval(&context)
diff --git a/servo/ports/glutin/window.rs b/servo/ports/glutin/window.rs
index 4b0ceb65666b..bc162f8f9ecb 100644
--- a/servo/ports/glutin/window.rs
+++ b/servo/ports/glutin/window.rs
@@ -693,6 +693,7 @@ impl Window {
         G_NESTED_EVENT_LOOP_LISTENER = None
     }
 
+    #[cfg(target_os = "windows")]
     fn char_to_script_key(c: char) -> Option<constellation_msg::Key> {
         match c {
             ' ' => Some(Key::Space),
diff --git a/servo/ports/servo/main.rs b/servo/ports/servo/main.rs
index 420d17ffc4d4..dc0ae0329aa8 100644
--- a/servo/ports/servo/main.rs
+++ b/servo/ports/servo/main.rs
@@ -33,6 +33,7 @@ extern crate sig;
 use backtrace::Backtrace;
 use servo::Browser;
 use servo::compositing::windowing::WindowEvent;
+#[cfg(target_os = "android")]
 use servo::config;
 use servo::config::opts::{self, ArgumentParsingResult};
 use servo::config::servo_version;
diff --git a/servo/python/servo/devenv_commands.py b/servo/python/servo/devenv_commands.py
index a3e14bee6525..d414a3324bc0 100644
--- a/servo/python/servo/devenv_commands.py
+++ b/servo/python/servo/devenv_commands.py
@@ -11,6 +11,8 @@ from __future__ import print_function, unicode_literals
 from os import path, getcwd, listdir
 
 import sys
+import urllib2
+import json
 
 from mach.decorators import (
     CommandArgument,
@@ -223,6 +225,22 @@ class MachCommands(CommandBase):
             ["git"] + ["grep"] + params + ['--'] + grep_paths + [':(exclude)*.min.js', ':(exclude)*.min.css'],
             env=self.build_env())
 
+    @Command('rustup',
+             description='Update the Rust version to latest master',
+             category='devenv')
+    def rustup(self):
+        url = "https://api.github.com/repos/rust-lang/rust/git/refs/heads/master"
+        commit = json.load(urllib2.urlopen(url))["object"]["sha"]
+        filename = path.join(self.context.topdir, "rust-commit-hash")
+        with open(filename, "w") as f:
+            f.write(commit)
+
+        # Reset self.config["tools"]["rust-root"]
+        self._rust_version = None
+        self.set_use_stable_rust(False)
+
+        self.fetch()
+
     @Command('fetch',
              description='Fetch Rust, Cargo and Cargo dependencies',
              category='devenv')
diff --git a/servo/rust-commit-hash b/servo/rust-commit-hash
index 978afb0be45f..04ac98844fd6 100644
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1 +1 @@
-5f13a3b540ab6024665322d716e487c800645f24
+23de823e93dc19ef1b9cb65b48860a892cd6ff18
\ No newline at end of file
diff --git a/servo/tests/unit/style/Cargo.toml b/servo/tests/unit/style/Cargo.toml
index bba488f01243..4450cb901b45 100644
--- a/servo/tests/unit/style/Cargo.toml
+++ b/servo/tests/unit/style/Cargo.toml
@@ -14,7 +14,7 @@ testing = ["style/testing"]
 
 [dependencies]
 app_units = "0.4"
-cssparser = "0.12.1"
+cssparser = "0.13"
 euclid = "0.11"
 html5ever-atoms = "0.3"
 parking_lot = "0.3"
diff --git a/servo/tests/unit/style/attr.rs b/servo/tests/unit/style/attr.rs
index 0521df3a6905..10f1bd5e5853 100644
--- a/servo/tests/unit/style/attr.rs
+++ b/servo/tests/unit/style/attr.rs
@@ -4,6 +4,19 @@
 
 use app_units::Au;
 use style::attr::{AttrValue, LengthOrPercentageOrAuto, parse_length};
+use style::values::computed::CalcLengthOrPercentage;
+
+#[test]
+fn test_length_calc() {
+    let calc = CalcLengthOrPercentage { length: Au(10), percentage: Some(0.2) };
+    assert_eq!(calc.to_computed(Some(Au(10))), Some(Au(12)));
+    assert_eq!(calc.to_computed(Some(Au(0))), Some(Au(10)));
+    assert_eq!(calc.to_computed(None), None);
+
+    let calc = CalcLengthOrPercentage { length: Au(10), percentage: None };
+    assert_eq!(calc.to_computed(Some(Au(0))), Some(Au(10)));
+    assert_eq!(calc.to_computed(None), Some(Au(10)));
+}
 
 #[test]
 fn test_parse_double() {
diff --git a/servo/tests/unit/stylo/Cargo.toml b/servo/tests/unit/stylo/Cargo.toml
index b9fff8503591..239763a68663 100644
--- a/servo/tests/unit/stylo/Cargo.toml
+++ b/servo/tests/unit/stylo/Cargo.toml
@@ -16,7 +16,7 @@ testing = ["style/testing"]
 
 [dependencies]
 atomic_refcell = "0.1"
-cssparser = "0.12.1"
+cssparser = "0.13"
 env_logger = "0.4"
 euclid = "0.11"
 libc = "0.2"
diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
index c7be3eb339d3..f85b06a4716a 100644
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1347,12 +1347,12 @@ talos-tp5o:
 talos-perf-reftest:
     description: "Talos perf-reftest"
     suite: talos
-    talos-try-name: perfref
+    talos-try-name: perf-reftest
     treeherder-symbol: tc-T(p)
     run-on-projects:
         by-test-platform:
-            linux64-stylo/.*: ['try']
-            default: ['try']
+            linux64-stylo/.*: ['mozilla-central', 'try']
+            default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
diff --git a/taskcluster/scripts/builder/hazard-analysis.sh b/taskcluster/scripts/builder/hazard-analysis.sh
index 4b56025001a1..e9370ef65305 100755
--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -151,7 +151,7 @@ function check_hazards () {
         exit 1
     fi
 
-    NUM_ALLOWED_WRITE_HAZARDS=3
+    NUM_ALLOWED_WRITE_HAZARDS=7
     if [ $NUM_WRITE_HAZARDS -gt $NUM_ALLOWED_WRITE_HAZARDS ]; then
         echo "TEST-UNEXPECTED-FAIL $NUM_WRITE_HAZARDS heap write hazards detected out of $NUM_ALLOWED_WRITE_HAZARDS allowed" >&2
         echo "TinderboxPrint: documentation<br/><a href='https://wiki.mozilla.org/Javascript:Hazard_Builds#Diagnosing_a_heap_write_hazard_failure'>heap write hazard analysis failures</a>, visit \"Inspect Task\" link for hazard details"
diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index 2de1bf4092e3..ea9ab9f12f7f 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -177,7 +177,7 @@ def target_tasks_graphics(full_task_graph, parameters):
 def target_tasks_valgrind(full_task_graph, parameters):
     """Target tasks that only run on the cedar branch."""
     def filter(task):
-        platform = task.attributes.get('test_platform')
+        platform = task.attributes.get('test_platform', '').split('/')[0]
         if platform not in ['linux64']:
             return False
 
@@ -193,7 +193,7 @@ def target_tasks_valgrind(full_task_graph, parameters):
 def target_tasks_code_coverage(full_task_graph, parameters):
     """Target tasks that generate coverage data."""
     def filter(task):
-        platform = task.attributes.get('test_platform')
+        platform = task.attributes.get('test_platform', '').split('/')[0]
         if platform not in ('linux64-ccov', 'linux64-jsdcov'):
             return False
         return True
diff --git a/taskcluster/taskgraph/test/test_try_option_syntax.py b/taskcluster/taskgraph/test/test_try_option_syntax.py
index a2abc9710f31..8168aeb223f0 100644
--- a/taskcluster/taskgraph/test/test_try_option_syntax.py
+++ b/taskcluster/taskgraph/test/test_try_option_syntax.py
@@ -13,32 +13,47 @@ from ..taskgraph import TaskGraph
 from ..task import Task
 from mozunit import main
 
-# an empty graph, for things that don't look at it
-empty_graph = TaskGraph({}, Graph(set(), set()))
 
-
-def unittest_task(n, tp):
+def unittest_task(n, tp, bt='opt'):
     return (n, Task('test', n, {
         'unittest_try_name': n,
-        'test_platform': tp,
+        'test_platform': tp.split('/')[0],
+        'build_type': bt,
     }, {}))
 
 
-def talos_task(n, tp):
+def talos_task(n, tp, bt='opt'):
     return (n, Task('test', n, {
         'talos_try_name': n,
-        'test_platform': tp,
+        'test_platform': tp.split('/')[0],
+        'build_type': bt,
     }, {}))
 
+
 tasks = {k: v for k, v in [
-    unittest_task('mochitest-browser-chrome', 'linux'),
-    unittest_task('mochitest-browser-chrome-e10s', 'linux64'),
-    unittest_task('mochitest-chrome', 'linux'),
-    unittest_task('mochitest-webgl', 'linux'),
-    unittest_task('crashtest-e10s', 'linux'),
-    unittest_task('gtest', 'linux64'),
-    talos_task('dromaeojs', 'linux64'),
+    unittest_task('mochitest-browser-chrome', 'linux/opt'),
+    unittest_task('mochitest-browser-chrome-e10s', 'linux64/opt'),
+    unittest_task('mochitest-chrome', 'linux/debug', 'debug'),
+    unittest_task('mochitest-webgl', 'linux/debug', 'debug'),
+    unittest_task('extra1', 'linux', 'debug/opt'),
+    unittest_task('extra2', 'win32/opt'),
+    unittest_task('crashtest-e10s', 'linux/other'),
+    unittest_task('gtest', 'linux64/asan'),
+    talos_task('dromaeojs', 'linux64/psan'),
+    unittest_task('extra3', 'linux/opt'),
+    unittest_task('extra4', 'linux64/debug', 'debug'),
+    unittest_task('extra5', 'linux/this'),
+    unittest_task('extra6', 'linux/that'),
+    unittest_task('extra7', 'linux/other'),
+    unittest_task('extra8', 'linux64/asan'),
+    talos_task('extra9', 'linux64/psan'),
 ]}
+
+for r in RIDEALONG_BUILDS.values():
+    tasks.update({k: v for k, v in [
+        unittest_task(n + '-test', n) for n in r
+    ]})
+
 unittest_tasks = {k: v for k, v in tasks.iteritems()
                   if 'unittest_try_name' in v.attributes}
 talos_tasks = {k: v for k, v in tasks.iteritems()
@@ -50,7 +65,7 @@ class TestTryOptionSyntax(unittest.TestCase):
 
     def test_empty_message(self):
         "Given an empty message, it should return an empty value"
-        tos = TryOptionSyntax('', empty_graph)
+        tos = TryOptionSyntax('', graph_with_jobs)
         self.assertEqual(tos.build_types, [])
         self.assertEqual(tos.jobs, [])
         self.assertEqual(tos.unittests, [])
@@ -65,7 +80,7 @@ class TestTryOptionSyntax(unittest.TestCase):
 
     def test_message_without_try(self):
         "Given a non-try message, it should return an empty value"
-        tos = TryOptionSyntax('Bug 1234: frobnicte the foo', empty_graph)
+        tos = TryOptionSyntax('Bug 1234: frobnicte the foo', graph_with_jobs)
         self.assertEqual(tos.build_types, [])
         self.assertEqual(tos.jobs, [])
         self.assertEqual(tos.unittests, [])
@@ -80,74 +95,74 @@ class TestTryOptionSyntax(unittest.TestCase):
 
     def test_unknown_args(self):
         "unknown arguments are ignored"
-        tos = TryOptionSyntax('try: --doubledash -z extra', empty_graph)
+        tos = TryOptionSyntax('try: --doubledash -z extra', graph_with_jobs)
         # equilvant to "try:"..
         self.assertEqual(tos.build_types, [])
         self.assertEqual(tos.jobs, None)
 
     def test_b_do(self):
         "-b do should produce both build_types"
-        tos = TryOptionSyntax('try: -b do', empty_graph)
+        tos = TryOptionSyntax('try: -b do', graph_with_jobs)
         self.assertEqual(sorted(tos.build_types), ['debug', 'opt'])
 
     def test_b_d(self):
         "-b d should produce build_types=['debug']"
-        tos = TryOptionSyntax('try: -b d', empty_graph)
+        tos = TryOptionSyntax('try: -b d', graph_with_jobs)
         self.assertEqual(sorted(tos.build_types), ['debug'])
 
     def test_b_o(self):
         "-b o should produce build_types=['opt']"
-        tos = TryOptionSyntax('try: -b o', empty_graph)
+        tos = TryOptionSyntax('try: -b o', graph_with_jobs)
         self.assertEqual(sorted(tos.build_types), ['opt'])
 
     def test_build_o(self):
         "--build o should produce build_types=['opt']"
-        tos = TryOptionSyntax('try: --build o', empty_graph)
+        tos = TryOptionSyntax('try: --build o', graph_with_jobs)
         self.assertEqual(sorted(tos.build_types), ['opt'])
 
     def test_b_dx(self):
         "-b dx should produce build_types=['debug'], silently ignoring the x"
-        tos = TryOptionSyntax('try: -b dx', empty_graph)
+        tos = TryOptionSyntax('try: -b dx', graph_with_jobs)
         self.assertEqual(sorted(tos.build_types), ['debug'])
 
     def test_j_job(self):
         "-j somejob sets jobs=['somejob']"
-        tos = TryOptionSyntax('try: -j somejob', empty_graph)
+        tos = TryOptionSyntax('try: -j somejob', graph_with_jobs)
         self.assertEqual(sorted(tos.jobs), ['somejob'])
 
     def test_j_jobs(self):
         "-j job1,job2 sets jobs=['job1', 'job2']"
-        tos = TryOptionSyntax('try: -j job1,job2', empty_graph)
+        tos = TryOptionSyntax('try: -j job1,job2', graph_with_jobs)
         self.assertEqual(sorted(tos.jobs), ['job1', 'job2'])
 
     def test_j_all(self):
         "-j all sets jobs=None"
-        tos = TryOptionSyntax('try: -j all', empty_graph)
+        tos = TryOptionSyntax('try: -j all', graph_with_jobs)
         self.assertEqual(tos.jobs, None)
 
     def test_j_twice(self):
         "-j job1 -j job2 sets jobs=job1, job2"
-        tos = TryOptionSyntax('try: -j job1 -j job2', empty_graph)
+        tos = TryOptionSyntax('try: -j job1 -j job2', graph_with_jobs)
         self.assertEqual(sorted(tos.jobs), sorted(['job1', 'job2']))
 
     def test_p_all(self):
         "-p all sets platforms=None"
-        tos = TryOptionSyntax('try: -p all', empty_graph)
+        tos = TryOptionSyntax('try: -p all', graph_with_jobs)
         self.assertEqual(tos.platforms, None)
 
     def test_p_linux(self):
         "-p linux sets platforms=['linux', 'linux-l10n']"
-        tos = TryOptionSyntax('try: -p linux', empty_graph)
+        tos = TryOptionSyntax('try: -p linux', graph_with_jobs)
         self.assertEqual(tos.platforms, ['linux', 'linux-l10n'])
 
     def test_p_linux_win32(self):
         "-p linux,win32 sets platforms=['linux', 'linux-l10n', 'win32']"
-        tos = TryOptionSyntax('try: -p linux,win32', empty_graph)
+        tos = TryOptionSyntax('try: -p linux,win32', graph_with_jobs)
         self.assertEqual(sorted(tos.platforms), ['linux', 'linux-l10n', 'win32'])
 
     def test_p_expands_ridealongs(self):
         "-p linux,linux64 includes the RIDEALONG_BUILDS"
-        tos = TryOptionSyntax('try: -p linux,linux64', empty_graph)
+        tos = TryOptionSyntax('try: -p linux,linux64', graph_with_jobs)
         platforms = set(['linux'] + RIDEALONG_BUILDS['linux'])
         platforms |= set(['linux64'] + RIDEALONG_BUILDS['linux64'])
         self.assertEqual(sorted(tos.platforms), sorted(platforms))
@@ -218,9 +233,10 @@ class TestTryOptionSyntax(unittest.TestCase):
     def test_u_platforms_negated(self):
         "-u gtest[-linux] selects all platforms but linux for gtest"
         tos = TryOptionSyntax('try: -u gtest[-linux]', graph_with_jobs)
-        self.assertEqual(sorted(tos.unittests), sorted([
-            {'test': 'gtest', 'platforms': ['linux64']},
-        ]))
+        all_platforms = set([x.attributes['test_platform'] for x in unittest_tasks.values()])
+        self.assertEqual(sorted(tos.unittests[0]['platforms']), sorted(
+            [x for x in all_platforms if x != 'linux']
+        ))
 
     def test_u_platforms_negated_pretty(self):
         "-u gtest[Ubuntu,-x64] selects just linux for gtest"
@@ -255,52 +271,52 @@ class TestTryOptionSyntax(unittest.TestCase):
 
     def test_trigger_tests(self):
         "--rebuild 10 sets trigger_tests"
-        tos = TryOptionSyntax('try: --rebuild 10', empty_graph)
+        tos = TryOptionSyntax('try: --rebuild 10', graph_with_jobs)
         self.assertEqual(tos.trigger_tests, 10)
 
     def test_talos_trigger_tests(self):
         "--rebuild-talos 10 sets talos_trigger_tests"
-        tos = TryOptionSyntax('try: --rebuild-talos 10', empty_graph)
+        tos = TryOptionSyntax('try: --rebuild-talos 10', graph_with_jobs)
         self.assertEqual(tos.talos_trigger_tests, 10)
 
     def test_interactive(self):
         "--interactive sets interactive"
-        tos = TryOptionSyntax('try: --interactive', empty_graph)
+        tos = TryOptionSyntax('try: --interactive', graph_with_jobs)
         self.assertEqual(tos.interactive, True)
 
     def test_all_email(self):
         "--all-emails sets notifications"
-        tos = TryOptionSyntax('try: --all-emails', empty_graph)
+        tos = TryOptionSyntax('try: --all-emails', graph_with_jobs)
         self.assertEqual(tos.notifications, 'all')
 
     def test_fail_email(self):
         "--failure-emails sets notifications"
-        tos = TryOptionSyntax('try: --failure-emails', empty_graph)
+        tos = TryOptionSyntax('try: --failure-emails', graph_with_jobs)
         self.assertEqual(tos.notifications, 'failure')
 
     def test_no_email(self):
         "no email settings don't set notifications"
-        tos = TryOptionSyntax('try:', empty_graph)
+        tos = TryOptionSyntax('try:', graph_with_jobs)
         self.assertEqual(tos.notifications, None)
 
     def test_setenv(self):
         "--setenv VAR=value adds a environment variables setting to env"
-        tos = TryOptionSyntax('try: --setenv VAR1=value1 --setenv VAR2=value2', empty_graph)
+        tos = TryOptionSyntax('try: --setenv VAR1=value1 --setenv VAR2=value2', graph_with_jobs)
         self.assertEqual(tos.env, ['VAR1=value1', 'VAR2=value2'])
 
     def test_profile(self):
         "--geckoProfile sets profile to true"
-        tos = TryOptionSyntax('try: --geckoProfile', empty_graph)
+        tos = TryOptionSyntax('try: --geckoProfile', graph_with_jobs)
         self.assertTrue(tos.profile)
 
     def test_tag(self):
         "--tag TAG sets tag to TAG value"
-        tos = TryOptionSyntax('try: --tag tagName', empty_graph)
+        tos = TryOptionSyntax('try: --tag tagName', graph_with_jobs)
         self.assertEqual(tos.tag, 'tagName')
 
     def test_no_retry(self):
         "--no-retry sets no_retry to true"
-        tos = TryOptionSyntax('try: --no-retry', empty_graph)
+        tos = TryOptionSyntax('try: --no-retry', graph_with_jobs)
         self.assertTrue(tos.no_retry)
 
 if __name__ == '__main__':
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index daacb5bff7d2..82a971dad925 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -679,8 +679,7 @@ def make_job_description(config, tests):
         attributes.update({
             'build_platform': attr_build_platform,
             'build_type': attr_build_type,
-            # only keep the first portion of the test platform
-            'test_platform': test['test-platform'].split('/')[0],
+            'test_platform': test['test-platform'],
             'test_chunk': str(test['this-chunk']),
             'unittest_suite': suite,
             'unittest_flavor': flavor,
diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py
index 5f174b3df3b8..6c267ee8900f 100644
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -121,6 +121,7 @@ UNITTEST_ALIASES = {
 # [test_platforms]} translations, This includes only the most commonly-used
 # substrings.  This is intended only for backward-compatibility.  New test
 # platforms should have their `test_platform` spelled out fully in try syntax.
+# Note that the test platforms here are only the prefix up to the `/`.
 UNITTEST_PLATFORM_PRETTY_NAMES = {
     'Ubuntu': ['linux32', 'linux64', 'linux64-asan'],
     'x64': ['linux64', 'linux64-asan'],
@@ -386,7 +387,7 @@ class TryOptionSyntax(object):
         if test_arg is None or test_arg == 'none':
             return []
 
-        all_platforms = set(t.attributes['test_platform']
+        all_platforms = set(t.attributes['test_platform'].split('/')[0]
                             for t in full_task_graph.tasks.itervalues()
                             if 'test_platform' in t.attributes)
 
@@ -584,8 +585,10 @@ class TryOptionSyntax(object):
                     break
             else:
                 return False
-            if 'platforms' in test and attr('test_platform') not in test['platforms']:
-                return False
+            if 'platforms' in test:
+                platform = attributes.get('test_platform', '').split('/')[0]
+                if platform not in test['platforms']:
+                    return False
             if 'only_chunks' in test and attr('test_chunk') not in test['only_chunks']:
                 return False
             return True
diff --git a/testing/firefox-ui/resources/update/snippet_empty.xml b/testing/firefox-ui/resources/update/snippet_empty.xml
new file mode 100644
index 000000000000..faab98118947
--- /dev/null
+++ b/testing/firefox-ui/resources/update/snippet_empty.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<updates>
+</updates>
diff --git a/testing/firefox-ui/tests/puppeteer/manifest.ini b/testing/firefox-ui/tests/puppeteer/manifest.ini
index 2eb24b6dc048..7af84671d49c 100644
--- a/testing/firefox-ui/tests/puppeteer/manifest.ini
+++ b/testing/firefox-ui/tests/puppeteer/manifest.ini
@@ -8,7 +8,6 @@ tags = local
 [test_security.py]
 tags = remote
 [test_software_update.py]
-tags = remote
 [test_utils.py]
 
 # UI tests
diff --git a/testing/firefox-ui/tests/puppeteer/test_software_update.py b/testing/firefox-ui/tests/puppeteer/test_software_update.py
index 04ca4a1f4a3e..c69aff178a42 100644
--- a/testing/firefox-ui/tests/puppeteer/test_software_update.py
+++ b/testing/firefox-ui/tests/puppeteer/test_software_update.py
@@ -32,16 +32,24 @@ class TestSoftwareUpdate(PuppeteerMixin, MarionetteTestCase):
         self.assertTrue(self.software_update.allowed)
 
     def test_build_info(self):
-        build_info = self.software_update.build_info
-        self.assertEqual(build_info['disabled_addons'], None)
-        self.assertIn('Mozilla/', build_info['user_agent'])
-        self.assertEqual(build_info['mar_channels'], set(['expected', 'channels']))
-        self.assertTrue(build_info['version'])
-        self.assertTrue(build_info['buildid'].isdigit())
-        self.assertTrue(build_info['locale'])
-        self.assertIn('force=1', build_info['update_url'])
-        self.assertIn('xml', build_info['update_snippet'])
-        self.assertEqual(build_info['channel'], self.software_update.update_channel)
+        self.software_update.update_url = self.marionette.absolute_url(
+            'update/snippet_empty.xml?product=%PRODUCT%&version=%VERSION%&'
+            'buildid=%BUILD_ID%&locale=%LOCALE%&channel=%CHANNEL%')
+
+        try:
+            build_info = self.software_update.build_info
+            self.assertEqual(build_info['disabled_addons'], None)
+            self.assertIn('Mozilla/', build_info['user_agent'])
+            self.assertEqual(build_info['mar_channels'], set(['expected', 'channels']))
+            self.assertTrue(build_info['version'])
+            self.assertTrue(build_info['buildid'].isdigit())
+            self.assertTrue(build_info['locale'])
+            self.assertIn('force=1', build_info['update_url'])
+            self.assertIn('xml', build_info['update_snippet'])
+            self.assertEqual(build_info['channel'], self.software_update.update_channel)
+        finally:
+            # Restart Firefox to reset the custom update url
+            self.restart(clean=True)
 
     def test_force_fallback(self):
         status_file = os.path.join(self.software_update.staging_directory, 'update.status')
@@ -95,6 +103,7 @@ class TestUpdateChannel(PuppeteerMixin, MarionetteTestCase):
             # Firefox to dump the logs to the console.
             self.restart(clean=True)
             self.assertEqual(self.software_update.update_channel, 'expected_channel')
+            self.assertEqual(self.software_update.patch_info['channel'], 'expected_channel')
         finally:
             self.software_update.update_channel = self.saved_channel
             self.restart(clean=True)
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py b/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
index 098a05781070..697ceb76ce28 100644
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
@@ -447,10 +447,10 @@ class TestBackForwardNavigation(BaseNavigationTestCase):
             self.marionette.go_back()
         self.marionette.timeout.reset()
 
-        Wait(self.marionette, self.marionette.timeout.page_load).until(
-            lambda mn: urls[0] == mn.get_url(),
-            message="'{}' has been successfully loaded after going back".format(urls[0]))
-        self.assertEqual(self.marionette.find_element(By.ID, "delay").text, "3")
+        delay = Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
+            expected.element_present(By.ID, "delay"),
+            message="Target element 'delay' has not been found after timeout in 'back'")
+        self.assertEqual(delay.text, "3")
 
         self.marionette.go_forward()
         self.assertEqual(urls[1], self.marionette.get_url())
@@ -461,10 +461,10 @@ class TestBackForwardNavigation(BaseNavigationTestCase):
             self.marionette.go_forward()
         self.marionette.timeout.reset()
 
-        Wait(self.marionette, self.marionette.timeout.page_load).until(
-            lambda mn: urls[2] == mn.get_url(),
-            message="'{}' has been successfully loaded after going back".format(urls[2]))
-        self.assertEqual(self.marionette.find_element(By.ID, "delay").text, "4")
+        delay = Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
+            expected.element_present(By.ID, "delay"),
+            message="Target element 'delay' has not been found after timeout in 'forward'")
+        self.assertEqual(delay.text, "4")
 
     def test_certificate_error(self):
         test_pages = [
diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py
index 09df04fbb68b..7721b04a690f 100644
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/software_update.py
@@ -5,6 +5,7 @@
 import ConfigParser
 import os
 import re
+import sys
 
 import mozinfo
 
@@ -359,15 +360,14 @@ class SoftwareUpdate(BaseLib):
 
         :param update_url: URL to the update snippet
         """
-        snippet = None
         try:
             import urllib2
             response = urllib2.urlopen(update_url)
-            snippet = response.read()
+            return response.read()
         except Exception:
-            pass
+            exc, val, tb = sys.exc_info()
 
-        return snippet
+            raise exc, "Failed to retrieve update snippet: {}".format(val.reason), tb
 
     def get_formatted_update_url(self, force=False):
         """Retrieve the formatted AUS update URL the update snippet is retrieved from.
diff --git a/testing/marionette/server.js b/testing/marionette/server.js
index 19929eba9670..c5e2fda6fef0 100644
--- a/testing/marionette/server.js
+++ b/testing/marionette/server.js
@@ -32,6 +32,7 @@ this.server = {};
 const PROTOCOL_VERSION = 3;
 
 const PREF_CONTENT_LISTENER = "marionette.contentListener";
+const PREF_PORT = "marionette.port";
 const PREF_RECOMMENDED = "marionette.prefs.recommended";
 
 // Marionette sets preferences recommended for automation when it starts,
@@ -273,6 +274,7 @@ server.TCPListener = class {
    */
   constructor (port) {
     this.port = port;
+    this.socket = null;
     this.conns = new Set();
     this.nextConnID = 0;
     this.alive = false;
@@ -283,7 +285,7 @@ server.TCPListener = class {
   /**
    * Function produces a GeckoDriver.
    *
-   * Determines application nameto initialise the driver with.
+   * Determines application name to initialise the driver with.
    *
    * @return {GeckoDriver}
    *     A driver instance.
@@ -303,6 +305,13 @@ server.TCPListener = class {
     this._acceptConnections = value;
   }
 
+  /**
+   * Bind this listener to |port| and start accepting incoming socket
+   * connections on |onSocketAccepted|.
+   *
+   * The marionette.port preference will be populated with the value
+   * of |this.port|.
+   */
   start () {
     if (this.alive) {
       return;
@@ -321,8 +330,10 @@ server.TCPListener = class {
 
     const flags = KeepWhenOffline | LoopbackOnly;
     const backlog = 1;
-    this.listener = new ServerSocket(this.port, flags, backlog);
-    this.listener.asyncListen(this);
+    this.socket = new ServerSocket(this.port, flags, backlog);
+    this.socket.asyncListen(this);
+    this.port = this.socket.port;
+    Preferences.set(PREF_PORT, this.port);
 
     this.alive = true;
     this._acceptConnections = true;
@@ -333,20 +344,18 @@ server.TCPListener = class {
       return;
     }
 
+    this._acceptConnections = false;
+
+    this.socket.close();
+    this.socket = null;
+
     for (let k of this.alteredPrefs) {
       logger.debug(`Resetting recommended pref ${k}`);
       Preferences.reset(k);
     }
-    this.closeListener();
 
     this.alteredPrefs.clear();
     this.alive = false;
-    this._acceptConnections = false;
-  }
-
-  closeListener () {
-    this.listener.close();
-    this.listener = null;
   }
 
   onSocketAccepted (serverSocket, clientSocket) {
diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py
index e644f670dc25..fc45873937ed 100755
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -795,16 +795,27 @@ or run without that action (ie: --no-{action})"
 
         buildid = None
         if c.get("is_automation"):
-            if self.buildbot_config['properties'].get('buildid'):
-                self.info("Determining buildid from buildbot properties")
-                buildid = self.buildbot_config['properties']['buildid'].encode(
-                    'ascii', 'replace'
-                )
+            if self.buildbot_config.get('properties'):
+                # We're on buildbot
+                if self.buildbot_config.get('properties').get('buildid'):
+                    # Try may not provide a buildid. This means, it's gonna be generated
+                    # below.
+                    self.info("Determining buildid from buildbot properties")
+                    buildid = self.buildbot_config['properties']['buildid'].encode(
+                        'ascii', 'replace'
+                    )
             else:
-                # for taskcluster, there are no buildbot properties, and we pass
+                # We're on taskcluster.
+                # In this case, there are no buildbot properties, and we must pass
                 # MOZ_BUILD_DATE into mozharness as an environment variable, only
                 # to have it pass the same value out with the same name.
-                buildid = os.environ.get('MOZ_BUILD_DATE')
+                try:
+                    buildid = os.environ['MOZ_BUILD_DATE']
+                except KeyError:
+                    self.fatal(
+                        "MOZ_BUILD_DATE must be provided as an environment var on Taskcluster"
+                    )
+
 
         if not buildid:
             self.info("Creating buildid through current time")
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 564c87a4cf0d..58c757a99550 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -211694,11 +211694,11 @@
    "testharness"
   ],
   "web-animations/animation-model/animation-types/property-list.js": [
-   "4fa529fe470abb7a6fb4582d0174f1696b141f87",
+   "0d7f75b05e66da256fe4d2ecb17332ec7abccfd2",
    "support"
   ],
   "web-animations/animation-model/animation-types/property-types.js": [
-   "7b79c51f6dc5c33aae127406509770159815c290",
+   "f114971fefa63200be12565b896e475667f07153",
    "support"
   ],
   "web-animations/animation-model/animation-types/spacing-keyframes-filters.html": [
diff --git a/testing/web-platform/meta/dom/lists/DOMTokenList-Iterable.html.ini b/testing/web-platform/meta/dom/lists/DOMTokenList-Iterable.html.ini
deleted file mode 100644
index a6ebef3dfbdb..000000000000
--- a/testing/web-platform/meta/dom/lists/DOMTokenList-Iterable.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DOMTokenList-Iterable.html]
-  type: testharness
-  [DOMTokenList is iterable via for-of loop.]
-    expected: FAIL
-    bug: https://github.com/whatwg/dom/issues/105
-
diff --git a/testing/web-platform/meta/dom/lists/DOMTokenList-iteration.html.ini b/testing/web-platform/meta/dom/lists/DOMTokenList-iteration.html.ini
deleted file mode 100644
index da8245d12dd7..000000000000
--- a/testing/web-platform/meta/dom/lists/DOMTokenList-iteration.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[DOMTokenList-iteration.html]
-  type: testharness
-  [DOMTokenList iteration: keys, values, etc.]
-    expected: FAIL
-
-  [classList]
-    expected: FAIL
-
-  [classList.keys]
-    expected: FAIL
-
-  [classList.values]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/dom/lists/DOMTokenList-value.html.ini b/testing/web-platform/meta/dom/lists/DOMTokenList-value.html.ini
deleted file mode 100644
index d204d531478a..000000000000
--- a/testing/web-platform/meta/dom/lists/DOMTokenList-value.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DOMTokenList-value.html]
-  type: testharness
-  [DOMTokenList value]
-    expected: FAIL
-    bug: https://github.com/whatwg/dom/issues/105
-
diff --git a/testing/web-platform/meta/dom/nodes/Element-classlist.html.ini b/testing/web-platform/meta/dom/nodes/Element-classlist.html.ini
deleted file mode 100644
index 96472ce23853..000000000000
--- a/testing/web-platform/meta/dom/nodes/Element-classlist.html.ini
+++ /dev/null
@@ -1,377 +0,0 @@
-[Element-classlist.html]
-  type: testharness
-  [classList.length when set to "a a" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (HTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (HTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (HTML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (HTML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (HTML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (HTML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (HTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (HTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (XHTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (XHTML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (XHTML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (XHTML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XHTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (XHTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (MathML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (MathML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (MathML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (MathML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (MathML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (MathML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (MathML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (MathML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (foo node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (foo node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (foo node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (foo node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (foo node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (foo node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (foo node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (foo node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (foo node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/web-animations/animation-model/animation-types/interpolation-per-property.html.ini b/testing/web-platform/meta/web-animations/animation-model/animation-types/interpolation-per-property.html.ini
index 1e06daad3e89..c686f5666fbc 100644
--- a/testing/web-platform/meta/web-animations/animation-model/animation-types/interpolation-per-property.html.ini
+++ b/testing/web-platform/meta/web-animations/animation-model/animation-types/interpolation-per-property.html.ini
@@ -12,21 +12,9 @@ prefs: [layout.css.contain.enabled:true, layout.css.initial-letter.enabled:true,
   [filterList has testInterpolation function]
     expected: FAIL
 
-  [boxShadowList has testInterpolation function]
-    expected: FAIL
-
-  [textShadowList has testInterpolation function]
-    expected: FAIL
-
-  [box-shadow (type: boxShadowList) has testInterpolation function]
-    expected: FAIL
-
   [filter (type: filterList) has testInterpolation function]
     expected: FAIL
 
-  [text-shadow (type: textShadowList) has testInterpolation function]
-    expected: FAIL
-
   [word-spacing supports animating as combination units "px" and "%"]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1291187
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/2_tracks.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/2_tracks.html.ini
index 84a161b1f85c..00038f39743d 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/2_tracks.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/2_tracks.html.ini
@@ -1,3 +1,4 @@
 [2_tracks.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1318542
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini
deleted file mode 100644
index 4540adcbb402..000000000000
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[basic.html]
-  type: reftest
-  disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1142501
-  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html.ini
index ac129dc8e214..941738fa3bb2 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html.ini
@@ -1,3 +1,4 @@
 [u05D0_first.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html.ini
index 2ace435466d6..1ba93fd81f55 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html.ini
@@ -1,3 +1,4 @@
 [u0628_first.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html.ini
index 3b573d90c18b..6fc8b14cb1f3 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html.ini
@@ -1,3 +1,4 @@
 [single_quote.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html.ini
index 6dc4ff2ec10d..1ab4b8c845de 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html.ini
@@ -1,3 +1,4 @@
 [line_0_is_top.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/repaint.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/repaint.html.ini
index 65c2198aeedd..71972f036d04 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/repaint.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/repaint.html.ini
@@ -1,3 +1,4 @@
 [repaint.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/__dir__.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/__dir__.ini
deleted file mode 100644
index faba2ce08f2c..000000000000
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1332564
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html.ini
new file mode 100644
index 000000000000..3cfca2139a2f
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html.ini
@@ -0,0 +1,4 @@
+[background_properties.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html.ini
new file mode 100644
index 000000000000..0f25b2d6efc3
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html.ini
@@ -0,0 +1,4 @@
+[background_shorthand.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html.ini
new file mode 100644
index 000000000000..707846fcf123
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html.ini
@@ -0,0 +1,4 @@
+[background_shorthand_css_relative_url.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini
deleted file mode 100644
index e929594c836d..000000000000
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font_properties.html]
-  type: reftest
-  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini
deleted file mode 100644
index 58a6d2ff045c..000000000000
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font_shorthand.html]
-  type: reftest
-  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html.ini
new file mode 100644
index 000000000000..a0fdfa7de125
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html.ini
@@ -0,0 +1,4 @@
+[white-space_pre-line_wrapped.html]
+  type: reftest
+  expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html.ini
index 5f9e964f67a7..dab62f5c78d1 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html.ini
@@ -1,4 +1,5 @@
 [white-space_pre-wrap_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected:
     if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html.ini
index 9766b9af4b8c..4a32ba026d98 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html.ini
@@ -1,4 +1,5 @@
 [white-space_pre_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected:
     if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html.ini
new file mode 100644
index 000000000000..58019d2aa735
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html.ini
@@ -0,0 +1,3 @@
+[background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html.ini
new file mode 100644
index 000000000000..8fbcfebdbc9b
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html.ini
new file mode 100644
index 000000000000..e5aee083b43f
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html.ini
@@ -0,0 +1,3 @@
+[background_shorthand_css_relative_url.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html.ini
new file mode 100644
index 000000000000..f05497405e64
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[bold_animation_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html.ini
new file mode 100644
index 000000000000..872a5327fdaf
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html.ini
@@ -0,0 +1,3 @@
+[bold_background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html.ini
new file mode 100644
index 000000000000..4bd2b4bd08fd
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[bold_background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html.ini
similarity index 64%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html.ini
index 0049066d0ac6..b76824d53de0 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html.ini
@@ -1,3 +1,3 @@
-[bidi_ruby.html]
+[bold_color.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html.ini
new file mode 100644
index 000000000000..4617a44121f4
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html.ini
@@ -0,0 +1,3 @@
+[bold_font_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html.ini
similarity index 55%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html.ini
index 0eb7dc57f759..527756bc205f 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html.ini
@@ -1,3 +1,3 @@
-[u06E9_no_strong_dir.html]
+[bold_font_shorthand.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html.ini
new file mode 100644
index 000000000000..153091c50d62
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html.ini
@@ -0,0 +1,3 @@
+[bold_outline_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html.ini
new file mode 100644
index 000000000000..7921834cdf80
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[bold_outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..1f08759fe8c7
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[bold_text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html.ini
new file mode 100644
index 000000000000..024913ca1f0b
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html.ini
@@ -0,0 +1,3 @@
+[bold_text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html.ini
new file mode 100644
index 000000000000..b5fa9100a030
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html.ini
@@ -0,0 +1,3 @@
+[bold_timestamp_future.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html.ini
new file mode 100644
index 000000000000..341993bd7d2e
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html.ini
@@ -0,0 +1,3 @@
+[bold_timestamp_past.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html.ini
index 7f8b322a5713..6317bcf2a986 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html.ini
@@ -1,4 +1,3 @@
 [bold_transition_with_timestamp.html]
   type: reftest
   expected: FAIL
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1288648
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html.ini
index dea80e290a2f..cabc009e5485 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html.ini
@@ -1,3 +1,4 @@
 [bold_white-space_normal_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html.ini
index 9f99a16c6bb8..c78e073007f8 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html.ini
@@ -1,3 +1,4 @@
 [bold_white-space_pre-line_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html.ini
new file mode 100644
index 000000000000..e6b7e95ed03d
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html.ini
@@ -0,0 +1,3 @@
+[bold_with_class.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html.ini
new file mode 100644
index 000000000000..17203b7e0bbb
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html.ini
@@ -0,0 +1,3 @@
+[bold_with_class_object_specific_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html.ini
new file mode 100644
index 000000000000..630a98f28471
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[class_animation_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html.ini
new file mode 100644
index 000000000000..6cddcdc7b61b
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html.ini
@@ -0,0 +1,3 @@
+[class_background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html.ini
new file mode 100644
index 000000000000..8108f31ac691
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[class_background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html.ini
similarity index 63%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html.ini
index fc5ff5617464..c4fb5401fe89 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html.ini
@@ -1,3 +1,3 @@
-[u0041_first.html]
+[class_color.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html.ini
new file mode 100644
index 000000000000..c9e236f3b455
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html.ini
@@ -0,0 +1,3 @@
+[class_font_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html.ini
new file mode 100644
index 000000000000..dc1eb5aa3890
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html.ini
@@ -0,0 +1,3 @@
+[class_font_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html.ini
similarity index 50%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html.ini
index 7ebda16077d8..e88204a897ae 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html.ini
@@ -1,3 +1,3 @@
-[align_middle_position_50.html]
+[class_outline_properties.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html.ini
new file mode 100644
index 000000000000..22652bff10ab
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[class_outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..87052fea03f8
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[class_text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html.ini
new file mode 100644
index 000000000000..5b85e4f61d91
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html.ini
@@ -0,0 +1,3 @@
+[class_text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html.ini
new file mode 100644
index 000000000000..67d92f83c002
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html.ini
@@ -0,0 +1,3 @@
+[class_timestamp_future.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html.ini
new file mode 100644
index 000000000000..2741e501be2e
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html.ini
@@ -0,0 +1,3 @@
+[class_timestamp_past.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html.ini
new file mode 100644
index 000000000000..20d7459b0162
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[class_transition_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html.ini
index b6e7ff34a036..a123a9db495b 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html.ini
@@ -1,3 +1,4 @@
 [class_white-space_normal_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html.ini
index ff7d6ed64613..f6234d850c5d 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html.ini
@@ -1,3 +1,4 @@
 [class_white-space_pre-line_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html.ini
new file mode 100644
index 000000000000..a272c20654cf
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html.ini
@@ -0,0 +1,3 @@
+[class_with_class.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html.ini
new file mode 100644
index 000000000000..021363a170c3
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html.ini
@@ -0,0 +1,3 @@
+[class_with_class_object_specific_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html.ini
similarity index 66%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html.ini
index 73b0fe48dbb6..3ec283eb30d6 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html.ini
@@ -1,3 +1,3 @@
-[size_90.html]
+[color_hex.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html.ini
new file mode 100644
index 000000000000..aea0368295f9
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html.ini
@@ -0,0 +1,3 @@
+[color_hsla.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html.ini
new file mode 100644
index 000000000000..6853601bfecd
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html.ini
@@ -0,0 +1,3 @@
+[color_rgba.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html.ini
similarity index 67%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html.ini
index 8062ff4d4e33..76981ccf657b 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html.ini
@@ -1,3 +1,3 @@
-[size_99.html]
+[id_color.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html.ini
new file mode 100644
index 000000000000..006fd8ccdc39
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[italic_animation_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html.ini
new file mode 100644
index 000000000000..ce162f93acc1
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html.ini
@@ -0,0 +1,3 @@
+[italic_background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html.ini
new file mode 100644
index 000000000000..2bb1e38d2d79
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[italic_background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html.ini
similarity index 62%
rename from testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle.html.ini
rename to testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html.ini
index 2a444577382a..4f488c21a0a7 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/align_middle.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html.ini
@@ -1,3 +1,3 @@
-[align_middle.html]
+[italic_color.html]
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html.ini
new file mode 100644
index 000000000000..ae822450ec32
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html.ini
@@ -0,0 +1,3 @@
+[italic_font_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html.ini
new file mode 100644
index 000000000000..e8632f86d66f
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html.ini
@@ -0,0 +1,3 @@
+[italic_font_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html.ini
new file mode 100644
index 000000000000..134d25d0224c
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html.ini
@@ -0,0 +1,3 @@
+[italic_outline_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html.ini
new file mode 100644
index 000000000000..1b12eb2c915a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[italic_outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..a86620bd46d7
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[italic_text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html.ini
new file mode 100644
index 000000000000..4f09902dadb2
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html.ini
@@ -0,0 +1,3 @@
+[italic_text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html.ini
new file mode 100644
index 000000000000..ec83be33bfc3
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html.ini
@@ -0,0 +1,3 @@
+[italic_timestamp_future.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html.ini
new file mode 100644
index 000000000000..86be5d609358
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html.ini
@@ -0,0 +1,3 @@
+[italic_timestamp_past.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html.ini
new file mode 100644
index 000000000000..18a54e336eed
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[italic_transition_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html.ini
index c7d320448c67..5c5e49955004 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html.ini
@@ -1,3 +1,4 @@
 [italic_white-space_normal_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html.ini
index cb971f92a385..6d5c2d703943 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html.ini
@@ -1,3 +1,4 @@
 [italic_white-space_pre-line_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html.ini
new file mode 100644
index 000000000000..a7ba26ef3a84
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html.ini
@@ -0,0 +1,3 @@
+[italic_with_class.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html.ini
new file mode 100644
index 000000000000..8eedac7dc93a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html.ini
@@ -0,0 +1,3 @@
+[italic_with_class_object_specific_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html.ini
new file mode 100644
index 000000000000..0b148ba3dcf9
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html.ini
@@ -0,0 +1,3 @@
+[not_root_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html.ini
new file mode 100644
index 000000000000..526aa11a37d3
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html.ini
@@ -0,0 +1,3 @@
+[outline_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html.ini
new file mode 100644
index 000000000000..59fb00fb29ce
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html.ini
new file mode 100644
index 000000000000..c144d2a2b71a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html.ini
@@ -0,0 +1,3 @@
+[root_namespace.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html.ini
new file mode 100644
index 000000000000..cb55e12c7a8a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html.ini
@@ -0,0 +1,3 @@
+[root_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..0c7b45c9ea54
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html.ini
new file mode 100644
index 000000000000..7b653165c767
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html.ini
@@ -0,0 +1,3 @@
+[text-decoration_overline.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html.ini
new file mode 100644
index 000000000000..9d81f4d2ee12
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html.ini
@@ -0,0 +1,3 @@
+[text-decoration_overline_underline_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html.ini
new file mode 100644
index 000000000000..7f0f9c0dec2d
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html.ini
@@ -0,0 +1,3 @@
+[text-decoration_underline.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html.ini
new file mode 100644
index 000000000000..0561ac802818
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html.ini
@@ -0,0 +1,3 @@
+[text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html.ini
new file mode 100644
index 000000000000..47260a136106
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[underline_animation_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html.ini
new file mode 100644
index 000000000000..6545ebb747d6
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html.ini
@@ -0,0 +1,3 @@
+[underline_background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html.ini
new file mode 100644
index 000000000000..574aab18edb9
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[underline_background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html.ini
new file mode 100644
index 000000000000..7875784ea431
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html.ini
@@ -0,0 +1,3 @@
+[underline_color.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html.ini
new file mode 100644
index 000000000000..3a4dcad1ede8
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html.ini
@@ -0,0 +1,3 @@
+[underline_font_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html.ini
new file mode 100644
index 000000000000..d3cdf36e51ac
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html.ini
@@ -0,0 +1,3 @@
+[underline_font_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html.ini
new file mode 100644
index 000000000000..45290ee0d7b5
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html.ini
@@ -0,0 +1,3 @@
+[underline_outline_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html.ini
new file mode 100644
index 000000000000..21a31145e6af
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[underline_outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..48c69bb8fc22
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[underline_text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html.ini
new file mode 100644
index 000000000000..3b2209e38ed7
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html.ini
@@ -0,0 +1,3 @@
+[underline_text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html.ini
new file mode 100644
index 000000000000..1ed025893558
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html.ini
@@ -0,0 +1,3 @@
+[underline_timestamp_future.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
new file mode 100644
index 000000000000..628f60bc5646
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
@@ -0,0 +1,3 @@
+[underline_timestamp_past.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html.ini
new file mode 100644
index 000000000000..697b2607e058
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[underline_transition_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html.ini
index 78883dc3fad0..efe8f08b244c 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html.ini
@@ -1,3 +1,4 @@
 [underline_white-space_normal_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html.ini
index 08d552ac18a4..123c32daced2 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html.ini
@@ -1,3 +1,4 @@
 [underline_white-space_pre-line_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html.ini
new file mode 100644
index 000000000000..dabbc9468875
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html.ini
@@ -0,0 +1,3 @@
+[underline_with_class.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html.ini
new file mode 100644
index 000000000000..66830cbaa6b6
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html.ini
@@ -0,0 +1,3 @@
+[underline_with_class_object_specific_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html.ini
new file mode 100644
index 000000000000..581a5d88655a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[voice_animation_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html.ini
new file mode 100644
index 000000000000..63ebf4bfeaf8
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html.ini
@@ -0,0 +1,3 @@
+[voice_background_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html.ini
new file mode 100644
index 000000000000..68ea5efb443c
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html.ini
@@ -0,0 +1,3 @@
+[voice_background_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html.ini
new file mode 100644
index 000000000000..14d76da7da7e
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html.ini
@@ -0,0 +1,3 @@
+[voice_color.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html.ini
new file mode 100644
index 000000000000..96dcb7d090a3
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html.ini
@@ -0,0 +1,3 @@
+[voice_font_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html.ini
new file mode 100644
index 000000000000..b1003d87fa46
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html.ini
@@ -0,0 +1,3 @@
+[voice_font_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html.ini
new file mode 100644
index 000000000000..3dbbfc4b6f10
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html.ini
@@ -0,0 +1,3 @@
+[voice_outline_properties.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html.ini
new file mode 100644
index 000000000000..9b15402cfbb1
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html.ini
@@ -0,0 +1,3 @@
+[voice_outline_shorthand.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html.ini
new file mode 100644
index 000000000000..dbdc21a87ffb
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html.ini
@@ -0,0 +1,3 @@
+[voice_text-decoration_line-through.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html.ini
new file mode 100644
index 000000000000..d09ec5d53f48
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html.ini
@@ -0,0 +1,3 @@
+[voice_text-shadow.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html.ini
new file mode 100644
index 000000000000..e69a7d9d2084
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html.ini
@@ -0,0 +1,3 @@
+[voice_timestamp_future.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html.ini
new file mode 100644
index 000000000000..cd410f5486df
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html.ini
@@ -0,0 +1,3 @@
+[voice_timestamp_past.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html.ini
new file mode 100644
index 000000000000..2ae367df0be9
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html.ini
@@ -0,0 +1,3 @@
+[voice_transition_with_timestamp.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html.ini
new file mode 100644
index 000000000000..9bd3a41726fc
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html.ini
@@ -0,0 +1,3 @@
+[voice_voice_attribute.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html.ini
index 02a222701cec..49a98cd714d3 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html.ini
@@ -1,3 +1,4 @@
 [voice_white-space_normal_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html.ini
index 8b5a712ea86f..1b4351ec2264 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html.ini
@@ -1,3 +1,4 @@
 [voice_white-space_pre-line_wrapped.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html.ini
new file mode 100644
index 000000000000..706918259fe6
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html.ini
@@ -0,0 +1,3 @@
+[voice_with_class.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html.ini
new file mode 100644
index 000000000000..7eb029bc646a
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html.ini
@@ -0,0 +1,3 @@
+[voice_with_class_object_specific_selector.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html.ini
new file mode 100644
index 000000000000..9ea2f2603173
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html.ini
@@ -0,0 +1,3 @@
+[white-space_normal_wrapped.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html.ini
new file mode 100644
index 000000000000..be6d9ea51576
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html.ini
@@ -0,0 +1,3 @@
+[white-space_nowrap_wrapped.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html.ini
new file mode 100644
index 000000000000..e6521e5d2e85
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html.ini
@@ -0,0 +1,3 @@
+[white-space_pre-line_wrapped.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html.ini
index 5f9e964f67a7..b83c3ca194a9 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html.ini
@@ -1,8 +1,3 @@
 [white-space_pre-wrap_wrapped.html]
   type: reftest
-  expected:
-    if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini
new file mode 100644
index 000000000000..c1964f841053
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini
@@ -0,0 +1,3 @@
+[white-space_pre.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html.ini
index 9766b9af4b8c..d93eb81e92bc 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html.ini
@@ -1,8 +1,3 @@
 [white-space_pre_wrapped.html]
   type: reftest
-  expected:
-    if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html.ini
new file mode 100644
index 000000000000..d20f1738da43
--- /dev/null
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html.ini
@@ -0,0 +1,3 @@
+[inherit_as_default_value_inherits_values_from_media_element.html]
+  type: reftest
+  expected: FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/size_50.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/size_50.html.ini
index 14bb681037c8..580dcdb70d8f 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/size_50.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/size_50.html.ini
@@ -1,3 +1,4 @@
 [size_50.html]
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1353689
   type: reftest
   expected: FAIL
diff --git a/testing/web-platform/mozilla/meta/dom/classList.html.ini b/testing/web-platform/mozilla/meta/dom/classList.html.ini
deleted file mode 100644
index ad220e029996..000000000000
--- a/testing/web-platform/mozilla/meta/dom/classList.html.ini
+++ /dev/null
@@ -1,452 +0,0 @@
-[classList.html]
-  type: testharness
-  [classList.length when set to "a a" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (HTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (HTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (HTML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (HTML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (HTML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (HTML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (HTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (HTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (HTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (XHTML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XHTML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (XHTML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (XHTML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (XHTML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XHTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (XHTML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (XHTML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (XUL node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (XUL node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (XUL node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (XUL node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (XUL node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (XUL node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (XUL node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (XUL node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XUL node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (XUL node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (XUL node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (XUL node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XUL node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (XUL node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (XUL node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (MathML node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (MathML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (MathML node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (MathML node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (MathML node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (MathML node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (MathML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (MathML node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (MathML node)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (XML node with null namespace)]
-    expected: FAIL
-
-  [classList.length when set to "a a" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a a a a a a" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a a b b" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "a b c c b a a b c c" (foo node)]
-    expected: FAIL
-
-  [classList.length when set to "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.item() when set to "aa AA aa" (foo node)]
-    expected: FAIL
-
-  [classList.item() when set to "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "a a a  b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value " " (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   \\f" (foo node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("a") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.add("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (foo node)]
-    expected: FAIL
-
-  [classList.add("a", "a") with attribute value "a b c " (foo node)]
-    expected: FAIL
-
-  [classList.add() with attribute value "a b c a " (foo node)]
-    expected: FAIL
-
-  [classList.remove("AA") with attribute value "AA BB aa CC AA dd aa" (foo node)]
-    expected: FAIL
-
-  [classList.remove() with attribute value "a a" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " " (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value "   \\f" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("d") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("a") with attribute value " A A A " (foo node)]
-    expected: FAIL
-
-  [classList.toggle("b") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
-  [classList.toggle("c") with attribute value "\\t\\n\\f\\r a\\t\\n\\f\\r b\\t\\n\\f\\r " (foo node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "a b a" (foo node)]
-    expected: FAIL
-
-  [classList.replace("b", "c") with attribute value "   a  a b" (foo node)]
-    expected: FAIL
-
diff --git a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
index 9135a8ebf7a4..f820d3fd63c8 100644
--- a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
+++ b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-list.js
@@ -318,6 +318,10 @@ var gCSSProperties = {
       { type: 'discrete', options: [ [ 'top', 'bottom' ] ] }
     ]
   },
+  'caret-color': {
+    // https://drafts.csswg.org/css-ui/#propdef-caret-color
+    types: [ 'color' ]
+  },
   'clear': {
     // https://drafts.csswg.org/css-page-floats/#propdef-clear
     types: [
diff --git a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
index 3941d3fee7fe..b86bcbb86f55 100644
--- a/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
+++ b/testing/web-platform/tests/web-animations/animation-model/animation-types/property-types.js
@@ -921,6 +921,83 @@ const filterListType = {
 };
 
 const textShadowListType = {
+  testInterpolation: function(property, setup) {
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'none',
+                                      'rgb(100, 100, 100) 10px 10px 10px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+                                  // Premultiplied
+        [{ time: 500,  expected: 'rgba(100, 100, 100, 0.5) 5px 5px 5px' }]);
+    }, property + ': from none to other');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(100, 100, 100) 10px 10px 10px',
+                                      'none' ] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+                                  // Premultiplied
+        [{ time: 500,  expected: 'rgba(100, 100, 100, 0.5) 5px 5px 5px' }]);
+    }, property + ': from other to none');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(0, 0, 0) 0px 0px 0px',
+                                      'rgb(100, 100, 100) 10px 10px 10px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(50, 50, 50) 5px 5px 5px' }]);
+    }, property + ': single shadow');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(0, 0, 0) 0px 0px 0px, '
+                                    + 'rgb(200, 200, 200) 20px 20px 20px',
+                                      'rgb(100, 100, 100) 10px 10px 10px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(50, 50, 50) 5px 5px 5px, '
+                               + 'rgb(150, 150, 150) 15px 15px 15px' }]);
+    }, property + ': shadow list');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(200, 200, 200) 20px 20px 20px',
+                                      'rgb(100, 100, 100) 10px 10px 10px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(150, 150, 150) 15px 15px 15px, '
+                               + 'rgba(100, 100, 100, 0.5) 5px 5px 5px' }]);
+    }, property + ': mismatched list length (from longer to shorter)');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(100, 100, 100) 10px 10px 10px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px',
+                                      'rgb(200, 200, 200) 20px 20px 20px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(150, 150, 150) 15px 15px 15px, '
+                               + 'rgba(100, 100, 100, 0.5) 5px 5px 5px' }]);
+    }, property + ': mismatched list length (from shorter to longer)');
+  },
+
   testAddition: function(property, setup) {
     test(function(t) {
       var idlName = propertyToIDL(property);
@@ -939,6 +1016,83 @@ const textShadowListType = {
 
 
 const boxShadowListType = {
+  testInterpolation: function(property, setup) {
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'none',
+                                      'rgb(100, 100, 100) 10px 10px 10px 0px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+                                  // Premultiplied
+        [{ time: 500,  expected: 'rgba(100, 100, 100, 0.5) 5px 5px 5px 0px' }]);
+    }, property + ': from none to other');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(100, 100, 100) 10px 10px 10px 0px',
+                                      'none' ] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+                                  // Premultiplied
+        [{ time: 500,  expected: 'rgba(100, 100, 100, 0.5) 5px 5px 5px 0px' }]);
+    }, property + ': from other to none');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(0, 0, 0) 0px 0px 0px 0px',
+                                      'rgb(100, 100, 100) 10px 10px 10px 0px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(50, 50, 50) 5px 5px 5px 0px' }]);
+    }, property + ': single shadow');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(0, 0, 0) 0px 0px 0px 0px, '
+                                    + 'rgb(200, 200, 200) 20px 20px 20px 20px',
+                                      'rgb(100, 100, 100) 10px 10px 10px 0px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px 0px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(50, 50, 50) 5px 5px 5px 0px, '
+                               + 'rgb(150, 150, 150) 15px 15px 15px 10px' }]);
+    }, property + ': shadow list');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(200, 200, 200) 20px 20px 20px 20px',
+                                      'rgb(100, 100, 100) 10px 10px 10px 0px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px 0px'] },
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(150, 150, 150) 15px 15px 15px 10px, '
+                               + 'rgba(100, 100, 100, 0.5) 5px 5px 5px 0px' }]);
+    }, property + ': mismatched list length (from shorter to longer)');
+
+    test(function(t) {
+      var idlName = propertyToIDL(property);
+      var target = createTestElement(t, setup);
+      var animation =
+        target.animate({ [idlName]: [ 'rgb(100, 100, 100) 10px 10px 10px 0px, '
+                                    + 'rgb(100, 100, 100) 10px 10px 10px 0px',
+                                      'rgb(200, 200, 200) 20px 20px 20px 20px']},
+                       { duration: 1000, fill: 'both' });
+      testAnimationSamples(animation, idlName,
+        [{ time: 500,  expected: 'rgb(150, 150, 150) 15px 15px 15px 10px, '
+                               + 'rgba(100, 100, 100, 0.5) 5px 5px 5px 0px' }]);
+    }, property + ': mismatched list length (from longer to shorter)');
+  },
+
   testAddition: function(property, setup) {
     test(function(t) {
       var idlName = propertyToIDL(property);
diff --git a/third_party/rust/cssparser-macros/.cargo-checksum.json b/third_party/rust/cssparser-macros/.cargo-checksum.json
index 8279deeec016..da4ef0d78dca 100644
--- a/third_party/rust/cssparser-macros/.cargo-checksum.json
+++ b/third_party/rust/cssparser-macros/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"e740a473ab5e2339d639a86f1996b1ecc72f25b25f23b2789c836bff1455cf5a","lib.rs":"2b54cf96da2049eb03e4b30a223124e7f5a9c067975d54ec0ecf92f0245777a1"},"package":"b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95"}
\ No newline at end of file
+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"3080a72e897022e23ede1dd38cf28049e74a077518cc25d91f559c3b575aa3e3","lib.rs":"17331a3a0b0be3c05fe360e08538baf26b343ae61feec9062429a34a1c1eb1e2"},"package":"079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"}
\ No newline at end of file
diff --git a/third_party/rust/cssparser-macros/Cargo.toml b/third_party/rust/cssparser-macros/Cargo.toml
index 3dd61a72fbb5..4770b4b11f63 100644
--- a/third_party/rust/cssparser-macros/Cargo.toml
+++ b/third_party/rust/cssparser-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cssparser-macros"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Simon Sapin <simon.sapin@exyr.org>"]
 description = "Procedural macros for cssparser"
 documentation = "https://docs.rs/cssparser-macros/"
diff --git a/third_party/rust/cssparser-macros/lib.rs b/third_party/rust/cssparser-macros/lib.rs
index 1e6f359037cf..80d3e545743c 100644
--- a/third_party/rust/cssparser-macros/lib.rs
+++ b/third_party/rust/cssparser-macros/lib.rs
@@ -27,15 +27,7 @@ define_proc_macros! {
         max_len(arms.iter().flat_map(|arm| &arm.pats).filter_map(|pattern| {
             let expr = match *pattern {
                 syn::Pat::Lit(ref expr) => expr,
-                syn::Pat::Wild |
-                syn::Pat::Ident(_, _, None) => return None,
-                syn::Pat::Ident(_, _, Some(ref sub_pattern)) => {
-                    match **sub_pattern {
-                        syn::Pat::Lit(ref expr) => expr,
-                        syn::Pat::Wild => return None,
-                        _ => panic!("expected string or wildcard pattern, got {:?}", pattern)
-                    }
-                }
+                syn::Pat::Wild => return None,
                 _ => panic!("expected string or wildcard pattern, got {:?}", pattern)
             };
             match **expr {
@@ -62,7 +54,7 @@ define_proc_macros! {
     /// and the corresponding value as a const expression.
     ///
     /// Output: a rust-phf map, with keys ASCII-lowercased:
-    /// ```
+    /// ```text
     /// static MAP: &'static ::cssparser::phf::Map<&'static str, $ValueType> = …;
     /// ```
     #[allow(non_snake_case)]
diff --git a/third_party/rust/cssparser/.cargo-checksum.json b/third_party/rust/cssparser/.cargo-checksum.json
index d4734f77816a..027529f13d9d 100644
--- a/third_party/rust/cssparser/.cargo-checksum.json
+++ b/third_party/rust/cssparser/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"e32812a8f09b0c5b0b972e2e090f8929eb5b600a37ca7aac2ed07ba10c30291e",".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"410baf41d446e2e281eabe0c52a0b094b457dbb5d7c096fcfbd6ce4e5e01b998","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"9afe084d70a5d9396674a2624012d6ac749df35f81e322d2d75b042bf208f523","build.rs":"950bcc47a196f07f99f59637c28cc65e02a885130011f90a2b2608248b4724a2","build/match_byte.rs":"89e8b941af74df2c204abf808672d3ff278bdec75abc918c41a843260b924677","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/big-data-url.css":"04a8f6197ea1181123bca48bd1ebd016268e1da40f01b8f21055814e44bf62b8","src/color.rs":"09249793df09c51ce0f2a8eabae85405cfdbd8c23330bb121f8b61665df853fd","src/css-parsing-tests/An+B.json":"d24559c1dad55d3da9d1fca29383edefdfc6046988435d6388a9bc0f28850257","src/css-parsing-tests/LICENSE":"5f9019a92f4aa8917aadc8e035aa673c2c1bf08d5ca2e535a0564106599f44eb","src/css-parsing-tests/README.rst":"775c5f957dd1d46d3ce954aaad219c821d2b64b4a9fb93c42e9737a11131ca44","src/css-parsing-tests/color3.json":"5104348cc58a10d113ad4c20f05bdba846ecb4920ee606203fe5d28a6a9f0a13","src/css-parsing-tests/color3_hsl.json":"88936185b3ead36f8613372bf595024073d7787adbf659a62446789a2504b59f","src/css-parsing-tests/color3_keywords.json":"95609bf9fe762c316878a30f371fa375a2e51c21a6fda24fa188a95cd9118f5c","src/css-parsing-tests/component_value_list.json":"dda7244eb3a4fcf6d296762e285f7031028837d987065a09e584e8d973edc7f3","src/css-parsing-tests/declaration_list.json":"0b85cc3f19e945f838432acbfb9edb003abea13debc4ea27bcdcef25d117eac5","src/css-parsing-tests/make_color3_hsl.py":"6297d9fb7b23875ccf99111a56a8e971a37c4206d7d6782001e95a7194fa6182","src/css-parsing-tests/make_color3_keywords.py":"66bccab3f1dea18698fcfd854be79b1fd1cd724dd487e25b1f057b522163aad2","src/css-parsing-tests/one_component_value.json":"8798017709002e14cf11e203c9d716f82d308ce6ba0f6e64ee4eea331b8485c6","src/css-parsing-tests/one_declaration.json":"a34c9da56edfff9e2e21615f059e141b0e878e90f794dc8fa58d65b47cd193ed","src/css-parsing-tests/one_rule.json":"88f7b1b6049be88e1e2827673b75fc9261986b216e8ee6bf09621fecbe274e3c","src/css-parsing-tests/rule_list.json":"97c45e80fb83abef149a4016c5625a74f053e7ad70a2ce5a95c02fce1c195686","src/css-parsing-tests/stylesheet.json":"05f1e10fc486bfbda2c059c313a74ff78c0063c0768b99737cab41969c0c87ce","src/css-parsing-tests/stylesheet_bytes.json":"890fd856a596e61f82cf7ed77920ffe95df89209fdb5ee0afe0b26bdfdb80a42","src/css-parsing-tests/urange.json":"90a0348cb785f8761d956458880486136de75f2c7ce44ec66da233f73d9098bf","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"ccc0f04541147d4fb90d3fe70591bacfb0c7030706c9be8fa60b80533e522bbc","src/macros.rs":"bd492479eee8c65850bdfc2c9de100eddc224e5d6629cd583219058901cd0ca7","src/nth.rs":"0a5e68bd8a597403e184ebf34e69230ae1e955f92b16b99b3f67cf8730a180a9","src/parser.rs":"a41b1d885389d34b4d81176f844ae3c4100e621628dd50d7348c42b08cdd13ae","src/rules_and_declarations.rs":"6b66a986e411a56998546ab0e64de5285df3368d7c4018c7230a1b6cf6bcc532","src/serializer.rs":"480043750508944fb75295d8638b6b33665273a2ac5791ec8261ae1fe63c0fcd","src/tests.rs":"80e4fec507258fe4e63a590f842f3213b44418cd69d755f78f938894966037db","src/tokenizer.rs":"945c29ff9f4a79d58aee956e27c8b476068859d878ead7c7fed83a9e89d2159f","src/unicode_range.rs":"fa0198eb00a68cd71d009551194a3f6d2cb0501513b77d9ea2fea22bfa45c141"},"package":"fb067f9d88368ca9053aea00581556151ef96f2591e32ad44f3312d7e6b67392"}
\ No newline at end of file
+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"0b944a5f5edfe3dca4796907e63f537a0e919630df66dca7945d51ba4e3c8051",".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"a6a5eab45b7398c4930ad529f4bf3f77b70fd4a3ea8c82fff5bb93ae305eacf9","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"9afe084d70a5d9396674a2624012d6ac749df35f81e322d2d75b042bf208f523","build.rs":"950bcc47a196f07f99f59637c28cc65e02a885130011f90a2b2608248b4724a2","build/match_byte.rs":"89e8b941af74df2c204abf808672d3ff278bdec75abc918c41a843260b924677","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/big-data-url.css":"04a8f6197ea1181123bca48bd1ebd016268e1da40f01b8f21055814e44bf62b8","src/color.rs":"0751c51a39a2d5d03dd5c41405bafc791eb12b508b7347d3a48ebddd97b67ba3","src/css-parsing-tests/An+B.json":"d24559c1dad55d3da9d1fca29383edefdfc6046988435d6388a9bc0f28850257","src/css-parsing-tests/LICENSE":"5f9019a92f4aa8917aadc8e035aa673c2c1bf08d5ca2e535a0564106599f44eb","src/css-parsing-tests/README.rst":"775c5f957dd1d46d3ce954aaad219c821d2b64b4a9fb93c42e9737a11131ca44","src/css-parsing-tests/color3.json":"6a09e71e7095374a6b44b9cb4341b7f675afe66a93427c62a9a0ff5f8c20ac6f","src/css-parsing-tests/color3_hsl.json":"88936185b3ead36f8613372bf595024073d7787adbf659a62446789a2504b59f","src/css-parsing-tests/color3_keywords.json":"95609bf9fe762c316878a30f371fa375a2e51c21a6fda24fa188a95cd9118f5c","src/css-parsing-tests/component_value_list.json":"dda7244eb3a4fcf6d296762e285f7031028837d987065a09e584e8d973edc7f3","src/css-parsing-tests/declaration_list.json":"0b85cc3f19e945f838432acbfb9edb003abea13debc4ea27bcdcef25d117eac5","src/css-parsing-tests/make_color3_hsl.py":"d7c3533f5f7158da10fa5c34ae5e1bd2b3b0da5d2ca90c16b6cd76f310f22941","src/css-parsing-tests/make_color3_keywords.py":"66bccab3f1dea18698fcfd854be79b1fd1cd724dd487e25b1f057b522163aad2","src/css-parsing-tests/one_component_value.json":"8798017709002e14cf11e203c9d716f82d308ce6ba0f6e64ee4eea331b8485c6","src/css-parsing-tests/one_declaration.json":"a34c9da56edfff9e2e21615f059e141b0e878e90f794dc8fa58d65b47cd193ed","src/css-parsing-tests/one_rule.json":"88f7b1b6049be88e1e2827673b75fc9261986b216e8ee6bf09621fecbe274e3c","src/css-parsing-tests/rule_list.json":"97c45e80fb83abef149a4016c5625a74f053e7ad70a2ce5a95c02fce1c195686","src/css-parsing-tests/stylesheet.json":"05f1e10fc486bfbda2c059c313a74ff78c0063c0768b99737cab41969c0c87ce","src/css-parsing-tests/stylesheet_bytes.json":"890fd856a596e61f82cf7ed77920ffe95df89209fdb5ee0afe0b26bdfdb80a42","src/css-parsing-tests/urange.json":"62720b143ddf52508baad42921473dd69519aad6c1cd49f37f3f264dc29e1c13","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"ccc0f04541147d4fb90d3fe70591bacfb0c7030706c9be8fa60b80533e522bbc","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"0a5e68bd8a597403e184ebf34e69230ae1e955f92b16b99b3f67cf8730a180a9","src/parser.rs":"a41b1d885389d34b4d81176f844ae3c4100e621628dd50d7348c42b08cdd13ae","src/rules_and_declarations.rs":"6b66a986e411a56998546ab0e64de5285df3368d7c4018c7230a1b6cf6bcc532","src/serializer.rs":"480043750508944fb75295d8638b6b33665273a2ac5791ec8261ae1fe63c0fcd","src/tests.rs":"80e4fec507258fe4e63a590f842f3213b44418cd69d755f78f938894966037db","src/tokenizer.rs":"945c29ff9f4a79d58aee956e27c8b476068859d878ead7c7fed83a9e89d2159f","src/unicode_range.rs":"f1f1dee3cc4efb6647557c6166aa5a93354fc0ee9beba53c1d63427beffe5a8d"},"package":"b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"}
\ No newline at end of file
diff --git a/third_party/rust/cssparser/.gitignore b/third_party/rust/cssparser/.gitignore
index 7cbe84a5e21e..0b837eae334b 100644
--- a/third_party/rust/cssparser/.gitignore
+++ b/third_party/rust/cssparser/.gitignore
@@ -1,3 +1,3 @@
-/target
+target
 /Cargo.lock
 /.cargo/config
diff --git a/third_party/rust/cssparser/Cargo.toml b/third_party/rust/cssparser/Cargo.toml
index 74b4a006e7a3..ba3cd60de85f 100644
--- a/third_party/rust/cssparser/Cargo.toml
+++ b/third_party/rust/cssparser/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "cssparser"
-version = "0.12.2"
+version = "0.13.1"
 authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 description = "Rust implementation of CSS Syntax Level 3"
@@ -20,7 +20,7 @@ difference = "1.0"
 encoding_rs = "0.5"
 
 [dependencies]
-cssparser-macros = {path = "./macros", version = "0.2"}
+cssparser-macros = {path = "./macros", version = "0.3"}
 heapsize = {version = "0.3", optional = true}
 matches = "0.1"
 phf = "0.7"
diff --git a/third_party/rust/cssparser/src/color.rs b/third_party/rust/cssparser/src/color.rs
index a1e2a4962376..d6a44d1f6cbd 100644
--- a/third_party/rust/cssparser/src/color.rs
+++ b/third_party/rust/cssparser/src/color.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use std::cmp;
 use std::fmt;
 use std::f32::consts::PI;
 
@@ -31,7 +30,12 @@ impl RGBA {
     /// clamped to the 0.0 ... 1.0 range.
     #[inline]
     pub fn from_floats(red: f32, green: f32, blue: f32, alpha: f32) -> Self {
-        Self::new(clamp_f32(red), clamp_f32(green), clamp_f32(blue), clamp_f32(alpha))
+        Self::new(
+            clamp_unit_f32(red),
+            clamp_unit_f32(green),
+            clamp_unit_f32(blue),
+            clamp_unit_f32(alpha),
+        )
     }
 
     /// Returns a transparent color.
@@ -99,7 +103,7 @@ impl ToCss for RGBA {
     {
         // Try first with two decimal places, then with three.
         let mut rounded_alpha = (self.alpha_f32() * 100.).round() / 100.;
-        if clamp_f32(rounded_alpha) != self.alpha {
+        if clamp_unit_f32(rounded_alpha) != self.alpha {
             rounded_alpha = (self.alpha_f32() * 1000.).round() / 1000.;
         }
 
@@ -381,12 +385,7 @@ fn parse_color_hash(value: &str) -> Result<Color, ()> {
     }
 }
 
-
-fn clamp_i32(val: i32) -> u8 {
-    cmp::min(cmp::max(0, val), 255) as u8
-}
-
-fn clamp_f32(val: f32) -> u8 {
+fn clamp_unit_f32(val: f32) -> u8 {
     // Scale by 256, not 255, so that each of the 256 u8 values has an equal range
     // of f32 values mapping to it. Floor before clamping.
     //
@@ -394,23 +393,21 @@ fn clamp_f32(val: f32) -> u8 {
     // `256.0_f32 as u8` is undefined behavior:
     //
     // https://github.com/rust-lang/rust/issues/10184
-    (val * 256.).floor().max(0.).min(255.) as u8
+    clamp_256_f32(val * 256.)
+}
+
+fn clamp_256_f32(val: f32) -> u8 {
+    val.floor().max(0.).min(255.) as u8
 }
 
 #[inline]
 fn parse_color_function(name: &str, arguments: &mut Parser) -> Result<Color, ()> {
-    let is_rgb = match_ignore_ascii_case! { name,
-        "rgb" | "rgba" => true,
-        "hsl" | "hsla" => false,
+    let (red, green, blue, uses_commas) = match_ignore_ascii_case! { name,
+        "rgb" | "rgba" => parse_rgb_components_rgb(arguments)?,
+        "hsl" | "hsla" => parse_rgb_components_hsl(arguments)?,
         _ => return Err(())
     };
 
-    let (red, green, blue, uses_commas) = if is_rgb {
-        parse_rgb_components_rgb(arguments)?
-    } else {
-        parse_rgb_components_hsl(arguments)?
-    };
-
     let alpha = if !arguments.is_exhausted() {
         if uses_commas {
             try!(arguments.expect_comma());
@@ -423,10 +420,10 @@ fn parse_color_function(name: &str, arguments: &mut Parser) -> Result<Color, ()>
         let token = try!(arguments.next());
         match token {
             Token::Number(NumericValue { value: v, .. }) => {
-                clamp_f32(v)
+                clamp_unit_f32(v)
             }
             Token::Percentage(ref v) => {
-                clamp_f32(v.unit_value)
+                clamp_unit_f32(v.unit_value)
             }
             _ => {
                 return Err(())
@@ -452,23 +449,23 @@ fn parse_rgb_components_rgb(arguments: &mut Parser) -> Result<(u8, u8, u8, bool)
     // https://drafts.csswg.org/css-color/#rgb-functions
     match try!(arguments.next()) {
         Token::Number(NumericValue { value: v, .. }) => {
-            red = clamp_i32(v as i32);
-            green = clamp_i32(match try!(arguments.next()) {
+            red = clamp_256_f32(v);
+            green = clamp_256_f32(match try!(arguments.next()) {
                 Token::Number(NumericValue { value: v, .. }) => v,
                 Token::Comma => {
                     uses_commas = true;
                     try!(arguments.expect_number())
                 }
                 _ => return Err(())
-            } as i32);
+            });
             if uses_commas {
                 try!(arguments.expect_comma());
             }
-            blue = clamp_i32(try!(arguments.expect_number()) as i32);
+            blue = clamp_256_f32(try!(arguments.expect_number()));
         }
         Token::Percentage(ref v) => {
-            red = clamp_f32(v.unit_value);
-            green = clamp_f32(match try!(arguments.next()) {
+            red = clamp_unit_f32(v.unit_value);
+            green = clamp_unit_f32(match try!(arguments.next()) {
                 Token::Percentage(ref v) => v.unit_value,
                 Token::Comma => {
                     uses_commas = true;
@@ -479,7 +476,7 @@ fn parse_rgb_components_rgb(arguments: &mut Parser) -> Result<(u8, u8, u8, bool)
             if uses_commas {
                 try!(arguments.expect_comma());
             }
-            blue = clamp_f32(try!(arguments.expect_percentage()));
+            blue = clamp_unit_f32(try!(arguments.expect_percentage()));
         }
         _ => return Err(())
     };
@@ -542,8 +539,8 @@ fn parse_rgb_components_hsl(arguments: &mut Parser) -> Result<(u8, u8, u8, bool)
              else { lightness + saturation - lightness * saturation };
     let m1 = lightness * 2. - m2;
     let hue_times_3 = hue * 3.;
-    let red = clamp_f32(hue_to_rgb(m1, m2, hue_times_3 + 1.));
-    let green = clamp_f32(hue_to_rgb(m1, m2, hue_times_3));
-    let blue = clamp_f32(hue_to_rgb(m1, m2, hue_times_3 - 1.));
+    let red = clamp_unit_f32(hue_to_rgb(m1, m2, hue_times_3 + 1.));
+    let green = clamp_unit_f32(hue_to_rgb(m1, m2, hue_times_3));
+    let blue = clamp_unit_f32(hue_to_rgb(m1, m2, hue_times_3 - 1.));
     return Ok((red, green, blue, uses_commas));
 }
diff --git a/third_party/rust/cssparser/src/css-parsing-tests/color3.json b/third_party/rust/cssparser/src/css-parsing-tests/color3.json
index 3a987ccd2269..d018749ac4a7 100644
--- a/third_party/rust/cssparser/src/css-parsing-tests/color3.json
+++ b/third_party/rust/cssparser/src/css-parsing-tests/color3.json
@@ -253,5 +253,8 @@
 "hsl(10.4719755118rad, 75%, 50%)", [32, 32, 224, 255],
 "hsl(2.6666666666turn, 75%, 50%)", [32, 32, 224, 255],
 
+"rgb(-2147483649, 4294967298, -18446744073709551619) /* https://github.com/w3c/web-platform-tests/blob/master/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html */",
+[0, 255, 0, 255],
+
 "cmyk(0, 0, 0, 0)", null
 ]
diff --git a/third_party/rust/cssparser/src/css-parsing-tests/make_color3_hsl.py b/third_party/rust/cssparser/src/css-parsing-tests/make_color3_hsl.py
index c037bc707658..f8e911dfdd69 100644
--- a/third_party/rust/cssparser/src/css-parsing-tests/make_color3_hsl.py
+++ b/third_party/rust/cssparser/src/css-parsing-tests/make_color3_hsl.py
@@ -2,18 +2,32 @@ import colorsys  # It turns out Python already does HSL -> RGB!
 trim = lambda s: s if not s.endswith('.0') else s[:-2]
 print('[')
 print(',\n'.join(
-    f[0] % (
-        (n, h, trim(str(s/10.)), trim(str(l/10.)),
-         f[1] % round(a / 255., 2) if a is not None else '')
-        + tuple(trim(str(min(255, v * 256)))
-                for v in colorsys.hls_to_rgb(h/360., l/1000., s/1000.))
-        + (a if a is not None else 255,)
+    function_format % tuple(
+        [
+            function_name,
+            hue,
+            trim(str(saturation / 10.)),
+            trim(str(lightness / 10.)),
+            alpha_format % round(alpha / 255., 2) if alpha is not None else ''
+        ] + [
+            trim(str(min(255, component * 256)))
+            for component in colorsys.hls_to_rgb(
+                hue / 360.,
+                lightness / 1000.,
+                saturation / 1000.
+            )
+        ] + [
+            alpha if alpha is not None else 255
+        ]
     )
-    for f in [('"%s(%s, %s%%, %s%%%s)", [%s, %s, %s, %s]', ', %s'), ('"%s(%s %s%% %s%%%s)", [%s, %s, %s, %s]', ' / %s')]
-    for n in ["hsl", "hsla"]
-    for a in [None, 255, 64, 0]
-    for l in range(0, 1001, 125)
-    for s in range(0, 1001, 125)
-    for h in range(0, 360, 30)
+    for function_format, alpha_format in [
+        ('"%s(%s, %s%%, %s%%%s)", [%s, %s, %s, %s]', ', %s'),
+        ('"%s(%s %s%% %s%%%s)", [%s, %s, %s, %s]', ' / %s')
+    ]
+    for function_name in ["hsl", "hsla"]
+    for alpha in [None, 255, 64, 0]
+    for lightness in range(0, 1001, 125)
+    for saturation in range(0, 1001, 125)
+    for hue in range(0, 360, 30)
 ))
 print(']')
diff --git a/third_party/rust/cssparser/src/css-parsing-tests/urange.json b/third_party/rust/cssparser/src/css-parsing-tests/urange.json
index 64fb7f3508be..857d1d62d356 100644
--- a/third_party/rust/cssparser/src/css-parsing-tests/urange.json
+++ b/third_party/rust/cssparser/src/css-parsing-tests/urange.json
@@ -60,6 +60,10 @@
     [0, 4095]
 ],
 
+"U+4E-9F", [
+    [78, 159]
+],
+
 "u+20-3F, u+3F-3F, u+3F-3E, U+0-110000, U+0-10FFFF, U+100000-2, U+1000000-2, U+10-200000", [
     [32, 63],
     [63, 63],
diff --git a/third_party/rust/cssparser/src/macros.rs b/third_party/rust/cssparser/src/macros.rs
index 6b75d46b6ba3..f3b80f09add3 100644
--- a/third_party/rust/cssparser/src/macros.rs
+++ b/third_party/rust/cssparser/src/macros.rs
@@ -22,7 +22,7 @@ define_invoke_proc_macro!(cssparser_internal__invoke_proc_macro);
 ///     "rgba" => parse_rgba(..),
 ///     "hsl" => parse_hsl(..),
 ///     "hsla" => parse_hsla(..),
-///     name @ _ => Err(format!("unknown function: {}", name))
+///     _ => Err(format!("unknown function: {}", function_name))
 /// }
 /// # ;}
 /// # use std::ops::RangeFull;
@@ -82,7 +82,7 @@ macro_rules! ascii_case_insensitive_phf_map {
         ascii_case_insensitive_phf_map!($name -> $ValueType = { $( $key => $value, )* })
     };
     ($name: ident -> $ValueType: ty = { $( $key: expr => $value: expr, )* }) => {
-        fn $name(input: &str) -> Option<&'static $ValueType> {
+        pub fn $name(input: &str) -> Option<&'static $ValueType> {
             cssparser_internal__invoke_proc_macro! {
                 cssparser_internal__phf_map!( ($ValueType) $( $key ($value) )+ )
             }
diff --git a/third_party/rust/cssparser/src/unicode_range.rs b/third_party/rust/cssparser/src/unicode_range.rs
index f13a1ad2cca4..6a6dc02242af 100644
--- a/third_party/rust/cssparser/src/unicode_range.rs
+++ b/third_party/rust/cssparser/src/unicode_range.rs
@@ -8,8 +8,7 @@ use {Parser, ToCss};
 use std::char;
 use std::cmp;
 use std::fmt;
-use std::io::{self, Write};
-use tokenizer::{Token, NumericValue};
+use tokenizer::Token;
 
 /// One contiguous range of code points.
 ///
@@ -35,22 +34,15 @@ impl UnicodeRange {
         //   u '+' '?'+
 
         input.expect_ident_matching("u")?;
+        let after_u = input.position();
+        parse_tokens(input)?;
 
-        // Since start or end can’t be above 0x10FFFF, they can’t have more than 6 hex digits
-        // Conversely, input with more digits would end up returning Err anyway.
-        const MAX_LENGTH_AFTER_U_PLUS: usize = 6 + 1 + 6; // 6 digits, '-', 6 digits
-        let mut buffer = [0; MAX_LENGTH_AFTER_U_PLUS];
+        // This deviates from the spec in case there are CSS comments
+        // between tokens in the middle of one <unicode-range>,
+        // but oh well…
+        let concatenated_tokens = input.slice_from(after_u);
 
-        let remaining_len;
-        {
-            let mut remaining = &mut buffer[..];
-            concatenate_tokens(input, &mut remaining)?;
-            remaining_len = remaining.len();
-        }
-
-        let text_len = buffer.len() - remaining_len;
-        let text = &buffer[..text_len];
-        let range = parse_concatenated(text)?;
+        let range = parse_concatenated(concatenated_tokens.as_bytes())?;
         if range.end > char::MAX as u32 || range.start > range.end {
             Err(())
         } else {
@@ -59,93 +51,52 @@ impl UnicodeRange {
     }
 }
 
-fn concatenate_tokens(input: &mut Parser, remaining: &mut &mut [u8]) -> Result<(), Error> {
+fn parse_tokens(input: &mut Parser) -> Result<(), ()> {
     match input.next_including_whitespace()? {
         Token::Delim('+') => {
             match input.next_including_whitespace()? {
-                Token::Ident(ident) => remaining.write_all(ident.as_bytes())?,
-                Token::Delim('?') => remaining.write_all(b"?")?,
-                _ => return Err(Error)
+                Token::Ident(_) => {}
+                Token::Delim('?') => {}
+                _ => return Err(())
             }
-            parse_question_marks(input, remaining)
+            parse_question_marks(input)
         }
-
-        Token::Dimension(ref value, ref unit) => {
-            // Require a '+' sign as part of the number
-            let int_value = positive_integer_with_plus_sign(value)?;
-            write!(remaining, "{}{}", int_value, unit)?;
-            parse_question_marks(input, remaining)
+        Token::Dimension(..) => {
+            parse_question_marks(input)
         }
-
-        Token::Number(ref value) => {
-            // Require a '+' sign as part of the number
-            let int_value = positive_integer_with_plus_sign(value)?;
-            write!(remaining, "{}", int_value)?;
-
+        Token::Number(_) => {
             let after_number = input.position();
             match input.next_including_whitespace() {
-                Ok(Token::Delim('?')) => {
-                    // If `remaining` is already full, `int_value` has too many digits
-                    // so we can use `result?` Rust syntax.
-                    remaining.write_all(b"?")?;
-                    parse_question_marks(input, remaining)
-                }
-
-                Ok(Token::Dimension(ref value, ref unit)) => {
-                    // Require a '-' sign as part of the number
-                    let int_value = negative_integer(value)?;
-                    write!(remaining, "{}{}", int_value, unit)?
-                }
-
-                Ok(Token::Number(ref value)) => {
-                    // Require a '-' sign as part of the number
-                    let int_value = negative_integer(value)?;
-                    write!(remaining, "{}", int_value)?
-                }
-
+                Ok(Token::Delim('?')) => parse_question_marks(input),
+                Ok(Token::Dimension(..)) => {}
+                Ok(Token::Number(_)) => {}
                 _ => input.reset(after_number)
             }
         }
-
-        _ => return Err(Error)
+        _ => return Err(())
     }
     Ok(())
 }
 
-/// Consume as many '?' as possible and write them to `remaining` until it’s full
-fn parse_question_marks(input: &mut Parser, remaining: &mut &mut [u8]) {
+/// Consume as many '?' as possible
+fn parse_question_marks(input: &mut Parser) {
     loop {
-        let result = input.try(|input| {
-            match input.next_including_whitespace() {
-                Ok(Token::Delim('?')) => remaining.write_all(b"?").map_err(|_| ()),
-                _ => Err(())
+        let position = input.position();
+        match input.next_including_whitespace() {
+            Ok(Token::Delim('?')) => {}
+            _ => {
+                input.reset(position);
+                return
             }
-        });
-        if result.is_err() {
-            return
         }
     }
 }
 
-fn positive_integer_with_plus_sign(value: &NumericValue) -> Result<i32, ()> {
-    let int_value = value.int_value.ok_or(())?;
-    if value.has_sign && int_value >= 0 {
-        Ok(int_value)
-    } else {
-        Err(())
-    }
-}
-
-fn negative_integer(value: &NumericValue) -> Result<i32, ()> {  // Necessarily had a negative sign.
-    let int_value = value.int_value.ok_or(())?;
-    if int_value <= 0 {
-        Ok(int_value)
-    } else {
-        Err(())
-    }
-}
-
-fn parse_concatenated(mut text: &[u8]) -> Result<UnicodeRange, ()> {
+fn parse_concatenated(text: &[u8]) -> Result<UnicodeRange, ()> {
+    let mut text = match text.split_first() {
+        Some((&b'+', text)) => text,
+        _ => return Err(())
+    };
     let (first_hex_value, hex_digit_count) = consume_hex(&mut text);
     let question_marks = consume_question_marks(&mut text);
     let consumed = hex_digit_count + question_marks;
@@ -241,18 +192,3 @@ impl ToCss for UnicodeRange {
         Ok(())
     }
 }
-
-/// Make conversions from io::Error implicit in `?` syntax.
-struct Error;
-
-impl From<Error> for () {
-    fn from(_: Error) -> Self { () }
-}
-
-impl From<()> for Error {
-    fn from(_: ()) -> Self { Error }
-}
-
-impl From<io::Error> for Error {
-    fn from(_: io::Error) -> Self { Error }
-}
diff --git a/toolkit/components/extensions/ExtensionStorageSync.jsm b/toolkit/components/extensions/ExtensionStorageSync.jsm
index 745608d22f27..0c9ce7dc77c6 100644
--- a/toolkit/components/extensions/ExtensionStorageSync.jsm
+++ b/toolkit/components/extensions/ExtensionStorageSync.jsm
@@ -808,13 +808,18 @@ class ExtensionStorageSync {
       };
     }
     for (const conflict of syncResults.resolved) {
-      // FIXME: Should we even send a notification? If so, what
-      // best values for "old" and "new"? This might violate
-      // client code's assumptions, since from their perspective,
-      // we were in state L, but this diff is from R -> L.
-      changes[conflict.remote.key] = {
-        oldValue: conflict.local.data,
-        newValue: conflict.remote.data,
+      // FIXME: We can't send a "changed" notification because
+      // kinto.js only provides the newly-resolved value. But should
+      // we even send a notification? We use CLIENT_WINS so nothing
+      // has really "changed" on this end. (The change will come on
+      // the other end when it pulls down the update, which is handled
+      // by the "updated" case above.) If we are going to send a
+      // notification, what best values for "old" and "new"?  This
+      // might violate client code's assumptions, since from their
+      // perspective, we were in state L, but this diff is from R ->
+      // L.
+      changes[conflict.key] = {
+        newValue: conflict.data,
       };
     }
     if (Object.keys(changes).length > 0) {
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js b/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
index 5f6269bd9496..491824b1c611 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
@@ -1114,6 +1114,75 @@ add_task(function* test_storage_sync_pushes_changes() {
   });
 });
 
+add_task(function* test_storage_sync_pulls_conflicts() {
+  const extensionId = uuid();
+  const extension = {id: extensionId};
+  yield* withContextAndServer(function* (context, server) {
+    yield* withSignedInUser(loggedInUser, function* (extensionStorageSync, fxaService) {
+      const cryptoCollection = new CryptoCollection(fxaService);
+      let transformer = new CollectionKeyEncryptionRemoteTransformer(cryptoCollection, extensionId);
+      server.installCollection("storage-sync-crypto");
+
+      yield extensionStorageSync.ensureCanSync([extensionId]);
+      const collectionId = yield cryptoCollection.extensionIdToCollectionId(extensionId);
+      yield server.encryptAndAddRecord(transformer, {
+        collectionId,
+        data: {
+          "id": "key-remote_2D_key",
+          "key": "remote-key",
+          "data": 6,
+        },
+        predicate: appearsAt(850),
+      });
+      server.etag = 900;
+
+      yield extensionStorageSync.set(extension, {"remote-key": 8}, context);
+
+      let calls = [];
+      yield extensionStorageSync.addOnChangedListener(extension, function() {
+        calls.push(arguments);
+      }, context);
+
+      yield extensionStorageSync.syncAll();
+      const remoteValue = (yield extensionStorageSync.get(extension, "remote-key", context))["remote-key"];
+      equal(remoteValue, 8,
+            "locally set value overrides remote value");
+
+      equal(calls.length, 1,
+            "conflicts manifest in on-changed listener");
+      deepEqual(calls[0][0], {"remote-key": {newValue: 8}});
+      calls = [];
+
+      // Syncing again doesn't do anything
+      yield extensionStorageSync.syncAll();
+
+      equal(calls.length, 0,
+            "syncing again shouldn't call on-changed listener");
+
+      // Updating the server causes us to pull down the new value
+      server.etag = 1000;
+      yield server.encryptAndAddRecord(transformer, {
+        collectionId,
+        data: {
+          "id": "key-remote_2D_key",
+          "key": "remote-key",
+          "data": 7,
+        },
+        predicate: appearsAt(950),
+      });
+
+      yield extensionStorageSync.syncAll();
+      const remoteValue2 = (yield extensionStorageSync.get(extension, "remote-key", context))["remote-key"];
+      equal(remoteValue2, 7,
+            "conflicts do not prevent retrieval of new values");
+
+      equal(calls.length, 1,
+            "syncing calls on-changed listener on update");
+      deepEqual(calls[0][0], {"remote-key": {oldValue: 8, newValue: 7}});
+    });
+  });
+});
+
 add_task(function* test_storage_sync_pulls_deletes() {
   const extension = defaultExtension;
   yield* withContextAndServer(function* (context, server) {
diff --git a/toolkit/components/jsdownloads/src/DownloadCore.jsm b/toolkit/components/jsdownloads/src/DownloadCore.jsm
index 0ba8f07b0b63..bbb21776469b 100644
--- a/toolkit/components/jsdownloads/src/DownloadCore.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadCore.jsm
@@ -1976,6 +1976,12 @@ this.DownloadCopySaver.prototype = {
             channel.referrer = NetUtil.newURI(download.source.referrer);
           }
 
+          // This makes the channel be corretly throttled during page loads
+          // and also prevents its caching.
+          if (channel instanceof Ci.nsIHttpChannelInternal) {
+            channel.channelIsForDownload = true;
+          }
+
           // If we have data that we can use to resume the download from where
           // it stopped, try to use it.
           let resumeAttempted = false;
@@ -2405,6 +2411,10 @@ this.DownloadLegacySaver.prototype = {
    *        are never added to history even if this parameter is false.
    */
   onTransferStarted(aRequest, aAlreadyAddedToHistory) {
+    // Store a reference to the request, used in some cases when handling
+    // completion, and also checked during the download by unit tests.
+    this.request = aRequest;
+
     // Store the entity ID to use for resuming if required.
     if (this.download.tryToKeepPartialData &&
         aRequest instanceof Ci.nsIResumableChannel) {
@@ -2432,15 +2442,10 @@ this.DownloadLegacySaver.prototype = {
   /**
    * Called by the nsITransfer implementation when the request has finished.
    *
-   * @param aRequest
-   *        nsIRequest associated to the status update.
    * @param aStatus
    *        Status code received by the nsITransfer implementation.
    */
-  onTransferFinished: function DLS_onTransferFinished(aRequest, aStatus) {
-    // Store a reference to the request, used when handling completion.
-    this.request = aRequest;
-
+  onTransferFinished: function DLS_onTransferFinished(aStatus) {
     if (Components.isSuccessCode(aStatus)) {
       this.deferExecuted.resolve();
     } else {
diff --git a/toolkit/components/jsdownloads/src/DownloadLegacy.js b/toolkit/components/jsdownloads/src/DownloadLegacy.js
index 8ebea2076aba..a062e7731ebc 100644
--- a/toolkit/components/jsdownloads/src/DownloadLegacy.js
+++ b/toolkit/components/jsdownloads/src/DownloadLegacy.js
@@ -127,7 +127,7 @@ DownloadLegacyTransfer.prototype = {
             this._cancelable.cancel(Cr.NS_ERROR_ABORT);
             if (this._cancelable instanceof Ci.nsIWebBrowserPersist) {
               // This component will not send the STATE_STOP notification.
-              download.saver.onTransferFinished(aRequest, Cr.NS_ERROR_ABORT);
+              download.saver.onTransferFinished(Cr.NS_ERROR_ABORT);
               this._cancelable = null;
             }
           }
@@ -145,7 +145,7 @@ DownloadLegacyTransfer.prototype = {
           download.saver.setSignatureInfo(this._signatureInfo);
           download.saver.setRedirects(this._redirects);
         }
-        download.saver.onTransferFinished(aRequest, aStatus);
+        download.saver.onTransferFinished(aStatus);
       }).then(null, Cu.reportError);
 
       // Release the reference to the component executing the download.
@@ -175,7 +175,7 @@ DownloadLegacyTransfer.prototype = {
 
       // Wait for the associated Download object to be available.
       this._deferDownload.promise.then(function DLT_OSC_onDownload(aDownload) {
-        aDownload.saver.onTransferFinished(aRequest, aStatus);
+        aDownload.saver.onTransferFinished(aStatus);
       }).then(null, Cu.reportError);
     }
   },
diff --git a/toolkit/components/jsdownloads/test/unit/common_test_Download.js b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
index 126dedd5d01a..dfa12e7ff15a 100644
--- a/toolkit/components/jsdownloads/test/unit/common_test_Download.js
+++ b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
@@ -229,6 +229,43 @@ add_task(function* test_basic_tryToKeepPartialData() {
   do_check_eq(32, download.saver.getSha256Hash().length);
 });
 
+/**
+ * Tests that the channelIsForDownload property is set for the network request,
+ * and that the request is marked as throttleable.
+ */
+add_task(function* test_channelIsForDownload_classFlags() {
+  let downloadChannel = null;
+
+  // We use a different method based on whether we are testing legacy downloads.
+  if (!gUseLegacySaver) {
+    let download = yield Downloads.createDownload({
+      source: {
+        url: httpUrl("interruptible_resumable.txt"),
+        async adjustChannel(channel) {
+          downloadChannel = channel;
+        },
+      },
+      target: getTempFile(TEST_TARGET_FILE_NAME).path,
+    });
+    yield download.start();
+  } else {
+    // Start a download using nsIExternalHelperAppService, but ensure it cannot
+    // finish before we retrieve the "request" property.
+    mustInterruptResponses();
+    let download = yield promiseStartExternalHelperAppServiceDownload();
+    downloadChannel = download.saver.request;
+    continueResponses();
+    yield promiseDownloadStopped(download);
+  }
+
+  do_check_true(downloadChannel.QueryInterface(Ci.nsIHttpChannelInternal)
+                               .channelIsForDownload);
+
+  // Throttleable is the only class flag assigned to downloads.
+  do_check_eq(downloadChannel.QueryInterface(Ci.nsIClassOfService)
+                             .classFlags, Ci.nsIClassOfService.Throttleable);
+});
+
 /**
  * Tests the permissions of the final target file once the download finished.
  */
diff --git a/toolkit/components/places/ExtensionSearchHandler.jsm b/toolkit/components/places/ExtensionSearchHandler.jsm
index 3eb699ca18e0..2d2be0746268 100644
--- a/toolkit/components/places/ExtensionSearchHandler.jsm
+++ b/toolkit/components/places/ExtensionSearchHandler.jsm
@@ -52,7 +52,9 @@ class InputSession {
   }
 
   addSuggestions(suggestions) {
-    this._suggestionsCallback(suggestions);
+    if (this._suggestionsCallback) {
+      this._suggestionsCallback(suggestions);
+    }
   }
 
   start(eventName) {
@@ -60,6 +62,7 @@ class InputSession {
   }
 
   update(eventName, text, suggestionsCallback, searchFinishedCallback) {
+    // Check to see if an existing input session needs to be ended first.
     if (this._searchFinishedCallback) {
       this._searchFinishedCallback();
     }
@@ -69,12 +72,20 @@ class InputSession {
   }
 
   cancel(eventName) {
-    this._searchFinishedCallback();
+    if (this._searchFinishedCallback) {
+      this._searchFinishedCallback();
+      this._searchFinishedCallback = null;
+      this._suggestionsCallback = null;
+    }
     this._extension.emit(eventName);
   }
 
   end(eventName, text, disposition) {
-    this._searchFinishedCallback();
+    if (this._searchFinishedCallback) {
+      this._searchFinishedCallback();
+      this._searchFinishedCallback = null;
+      this._suggestionsCallback = null;
+    }
     this._extension.emit(eventName, text, disposition);
   }
 }
diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
index 0e7b7d21d3dd..7ca4902a88f8 100644
--- a/toolkit/components/startup/nsAppStartup.cpp
+++ b/toolkit/components/startup/nsAppStartup.cpp
@@ -609,7 +609,7 @@ nsAppStartup::CreateChromeWindow(nsIWebBrowserChrome *aParent,
                                  nsIWebBrowserChrome **_retval)
 {
   bool cancel;
-  return CreateChromeWindow2(aParent, aChromeFlags, nullptr, nullptr, &cancel, _retval);
+  return CreateChromeWindow2(aParent, aChromeFlags, nullptr, nullptr, 0, &cancel, _retval);
 }
 
 
@@ -633,6 +633,7 @@ nsAppStartup::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
                                   uint32_t aChromeFlags,
                                   nsITabParent *aOpeningTab,
                                   mozIDOMWindowProxy* aOpener,
+                                  uint64_t aNextTabParentId,
                                   bool *aCancel,
                                   nsIWebBrowserChrome **_retval)
 {
@@ -652,10 +653,15 @@ nsAppStartup::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
     NS_ASSERTION(xulParent, "window created using non-XUL parent. that's unexpected, but may work.");
 
     if (xulParent)
-      xulParent->CreateNewWindow(aChromeFlags, aOpeningTab, aOpener, getter_AddRefs(newWindow));
+      xulParent->CreateNewWindow(aChromeFlags, aOpeningTab, aOpener,
+                                 aNextTabParentId,
+                                 getter_AddRefs(newWindow));
     // And if it fails, don't try again without a parent. It could fail
     // intentionally (bug 115969).
   } else { // try using basic methods:
+    MOZ_RELEASE_ASSERT(aNextTabParentId == 0,
+                       "Unexpected aNextTabParentId, we shouldn't ever have a next actor ID without a parent");
+
     /* You really shouldn't be making dependent windows without a parent.
       But unparented modal (and therefore dependent) windows happen
       in our codebase, so we allow it after some bellyaching: */
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 0ffb7d7421c4..bb66f9fd313c 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9444,29 +9444,14 @@
     "kind": "flag",
     "description": "If a master-password is enabled for this profile"
   },
-  "DISPLAY_SCALING_OSX" : {
+  "DISPLAY_SCALING" : {
     "expires_in_version": "never",
     "kind": "linear",
     "high": 500,
     "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (OS X only)",
-    "cpp_guard": "XP_MACOSX"
-  },
-  "DISPLAY_SCALING_MSWIN" : {
-    "expires_in_version": "never",
-    "kind": "linear",
-    "high": 500,
-    "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (MS Windows only)",
-    "cpp_guard": "XP_WIN"
-  },
-  "DISPLAY_SCALING_LINUX" : {
-    "expires_in_version": "never",
-    "kind": "linear",
-    "high": 500,
-    "n_buckets": 100,
-    "description": "Scaling percentage for the display where the first window is opened (Linux only)",
-    "cpp_guard": "XP_LINUX"
+    "bug_numbers": [1121966],
+    "alert_emails": ["dolske@mozilla.com"],
+    "description": "Scaling percentage for the display where the first window is opened"
   },
   "SOCIAL_SIDEBAR_STATE": {
     "expires_in_version": "never",
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index 72b636e5f357..95e4deadff20 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -205,9 +205,6 @@
     "DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT",
-    "DISPLAY_SCALING_LINUX",
-    "DISPLAY_SCALING_MSWIN",
-    "DISPLAY_SCALING_OSX",
     "DNS_BLACKLIST_COUNT",
     "DNS_CLEANUP_AGE",
     "DNS_FAILED_LOOKUP_TIME",
@@ -881,9 +878,6 @@
     "DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT",
-    "DISPLAY_SCALING_LINUX",
-    "DISPLAY_SCALING_MSWIN",
-    "DISPLAY_SCALING_OSX",
     "DNS_BLACKLIST_COUNT",
     "DNS_CLEANUP_AGE",
     "DNS_FAILED_LOOKUP_TIME",
diff --git a/toolkit/components/windowcreator/nsIWindowCreator2.idl b/toolkit/components/windowcreator/nsIWindowCreator2.idl
index e41483b9de8f..bf27753be51d 100644
--- a/toolkit/components/windowcreator/nsIWindowCreator2.idl
+++ b/toolkit/components/windowcreator/nsIWindowCreator2.idl
@@ -37,6 +37,8 @@ interface nsIWindowCreator2 : nsIWindowCreator {
                          window. Can be nullptr.
       @param aOpener The window which is trying to open this new chrome window.
                      Can be nullptr
+      @param aNextTabParentId The integer ID of the next tab parent actor to use.
+                              0 means there is no next tab parent ID to use.
       @param cancel Return |true| to reject window creation. If true the
                     implementation has determined the window should not
                     be created at all. The caller should not default
@@ -47,6 +49,7 @@ interface nsIWindowCreator2 : nsIWindowCreator {
                                           in uint32_t chromeFlags,
                                           in nsITabParent aOpeningTab,
                                           in mozIDOMWindowProxy aOpener,
+                                          in unsigned long long aNextTabParentId,
                                           out boolean cancel);
 
   /**
diff --git a/toolkit/components/windowwatcher/nsPIWindowWatcher.idl b/toolkit/components/windowwatcher/nsPIWindowWatcher.idl
index 45623fad52a4..b13d4f6c4015 100644
--- a/toolkit/components/windowwatcher/nsPIWindowWatcher.idl
+++ b/toolkit/components/windowwatcher/nsPIWindowWatcher.idl
@@ -102,6 +102,9 @@ interface nsPIWindowWatcher : nsISupports
    * @param aOpenerFullZoom
    *        The current zoom multiplier for the opener tab. This is then
    *        applied to the newly opened window.
+   * @param aNextTabParentId
+   *        The integer ID for the next tab parent actor.
+   *        0 means there is no next tab parent actor to use.
    *
    * @return the nsITabParent of the initial browser for the newly opened
    *         window.
@@ -109,7 +112,8 @@ interface nsPIWindowWatcher : nsISupports
   nsITabParent openWindowWithTabParent(in nsITabParent aOpeningTab,
                                        in ACString aFeatures,
                                        in boolean aCalledFromJS,
-                                       in float aOpenerFullZoom);
+                                       in float aOpenerFullZoom,
+                                       in unsigned long long aNextTabParentId);
 
   /**
    * Find a named docshell tree item amongst all windows registered
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
index 4e2b036b7a6c..0e525f51028f 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
@@ -482,6 +482,7 @@ nsWindowWatcher::CreateChromeWindow(const nsACString& aFeatures,
                                     uint32_t aChromeFlags,
                                     nsITabParent* aOpeningTabParent,
                                     mozIDOMWindowProxy* aOpener,
+                                    uint64_t aNextTabParentId,
                                     nsIWebBrowserChrome** aResult)
 {
   nsCOMPtr<nsIWindowCreator2> windowCreator2(do_QueryInterface(mWindowCreator));
@@ -500,7 +501,8 @@ nsWindowWatcher::CreateChromeWindow(const nsACString& aFeatures,
   nsCOMPtr<nsIWebBrowserChrome> newWindowChrome;
   nsresult rv =
     windowCreator2->CreateChromeWindow2(aParentChrome, aChromeFlags,
-                                        aOpeningTabParent, aOpener, &cancel,
+                                        aOpeningTabParent, aOpener,
+                                        aNextTabParentId, &cancel,
                                         getter_AddRefs(newWindowChrome));
 
   if (NS_SUCCEEDED(rv) && cancel) {
@@ -547,6 +549,7 @@ nsWindowWatcher::OpenWindowWithTabParent(nsITabParent* aOpeningTabParent,
                                          const nsACString& aFeatures,
                                          bool aCalledFromJS,
                                          float aOpenerFullZoom,
+                                         uint64_t aNextTabParentId,
                                          nsITabParent** aResult)
 {
   MOZ_ASSERT(XRE_IsParentProcess());
@@ -615,6 +618,7 @@ nsWindowWatcher::OpenWindowWithTabParent(nsITabParent* aOpeningTabParent,
 
   CreateChromeWindow(aFeatures, parentChrome, chromeFlags,
                      aOpeningTabParent, nullptr,
+                     aNextTabParentId,
                      getter_AddRefs(newWindowChrome));
 
   if (NS_WARN_IF(!newWindowChrome)) {
@@ -985,7 +989,8 @@ nsWindowWatcher::OpenWindowInternal(mozIDOMWindowProxy* aParent,
       if (windowCreator2) {
         mozIDOMWindowProxy* openerWindow = aForceNoOpener ? nullptr : aParent;
         rv = CreateChromeWindow(features, parentChrome, chromeFlags,
-                                nullptr, openerWindow, getter_AddRefs(newChrome));
+                                nullptr, openerWindow, 0,
+                                getter_AddRefs(newChrome));
 
       } else {
         rv = mWindowCreator->CreateChromeWindow(parentChrome, chromeFlags,
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.h b/toolkit/components/windowwatcher/nsWindowWatcher.h
index bedc69917964..deb7b2ca3f3a 100644
--- a/toolkit/components/windowwatcher/nsWindowWatcher.h
+++ b/toolkit/components/windowwatcher/nsWindowWatcher.h
@@ -130,6 +130,7 @@ private:
                               uint32_t aChromeFlags,
                               nsITabParent* aOpeningTabParent,
                               mozIDOMWindowProxy* aOpener,
+                              uint64_t aNextTabParentId,
                               nsIWebBrowserChrome** aResult);
 
   void MaybeDisablePersistence(const nsACString& aFeatures,
diff --git a/toolkit/content/widgets/datetimebox.xml b/toolkit/content/widgets/datetimebox.xml
index fea82f3fb23c..59442481458d 100644
--- a/toolkit/content/widgets/datetimebox.xml
+++ b/toolkit/content/widgets/datetimebox.xml
@@ -1134,6 +1134,9 @@
           capture: true,
           mozSystemGroup: true
         });
+        // This is to close the picker when input element blurs.
+        this.mInputElement.addEventListener("blur", this,
+                                            { mozSystemGroup: true });
       ]]>
       </constructor>
 
@@ -1589,12 +1592,17 @@
         <parameter name="aEvent"/>
         <body>
         <![CDATA[
-          this.log("onBlur originalTarget: " + aEvent.originalTarget);
+          this.log("onBlur originalTarget: " + aEvent.originalTarget +
+            " target: " + aEvent.target);
 
           if (document.activeElement == this.mInputElement) {
             return;
           }
 
+          if (aEvent.target == this.mInputElement && this.mIsPickerOpen) {
+            this.mInputElement.closeDateTimePicker();
+          }
+
           let target = aEvent.originalTarget;
           target.setAttribute("typeBuffer", "");
           this.setInputValueFromFields();
@@ -1610,11 +1618,14 @@
           this.log("onKeyPress key: " + aEvent.key);
 
           switch (aEvent.key) {
-            // Close picker on Enter or Space key.
+            // Close picker on Enter, Escape or Space key.
             case "Enter":
+            case "Escape":
             case " ": {
-              this.mInputElement.closeDateTimePicker();
-              aEvent.preventDefault();
+              if (this.mIsPickerOpen) {
+                this.mInputElement.closeDateTimePicker();
+                aEvent.preventDefault();
+              }
               break;
             }
             case "Backspace": {
@@ -1670,7 +1681,7 @@
 
           if (aEvent.originalTarget == this.mResetButton) {
             this.clearInputFields(false);
-          } else {
+          } else if (!this.mIsPickerOpen) {
             this.mInputElement.openDateTimePicker(this.getCurrentValue());
           }
         ]]>
diff --git a/toolkit/content/widgets/datetimepopup.xml b/toolkit/content/widgets/datetimepopup.xml
index e107c60690dc..b3ca5b9eef22 100644
--- a/toolkit/content/widgets/datetimepopup.xml
+++ b/toolkit/content/widgets/datetimepopup.xml
@@ -28,11 +28,11 @@
         // Notify DateTimePickerHelper.jsm that binding is ready.
         this.dispatchEvent(new CustomEvent("DateTimePickerBindingReady"));
       ]]></constructor>
-      <method name="loadPicker">
+      <method name="openPicker">
         <parameter name="type"/>
+        <parameter name="anchor"/>
         <parameter name="detail"/>
         <body><![CDATA[
-          this.hidden = false;
           this.type = type;
           this.pickerState = {};
           // TODO: Resize picker according to content zoom level
@@ -55,17 +55,20 @@
               break;
             }
           }
+          this.hidden = false;
+          this.openPopup(anchor, "after_start", 0, 0);
         ]]></body>
       </method>
       <method name="closePicker">
         <body><![CDATA[
-          this.hidden = true;
           this.setInputBoxValue(true);
           this.pickerState = {};
           this.type = undefined;
           this.dateTimePopupFrame.removeEventListener("load", this, true);
           this.dateTimePopupFrame.contentDocument.removeEventListener("message", this);
           this.dateTimePopupFrame.setAttribute("src", "");
+          this.hidePopup();
+          this.hidden = true;
         ]]></body>
       </method>
       <method name="setPopupValue">
@@ -310,12 +313,5 @@
       </method>
 
     </implementation>
-    <handlers>
-      <handler event="popuphiding">
-        <![CDATA[
-          this.closePicker();
-        ]]>
-      </handler>
-    </handlers>
   </binding>
 </bindings>
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index 2c8d01590784..981390b591f3 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -23,6 +23,16 @@
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 @namespace xbl url("http://www.mozilla.org/xbl"); /* namespace for XBL elements */
 
+/* All XUL pseudo elements needs to have appearance:auto by default, just in
+   case they have a -moz-appearance. */
+::-moz-tree-column, ::-moz-tree-row, ::-moz-tree-separator,
+::-moz-tree-cell, ::-moz-tree-indentation, ::-moz-tree-line,
+::-moz-tree-twisty, ::-moz-tree-image, ::-moz-tree-cell-text,
+::-moz-tree-checkbox, ::-moz-tree-progressmeter,
+::-moz-tree-drop-feedback {
+  appearance: auto;
+}
+
 /* ::::::::::
    :: Rules for 'hiding' portions of the chrome for special
    :: kinds of windows (not JUST browser windows) with toolbars
diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock
index 32963f080786..621a3e2e6f85 100644
--- a/toolkit/library/gtest/rust/Cargo.lock
+++ b/toolkit/library/gtest/rust/Cargo.lock
@@ -181,10 +181,10 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.12.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -194,7 +194,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -302,7 +302,7 @@ name = "geckoservo"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -687,7 +687,7 @@ name = "selectors"
 version = "0.18.0"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -767,7 +767,7 @@ dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -797,7 +797,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1095,8 +1095,8 @@ dependencies = [
 "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624"
 "checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f"
 "checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d"
-"checksum cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fb067f9d88368ca9053aea00581556151ef96f2591e32ad44f3312d7e6b67392"
-"checksum cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95"
+"checksum cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"
+"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
 "checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf"
 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
 "checksum dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74114b6b49d6731835da7a28a3642651451e315f7f9b9d04e907e65a45681796"
diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock
index 668b5dcad0b0..92d5d94c1203 100644
--- a/toolkit/library/rust/Cargo.lock
+++ b/toolkit/library/rust/Cargo.lock
@@ -179,10 +179,10 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.12.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -192,7 +192,7 @@ dependencies = [
 
 [[package]]
 name = "cssparser-macros"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -300,7 +300,7 @@ name = "geckoservo"
 version = "0.0.1"
 dependencies = [
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -674,7 +674,7 @@ name = "selectors"
 version = "0.18.0"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -754,7 +754,7 @@ dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -784,7 +784,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1082,8 +1082,8 @@ dependencies = [
 "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624"
 "checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f"
 "checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d"
-"checksum cssparser 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fb067f9d88368ca9053aea00581556151ef96f2591e32ad44f3312d7e6b67392"
-"checksum cssparser-macros 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f0415de0bdbce823c0db204e00a62c8240fa2d3e04cd13ff7c6396e4446b95"
+"checksum cssparser 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b39404c5e04492194e3c69f1a10964b980f2c95c884a940f7903446779f6b027"
+"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
 "checksum deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1614659040e711785ed8ea24219140654da1729f3ec8a47a9719d041112fe7bf"
 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
 "checksum dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74114b6b49d6731835da7a28a3642651451e315f7f9b9d04e907e65a45681796"
diff --git a/toolkit/modules/DateTimePickerHelper.jsm b/toolkit/modules/DateTimePickerHelper.jsm
index ab82bb782560..464964ad96d8 100644
--- a/toolkit/modules/DateTimePickerHelper.jsm
+++ b/toolkit/modules/DateTimePickerHelper.jsm
@@ -136,9 +136,9 @@ this.DateTimePickerHelper = {
       return;
     }
     // The datetimepopup binding is only attached when it is needed.
-    // Check if loadPicker method is present to determine if binding has
+    // Check if openPicker method is present to determine if binding has
     // been attached. If not, attach the binding first before calling it.
-    if (!this.picker.loadPicker) {
+    if (!this.picker.openPicker) {
       let bindingPromise = new Promise(resolve => {
         this.picker.addEventListener("DateTimePickerBindingReady",
                                      resolve, {once: true});
@@ -146,10 +146,9 @@ this.DateTimePickerHelper = {
       this.picker.setAttribute("active", true);
       yield bindingPromise;
     }
-    this.picker.loadPicker(type, detail);
     // The arrow panel needs an anchor to work. The popupAnchor (this._anchor)
     // is a transparent div that the arrow can point to.
-    this.picker.openPopup(this._anchor, "after_start", 0, 0);
+    this.picker.openPicker(type, this._anchor, detail);
 
     this.addPickerListeners();
   }),
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index fd7714584b6f..22355b4f90cc 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -3081,6 +3081,11 @@ this.AddonManagerPrivate = {
     AddonManagerInternal.startup();
   },
 
+  addonIsActive(addonId) {
+    return AddonManagerInternal._getProviderByName("XPIProvider")
+                               .addonIsActive(addonId);
+  },
+
   get browserUpdated() {
     return gBrowserUpdated;
   },
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 09bb3ece6ba3..6c352563483b 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -2472,6 +2472,8 @@ this.XPIStates = {
   },
 };
 
+const hasOwnProperty = Function.call.bind({}.hasOwnProperty);
+
 this.XPIProvider = {
   get name() {
     return "XPIProvider";
@@ -2520,6 +2522,23 @@ this.XPIProvider = {
   // Have we started shutting down bootstrap add-ons?
   _closing: false,
 
+  /**
+   * Returns true if the add-on with the given ID is currently active,
+   * without forcing the add-ons database to load.
+   *
+   * @param {string} addonId
+   *        The ID of the add-on to check.
+   * @returns {boolean}
+   */
+  addonIsActive(addonId) {
+    if (hasOwnProperty(this.bootstrappedAddons, addonId)) {
+      return true;
+    }
+
+    let [, state] = XPIStates.findAddon(addonId);
+    return state && state.enabled;
+  },
+
   /**
    * Returns an array of the add-on values in `bootstrappedAddons`,
    * sorted so that all of an add-on's dependencies appear in the array
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js b/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
index dbe04b129d71..c4502750bef6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_shutdown.js
@@ -16,7 +16,7 @@ const IGNORE = ["getPreferredIconURL", "escapeAddonURI",
 
 const IGNORE_PRIVATE = ["AddonAuthor", "AddonCompatibilityOverride",
                         "AddonScreenshot", "AddonType", "startup", "shutdown",
-                        "registerProvider", "unregisterProvider",
+                        "addonIsActive", "registerProvider", "unregisterProvider",
                         "addStartupChange", "removeStartupChange",
                         "recordTimestamp", "recordSimpleMeasure",
                         "recordException", "getSimpleMeasures", "simpleTimer",
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index c74b675f373c..143e42cbaa19 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -35,6 +35,9 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     EXPORTS += ['EventTracer.h']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    SOURCES += [
+        '../../other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
+    ]
     UNIFIED_SOURCES += [
         'nsNativeAppSupportWin.cpp',
     ]
diff --git a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
index 4c7ffff484f0..47f4dff8847f 100644
--- a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
+++ b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp
@@ -55,19 +55,20 @@ nsAndroidHandlerApp::SetDetailedDescription(const nsAString & aDescription)
   return NS_OK;
 }
 
-// XXX Workaround for bug 986975 to maintain the existing broken semantics
-template<>
-struct nsISharingHandlerApp::COMTypeInfo<nsAndroidHandlerApp, void> {
-  static const nsIID kIID;
-};
-const nsIID nsISharingHandlerApp::COMTypeInfo<nsAndroidHandlerApp, void>::kIID = NS_IHANDLERAPP_IID;
-
 NS_IMETHODIMP
 nsAndroidHandlerApp::Equals(nsIHandlerApp *aHandlerApp, bool *aRetval)
 {
-  nsCOMPtr<nsAndroidHandlerApp> aApp = do_QueryInterface(aHandlerApp);
-  *aRetval = aApp && aApp->mName.Equals(mName) &&
-    aApp->mDescription.Equals(mDescription);
+  *aRetval = false;
+  if (!aHandlerApp) {
+    return NS_OK;
+  }
+
+  nsAutoString name;
+  nsAutoString detailedDescription;
+  aHandlerApp->GetName(name);
+  aHandlerApp->GetDetailedDescription(detailedDescription);
+
+  *aRetval = name.Equals(mName) && detailedDescription.Equals(mDescription);
   return NS_OK;
 }
 
diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
index ee9bc8570da5..9fb203d6eff7 100644
--- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
+++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp
@@ -380,11 +380,13 @@ nsMIMEInfoAndroid::nsMIMEInfoAndroid(const nsACString& aMIMEType) :
   mHandlerApps->AppendElement(mPrefApp, false);
 }
 
+#define SYSTEMCHOOSER_NAME u"Android chooser"
+#define SYSTEMCHOOSER_DESCRIPTION u"Android's default handler application chooser"
+
 NS_IMPL_ISUPPORTS(nsMIMEInfoAndroid::SystemChooser, nsIHandlerApp)
 
-
 nsresult nsMIMEInfoAndroid::SystemChooser::GetName(nsAString & aName) {
-  aName.AssignLiteral(u"Android chooser");
+  aName.AssignLiteral(SYSTEMCHOOSER_NAME);
   return NS_OK;
 }
 
@@ -395,7 +397,7 @@ nsMIMEInfoAndroid::SystemChooser::SetName(const nsAString&) {
 
 nsresult
 nsMIMEInfoAndroid::SystemChooser::GetDetailedDescription(nsAString & aDesc) {
-  aDesc.AssignLiteral(u"Android's default handler application chooser");
+  aDesc.AssignLiteral(SYSTEMCHOOSER_DESCRIPTION);
   return NS_OK;
 }
 
@@ -404,19 +406,20 @@ nsMIMEInfoAndroid::SystemChooser::SetDetailedDescription(const nsAString&) {
   return NS_OK;
 }
 
-// XXX Workaround for bug 986975 to maintain the existing broken semantics
-template<>
-struct nsIHandlerApp::COMTypeInfo<nsMIMEInfoAndroid::SystemChooser, void> {
-  static const nsIID kIID;
-};
-const nsIID nsIHandlerApp::COMTypeInfo<nsMIMEInfoAndroid::SystemChooser, void>::kIID = NS_IHANDLERAPP_IID;
-
 nsresult
 nsMIMEInfoAndroid::SystemChooser::Equals(nsIHandlerApp *aHandlerApp, bool *aRetVal) {
-  nsCOMPtr<nsMIMEInfoAndroid::SystemChooser> info = do_QueryInterface(aHandlerApp);
-  if (info)
-    return mOuter->Equals(info->mOuter, aRetVal);
   *aRetVal = false;
+  if (!aHandlerApp) {
+    return NS_OK;
+  }
+
+  nsAutoString name;
+  nsAutoString detailedDescription;
+  aHandlerApp->GetName(name);
+  aHandlerApp->GetDetailedDescription(detailedDescription);
+
+  *aRetVal = name.Equals(SYSTEMCHOOSER_NAME) &&
+             detailedDescription.Equals(SYSTEMCHOOSER_DESCRIPTION);
   return NS_OK;
 }
 
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index a1a603f8a612..992656edcca6 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1677,7 +1677,8 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo
     return NS_OK;
   }
 
-  // Inform channel it is open on behalf of a download to prevent caching.
+  // Inform channel it is open on behalf of a download to throttle it during
+  // page loads and prevent its caching.
   nsCOMPtr<nsIHttpChannelInternal> httpInternal = do_QueryInterface(aChannel);
   if (httpInternal) {
     rv = httpInternal->SetChannelIsForDownload(true);
diff --git a/uriloader/exthandler/nsHandlerService-json.js b/uriloader/exthandler/nsHandlerService-json.js
index 961e654ddad2..fe51db61f3c7 100644
--- a/uriloader/exthandler/nsHandlerService-json.js
+++ b/uriloader/exthandler/nsHandlerService-json.js
@@ -39,8 +39,7 @@ HandlerService.prototype = {
   get _store() {
     if (!this.__store) {
       this.__store = new JSONFile({
-        path: OS.Path.join(OS.Constants.Path.profileDir,
-                           "handlers.json"),
+        path: OS.Path.join(OS.Constants.Path.profileDir, "handlers.json"),
         dataPostProcessor: this._dataPostProcessor.bind(this),
       });
       this.__store.ensureDataReady();
@@ -50,21 +49,26 @@ HandlerService.prototype = {
   },
 
   _dataPostProcessor(data) {
-    return data.schemes ? data : { version: {}, mimetypes: {}, schemes: {} };
+    return data.defaultHandlersVersion ? data : {
+      defaultHandlersVersion: {},
+      mimeTypes: {},
+      schemes: {},
+    };
   },
 
   _updateDB() {
     try {
-
       let locale = Services.locale.getAppLocaleAsLangTag();
       let prefsDefaultHandlersVersion = Number(Services.prefs.getComplexValue(
         "gecko.handlerService.defaultHandlersVersion",
         Ci.nsIPrefLocalizedString).data);
 
-      let defaultHandlersVersion = this._store.data.version[locale] || 0;
-      if (defaultHandlersVersion < prefsDefaultHandlersVersion ) {
+      let defaultHandlersVersion =
+          this._store.data.defaultHandlersVersion[locale] || 0;
+      if (defaultHandlersVersion < prefsDefaultHandlersVersion) {
         this._injectNewDefaults();
-        this._store.data.version[locale] = prefsDefaultHandlersVersion;
+        this._store.data.defaultHandlersVersion[locale] =
+          prefsDefaultHandlersVersion;
       }
     } catch (ex) {
       Cu.reportError(ex);
@@ -121,26 +125,15 @@ HandlerService.prototype = {
 
       for (let handlerNumber of Object.keys(schemes[scheme])) {
         let handlerApp = this.handlerAppFromSerializable(schemes[scheme][handlerNumber]);
-        if (!this._isInHandlerArray(possibleHandlers, handlerApp)) {
-          possibleHandlers.appendElement(handlerApp);
-        }
+        // If there is already a handler registered with the same template
+        // URL, the newly added one will be ignored when saving.
+        possibleHandlers.appendElement(handlerApp, false);
       }
 
       this.store(protoInfo);
     }
   },
 
-  _isInHandlerArray(array, handler) {
-    let enumerator = array.enumerate();
-    while (enumerator.hasMoreElements()) {
-      let handlerApp = enumerator.getNext().QueryInterface(Ci.nsIHandlerApp);
-      if (handlerApp.equals(handler)) {
-        return true;
-      }
-    }
-    return false;
-  },
-
   _onDBChange() {
     return Task.spawn(function* () {
       if (this.__store) {
@@ -163,9 +156,9 @@ HandlerService.prototype = {
 
   // nsIHandlerService
   enumerate() {
-    let handlers = Cc["@mozilla.org/array;1"].
-                     createInstance(Ci.nsIMutableArray);
-    for (let type of Object.keys(this._store.data.mimetypes)) {
+    let handlers = Cc["@mozilla.org/array;1"]
+                     .createInstance(Ci.nsIMutableArray);
+    for (let type of Object.keys(this._store.data.mimeTypes)) {
       let handler = gMIMEService.getFromTypeAndExtension(type, null);
       handlers.appendElement(handler);
     }
@@ -178,46 +171,76 @@ HandlerService.prototype = {
 
   // nsIHandlerService
   store(handlerInfo) {
-    let handlerObj = {
-      action: handlerInfo.preferredAction,
-      askBeforeHandling: handlerInfo.alwaysAskBeforeHandling,
-    };
+    let handlerList = this._getHandlerListByHandlerInfoType(handlerInfo);
 
-    let preferredHandler = handlerInfo.preferredApplicationHandler;
-    if (preferredHandler) {
-      let serializable = this.handlerAppToSerializable(preferredHandler);
-      if (serializable) {
-        handlerObj.preferredHandler = serializable;
+    // Retrieve an existing entry if present, instead of creating a new one, so
+    // that we preserve unknown properties for forward compatibility.
+    let storedHandlerInfo = handlerList[handlerInfo.type];
+    if (!storedHandlerInfo) {
+      storedHandlerInfo = {};
+      handlerList[handlerInfo.type] = storedHandlerInfo;
+    }
+
+    // Only a limited number of preferredAction values is allowed.
+    if (handlerInfo.preferredAction == Ci.nsIHandlerInfo.saveToDisk ||
+        handlerInfo.preferredAction == Ci.nsIHandlerInfo.useSystemDefault ||
+        handlerInfo.preferredAction == Ci.nsIHandlerInfo.handleInternally) {
+      storedHandlerInfo.action = handlerInfo.preferredAction;
+    } else {
+      storedHandlerInfo.action = Ci.nsIHandlerInfo.useHelperApp;
+    }
+
+    if (handlerInfo.alwaysAskBeforeHandling) {
+      storedHandlerInfo.ask = true;
+    } else {
+      delete storedHandlerInfo.ask;
+    }
+
+    // Build a list of unique nsIHandlerInfo instances to process later.
+    let handlers = [];
+    if (handlerInfo.preferredApplicationHandler) {
+      handlers.push(handlerInfo.preferredApplicationHandler);
+    }
+    let enumerator = handlerInfo.possibleApplicationHandlers.enumerate();
+    while (enumerator.hasMoreElements()) {
+      let handler = enumerator.getNext().QueryInterface(Ci.nsIHandlerApp);
+      // If the caller stored duplicate handlers, we save them only once.
+      if (!handlers.some(h => h.equals(handler))) {
+        handlers.push(handler);
       }
     }
 
-    let apps = handlerInfo.possibleApplicationHandlers.enumerate();
-    let possibleHandlers = [];
-    while (apps.hasMoreElements()) {
-      let handler = apps.getNext().QueryInterface(Ci.nsIHandlerApp);
-      let serializable = this.handlerAppToSerializable(handler);
-      if (serializable) {
-        possibleHandlers.push(serializable);
+    // If any of the nsIHandlerInfo instances cannot be serialized, it is not
+    // included in the final list. The first element is always the preferred
+    // handler, or null if there is none.
+    let serializableHandlers =
+        handlers.map(h => this.handlerAppToSerializable(h)).filter(h => h);
+    if (serializableHandlers.length) {
+      if (!handlerInfo.preferredApplicationHandler) {
+        serializableHandlers.unshift(null);
       }
-    }
-    if (possibleHandlers.length) {
-      handlerObj.possibleHandlers = possibleHandlers;
+      storedHandlerInfo.handlers = serializableHandlers;
+    } else {
+      delete storedHandlerInfo.handlers;
     }
 
     if (this._isMIMEInfo(handlerInfo)) {
       let extEnumerator = handlerInfo.getFileExtensions();
-      let extensions = [];
+      let extensions = storedHandlerInfo.extensions || [];
       while (extEnumerator.hasMore()) {
-        let extension = extEnumerator.getNext();
+        let extension = extEnumerator.getNext().toLowerCase();
+        // If the caller stored duplicate extensions, we save them only once.
         if (!extensions.includes(extension)) {
           extensions.push(extension);
         }
       }
       if (extensions.length) {
-        handlerObj.fileExtensions = extensions;
+        storedHandlerInfo.extensions = extensions;
+      } else {
+        delete storedHandlerInfo.extensions;
       }
     }
-    this._getHandlerListByHandlerInfoType(handlerInfo)[handlerInfo.type] = handlerObj;
+
     this._store.saveSoon();
   },
 
@@ -230,42 +253,26 @@ HandlerService.prototype = {
                                      Cr.NS_ERROR_NOT_AVAILABLE);
     }
 
-    // logic from _retrievePreferredAction of nsHandlerService.js
-    if (storedHandlerInfo.action == Ci.nsIHandlerInfo.saveToDisk ||
-        storedHandlerInfo.action == Ci.nsIHandlerInfo.useSystemDefault ||
-        storedHandlerInfo.action == Ci.nsIHandlerInfo.handleInternally) {
-      handlerInfo.preferredAction = storedHandlerInfo.action;
-    } else {
-      handlerInfo.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-    }
+    handlerInfo.preferredAction = storedHandlerInfo.action;
+    handlerInfo.alwaysAskBeforeHandling = !!storedHandlerInfo.ask;
 
-    let preferHandler = null;
-    if (storedHandlerInfo.preferredHandler) {
-      preferHandler = this.handlerAppFromSerializable(storedHandlerInfo.preferredHandler);
-    }
-    handlerInfo.preferredApplicationHandler = preferHandler;
-    if (preferHandler) {
-      handlerInfo.possibleApplicationHandlers.appendElement(preferHandler);
-    }
-
-    if (storedHandlerInfo.possibleHandlers) {
-      for (let handler of storedHandlerInfo.possibleHandlers) {
-        let possibleHandler = this.handlerAppFromSerializable(handler);
-        if (possibleHandler && (!preferHandler ||
-                                !possibleHandler.equals(preferHandler))) {
-          handlerInfo.possibleApplicationHandlers.appendElement(possibleHandler);
-        }
+    // If the first item is not null, it is also the preferred handler. Since
+    // we cannot modify the stored array, use a boolean to keep track of this.
+    let isFirstItem = true;
+    for (let handler of storedHandlerInfo.handlers || [null]) {
+      let handlerApp = this.handlerAppFromSerializable(handler || {});
+      if (isFirstItem) {
+        isFirstItem = false;
+        handlerInfo.preferredApplicationHandler = handlerApp;
+      }
+      if (handlerApp) {
+        handlerInfo.possibleApplicationHandlers.appendElement(handlerApp);
       }
     }
 
-    // We always store "askBeforeHandling" in the JSON file. Just use this value.
-    handlerInfo.alwaysAskBeforeHandling = storedHandlerInfo.askBeforeHandling;
-
-    if (this._isMIMEInfo(handlerInfo)) {
-      if (storedHandlerInfo.fileExtensions) {
-        for (let extension of storedHandlerInfo.fileExtensions) {
-          handlerInfo.appendExtension(extension);
-        }
+    if (this._isMIMEInfo(handlerInfo) && storedHandlerInfo.extensions) {
+      for (let extension of storedHandlerInfo.extensions) {
+        handlerInfo.appendExtension(extension);
       }
     }
   },
@@ -313,19 +320,19 @@ HandlerService.prototype = {
         if (!file.exists()) {
           return null;
         }
-        handlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"].
-                   createInstance(Ci.nsILocalHandlerApp);
+        handlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"]
+                       .createInstance(Ci.nsILocalHandlerApp);
         handlerApp.executable = file;
       } catch (ex) {
         return null;
       }
     } else if ("uriTemplate" in handlerObj) {
-      handlerApp = Cc["@mozilla.org/uriloader/web-handler-app;1"].
-                   createInstance(Ci.nsIWebHandlerApp);
+      handlerApp = Cc["@mozilla.org/uriloader/web-handler-app;1"]
+                     .createInstance(Ci.nsIWebHandlerApp);
       handlerApp.uriTemplate = handlerObj.uriTemplate;
     } else if ("service" in handlerObj) {
-      handlerApp = Cc["@mozilla.org/uriloader/dbus-handler-app;1"].
-                   createInstance(Ci.nsIDBusHandlerApp);
+      handlerApp = Cc["@mozilla.org/uriloader/dbus-handler-app;1"]
+                     .createInstance(Ci.nsIDBusHandlerApp);
       handlerApp.service = handlerObj.service;
       handlerApp.method = handlerObj.method;
       handlerApp.objectPath = handlerObj.objectPath;
@@ -339,11 +346,11 @@ HandlerService.prototype = {
   },
 
   /**
-   * The function return a reference to the "mimetypes" or "schemes" object
+   * The function returns a reference to the "mimeTypes" or "schemes" object
    * based on which type of handlerInfo is provided.
    */
   _getHandlerListByHandlerInfoType(handlerInfo) {
-    return this._isMIMEInfo(handlerInfo) ? this._store.data.mimetypes
+    return this._isMIMEInfo(handlerInfo) ? this._store.data.mimeTypes
                                          : this._store.data.schemes;
   },
 
@@ -372,16 +379,15 @@ HandlerService.prototype = {
   // nsIHandlerService
   getTypeFromExtension(fileExtension) {
     let extension = fileExtension.toLowerCase();
-    let mimeTypes = this._store.data.mimetypes;
+    let mimeTypes = this._store.data.mimeTypes;
     for (let type of Object.keys(mimeTypes)) {
-      if (mimeTypes[type].fileExtensions &&
-          mimeTypes[type].fileExtensions.includes(extension)) {
-          return type;
+      if (mimeTypes[type].extensions &&
+          mimeTypes[type].extensions.includes(extension)) {
+        return type;
       }
     }
     return "";
   },
-
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([HandlerService]);
diff --git a/uriloader/exthandler/nsHandlerService.js b/uriloader/exthandler/nsHandlerService.js
index 0488f30d5a39..10bd5e56e648 100644
--- a/uriloader/exthandler/nsHandlerService.js
+++ b/uriloader/exthandler/nsHandlerService.js
@@ -709,12 +709,7 @@ HandlerService.prototype = {
 
     var handler = aHandlerInfo.preferredApplicationHandler;
 
-    if (handler) {
-      // If the handlerApp is an unknown type, ignore it.
-      // Android default application handler is the case.
-      if (this._handlerAppIsUnknownType(handler)) {
-        return;
-      }
+    if (handler && !this._handlerAppIsUnknownType(handler)) {
       this._storeHandlerApp(handlerID, handler);
 
       // Make this app be the preferred app for the handler info.
@@ -728,8 +723,9 @@ HandlerService.prototype = {
       this._setResource(infoID, NC_PREFERRED_APP, handlerID);
     }
     else {
-      // There isn't a preferred handler.  Remove the existing record for it,
-      // if any.
+      // There isn't a preferred handler or the handler cannot be serialized,
+      // for example the Android default application handler. Remove the
+      // existing record for it, if any.
       this._removeTarget(infoID, NC_PREFERRED_APP);
       this._removeAssertions(handlerID);
     }
diff --git a/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm b/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
index 8de0f2dec588..be79f00dba3b 100644
--- a/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
+++ b/uriloader/exthandler/tests/HandlerServiceTestUtils.jsm
@@ -95,6 +95,14 @@ this.HandlerServiceTestUtils = {
       // that may have been imported from the default nsIHandlerService instance
       // and is not overwritten by fillHandlerInfo later.
       let handlerInfo = gMIMEService.getFromTypeAndExtension(type, null);
+      if (AppConstants.platform == "android") {
+        // On Android, the first handler application is always the internal one.
+        while (handlerInfo.possibleApplicationHandlers.length > 1) {
+          handlerInfo.possibleApplicationHandlers.removeElementAt(1);
+        }
+      } else {
+        handlerInfo.possibleApplicationHandlers.clear();
+      }
       handlerInfo.setFileExtensions("");
       // Populate the object from the handler service instance under testing.
       if (this.handlerService.exists(handlerInfo)) {
@@ -173,9 +181,12 @@ this.HandlerServiceTestUtils = {
                                                         : Ci.nsIHandlerInfo;
     Assert.ok(handlerInfo instanceof expectedInterface);
     Assert.equal(handlerInfo.type, expected.type);
-    Assert.equal(handlerInfo.preferredAction, expected.preferredAction);
-    Assert.equal(handlerInfo.alwaysAskBeforeHandling,
-                 expected.alwaysAskBeforeHandling);
+
+    if (!expected.preferredActionOSDependent) {
+      Assert.equal(handlerInfo.preferredAction, expected.preferredAction);
+      Assert.equal(handlerInfo.alwaysAskBeforeHandling,
+                   expected.alwaysAskBeforeHandling);
+    }
 
     if (expectedInterface == Ci.nsIMIMEInfo) {
       let fileExtensionsEnumerator = handlerInfo.getFileExtensions();
diff --git a/uriloader/exthandler/tests/unit/common_test_handlerService.js b/uriloader/exthandler/tests/unit/common_test_handlerService.js
index 94de89a5861d..13e35afa9511 100644
--- a/uriloader/exthandler/tests/unit/common_test_handlerService.js
+++ b/uriloader/exthandler/tests/unit/common_test_handlerService.js
@@ -1,68 +1,57 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/**
- * This script is loaded by "test_handlerService_json.js" and "test_handlerService_rdf.js"
- * to make sure there is the same behavior when using two different implementations
- * of handlerService (JSON backend and RDF backend).
+/*
+ * Loaded by "test_handlerService_json.js" and "test_handlerService_rdf.js" to
+ * check that the nsIHandlerService interface has the same behavior with both
+ * the JSON and RDF backends.
  */
 
 HandlerServiceTestUtils.handlerService = gHandlerService;
 
-const pdfHandlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-const gzipHandlerInfo =
-      HandlerServiceTestUtils.getHandlerInfo("application/x-gzip");
-const ircHandlerInfo =
-      HandlerServiceTestUtils.getHandlerInfo("irc");
-
-let executable = Services.dirsvc.get("TmpD", Ci.nsIFile);
-let localHandler = {
-  name: "Local Handler",
-  executable: executable,
-  interfaces: [Ci.nsIHandlerApp, Ci.nsILocalHandlerApp, Ci.nsISupports],
-  QueryInterface: function(iid) {
-    if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
+// Set up an nsIWebHandlerApp instance that can be used in multiple tests.
+let webHandlerApp = Cc["@mozilla.org/uriloader/web-handler-app;1"]
+                      .createInstance(Ci.nsIWebHandlerApp);
+webHandlerApp.name = "Web Handler";
+webHandlerApp.uriTemplate = "https://www.example.com/?url=%s";
+let expectedWebHandlerApp = {
+  name: webHandlerApp.name,
+  uriTemplate: webHandlerApp.uriTemplate,
 };
 
-let webHandler = {
-  name: "Web Handler",
-  uriTemplate: "https://www.webhandler.com/?url=%s",
-  interfaces: [Ci.nsIHandlerApp, Ci.nsIWebHandlerApp, Ci.nsISupports],
-  QueryInterface: function(iid) {
-    if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
+// Set up an nsILocalHandlerApp instance that can be used in multiple tests. The
+// executable should exist, but it doesn't need to point to an actual file, so
+// we simply initialize it to the path of an existing directory.
+let localHandlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"]
+                        .createInstance(Ci.nsILocalHandlerApp);
+localHandlerApp.name = "Local Handler";
+localHandlerApp.executable = FileUtils.getFile("TmpD", []);
+let expectedLocalHandlerApp = {
+  name: localHandlerApp.name,
+  executable: localHandlerApp.executable,
 };
 
-let dBusHandler = {
-  name: "DBus Handler",
-  service: "DBus Service",
-  method: "DBus method",
-  objectPath: "/tmp/PATH/DBus",
-  dBusInterface: "DBusInterface",
-  interfaces: [Ci.nsIHandlerApp, Ci.nsIDBusHandlerApp, Ci.nsISupports],
-  QueryInterface: function(iid) {
-    if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};
+/**
+ * Returns a new nsIHandlerInfo instance initialized to known values that don't
+ * depend on the platform and are easier to verify later.
+ *
+ * @param type
+ *        Because the "preferredAction" is initialized to saveToDisk, this
+ *        should represent a MIME type rather than a protocol.
+ */
+function getKnownHandlerInfo(type) {
+  let handlerInfo = HandlerServiceTestUtils.getBlankHandlerInfo(type);
+  handlerInfo.preferredAction = Ci.nsIHandlerInfo.saveToDisk;
+  handlerInfo.alwaysAskBeforeHandling = false;
+  return handlerInfo;
+}
 
-// Loads data from a file in a predefined format. This test verifies that:
-//  - The JSON format used in previous versions can be loaded
-//  - All the known properties specified in the JSON file are considered
-add_task(function* testLoadPredefined() {
-  yield prepareImportDB();
-
-  let handlerInfos =
-      HandlerServiceTestUtils.getAllHandlerInfos();
+/**
+ * Checks that the information stored in the handler service instance under
+ * testing matches the test data files.
+ */
+function* assertAllHandlerInfosMatchTestData() {
+  let handlerInfos = HandlerServiceTestUtils.getAllHandlerInfos();
 
   // It's important that the MIME types we check here do not exist at the
   // operating system level, otherwise the list of handlers and file extensions
@@ -70,29 +59,485 @@ add_task(function* testLoadPredefined() {
   // even if one already exists in the system, resulting in duplicate entries.
 
   HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
-    type: "irc",
+    type: "example/type.handleinternally",
+    preferredAction: Ci.nsIHandlerInfo.handleInternally,
+    alwaysAskBeforeHandling: false,
+    fileExtensions: [
+      "example_one",
+    ],
+  });
+
+  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
+    type: "example/type.savetodisk",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: true,
+    preferredApplicationHandler: {
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    },
+    possibleApplicationHandlers: [{
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    }],
+    fileExtensions: [
+      "example_two",
+      "example_three",
+    ],
+  });
+
+  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
+    type: "example/type.usehelperapp",
     preferredAction: Ci.nsIHandlerInfo.useHelperApp,
     alwaysAskBeforeHandling: true,
+    preferredApplicationHandler: {
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    },
     possibleApplicationHandlers: [{
-      name: "Mibbit",
-      uriTemplate: "https://www.mibbit.com/?url=%s",
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    },{
+      name: "Example Possible Handler One",
+      uriTemplate: "http://www.example.com/?id=1&url=%s",
+    },{
+      name: "Example Possible Handler Two",
+      uriTemplate: "http://www.example.com/?id=2&url=%s",
+    }],
+    fileExtensions: [
+      "example_two",
+      "example_three",
+    ],
+  });
+
+  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
+    type: "example/type.usesystemdefault",
+    preferredAction: Ci.nsIHandlerInfo.useSystemDefault,
+    alwaysAskBeforeHandling: false,
+    possibleApplicationHandlers: [{
+      name: "Example Possible Handler",
+      uriTemplate: "http://www.example.com/?url=%s",
     }],
   });
 
   HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
-    type: "ircs",
+    type: "examplescheme.usehelperapp",
     preferredAction: Ci.nsIHandlerInfo.useHelperApp,
     alwaysAskBeforeHandling: true,
+    preferredApplicationHandler: {
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    },
     possibleApplicationHandlers: [{
-      name: "Mibbit",
-      uriTemplate: "https://www.mibbit.com/?url=%s",
+      name: "Example Default Handler",
+      uriTemplate: "https://www.example.com/?url=%s",
+    },{
+      name: "Example Possible Handler One",
+      uriTemplate: "http://www.example.com/?id=1&url=%s",
+    },{
+      name: "Example Possible Handler Two",
+      uriTemplate: "http://www.example.com/?id=2&url=%s",
     }],
   });
 
+  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
+    type: "examplescheme.usesystemdefault",
+    preferredAction: Ci.nsIHandlerInfo.useSystemDefault,
+    alwaysAskBeforeHandling: false,
+    possibleApplicationHandlers: [{
+      name: "Example Possible Handler",
+      uriTemplate: "http://www.example.com/?url=%s",
+    }],
+  });
+
+  do_check_eq(handlerInfos.length, 0);
+}
+
+/**
+ * Loads data from a file in a predefined format, verifying that the format is
+ * recognized and all the known properties are loaded and saved.
+ */
+add_task(function* test_store_fillHandlerInfo_predefined() {
+  // Test that the file format used in previous versions can be loaded.
+  yield copyTestDataToHandlerStore();
+  yield assertAllHandlerInfosMatchTestData();
+
+  // Keep a copy of the nsIHandlerInfo instances, then delete the handler store
+  // and populate it with the known data. Since the handler store is empty, the
+  // default handlers for the current locale are also injected, so we have to
+  // delete them manually before adding the other nsIHandlerInfo instances.
+  let testHandlerInfos = HandlerServiceTestUtils.getAllHandlerInfos();
+  yield deleteHandlerStore();
+  for (let handlerInfo of HandlerServiceTestUtils.getAllHandlerInfos()) {
+    gHandlerService.remove(handlerInfo);
+  }
+  for (let handlerInfo of testHandlerInfos) {
+    gHandlerService.store(handlerInfo);
+  }
+
+  // Test that the known data still matches after saving it and reloading.
+  yield unloadHandlerStore();
+  yield assertAllHandlerInfosMatchTestData();
+});
+
+/**
+ * Check that "store" is able to add new instances, that "remove" and "exists"
+ * work, and that "fillHandlerInfo" throws when the instance does not exist.
+ */
+add_task(function* test_store_remove_exists() {
+  // Test both MIME types and protocols.
+  for (let type of ["example/type.usehelperapp",
+                    "examplescheme.usehelperapp"]) {
+    // Create new nsIHandlerInfo instances before loading the test data.
+    yield deleteHandlerStore();
+    let handlerInfoPresent = HandlerServiceTestUtils.getHandlerInfo(type);
+    let handlerInfoAbsent = HandlerServiceTestUtils.getHandlerInfo(type + "2");
+
+    // Set up known properties that we can verify later.
+    handlerInfoAbsent.preferredAction = Ci.nsIHandlerInfo.saveToDisk;
+    handlerInfoAbsent.alwaysAskBeforeHandling = false;
+
+    yield copyTestDataToHandlerStore();
+
+    do_check_true(gHandlerService.exists(handlerInfoPresent));
+    do_check_false(gHandlerService.exists(handlerInfoAbsent));
+
+    gHandlerService.store(handlerInfoAbsent);
+    gHandlerService.remove(handlerInfoPresent);
+
+    yield unloadHandlerStore();
+
+    do_check_false(gHandlerService.exists(handlerInfoPresent));
+    do_check_true(gHandlerService.exists(handlerInfoAbsent));
+
+    Assert.throws(
+      () => gHandlerService.fillHandlerInfo(handlerInfoPresent, ""),
+      ex => ex.result == Cr.NS_ERROR_NOT_AVAILABLE);
+
+    let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo(type + "2");
+    HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+      type: type + "2",
+      preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+      alwaysAskBeforeHandling: false,
+    });
+  }
+});
+
+/**
+ * Tests that it is possible to save an nsIHandlerInfo instance with a
+ * "preferredAction" that is alwaysAsk or has an unknown value, but the
+ * action always becomes useHelperApp when reloading.
+ */
+add_task(function* test_store_preferredAction() {
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+
+  for (let preferredAction of [Ci.nsIHandlerInfo.alwaysAsk, 999]) {
+    handlerInfo.preferredAction = preferredAction;
+    gHandlerService.store(handlerInfo);
+    gHandlerService.fillHandlerInfo(handlerInfo, "");
+    do_check_eq(handlerInfo.preferredAction, Ci.nsIHandlerInfo.useHelperApp);
+  }
+});
+
+/**
+ * Tests that it is possible to save an nsIHandlerInfo instance containing an
+ * nsILocalHandlerApp instance pointing to an executable that doesn't exist, but
+ * this entry is ignored when reloading.
+ */
+add_task(function* test_store_localHandlerApp_missing() {
+  if (!("@mozilla.org/uriloader/dbus-handler-app;1" in Cc)) {
+    do_print("Skipping test because it does not apply to this platform.");
+    return;
+  }
+
+  let missingHandlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"]
+                            .createInstance(Ci.nsILocalHandlerApp);
+  missingHandlerApp.name = "Non-existing Handler";
+  missingHandlerApp.executable = FileUtils.getFile("TmpD", ["nonexisting"]);
+
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.preferredApplicationHandler = missingHandlerApp;
+  handlerInfo.possibleApplicationHandlers.appendElement(missingHandlerApp);
+  handlerInfo.possibleApplicationHandlers.appendElement(webHandlerApp);
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    possibleApplicationHandlers: [expectedWebHandlerApp],
+  });
+});
+
+/**
+ * Test saving and reloading an instance of nsIDBusHandlerApp.
+ */
+add_task(function* test_store_dBusHandlerApp() {
+  if (!("@mozilla.org/uriloader/dbus-handler-app;1" in Cc)) {
+    do_print("Skipping test because it does not apply to this platform.");
+    return;
+  }
+
+  // Set up an nsIDBusHandlerApp instance for testing.
+  let dBusHandlerApp = Cc["@mozilla.org/uriloader/dbus-handler-app;1"]
+                         .createInstance(Ci.nsIDBusHandlerApp);
+  dBusHandlerApp.name = "DBus Handler";
+  dBusHandlerApp.service = "test.method.server";
+  dBusHandlerApp.method = "Method";
+  dBusHandlerApp.dBusInterface = "test.method.Type";
+  dBusHandlerApp.objectPath = "/test/method/Object";
+  let expectedDBusHandlerApp = {
+    name: dBusHandlerApp.name,
+    service: dBusHandlerApp.service,
+    method: dBusHandlerApp.method,
+    dBusInterface: dBusHandlerApp.dBusInterface,
+    objectPath: dBusHandlerApp.objectPath,
+  };
+
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.preferredApplicationHandler = dBusHandlerApp;
+  handlerInfo.possibleApplicationHandlers.appendElement(dBusHandlerApp);
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    preferredApplicationHandler: expectedDBusHandlerApp,
+    possibleApplicationHandlers: [expectedDBusHandlerApp],
+  });
+});
+
+/**
+ * Tests that it is possible to save an nsIHandlerInfo instance with a
+ * "preferredApplicationHandler" and no "possibleApplicationHandlers", but the
+ * former is always included in the latter list when reloading.
+ */
+add_task(function* test_store_possibleApplicationHandlers_includes_preferred() {
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.preferredApplicationHandler = localHandlerApp;
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    preferredApplicationHandler: expectedLocalHandlerApp,
+    possibleApplicationHandlers: [expectedLocalHandlerApp],
+  });
+});
+
+/**
+ * Tests that it is possible to save an nsIHandlerInfo instance with a
+ * "preferredApplicationHandler" that is not the first element in
+ * "possibleApplicationHandlers", but the former is always included as the first
+ * element of the latter list when reloading.
+ */
+add_task(function* test_store_possibleApplicationHandlers_preferred_first() {
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.preferredApplicationHandler = webHandlerApp;
+  // The preferred handler is appended after the other one.
+  handlerInfo.possibleApplicationHandlers.appendElement(localHandlerApp);
+  handlerInfo.possibleApplicationHandlers.appendElement(webHandlerApp);
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    preferredApplicationHandler: expectedWebHandlerApp,
+    possibleApplicationHandlers: [
+      expectedWebHandlerApp,
+      expectedLocalHandlerApp,
+    ],
+  });
+});
+
+/**
+ * Tests that it is possible to save an nsIHandlerInfo instance with an
+ * uppercase file extension, but it is converted to lowercase when reloading.
+ */
+add_task(function* test_store_fileExtensions_lowercase() {
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.appendExtension("extension_test1");
+  handlerInfo.appendExtension("EXTENSION_test2");
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    fileExtensions: [
+      "extension_test1",
+      "extension_test2",
+    ],
+  });
+});
+
+/**
+ * Tests that duplicates added with "appendExtension" or present in
+ * "possibleApplicationHandlers" are removed when saving and reloading.
+ */
+add_task(function* test_store_no_duplicates() {
+  yield deleteHandlerStore();
+
+  let handlerInfo = getKnownHandlerInfo("example/new");
+  handlerInfo.preferredApplicationHandler = webHandlerApp;
+  handlerInfo.possibleApplicationHandlers.appendElement(webHandlerApp);
+  handlerInfo.possibleApplicationHandlers.appendElement(localHandlerApp);
+  handlerInfo.possibleApplicationHandlers.appendElement(localHandlerApp);
+  handlerInfo.possibleApplicationHandlers.appendElement(webHandlerApp);
+  handlerInfo.appendExtension("extension_test1");
+  handlerInfo.appendExtension("extension_test2");
+  handlerInfo.appendExtension("extension_test1");
+  handlerInfo.appendExtension("EXTENSION_test1");
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+
+  let actualHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("example/new");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/new",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    preferredApplicationHandler: expectedWebHandlerApp,
+    possibleApplicationHandlers: [
+      expectedWebHandlerApp,
+      expectedLocalHandlerApp,
+    ],
+    fileExtensions: [
+      "extension_test1",
+      "extension_test2",
+    ],
+  });
+});
+
+/**
+ * Tests that "store" deletes properties that have their default values from
+ * the data store. This is mainly relevant for the JSON back-end.
+ *
+ * File extensions are never deleted once they have been associated.
+ */
+add_task(function* test_store_deletes_properties_except_extensions() {
+  yield deleteHandlerStore();
+
+  // Prepare an nsIHandlerInfo instance with all the properties set to values
+  // that will result in deletions. The preferredAction is also set to a defined
+  // value so we can more easily verify it later.
+  let handlerInfo =
+      HandlerServiceTestUtils.getBlankHandlerInfo("example/type.savetodisk");
+  handlerInfo.preferredAction = Ci.nsIHandlerInfo.saveToDisk;
+  handlerInfo.alwaysAskBeforeHandling = false;
+
+  // All the properties for "example/type.savetodisk" are present in the test
+  // data, so we load the data before overwriting their values.
+  yield copyTestDataToHandlerStore();
+  gHandlerService.store(handlerInfo);
+
+  // Now we can reload the data and verify that no extra values have been kept.
+  yield unloadHandlerStore();
+  let actualHandlerInfo =
+      HandlerServiceTestUtils.getHandlerInfo("example/type.savetodisk");
+  HandlerServiceTestUtils.assertHandlerInfoMatches(actualHandlerInfo, {
+    type: "example/type.savetodisk",
+    preferredAction: Ci.nsIHandlerInfo.saveToDisk,
+    alwaysAskBeforeHandling: false,
+    fileExtensions: [
+      "example_two",
+      "example_three"
+    ],
+  });
+});
+
+/**
+ * Tests the "overrideType" argument of "fillHandlerInfo".
+ */
+add_task(function* test_fillHandlerInfo_overrideType() {
+  // Test both MIME types and protocols.
+  for (let type of ["example/type.usesystemdefault",
+                    "examplescheme.usesystemdefault"]) {
+    yield deleteHandlerStore();
+
+    // Create new nsIHandlerInfo instances before loading the test data.
+    let handlerInfoAbsent = HandlerServiceTestUtils.getHandlerInfo(type + "2");
+
+    // Fill the nsIHandlerInfo instance using the type that actually exists.
+    yield copyTestDataToHandlerStore();
+    gHandlerService.fillHandlerInfo(handlerInfoAbsent, type);
+    HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfoAbsent, {
+      // While the data is populated from another type, the type is unchanged.
+      type: type + "2",
+      preferredAction: Ci.nsIHandlerInfo.useSystemDefault,
+      alwaysAskBeforeHandling: false,
+      possibleApplicationHandlers: [{
+        name: "Example Possible Handler",
+        uriTemplate: "http://www.example.com/?url=%s",
+      }],
+    });
+  }
+});
+
+/**
+ * Tests "getTypeFromExtension" including unknown extensions.
+ */
+add_task(function* test_getTypeFromExtension() {
+  yield copyTestDataToHandlerStore();
+
+  do_check_eq(gHandlerService.getTypeFromExtension(""), "");
+  do_check_eq(gHandlerService.getTypeFromExtension("example_unknown"), "");
+  do_check_eq(gHandlerService.getTypeFromExtension("example_one"),
+              "example/type.handleinternally");
+  do_check_eq(gHandlerService.getTypeFromExtension("EXAMPLE_one"),
+              "example/type.handleinternally");
+});
+
+/**
+ * Checks that the information stored in the handler service instance under
+ * testing matches the default handlers for the English locale.
+ */
+function* assertAllHandlerInfosMatchDefaultHandlers() {
+  let handlerInfos = HandlerServiceTestUtils.getAllHandlerInfos();
+
+  for (let type of ["irc", "ircs"]) {
+    HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
+      type,
+      preferredActionOSDependent: true,
+      possibleApplicationHandlers: [{
+        name: "Mibbit",
+        uriTemplate: "https://www.mibbit.com/?url=%s",
+      }],
+    });
+  }
+
   HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
     type: "mailto",
-    preferredAction: Ci.nsIHandlerInfo.useSystemDefault,
-    alwaysAskBeforeHandling: false,
+    preferredActionOSDependent: true,
     possibleApplicationHandlers: [{
       name: "Yahoo! Mail",
       uriTemplate: "https://compose.mail.yahoo.com/?To=%s",
@@ -102,437 +547,65 @@ add_task(function* testLoadPredefined() {
     }],
   });
 
-  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
-    type: "nonexistent/type",
-    preferredAction: Ci.nsIHandlerInfo.handleInternally,
-    alwaysAskBeforeHandling: false,
-    fileExtensions: ["pdf"],
-  });
-
   HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfos.shift(), {
     type: "webcal",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: true,
-    preferredApplicationHandler: {
-      name: "30 Boxes",
-      uriTemplate: "http://30boxes.com/external/widget?refer=ff&url=%s",
-    },
+    preferredActionOSDependent: true,
     possibleApplicationHandlers: [{
-      name: "30 Boxes",
-      uriTemplate: "http://30boxes.com/external/widget?refer=ff&url=%s",
-    },{
       name: "30 Boxes",
       uriTemplate: "https://30boxes.com/external/widget?refer=ff&url=%s",
     }],
   });
 
   do_check_eq(handlerInfos.length, 0);
-});
+}
 
-// Verify the load mechansim of hander service by
-// - Start the hander service with DB
-// - Do some modifications on DB first and reload it
-add_task(function* testImportAndReload() {
-  // I. Prepare a testing ds first and do reload for handerService
-  yield prepareImportDB();
-  Assert.deepEqual(HandlerServiceTestUtils.getAllHandlerInfoTypes(),
-                   ["irc", "ircs", "mailto", "nonexistent/type", "webcal"]);
-
-  // II. do modifications first and reload the DS again
-  gHandlerService.store(gzipHandlerInfo);
-  gHandlerService.remove(pdfHandlerInfo);
-  yield reloadData();
-  Assert.deepEqual(HandlerServiceTestUtils.getAllHandlerInfoTypes(),
-                   ["application/x-gzip", "irc", "ircs", "mailto", "webcal"]);
-});
-
-// Verify reload without DB
-add_task(function* testReloadWithoutDB() {
-  yield removeImportDB();
-  // If we have a defaultHandlersVersion pref, then assume that we're in the
-  // firefox tree and that we'll also have default handlers.
-  if (Services.prefs.getPrefType("gecko.handlerService.defaultHandlersVersion")){
-    Assert.deepEqual(HandlerServiceTestUtils.getAllHandlerInfoTypes(),
-                     ["irc", "ircs", "mailto", "webcal"]);
-  }
-});
-
-// Do the test for exist() with store() and remove()
-add_task(function* testExists() {
-  yield prepareImportDB();
-
-  do_check_true(gHandlerService.exists(pdfHandlerInfo));
-  do_check_false(gHandlerService.exists(gzipHandlerInfo));
-
-  // Remove the handler of irc first
-  let handler = ircHandlerInfo;
-  gHandlerService.remove(handler);
-  do_check_false(gHandlerService.exists(handler));
-  gHandlerService.store(handler);
-  do_check_true(gHandlerService.exists(handler));
-});
-
-// Do the test for GetTypeFromExtension() with store(), remove() and exist()
-add_task(function* testGetTypeFromExtension() {
-  yield prepareImportDB();
-
-  let type = gHandlerService.getTypeFromExtension("doc");
-  do_check_eq(type, "");
-  type = gHandlerService.getTypeFromExtension("pdf");
-  do_check_eq(type, "nonexistent/type");
-
-  // Load the "pdf" extension into the nsIHandlerInfo for "nonexistent/type".
-  gHandlerService.fillHandlerInfo(pdfHandlerInfo, "");
-
-  gHandlerService.remove(pdfHandlerInfo);
-  do_check_false(gHandlerService.exists(pdfHandlerInfo));
-  type = gHandlerService.getTypeFromExtension("pdf");
-  do_check_eq(type, "");
-
-  gHandlerService.store(pdfHandlerInfo);
-  do_check_true(gHandlerService.exists(pdfHandlerInfo));
-  type = gHandlerService.getTypeFromExtension("pdf");
-  do_check_eq(type, "nonexistent/type");
-});
-
-// Test the functionality of fillHandlerInfo :
-//   - All the detail of handlerinfo are filled perferectly
-//   - The set of possible handlers included the preferred handler
-add_task(function* testStoreAndFillHandlerInfo() {
-  yield removeImportDB();
-
-  // Get a handler info for a MIME type that neither the application nor
-  // the OS knows about and make sure its properties are set to the proper
-  // default values.
-  let handlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  let handlerInfo2 =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type2");
-  handlerInfo2.preferredAction = Ci.nsIHandlerInfo.useSystemDefault;
-  handlerInfo2.preferredApplicationHandler = localHandler;
-  handlerInfo2.alwaysAskBeforeHandling = false;
-  handlerInfo2.appendExtension("type2");
-  gHandlerService.store(handlerInfo2);
-
-  gHandlerService.fillHandlerInfo(handlerInfo, "nonexistent/type2");
-  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfo, {
-    type: "nonexistent/type",
-    preferredAction: Ci.nsIHandlerInfo.useSystemDefault,
-    alwaysAskBeforeHandling: false,
-    fileExtensions: ["type2"],
-    preferredApplicationHandler: {
-      name: "Local Handler",
-      executable,
-    },
-    possibleApplicationHandlers: [{
-      name: "Local Handler",
-      executable,
-    }],
-  });
-});
-
-// Test the functionality of fillHandlerInfo :
-// - Check the failure case by requesting a non-existent handler type
-add_task(function* testFillHandlerInfoWithError() {
-  yield removeImportDB();
-
-  let handlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-
-  Assert.throws(
-    () => gHandlerService.fillHandlerInfo(handlerInfo, "nonexistent/type2"),
-    ex => ex.result == Cr.NS_ERROR_NOT_AVAILABLE);
-});
-
-// Test the functionality of fillHandlerInfo :
-// - Prefer handler is the first one of possibleHandlers and with only one instance
-add_task(function* testPreferHandlerIsTheFirstOrder() {
-  yield removeImportDB();
-
-  let handlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  let handlerInfo2 =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type2");
-  handlerInfo2.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-  handlerInfo2.preferredApplicationHandler = webHandler;
-  handlerInfo2.possibleApplicationHandlers.appendElement(localHandler);
-  handlerInfo2.possibleApplicationHandlers.appendElement(webHandler);
-  handlerInfo2.alwaysAskBeforeHandling = false;
-  gHandlerService.store(handlerInfo2);
-
-  gHandlerService.fillHandlerInfo(handlerInfo, "nonexistent/type2");
-  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfo, {
-    type: "nonexistent/type",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: false,
-    preferredApplicationHandler: {
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    },
-    possibleApplicationHandlers: [{
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    },{
-      name: "Local Handler",
-      executable,
-    }],
-  });
-});
-
-// Verify the handling of app handler: web handler
-add_task(function* testStoreForWebHandler() {
-  yield removeImportDB();
-
-  let handlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  let handlerInfo2 =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type2");
-  handlerInfo2.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-  handlerInfo2.preferredApplicationHandler = webHandler;
-  handlerInfo2.alwaysAskBeforeHandling = false;
-  gHandlerService.store(handlerInfo2);
-
-  gHandlerService.fillHandlerInfo(handlerInfo, "nonexistent/type2");
-  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfo, {
-    type: "nonexistent/type",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: false,
-    preferredApplicationHandler: {
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    },
-    possibleApplicationHandlers: [{
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    }],
-  });
-});
-
-// Verify the handling of app handler: DBus handler
-add_task(function* testStoreForDBusHandler() {
-  if (!("@mozilla.org/uriloader/dbus-handler-app;1" in Cc)) {
-    do_print("Skipping test because it does not apply to this platform.");
-    return;
-  }
-
-  yield removeImportDB();
-
-  let handlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  let handlerInfo2 =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type2");
-  handlerInfo2.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-  handlerInfo2.preferredApplicationHandler = dBusHandler;
-  handlerInfo2.alwaysAskBeforeHandling = false;
-  gHandlerService.store(handlerInfo2);
-
-  gHandlerService.fillHandlerInfo(handlerInfo, "nonexistent/type2");
-  let expectedHandler = {
-    name: dBusHandler.name,
-    service: dBusHandler.service,
-    method: dBusHandler.method,
-    dBusInterface: dBusHandler.dBusInterface,
-    objectPath: dBusHandler.objectPath,
-  };
-  HandlerServiceTestUtils.assertHandlerInfoMatches(handlerInfo, {
-    type: "nonexistent/type",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: false,
-    preferredApplicationHandler: expectedHandler,
-    possibleApplicationHandlers: [expectedHandler],
-  });
-});
-
-// Test the functionality of _IsInHandlerArray() by injecting default handler again
-// Since we don't have defaultHandlersVersion pref on Android, skip this test.
-// Also skip for applications like Thunderbird which don't have all the prefs.
-add_task(function* testIsInHandlerArray() {
-  if (AppConstants.platform == "android") {
-    do_print("Skipping test because it does not apply to this platform.");
-    return;
-  }
+/**
+ * Tests the default protocol handlers imported from the locale-specific data.
+ */
+add_task(function* test_default_protocol_handlers() {
   if (!Services.prefs.getPrefType("gecko.handlerService.defaultHandlersVersion")) {
-    do_print("Skipping test: No pref gecko.handlerService.defaultHandlersVersion.");
+    do_print("This platform or locale does not have default handlers.");
     return;
   }
 
-  yield removeImportDB();
+  // This will inject the default protocol handlers for the current locale.
+  yield deleteHandlerStore();
 
-  let protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  do_check_eq(protoInfo.possibleApplicationHandlers.length, 0);
-  gHandlerService.fillHandlerInfo(protoInfo, "ircs");
-  do_check_eq(protoInfo.possibleApplicationHandlers.length, 1);
+  yield assertAllHandlerInfosMatchDefaultHandlers();
+});
 
-  // Remove the handler of irc first
-  let ircInfo = HandlerServiceTestUtils.getHandlerInfo("irc");
-  gHandlerService.remove(ircInfo);
-  do_check_false(gHandlerService.exists(ircInfo));
+/**
+ * Tests that the default protocol handlers are not imported again from the
+ * locale-specific data if they already exist.
+ */
+add_task(function* test_default_protocol_handlers_no_duplicates() {
+  if (!Services.prefs.getPrefType("gecko.handlerService.defaultHandlersVersion")) {
+    do_print("This platform or locale does not have default handlers.");
+    return;
+  }
 
-  let origPrefs = Services.prefs.getComplexValue(
+  // This will inject the default protocol handlers for the current locale.
+  yield deleteHandlerStore();
+
+  // Remove the "irc" handler so we can verify that the injection is repeated.
+  let ircHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("irc");
+  gHandlerService.remove(ircHandlerInfo);
+
+  let originalDefaultHandlersVersion = Services.prefs.getComplexValue(
     "gecko.handlerService.defaultHandlersVersion", Ci.nsIPrefLocalizedString);
 
-  // Set preference as an arbitrarily high number to force injecting
-  let string = Cc["@mozilla.org/pref-localizedstring;1"]
-               .createInstance(Ci.nsIPrefLocalizedString);
-  string.data = "999";
-  Services.prefs.setComplexValue("gecko.handlerService.defaultHandlersVersion",
-                                 Ci.nsIPrefLocalizedString, string);
+  // Set the preference to an arbitrarily high number to force injecting again.
+  Services.prefs.setStringPref("gecko.handlerService.defaultHandlersVersion",
+                               "999");
 
-  // do reloading
-  yield reloadData();
+  yield unloadHandlerStore();
 
-  // check "irc" exists again to make sure that injection actually happened
-  do_check_true(gHandlerService.exists(ircInfo));
+  // Check that "irc" exists to make sure that the injection was repeated.
+  do_check_true(gHandlerService.exists(ircHandlerInfo));
 
-  // test "ircs" has only one handler to know the _IsInHandlerArray was invoked
-  protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  do_check_false(gHandlerService.exists(protoInfo));
-  gHandlerService.fillHandlerInfo(protoInfo, "ircs");
-  do_check_eq(protoInfo.possibleApplicationHandlers.length, 1);
+  // There should be no duplicate handlers in the protocols.
+  yield assertAllHandlerInfosMatchDefaultHandlers();
 
-  // reset the preference after the test
-  Services.prefs.setComplexValue("gecko.handlerService.defaultHandlersVersion",
-                                 Ci.nsIPrefLocalizedString, origPrefs);
-});
-
-// Test the basic functionality of FillHandlerInfo() for protocol
-// Since Android use mimeInfo to deal with mimeTypes and protocol, skip this test.
-// Also skip for applications like Thunderbird which don't have all the prefs.
-add_task(function* testFillHandlerInfoForProtocol() {
-  if (AppConstants.platform == "android") {
-    do_print("Skipping test because it does not apply to this platform.");
-    return;
-  }
-  if (!Services.prefs.getPrefType("gecko.handlerService.defaultHandlersVersion")) {
-    do_print("Skipping test: No pref gecko.handlerService.defaultHandlersVersion.");
-    return;
-  }
-
-  yield removeImportDB();
-
-  let protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-
-  let ircInfo = HandlerServiceTestUtils.getHandlerInfo("irc");
-  do_check_true(gHandlerService.exists(ircInfo));
-
-  gHandlerService.fillHandlerInfo(protoInfo, "irc");
-  HandlerServiceTestUtils.assertHandlerInfoMatches(protoInfo, {
-    type: "nonexistent",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: true,
-    possibleApplicationHandlers: [{
-      name: "Mibbit",
-      uriTemplate: "https://www.mibbit.com/?url=%s",
-    }],
-  });
-});
-
-
-// Test the functionality of store() and fillHandlerInfo for protocol
-add_task(function* testStoreForProtocol() {
-  yield removeImportDB();
-
-  let protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  let protoInfo2 = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent2");
-  protoInfo2.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-  protoInfo2.alwaysAskBeforeHandling = false;
-  protoInfo2.preferredApplicationHandler = webHandler;
-  gHandlerService.store(protoInfo2);
-
-  yield reloadData();
-  do_check_true(gHandlerService.exists(protoInfo2));
-
-  gHandlerService.fillHandlerInfo(protoInfo, "nonexistent2");
-  HandlerServiceTestUtils.assertHandlerInfoMatches(protoInfo, {
-    type: "nonexistent",
-    preferredAction: Ci.nsIHandlerInfo.useHelperApp,
-    alwaysAskBeforeHandling: false,
-    preferredApplicationHandler: {
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    },
-    possibleApplicationHandlers: [{
-      name: webHandler.name,
-      uriTemplate: webHandler.uriTemplate,
-    }],
-  });
-});
-
-// Test the functionality of fillHandlerInfo when there is no overrideType
-add_task(function* testFillHandlerInfoWithoutOverrideType() {
-  yield removeImportDB();
-
-  // mimeType
-  let mimeInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  let storedHandlerInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent/type");
-  storedHandlerInfo.preferredAction = Ci.nsIHandlerInfo.useSystemDefault;
-  storedHandlerInfo.preferredApplicationHandler = webHandler;
-  storedHandlerInfo.alwaysAskBeforeHandling = false;
-  gHandlerService.store(storedHandlerInfo);
-
-  // protocol type
-  let protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  let storedProtoInfo =
-      HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  storedProtoInfo.preferredAction = Ci.nsIHandlerInfo.useHelperApp;
-  storedProtoInfo.alwaysAskBeforeHandling = false;
-  storedProtoInfo.preferredApplicationHandler = webHandler;
-  gHandlerService.store(storedProtoInfo);
-
-  // Get handlerInfo by fillHandlerInfo without overrideType
-  for (let handlerInfo of [mimeInfo, protoInfo]) {
-    let handlerInfo2 = storedProtoInfo;
-    if (handlerInfo.type == "nonexistent/type") {
-      handlerInfo2 = storedHandlerInfo;
-    }
-    gHandlerService.fillHandlerInfo(handlerInfo, null);
-    do_check_eq(handlerInfo.preferredAction, handlerInfo2.preferredAction);
-    do_check_eq(handlerInfo.alwaysAskBeforeHandling,
-                handlerInfo2.alwaysAskBeforeHandling);
-    do_check_eq(handlerInfo.preferredApplicationHandler.name,
-                handlerInfo2.preferredApplicationHandler.name);
-    let apps = handlerInfo.possibleApplicationHandlers.enumerate();
-    let app;
-    if (AppConstants.platform == "android") {
-      app = apps.getNext().QueryInterface(Ci.nsIHandlerApp);
-      do_check_eq(app.name, "Android chooser");
-    }
-    app = apps.getNext().QueryInterface(Ci.nsIWebHandlerApp);
-    do_check_eq(app.name, webHandler.name);
-    do_check_eq(app.uriTemplate, webHandler.uriTemplate);
-  }
-});
-
-// Test the functionality of fillHandlerInfo() :
-// - Use "nsIHandlerInfo.useHelperApp" to replace "nsIHandlerInfo.alwaysAsk" for handlerInfo.preferredAction
-// - Use "nsIHandlerInfo.useHelperApp" to replace unknow action for handlerInfo.preferredAction
-add_task(function* testPreferredActionHandling() {
-  yield removeImportDB();
-
-  let protoInfo = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent");
-  let protoInfo2 = HandlerServiceTestUtils.getBlankHandlerInfo("nonexistent2");
-
-  for (let preferredAction of [
-    Ci.nsIHandlerInfo.saveToDisk,
-    Ci.nsIHandlerInfo.useHelperApp,
-    Ci.nsIHandlerInfo.handleInternally,
-    Ci.nsIHandlerInfo.useSystemDefault
-  ]) {
-    protoInfo2.preferredAction = preferredAction;
-    gHandlerService.store(protoInfo2);
-    gHandlerService.fillHandlerInfo(protoInfo, "nonexistent2");
-    do_check_eq(protoInfo.preferredAction, preferredAction);
-  }
-
-  for (let preferredAction of [
-    Ci.nsIHandlerInfo.alwaysAsk,
-    999
-  ]) {
-    protoInfo2.preferredAction = preferredAction;
-    gHandlerService.store(protoInfo2);
-    gHandlerService.fillHandlerInfo(protoInfo, "nonexistent2");
-    do_check_eq(protoInfo.preferredAction, Ci.nsIHandlerInfo.useHelperApp);
-  }
+  Services.prefs.setStringPref("gecko.handlerService.defaultHandlersVersion",
+                               originalDefaultHandlersVersion);
 });
diff --git a/uriloader/exthandler/tests/unit/handlers.json b/uriloader/exthandler/tests/unit/handlers.json
index 93e39b8f98cb..40e88f930ae8 100644
--- a/uriloader/exthandler/tests/unit/handlers.json
+++ b/uriloader/exthandler/tests/unit/handlers.json
@@ -1 +1,90 @@
-{"version":{"en-US":999},"mimetypes":{"nonexistent/type":{"action":3,"askBeforeHandling":false,"fileExtensions":["pdf"]}},"schemes":{"webcal":{"action":1,"askBeforeHandling":true,"preferredHandler":{"name":"30 Boxes","uriTemplate":"http://30boxes.com/external/widget?refer=ff&url=%s"},"possibleHandlers":[{"name":"30 Boxes","uriTemplate":"https://30boxes.com/external/widget?refer=ff&url=%s"}]},"ircs":{"action":1,"askBeforeHandling":true,"fileExtensions":[],"possibleHandlers":[{"name":"Mibbit","uriTemplate":"https://www.mibbit.com/?url=%s"}]},"mailto":{"action":4,"askBeforeHandling":false,"possibleHandlers":[{"name":"Yahoo! Mail","uriTemplate":"https://compose.mail.yahoo.com/?To=%s"},{"name":"Gmail","uriTemplate":"https://mail.google.com/mail/?extsrc=mailto&url=%s"}]},"irc":{"action":1,"askBeforeHandling":true,"possibleHandlers":[{"name":"Mibbit","uriTemplate":"https://www.mibbit.com/?url=%s"}]}}}
+{
+  "defaultHandlersVersion": {
+    "en-US": 999
+  },
+  "mimeTypes": {
+    "example/type.handleinternally": {
+      "unknownProperty": "preserved",
+      "action": 3,
+      "extensions": [
+        "example_one"
+      ]
+    },
+    "example/type.savetodisk": {
+      "action": 0,
+      "ask": true,
+      "handlers": [
+        {
+          "name": "Example Default Handler",
+          "uriTemplate": "https://www.example.com/?url=%s"
+        }
+      ],
+      "extensions": [
+        "example_two",
+        "example_three"
+      ]
+    },
+    "example/type.usehelperapp": {
+      "action": 2,
+      "ask": true,
+      "handlers": [
+        {
+          "name": "Example Default Handler",
+          "uriTemplate": "https://www.example.com/?url=%s"
+        },
+        {
+          "name": "Example Possible Handler One",
+          "uriTemplate": "http://www.example.com/?id=1&url=%s"
+        },
+        {
+          "name": "Example Possible Handler Two",
+          "uriTemplate": "http://www.example.com/?id=2&url=%s"
+        }
+      ],
+      "extensions": [
+        "example_two",
+        "example_three"
+      ]
+    },
+    "example/type.usesystemdefault": {
+      "action": 4,
+      "handlers": [
+        null,
+        {
+          "name": "Example Possible Handler",
+          "uriTemplate": "http://www.example.com/?url=%s"
+        }
+      ]
+    }
+  },
+  "schemes": {
+    "examplescheme.usehelperapp": {
+      "action": 2,
+      "ask": true,
+      "handlers": [
+        {
+          "name": "Example Default Handler",
+          "uriTemplate": "https://www.example.com/?url=%s"
+        },
+        {
+          "name": "Example Possible Handler One",
+          "uriTemplate": "http://www.example.com/?id=1&url=%s"
+        },
+        {
+          "name": "Example Possible Handler Two",
+          "uriTemplate": "http://www.example.com/?id=2&url=%s"
+        }
+      ]
+    },
+    "examplescheme.usesystemdefault": {
+      "action": 4,
+      "handlers": [
+        null,
+        {
+          "name": "Example Possible Handler",
+          "uriTemplate": "http://www.example.com/?url=%s"
+        }
+      ]
+    }
+  }
+}
diff --git a/uriloader/exthandler/tests/unit/head.js b/uriloader/exthandler/tests/unit/head.js
index 4244d3ef5dd4..b47c632fb908 100644
--- a/uriloader/exthandler/tests/unit/head.js
+++ b/uriloader/exthandler/tests/unit/head.js
@@ -11,6 +11,7 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/AppConstants.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -26,8 +27,7 @@ do_get_profile();
 
 let jsonPath = OS.Path.join(OS.Constants.Path.profileDir, "handlers.json");
 
-let rdfFile = Services.dirsvc.get("ProfD", Ci.nsIFile);
-rdfFile.append("mimeTypes.rdf")
+let rdfFile = FileUtils.getFile("ProfD", ["mimeTypes.rdf"]);
 
 function deleteDatasourceFile() {
   if (rdfFile.exists()) {
diff --git a/uriloader/exthandler/tests/unit/mimeTypes-android.rdf b/uriloader/exthandler/tests/unit/mimeTypes-android.rdf
index 13b59b07649c..a3df9a5bf029 100644
--- a/uriloader/exthandler/tests/unit/mimeTypes-android.rdf
+++ b/uriloader/exthandler/tests/unit/mimeTypes-android.rdf
@@ -1,78 +1,100 @@
 <?xml version="1.0"?>
 <RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:webcal"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://30boxes.com/external/widget?refer=ff&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://30boxes.com/external/widget?refer=ff&amp;url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:nonexistent/type"
-                   NC:value="nonexistent/type"
-                   NC:fileExtensions="pdf">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:nonexistent/type"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://compose.mail.yahoo.com/?To=%s"
-                   NC:prettyName="Yahoo! Mail"
-                   NC:uriTemplate="https://compose.mail.yahoo.com/?To=%s" />
-  <RDF:Description RDF:about="urn:handler:web:https://30boxes.com/external/widget?refer=ff&amp;url=%s"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="https://30boxes.com/external/widget?refer=ff&amp;url=%s" />
   <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:irc"/>
-    <RDF:li RDF:resource="urn:mimetype:ircs"/>
-    <RDF:li RDF:resource="urn:mimetype:mailto"/>
-    <RDF:li RDF:resource="urn:mimetype:nonexistent/type"/>
-    <RDF:li RDF:resource="urn:mimetype:webcal"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.handleinternally"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.savetodisk"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.usehelperapp"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.usesystemdefault"/>
+    <RDF:li RDF:resource="urn:mimetype:examplescheme.usehelperapp"/>
+    <RDF:li RDF:resource="urn:mimetype:examplescheme.usesystemdefault"/>
   </RDF:Seq>
-  <RDF:Description RDF:about="urn:mimetype:handler:nonexistent/type"
+  <RDF:Description RDF:about="urn:mimetype:example/type.usehelperapp"
+                   NC:value="example/type.usehelperapp">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.usehelperapp"/>
+    <NC:fileExtensions>example_two</NC:fileExtensions>
+    <NC:fileExtensions>example_three</NC:fileExtensions>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"
+                   NC:prettyName="Example Possible Handler Two"
+                   NC:uriTemplate="http://www.example.com/?id=2&amp;url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.handleinternally"
                    NC:handleInternal="true"
                    NC:alwaysAsk="false" />
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:webcal"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="http://30boxes.com/external/widget?refer=ff&amp;url=%s" />
-  <RDF:Description RDF:about="urn:mimetype:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:mailto"/>
+  <RDF:Description RDF:about="urn:mimetype:examplescheme.usesystemdefault"
+                   NC:value="examplescheme.usesystemdefault">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:examplescheme.usesystemdefault"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:mailto"
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:example/type.usehelperapp"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:example/type.savetodisk"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:example/type.usesystemdefault"
+                   NC:value="example/type.usesystemdefault">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.usesystemdefault"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:examplescheme.usehelperapp"
+                   NC:value="examplescheme.usehelperapp">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:examplescheme.usehelperapp"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?url=%s"
+                   NC:prettyName="Example Possible Handler"
+                   NC:uriTemplate="http://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:example/type.savetodisk"
+                   NC:value="example/type.savetodisk">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.savetodisk"/>
+    <NC:fileExtensions>example_two</NC:fileExtensions>
+    <NC:fileExtensions>example_three</NC:fileExtensions>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:handler:examplescheme.usehelperapp"
+                   NC:alwaysAsk="true">
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:examplescheme.usehelperapp"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:example/type.handleinternally"
+                   NC:value="example/type.handleinternally"
+                   NC:fileExtensions="example_one">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.handleinternally"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"
+                   NC:prettyName="Example Possible Handler One"
+                   NC:uriTemplate="http://www.example.com/?id=1&amp;url=%s" />
+  <RDF:Description RDF:about="urn:handler:web:https://www.example.com/?url=%s"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:handler:examplescheme.usesystemdefault"
                    NC:useSystemDefault="true"
                    NC:alwaysAsk="false">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://compose.mail.yahoo.com/?To=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.usesystemdefault"
+                   NC:useSystemDefault="true"
+                   NC:alwaysAsk="false">
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-  <RDF:Description RDF:about="urn:mimetype:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://30boxes.com/external/widget?refer=ff&amp;url=%s"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="http://30boxes.com/external/widget?refer=ff&amp;url=%s" />
   <RDF:Description RDF:about="urn:root"
                    NC:en-US_defaultHandlersVersion="999" />
-  <RDF:Description RDF:about="urn:mimetype:handler:irc"
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.usehelperapp"
                    NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:irc"/>
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:example/type.usehelperapp"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"/>
   </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:examplescheme.usehelperapp"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
   <RDF:Description RDF:about="urn:mimetypes">
     <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
   </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.savetodisk"
+                   NC:saveToDisk="true"
+                   NC:alwaysAsk="true">
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:example/type.savetodisk"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+  </RDF:Description>
 </RDF:RDF>
diff --git a/uriloader/exthandler/tests/unit/mimeTypes.rdf b/uriloader/exthandler/tests/unit/mimeTypes.rdf
index 09ec8baedcb6..682453569eff 100644
--- a/uriloader/exthandler/tests/unit/mimeTypes.rdf
+++ b/uriloader/exthandler/tests/unit/mimeTypes.rdf
@@ -1,83 +1,105 @@
 <?xml version="1.0"?>
 <RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:example/type.usehelperapp"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:scheme:examplescheme.usesystemdefault"
+                   NC:value="examplescheme.usesystemdefault">
+    <NC:handlerProp RDF:resource="urn:scheme:handler:examplescheme.usesystemdefault"/>
   </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:nonexistent/type"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:mimetype:handler:nonexistent/type"
-                   NC:handleInternal="true"
-                   NC:alwaysAsk="false" />
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:externalApplication:webcal"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="http://30boxes.com/external/widget?refer=ff&amp;url=%s" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
+  <RDF:Description RDF:about="urn:scheme:handler:examplescheme.usehelperapp"
                    NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
+    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:examplescheme.usehelperapp"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?url=%s"
+                   NC:prettyName="Example Possible Handler"
+                   NC:uriTemplate="http://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:scheme:handler:examplescheme.usesystemdefault"
                    NC:useSystemDefault="true"
                    NC:alwaysAsk="false">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://compose.mail.yahoo.com/?To=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
+  <RDF:Description RDF:about="urn:mimetype:example/type.savetodisk"
+                   NC:value="example/type.savetodisk">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.savetodisk"/>
+    <NC:fileExtensions>example_two</NC:fileExtensions>
+    <NC:fileExtensions>example_three</NC:fileExtensions>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:mimetype:nonexistent/type"
-                   NC:value="nonexistent/type"
-                   NC:fileExtensions="pdf">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:nonexistent/type"/>
+  <RDF:Description RDF:about="urn:mimetype:example/type.usesystemdefault"
+                   NC:value="example/type.usesystemdefault">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.usesystemdefault"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://compose.mail.yahoo.com/?To=%s"
-                   NC:prettyName="Yahoo! Mail"
-                   NC:uriTemplate="https://compose.mail.yahoo.com/?To=%s" />
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.savetodisk"
+                   NC:saveToDisk="true"
+                   NC:alwaysAsk="true">
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:example/type.savetodisk"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"
+                   NC:prettyName="Example Possible Handler One"
+                   NC:uriTemplate="http://www.example.com/?id=1&amp;url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:example/type.handleinternally"
+                   NC:value="example/type.handleinternally"
+                   NC:fileExtensions="example_one">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.handleinternally"/>
   </RDF:Description>
   <RDF:Description RDF:about="urn:root"
                    NC:en-US_defaultHandlersVersion="999" />
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.usesystemdefault"
+                   NC:useSystemDefault="true"
+                   NC:alwaysAsk="false">
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
+  <RDF:Description RDF:about="urn:scheme:externalApplication:examplescheme.usehelperapp"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Seq RDF:about="urn:mimetypes:root">
+    <RDF:li RDF:resource="urn:mimetype:example/type.handleinternally"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.savetodisk"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.usehelperapp"/>
+    <RDF:li RDF:resource="urn:mimetype:example/type.usesystemdefault"/>
+  </RDF:Seq>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.usehelperapp"
                    NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:example/type.usehelperapp"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.example.com/?url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=1&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:webcal"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://30boxes.com/external/widget?refer=ff&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://30boxes.com/external/widget?refer=ff&amp;url=%s"/>
+  <RDF:Description RDF:about="urn:scheme:examplescheme.usehelperapp"
+                   NC:value="examplescheme.usehelperapp">
+    <NC:handlerProp RDF:resource="urn:scheme:handler:examplescheme.usehelperapp"/>
   </RDF:Description>
   <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
+    <RDF:li RDF:resource="urn:scheme:examplescheme.usehelperapp"/>
+    <RDF:li RDF:resource="urn:scheme:examplescheme.usesystemdefault"/>
   </RDF:Seq>
+  <RDF:Description RDF:about="urn:handler:web:https://www.example.com/?url=%s"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:example/type.savetodisk"
+                   NC:prettyName="Example Default Handler"
+                   NC:uriTemplate="https://www.example.com/?url=%s" />
   <RDF:Description RDF:about="urn:mimetypes">
     <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://30boxes.com/external/widget?refer=ff&amp;url=%s"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="http://30boxes.com/external/widget?refer=ff&amp;url=%s" />
-  <RDF:Description RDF:about="urn:handler:web:https://30boxes.com/external/widget?refer=ff&amp;url=%s"
-                   NC:prettyName="30 Boxes"
-                   NC:uriTemplate="https://30boxes.com/external/widget?refer=ff&amp;url=%s" />
+  <RDF:Description RDF:about="urn:handler:web:http://www.example.com/?id=2&amp;url=%s"
+                   NC:prettyName="Example Possible Handler Two"
+                   NC:uriTemplate="http://www.example.com/?id=2&amp;url=%s" />
+  <RDF:Description RDF:about="urn:schemes">
+    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:handler:example/type.handleinternally"
+                   NC:handleInternal="true"
+                   NC:alwaysAsk="false" />
+  <RDF:Description RDF:about="urn:mimetype:example/type.usehelperapp"
+                   NC:value="example/type.usehelperapp">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:example/type.usehelperapp"/>
+    <NC:fileExtensions>example_two</NC:fileExtensions>
+    <NC:fileExtensions>example_three</NC:fileExtensions>
+  </RDF:Description>
 </RDF:RDF>
diff --git a/uriloader/exthandler/tests/unit/test_handlerService_json.js b/uriloader/exthandler/tests/unit/test_handlerService_json.js
index 40e9b9e15fa6..4bcd9d8bc37c 100644
--- a/uriloader/exthandler/tests/unit/test_handlerService_json.js
+++ b/uriloader/exthandler/tests/unit/test_handlerService_json.js
@@ -1,35 +1,65 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/**
- * Tests the handlerService interfaces using JSON backend.
+/*
+ * Tests the nsIHandlerService interface using the JSON backend.
  */
 
 XPCOMUtils.defineLazyServiceGetter(this, "gHandlerService",
                                    "@mozilla.org/uriloader/handler-service-json;1",
                                    "nsIHandlerService");
 
-var scriptFile = do_get_file("common_test_handlerService.js");
-Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
+/**
+ * Unloads the nsIHandlerService data store, so the back-end file can be
+ * accessed or modified, and the new data will be loaded at the next access.
+ */
+let unloadHandlerStore = Task.async(function* () {
+  // If this function is called before the nsIHandlerService instance has been
+  // initialized for the first time, the observer below will not be registered.
+  // We have to force initialization to prevent the function from stalling.
+  gHandlerService;
 
-var prepareImportDB = Task.async(function* () {
-  yield reloadData();
-
-  yield OS.File.copy(do_get_file("handlers.json").path, jsonPath);
-});
-
-var removeImportDB = Task.async(function* () {
-  yield reloadData();
-
-  yield OS.File.remove(jsonPath, { ignoreAbsent: true });
-});
-
-var reloadData = Task.async(function* () {
-  // Force the initialization of handlerService to prevent observer is not initialized yet.
-  let svc = gHandlerService;
   let promise = TestUtils.topicObserved("handlersvc-json-replace-complete");
   Services.obs.notifyObservers(null, "handlersvc-json-replace");
   yield promise;
 });
+
+/**
+ * Unloads the data store and deletes it.
+ */
+let deleteHandlerStore = Task.async(function* () {
+  yield unloadHandlerStore();
+
+  yield OS.File.remove(jsonPath, { ignoreAbsent: true });
+});
+
+/**
+ * Unloads the data store and replaces it with the test data file.
+ */
+let copyTestDataToHandlerStore = Task.async(function* () {
+  yield unloadHandlerStore();
+
+  yield OS.File.copy(do_get_file("handlers.json").path, jsonPath);
+});
+
+var scriptFile = do_get_file("common_test_handlerService.js");
+Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
+
+/**
+ * Ensures forward compatibility by checking that the "store" method preserves
+ * unknown properties in the test data. This is specific to the JSON back-end.
+ */
+add_task(function* test_store_keeps_unknown_properties() {
+  // Create a new nsIHandlerInfo instance before loading the test data.
+  yield deleteHandlerStore();
+  let handlerInfo =
+      HandlerServiceTestUtils.getHandlerInfo("example/type.handleinternally");
+
+  yield copyTestDataToHandlerStore();
+  gHandlerService.store(handlerInfo);
+
+  yield unloadHandlerStore();
+  let data = JSON.parse(new TextDecoder().decode(yield OS.File.read(jsonPath)));
+  do_check_eq(data.mimeTypes["example/type.handleinternally"].unknownProperty,
+              "preserved");
+});
diff --git a/uriloader/exthandler/tests/unit/test_handlerService_rdf.js b/uriloader/exthandler/tests/unit/test_handlerService_rdf.js
index f6205aadee61..1150d76ea937 100644
--- a/uriloader/exthandler/tests/unit/test_handlerService_rdf.js
+++ b/uriloader/exthandler/tests/unit/test_handlerService_rdf.js
@@ -1,37 +1,48 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-/**
- * Tests the handlerService interfaces using RDF backend.
+/*
+ * Tests the nsIHandlerService interface using the JSON backend.
  */
 
 XPCOMUtils.defineLazyServiceGetter(this, "gHandlerService",
                                    "@mozilla.org/uriloader/handler-service;1",
                                    "nsIHandlerService");
 
-var scriptFile = do_get_file("common_test_handlerService.js");
-Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
+/**
+ * Unloads the nsIHandlerService data store, so the back-end file can be
+ * accessed or modified, and the new data will be loaded at the next access.
+ */
+let unloadHandlerStore = Task.async(function* () {
+  // If this function is called before the nsIHandlerService instance has been
+  // initialized for the first time, the observer below will not be registered.
+  // We have to force initialization to prevent the function from stalling.
+  gHandlerService;
 
-var prepareImportDB = Task.async(function* () {
-  yield reloadData();
+  let promise = TestUtils.topicObserved("handlersvc-rdf-replace-complete");
+  Services.obs.notifyObservers(null, "handlersvc-rdf-replace");
+  yield promise;
+});
+
+/**
+ * Unloads the data store and deletes it.
+ */
+let deleteHandlerStore = Task.async(function* () {
+  yield unloadHandlerStore();
+
+  yield OS.File.remove(rdfFile.path, { ignoreAbsent: true });
+});
+
+/**
+ * Unloads the data store and replaces it with the test data file.
+ */
+let copyTestDataToHandlerStore = Task.async(function* () {
+  yield unloadHandlerStore();
 
   let fileName = AppConstants.platform == "android" ? "mimeTypes-android.rdf"
                                                     : "mimeTypes.rdf";
   yield OS.File.copy(do_get_file(fileName).path, rdfFile.path);
 });
 
-var removeImportDB = Task.async(function* () {
-  yield reloadData();
-
-  yield OS.File.remove(rdfFile.path, { ignoreAbsent: true });
-});
-
-var reloadData = Task.async(function* () {
-  // Force the initialization of handlerService to prevent observer is not initialized yet.
-  let svc = gHandlerService;
-  let promise = TestUtils.topicObserved("handlersvc-rdf-replace-complete");
-  Services.obs.notifyObservers(null, "handlersvc-rdf-replace");
-  yield promise;
-});
+var scriptFile = do_get_file("common_test_handlerService.js");
+Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
index e9e36a96be33..f7fff3df30dd 100644
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -161,7 +161,7 @@ public:
   nsCOMPtr<nsIObserver> mObserver;
   nsString mCookie;
   RefPtr<nsICancelable> mIconRequest;
-  id<FakeNSUserNotification> mPendingNotifiction;
+  id<FakeNSUserNotification> mPendingNotification;
 };
 
 NS_IMPL_ISUPPORTS0(OSXNotificationInfo)
@@ -175,7 +175,7 @@ OSXNotificationInfo::OSXNotificationInfo(NSString *name, nsIObserver *observer,
   mName = [name retain];
   mObserver = observer;
   mCookie = alertCookie;
-  mPendingNotifiction = nil;
+  mPendingNotification = nil;
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -185,7 +185,7 @@ OSXNotificationInfo::~OSXNotificationInfo()
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   [mName release];
-  [mPendingNotifiction release];
+  [mPendingNotification release];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -404,7 +404,7 @@ OSXNotificationCenter::ShowAlertWithIconData(nsIAlertNotification* aAlert,
     }
   } else {
     mPendingAlerts.AppendElement(osxni);
-    osxni->mPendingNotifiction = notification;
+    osxni->mPendingNotification = notification;
     // Wait six seconds for the image to load.
     rv = aAlert->LoadImage(6000, this, osxni,
                            getter_AddRefs(osxni->mIconRequest));
@@ -530,14 +530,14 @@ OSXNotificationCenter::ShowPendingNotification(OSXNotificationInfo *osxni)
     }
   }
 
-  [GetNotificationCenter() deliverNotification:osxni->mPendingNotifiction];
+  [GetNotificationCenter() deliverNotification:osxni->mPendingNotification];
 
   if (osxni->mObserver) {
     osxni->mObserver->Observe(nullptr, "alertshow", osxni->mCookie.get());
   }
 
-  [osxni->mPendingNotifiction release];
-  osxni->mPendingNotifiction = nil;
+  [osxni->mPendingNotification release];
+  osxni->mPendingNotification = nil;
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -548,7 +548,7 @@ OSXNotificationCenter::OnImageMissing(nsISupports* aUserData)
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
-  if (osxni->mPendingNotifiction) {
+  if (osxni->mPendingNotification) {
     // If there was an error getting the image, or the request timed out, show
     // the notification without a content image.
     ShowPendingNotification(osxni);
@@ -571,13 +571,13 @@ OSXNotificationCenter::OnImageReady(nsISupports* aUserData,
   }
 
   OSXNotificationInfo *osxni = static_cast<OSXNotificationInfo*>(aUserData);
-  if (!osxni->mPendingNotifiction) {
+  if (!osxni->mPendingNotification) {
     return NS_ERROR_FAILURE;
   }
 
   NSImage *cocoaImage = nil;
   nsCocoaUtils::CreateNSImageFromImageContainer(image, imgIContainer::FRAME_FIRST, &cocoaImage, 1.0f);
-  (osxni->mPendingNotifiction).contentImage = cocoaImage;
+  (osxni->mPendingNotification).contentImage = cocoaImage;
   [cocoaImage release];
   ShowPendingNotification(osxni);
 
diff --git a/widget/reftests/reftest-stylo.list b/widget/reftests/reftest-stylo.list
index 78fe1b539aef..dfbf0c61b5dd 100644
--- a/widget/reftests/reftest-stylo.list
+++ b/widget/reftests/reftest-stylo.list
@@ -1,6 +1,6 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 skip-if(!cocoaWidget) == 507947.html 507947.html
-fails == progressbar-fallback-default-style.html progressbar-fallback-default-style.html
+== progressbar-fallback-default-style.html progressbar-fallback-default-style.html
 == meter-native-style.html meter-native-style.html
 fails == meter-vertical-native-style.html meter-vertical-native-style.html
 fails == meter-fallback-default-style.html meter-fallback-default-style.html
diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp
index d4767817cbf3..1ecba2a5501a 100644
--- a/widget/windows/nsLookAndFeel.cpp
+++ b/widget/windows/nsLookAndFeel.cpp
@@ -64,6 +64,8 @@ static int32_t GetSystemParam(long flag, int32_t def)
 nsLookAndFeel::nsLookAndFeel()
   : nsXPLookAndFeel()
   , mUseAccessibilityTheme(0)
+  , mUseDefaultTheme(0)
+  , mNativeThemeId(eWindowsTheme_Generic)
 {
   mozilla::Telemetry::Accumulate(mozilla::Telemetry::TOUCH_ENABLED_DEVICE,
                                  WinUtils::IsTouchDeviceSupportPresent());
@@ -395,10 +397,18 @@ nsLookAndFeel::GetIntImpl(IntID aID, int32_t &aResult)
         aResult = WinUtils::IsTouchDeviceSupportPresent();
         break;
     case eIntID_WindowsDefaultTheme:
-        aResult = nsUXThemeData::IsDefaultWindowTheme();
+        if (XRE_IsContentProcess()) {
+          aResult = mUseDefaultTheme;
+        } else {
+          aResult = nsUXThemeData::IsDefaultWindowTheme();
+        }
         break;
     case eIntID_WindowsThemeIdentifier:
-        aResult = nsUXThemeData::GetNativeThemeId();
+        if (XRE_IsContentProcess()) {
+          aResult = mNativeThemeId;
+        } else {
+          aResult = nsUXThemeData::GetNativeThemeId();
+        }
         break;
 
     case eIntID_OperatingSystemVersionIdentifier:
@@ -675,10 +685,18 @@ nsLookAndFeel::GetIntCacheImpl()
   nsTArray<LookAndFeelInt> lookAndFeelIntCache =
     nsXPLookAndFeel::GetIntCacheImpl();
 
-  LookAndFeelInt useAccessibilityTheme;
-  useAccessibilityTheme.id = eIntID_UseAccessibilityTheme;
-  useAccessibilityTheme.value = GetInt(eIntID_UseAccessibilityTheme);
-  lookAndFeelIntCache.AppendElement(useAccessibilityTheme);
+  LookAndFeelInt lafInt;
+  lafInt.id = eIntID_UseAccessibilityTheme;
+  lafInt.value = GetInt(eIntID_UseAccessibilityTheme);
+  lookAndFeelIntCache.AppendElement(lafInt);
+
+  lafInt.id = eIntID_WindowsDefaultTheme;
+  lafInt.value = GetInt(eIntID_WindowsDefaultTheme);
+  lookAndFeelIntCache.AppendElement(lafInt);
+
+  lafInt.id = eIntID_WindowsThemeIdentifier;
+  lafInt.value = GetInt(eIntID_WindowsThemeIdentifier);
+  lookAndFeelIntCache.AppendElement(lafInt);
 
   return lookAndFeelIntCache;
 }
@@ -687,9 +705,16 @@ void
 nsLookAndFeel::SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache)
 {
   for (auto entry : aLookAndFeelIntCache) {
-    if (entry.id == eIntID_UseAccessibilityTheme) {
+    switch (entry.id) {
+      case eIntID_UseAccessibilityTheme:
       mUseAccessibilityTheme = entry.value;
       break;
+      case eIntID_WindowsDefaultTheme:
+      mUseDefaultTheme = entry.value;
+      break;
+      case eIntID_WindowsThemeIdentifier:
+      mNativeThemeId = entry.value;
+      break;
     }
   }
 }
diff --git a/widget/windows/nsLookAndFeel.h b/widget/windows/nsLookAndFeel.h
index c931d389a7d0..a35af9963d0e 100644
--- a/widget/windows/nsLookAndFeel.h
+++ b/widget/windows/nsLookAndFeel.h
@@ -48,7 +48,11 @@ public:
   virtual void SetIntCacheImpl(const nsTArray<LookAndFeelInt>& aLookAndFeelIntCache);
 
 private:
+  // Content process cached values that get shipped over from the browser
+  // process.
   int32_t mUseAccessibilityTheme;
+  int32_t mUseDefaultTheme; // is the current theme a known default?
+  int32_t mNativeThemeId; // see LookAndFeel enum 'WindowsTheme'
 };
 
 #endif
diff --git a/xpcom/base/ErrorList.py b/xpcom/base/ErrorList.py
index 6f785f63a3ab..8a1b22daa100 100644
--- a/xpcom/base/ErrorList.py
+++ b/xpcom/base/ErrorList.py
@@ -1064,6 +1064,7 @@ with modules["DOM_PUSH"]:
     errors["NS_ERROR_DOM_PUSH_SERVICE_UNREACHABLE"] = FAILURE(4)
     errors["NS_ERROR_DOM_PUSH_INVALID_KEY_ERR"] = FAILURE(5)
     errors["NS_ERROR_DOM_PUSH_MISMATCHED_KEY_ERR"] = FAILURE(6)
+    errors["NS_ERROR_DOM_PUSH_GCM_DISABLED"] = FAILURE(7)
 
 
 # =======================================================================
diff --git a/xpfe/appshell/nsIXULWindow.idl b/xpfe/appshell/nsIXULWindow.idl
index 27468df825c1..ae9486a36419 100644
--- a/xpfe/appshell/nsIXULWindow.idl
+++ b/xpfe/appshell/nsIXULWindow.idl
@@ -116,11 +116,14 @@ interface nsIXULWindow : nsISupports
    * @param aOpeningTab the TabParent that requested this new window be opened.
    *                    Can be left null.
    * @param aOpener The window which is requesting that this new window be opened.
+   * @param aNextTabParentId The integer ID of the next tab parent actor to use.
+   *        0 means there is no next tab parent actor to use.
    * @return the newly minted window
    */
   nsIXULWindow createNewWindow(in int32_t aChromeFlags,
                                in nsITabParent aOpeningTab,
-                               in mozIDOMWindowProxy aOpener);
+                               in mozIDOMWindowProxy aOpener,
+                               in unsigned long long aNextTabParentId);
 
   attribute nsIXULBrowserWindow XULBrowserWindow;
 
@@ -159,4 +162,11 @@ interface nsIXULWindow : nsISupports
                                                  in int32_t aDesiredHeight,
                                                  in int32_t shellItemWidth,
                                                  in int32_t shellItemHeight);
+
+  /**
+   * If the window was opened as a content window by script, this will return the
+   * integer ID of the next TabParent actor to use.
+   */
+  [noscript]
+  readonly attribute unsigned long long nextTabParentId;
 };
diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp
index a11a61f1d6c6..b1e28dfffdfc 100644
--- a/xpfe/appshell/nsXULWindow.cpp
+++ b/xpfe/appshell/nsXULWindow.cpp
@@ -107,7 +107,8 @@ nsXULWindow::nsXULWindow(uint32_t aChromeFlags)
     mRegistered(false),
     mPersistentAttributesDirty(0),
     mPersistentAttributesMask(0),
-    mChromeFlags(aChromeFlags)
+    mChromeFlags(aChromeFlags),
+    mNextTabParentId(0)
 {
 }
 
@@ -1901,13 +1902,17 @@ NS_IMETHODIMP nsXULWindow::ExitModalLoop(nsresult aStatus)
 NS_IMETHODIMP nsXULWindow::CreateNewWindow(int32_t aChromeFlags,
                                            nsITabParent *aOpeningTab,
                                            mozIDOMWindowProxy *aOpener,
+                                           uint64_t aNextTabParentId,
                                            nsIXULWindow **_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
 
-  if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)
+  if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME) {
+    MOZ_RELEASE_ASSERT(aNextTabParentId == 0,
+                       "Unexpected next tab parent ID, should never have a non-zero nextTabParentId when creating a new chrome window");
     return CreateNewChromeWindow(aChromeFlags, aOpeningTab, aOpener, _retval);
-  return CreateNewContentWindow(aChromeFlags, aOpeningTab, aOpener, _retval);
+  }
+  return CreateNewContentWindow(aChromeFlags, aOpeningTab, aOpener, aNextTabParentId, _retval);
 }
 
 NS_IMETHODIMP nsXULWindow::CreateNewChromeWindow(int32_t aChromeFlags,
@@ -1937,6 +1942,7 @@ NS_IMETHODIMP nsXULWindow::CreateNewChromeWindow(int32_t aChromeFlags,
 NS_IMETHODIMP nsXULWindow::CreateNewContentWindow(int32_t aChromeFlags,
                                                   nsITabParent *aOpeningTab,
                                                   mozIDOMWindowProxy *aOpener,
+                                                  uint64_t aNextTabParentId,
                                                   nsIXULWindow **_retval)
 {
   nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
@@ -1982,6 +1988,10 @@ NS_IMETHODIMP nsXULWindow::CreateNewContentWindow(int32_t aChromeFlags,
                                    (static_cast<nsIXULWindow*>
                                                (newWindow));
 
+  if (aNextTabParentId) {
+    xulWin->mNextTabParentId = aNextTabParentId;
+  }
+
   if (aOpener) {
     nsCOMPtr<nsIDocShell> docShell;
     xulWin->GetDocShell(getter_AddRefs(docShell));
@@ -2005,6 +2015,7 @@ NS_IMETHODIMP nsXULWindow::CreateNewContentWindow(int32_t aChromeFlags,
   }
 
   NS_ENSURE_STATE(xulWin->mPrimaryContentShell || xulWin->mPrimaryTabParent);
+  MOZ_ASSERT_IF(xulWin->mPrimaryContentShell, aNextTabParentId == 0);
 
   *_retval = newWindow;
   NS_ADDREF(*_retval);
@@ -2304,3 +2315,11 @@ nsXULWindow::GetTabCount(uint32_t* aResult)
   *aResult = 0;
   return NS_OK;
 }
+
+nsresult
+nsXULWindow::GetNextTabParentId(uint64_t* aNextTabParentId)
+{
+  NS_ENSURE_ARG_POINTER(aNextTabParentId);
+  *aNextTabParentId = mNextTabParentId;
+  return NS_OK;
+}
diff --git a/xpfe/appshell/nsXULWindow.h b/xpfe/appshell/nsXULWindow.h
index 8ce6e6986fe5..5fc106cd6823 100644
--- a/xpfe/appshell/nsXULWindow.h
+++ b/xpfe/appshell/nsXULWindow.h
@@ -123,7 +123,11 @@ protected:
       int32_t aCY);
    NS_IMETHOD ExitModalLoop(nsresult aStatus);
    NS_IMETHOD CreateNewChromeWindow(int32_t aChromeFlags, nsITabParent* aOpeningTab, mozIDOMWindowProxy* aOpenerWindow, nsIXULWindow **_retval);
-   NS_IMETHOD CreateNewContentWindow(int32_t aChromeFlags, nsITabParent* aOpeningTab, mozIDOMWindowProxy* aOpenerWindow, nsIXULWindow **_retval);
+   NS_IMETHOD CreateNewContentWindow(int32_t aChromeFlags,
+                                     nsITabParent* aOpeningTab,
+                                     mozIDOMWindowProxy* aOpenerWindow,
+                                     uint64_t aNextTabParentId,
+                                     nsIXULWindow **_retval);
    NS_IMETHOD GetHasPrimaryContent(bool* aResult);
 
    void       EnableParent(bool aEnable);
@@ -167,6 +171,7 @@ protected:
    uint32_t                mPersistentAttributesDirty; // persistentAttributes
    uint32_t                mPersistentAttributesMask;
    uint32_t                mChromeFlags;
+   uint64_t                mNextTabParentId;
    nsString                mTitle;
    nsIntRect               mOpenerScreenRect; // the screen rect of the opener