diff -Nru firefox-98.0.1+build2/browser/components/extensions/parent/ext-pkcs11.js firefox-98.0.2+build1/browser/components/extensions/parent/ext-pkcs11.js --- firefox-98.0.1+build2/browser/components/extensions/parent/ext-pkcs11.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/extensions/parent/ext-pkcs11.js 2022-03-23 06:26:27.000000000 +0000 @@ -39,19 +39,31 @@ context ); if (hostInfo) { - if (AppConstants.platform === "win") { - // If the path specified in the manifest is not an abslute path, - // translate it relative to manifest's directory. - if (!PathUtils.isAbsolute(hostInfo.manifest.path)) { - hostInfo.manifest.path = PathUtils.normalize( - PathUtils.joinRelative( - PathUtils.parent(hostInfo.path), - hostInfo.manifest.path - ) + // We don't normalize the absolute path below because + // `Path.normalize` throws when the target file doesn't + // exist, and that might be the case on non Windows + // builds. + let absolutePath = PathUtils.isAbsolute(hostInfo.manifest.path) + ? hostInfo.manifest.path + : PathUtils.joinRelative( + PathUtils.parent(hostInfo.path), + hostInfo.manifest.path ); - } + + if (AppConstants.platform === "win") { + // On Windows, `hostInfo.manifest.path` is expected to be a normalized + // absolute path. On other platforms, this path may be relative but we + // cannot use `PathUtils.normalize()` on non-absolute paths. + absolutePath = PathUtils.normalize(absolutePath); + hostInfo.manifest.path = absolutePath; } - let manifestLib = PathUtils.filename(hostInfo.manifest.path); + + // PathUtils.filename throws if the path is not an absolute path. + // The result is expected to be the basename of the file (without + // the dir path and the extension) so it is fine to use an absolute + // path that may not be normalized (non-Windows platforms). + let manifestLib = PathUtils.filename(absolutePath); + if (AppConstants.platform !== "linux") { manifestLib = manifestLib.toLowerCase(manifestLib); } diff -Nru firefox-98.0.1+build2/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js firefox-98.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js --- firefox-98.0.1+build2/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js 2022-03-23 06:26:27.000000000 +0000 @@ -111,6 +111,17 @@ add_task(async function test_pkcs11() { async function background() { try { + const { os } = await browser.runtime.getPlatformInfo(); + if (os !== "win") { + // Expect this call to not throw (explicitly cover regression fixed in Bug 1759162). + let isInstalledNonAbsolute = await browser.pkcs11.isModuleInstalled( + "testmoduleNonAbsolutePath" + ); + browser.test.assertFalse( + isInstalledNonAbsolute, + "PKCS#11 module with non absolute path expected to not be installed" + ); + } let isInstalled = await browser.pkcs11.isModuleInstalled("testmodule"); browser.test.assertFalse( isInstalled, @@ -248,6 +259,12 @@ id: "pkcs11@tests.mozilla.org", }, { + name: "testmoduleNonAbsolutePath", + description: "PKCS#11 Test Module", + path: ctypes.libraryName("pkcs11testmodule"), + id: "pkcs11@tests.mozilla.org", + }, + { name: "othermodule", description: "PKCS#11 Test Module", path: testmodule, diff -Nru firefox-98.0.1+build2/browser/components/newtab/lib/CFRPageActions.jsm firefox-98.0.2+build1/browser/components/newtab/lib/CFRPageActions.jsm --- firefox-98.0.1+build2/browser/components/newtab/lib/CFRPageActions.jsm 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/newtab/lib/CFRPageActions.jsm 2022-03-23 06:26:27.000000000 +0000 @@ -551,7 +551,8 @@ ); const { primary, secondary } = content.buttons; let primaryActionCallback; - let options = { persistent: !!content.persistent_doorhanger }; + let persistent = !!content.persistent_doorhanger; + let options = { persistent, persistWhileVisible: persistent }; let panelTitle; headerLabel.value = await this.getStrings(content.heading_text); @@ -851,16 +852,18 @@ // The browser has a recommendation specified with this host, so show // the page action pageAction.showAddressBarNotifier(recommendation); - } else if (recommendation.retain) { - // Keep the recommendation first time the user navigates away just in - // case they will go back to the previous page - pageAction.hideAddressBarNotifier(); - recommendation.retain = false; - } else { - // The user has navigated away from the specified host in the given - // browser, so the recommendation is no longer valid and should be removed - RecommendationMap.delete(browser); - pageAction.hideAddressBarNotifier(); + } else if (!recommendation.content.persistent_doorhanger) { + if (recommendation.retain) { + // Keep the recommendation first time the user navigates away just in + // case they will go back to the previous page + pageAction.hideAddressBarNotifier(); + recommendation.retain = false; + } else { + // The user has navigated away from the specified host in the given + // browser, so the recommendation is no longer valid and should be removed + RecommendationMap.delete(browser); + pageAction.hideAddressBarNotifier(); + } } } else { // There's no recommendation specified for this browser, so hide the page action diff -Nru firefox-98.0.1+build2/browser/components/newtab/test/unit/asrouter/CFRPageActions.test.js firefox-98.0.2+build1/browser/components/newtab/test/unit/asrouter/CFRPageActions.test.js --- firefox-98.0.1+build2/browser/components/newtab/test/unit/asrouter/CFRPageActions.test.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/newtab/test/unit/asrouter/CFRPageActions.test.js 2022-03-23 06:26:27.000000000 +0000 @@ -727,6 +727,7 @@ hideClose: true, eventCallback: pageAction._popupStateChange, persistent: false, + persistWhileVisible: false, } ); }); diff -Nru firefox-98.0.1+build2/browser/components/search/content/searchbar.js firefox-98.0.2+build1/browser/components/search/content/searchbar.js --- firefox-98.0.1+build2/browser/components/search/content/searchbar.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/search/content/searchbar.js 2022-03-23 06:26:27.000000000 +0000 @@ -815,10 +815,11 @@ }; this.textbox.onkeyup = event => { - if ( - event.keyCode === KeyEvent.DOM_VK_RETURN && - this._needBrowserFocusAtEnterKeyUp - ) { + // Pressing Enter key while pressing Meta key, and next, even when + // releasing Enter key before releasing Meta key, the keyup event is not + // fired. Therefore, if Enter keydown is detecting, continue the post + // processing for Enter key when any keyup event is detected. + if (this._needBrowserFocusAtEnterKeyUp) { this._needBrowserFocusAtEnterKeyUp = false; gBrowser.selectedBrowser.focus(); } diff -Nru firefox-98.0.1+build2/browser/components/search/test/browser/browser_searchbar_enter.js firefox-98.0.2+build1/browser/components/search/test/browser/browser_searchbar_enter.js --- firefox-98.0.1+build2/browser/components/search/test/browser/browser_searchbar_enter.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/search/test/browser/browser_searchbar_enter.js 2022-03-23 06:26:27.000000000 +0000 @@ -119,3 +119,38 @@ // Cleanup. await BrowserTestUtils.closeWindow(win); }); + +add_task(async function keyupEnterWhilePressingMeta() { + const win = await BrowserTestUtils.openNewBrowserWindow(); + const browser = win.gBrowser.selectedBrowser; + const searchBar = win.BrowserSearch.searchBar; + + info("Keydown Meta+Enter"); + searchBar.textbox.focus(); + searchBar.textbox.value = ""; + EventUtils.synthesizeKey( + "KEY_Enter", + { type: "keydown", metaKey: true }, + win + ); + + // Pressing Enter key while pressing Meta key, and next, even when releasing + // Enter key before releasing Meta key, the keyup event is not fired. + // Therefor, we fire Meta keyup event only. + info("Keyup Meta"); + EventUtils.synthesizeKey("KEY_Meta", { type: "keyup" }, win); + + await TestUtils.waitForCondition( + () => browser.ownerDocument.activeElement === browser, + "Wait for focus to be moved to the browser" + ); + info("The focus is moved to the browser"); + + info("Check whether we can input on the search bar"); + searchBar.textbox.focus(); + EventUtils.synthesizeKey("a", {}, win); + is(searchBar.textbox.value, "a", "Can input a char"); + + // Cleanup. + await BrowserTestUtils.closeWindow(win); +}); diff -Nru firefox-98.0.1+build2/browser/components/urlbar/tests/browser/browser_enter.js firefox-98.0.2+build1/browser/components/urlbar/tests/browser/browser_enter.js --- firefox-98.0.1+build2/browser/components/urlbar/tests/browser/browser_enter.js 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/urlbar/tests/browser/browser_enter.js 2022-03-23 06:26:28.000000000 +0000 @@ -303,3 +303,25 @@ // Cleanup. BrowserTestUtils.removeTab(tab); }); + +add_task(async function keyupEnterWhilePressingMeta() { + const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser); + + info("Keydown Meta+Enter"); + gURLBar.focus(); + gURLBar.value = ""; + EventUtils.synthesizeKey("KEY_Enter", { type: "keydown", metaKey: true }); + + // Pressing Enter key while pressing Meta key, and next, even when releasing + // Enter key before releasing Meta key, the keyup event is not fired. + // Therefor, we fire Meta keyup event only. + info("Keyup Meta"); + EventUtils.synthesizeKey("KEY_Meta", { type: "keyup" }); + + // Check whether we can input on URL bar. + EventUtils.synthesizeKey("a"); + is(gURLBar.value, "a", "Can input a char"); + + // Cleanup. + BrowserTestUtils.removeTab(tab); +}); diff -Nru firefox-98.0.1+build2/browser/components/urlbar/UrlbarInput.jsm firefox-98.0.2+build1/browser/components/urlbar/UrlbarInput.jsm --- firefox-98.0.1+build2/browser/components/urlbar/UrlbarInput.jsm 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/components/urlbar/UrlbarInput.jsm 2022-03-23 06:26:27.000000000 +0000 @@ -3250,10 +3250,17 @@ } async _on_keyup(event) { - if ( - event.keyCode === KeyEvent.DOM_VK_RETURN && - this._keyDownEnterDeferred - ) { + if (event.keyCode === KeyEvent.DOM_VK_CONTROL) { + this._isKeyDownWithCtrl = false; + } + + this._toggleActionOverride(event); + + // Pressing Enter key while pressing Meta key, and next, even when releasing + // Enter key before releasing Meta key, the keyup event is not fired. + // Therefore, if Enter keydown is detecting, continue the post processing + // for Enter key when any keyup event is detected. + if (this._keyDownEnterDeferred) { if (this._keyDownEnterDeferred.loadedContent) { try { const loadingBrowser = await this._keyDownEnterDeferred.promise; @@ -3263,24 +3270,19 @@ // Make sure the domain name stays visible for spoof protection and usability. this.selectionStart = this.selectionEnd = 0; } - this._keyDownEnterDeferred = null; } catch (ex) { // Not all the Enter actions in the urlbar will cause a navigation, then it // is normal for this to be rejected. // If _keyDownEnterDeferred was rejected on keydown, we don't nullify it here // to ensure not overwriting the new value created by keydown. } - return; + } else { + // Discard the _keyDownEnterDeferred promise to receive any key inputs immediately. + this._keyDownEnterDeferred.resolve(); } - // Discard the _keyDownEnterDeferred promise to receive any key inputs immediately. - this._keyDownEnterDeferred.resolve(); this._keyDownEnterDeferred = null; - } else if (event.keyCode === KeyEvent.DOM_VK_CONTROL) { - this._isKeyDownWithCtrl = false; } - - this._toggleActionOverride(event); } _on_compositionstart(event) { diff -Nru firefox-98.0.1+build2/browser/config/version_display.txt firefox-98.0.2+build1/browser/config/version_display.txt --- firefox-98.0.1+build2/browser/config/version_display.txt 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/config/version_display.txt 2022-03-23 06:26:28.000000000 +0000 @@ -1 +1 @@ -98.0.1 +98.0.2 diff -Nru firefox-98.0.1+build2/browser/config/version.txt firefox-98.0.2+build1/browser/config/version.txt --- firefox-98.0.1+build2/browser/config/version.txt 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/browser/config/version.txt 2022-03-23 06:26:28.000000000 +0000 @@ -1 +1 @@ -98.0.1 +98.0.2 diff -Nru firefox-98.0.1+build2/BUILDID firefox-98.0.2+build1/BUILDID --- firefox-98.0.1+build2/BUILDID 2022-03-13 21:07:36.000000000 +0000 +++ firefox-98.0.2+build1/BUILDID 2022-03-23 06:36:11.000000000 +0000 @@ -1 +1 @@ -20220313140707 \ No newline at end of file +20220322144853 \ No newline at end of file diff -Nru firefox-98.0.1+build2/config/milestone.txt firefox-98.0.2+build1/config/milestone.txt --- firefox-98.0.1+build2/config/milestone.txt 2022-03-13 20:58:08.000000000 +0000 +++ firefox-98.0.2+build1/config/milestone.txt 2022-03-23 06:26:28.000000000 +0000 @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -98.0.1 +98.0.2 diff -Nru firefox-98.0.1+build2/debian/changelog firefox-98.0.2+build1/debian/changelog --- firefox-98.0.1+build2/debian/changelog 2022-03-13 22:05:52.000000000 +0000 +++ firefox-98.0.2+build1/debian/changelog 2022-03-23 08:54:29.000000000 +0000 @@ -1,3 +1,9 @@ +firefox (98.0.2+build1-0ubuntu0.20.04.1) focal; urgency=medium + + * New upstream release (98.0.2+build1) + + -- Olivier Tilloy Wed, 23 Mar 2022 09:54:29 +0100 + firefox (98.0.1+build2-0ubuntu0.20.04.1) focal; urgency=medium * New upstream release (98.0.1+build2) diff -Nru firefox-98.0.1+build2/docshell/base/nsDocShell.cpp firefox-98.0.2+build1/docshell/base/nsDocShell.cpp --- firefox-98.0.1+build2/docshell/base/nsDocShell.cpp 2022-03-13 20:58:09.000000000 +0000 +++ firefox-98.0.2+build1/docshell/base/nsDocShell.cpp 2022-03-23 06:26:29.000000000 +0000 @@ -789,11 +789,6 @@ ("nsDocShell[%p]: loading %s with flags 0x%08x", this, aLoadState->URI()->GetSpecOrDefault().get(), aLoadState->LoadFlags())); - // Always clear mCheckingSessionHistory. MaybeHandleSubframeHistory uses it - // internally when querying session history information from the parent - // process. - mCheckingSessionHistory = false; - if ((!aLoadState->LoadIsFromSessionHistory() && !LOAD_TYPE_HAS_FLAGS(aLoadState->LoadType(), LOAD_FLAGS_REPLACE_HISTORY)) || diff -Nru firefox-98.0.1+build2/docshell/test/navigation/file_bug1758664.html firefox-98.0.2+build1/docshell/test/navigation/file_bug1758664.html --- firefox-98.0.1+build2/docshell/test/navigation/file_bug1758664.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-98.0.2+build1/docshell/test/navigation/file_bug1758664.html 2022-03-23 06:26:29.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + + + + + diff -Nru firefox-98.0.1+build2/docshell/test/navigation/mochitest.ini firefox-98.0.2+build1/docshell/test/navigation/mochitest.ini --- firefox-98.0.1+build2/docshell/test/navigation/mochitest.ini 2022-03-13 20:58:10.000000000 +0000 +++ firefox-98.0.2+build1/docshell/test/navigation/mochitest.ini 2022-03-23 06:26:29.000000000 +0000 @@ -106,6 +106,9 @@ cache_control_max_age_3600.sjs [test_bug1750973.html] support-files = file_bug1750973.html +[test_bug1758664.html] +support-files = file_bug1758664.html +skip-if = !sessionHistoryInParent # the old implementation behaves inconsistently [test_bug270414.html] [test_bug278916.html] [test_bug279495.html] diff -Nru firefox-98.0.1+build2/docshell/test/navigation/test_bug1758664.html firefox-98.0.2+build1/docshell/test/navigation/test_bug1758664.html --- firefox-98.0.1+build2/docshell/test/navigation/test_bug1758664.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-98.0.2+build1/docshell/test/navigation/test_bug1758664.html 2022-03-23 06:26:29.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + Bug 1758664 + + + + + +

+ +

+
+
diff -Nru firefox-98.0.1+build2/dom/base/test/test_bug338583.html firefox-98.0.2+build1/dom/base/test/test_bug338583.html
--- firefox-98.0.1+build2/dom/base/test/test_bug338583.html	2022-03-13 20:58:09.000000000 +0000
+++ firefox-98.0.2+build1/dom/base/test/test_bug338583.html	2022-03-23 06:26:29.000000000 +0000
@@ -338,7 +338,7 @@
   }
 
   function doTest3_g(test_id) {
-    gEventSourceObj3_g = new EventSource("http://hdfskjghsbg.jtiyoejowe.dafsgbhjab.com");
+    gEventSourceObj3_g = new EventSource("http://hdfskjghsbg.jtiyoejowe.example.com");
 
     gEventSourceObj3_g.onmessage = fn_onmessage;
     gEventSourceObj3_g.hits = [];
diff -Nru firefox-98.0.1+build2/dom/localstorage/ActorsChild.cpp firefox-98.0.2+build1/dom/localstorage/ActorsChild.cpp
--- firefox-98.0.1+build2/dom/localstorage/ActorsChild.cpp	2022-03-13 20:58:11.000000000 +0000
+++ firefox-98.0.2+build1/dom/localstorage/ActorsChild.cpp	2022-03-23 06:26:30.000000000 +0000
@@ -141,7 +141,7 @@
 
   QM_TRY_INSPECT(const auto& principal,
                  PrincipalInfoToPrincipal(aPrincipalInfo),
-                 IPC_FAIL_NO_REASON(this));
+                 IPC_FAIL(this, "PrincipalInfoToPrincipal failed!"));
 
   Storage::NotifyChange(/* aStorage */ nullptr, principal, aKey,
                         aOldValue.AsString(), aNewValue.AsString(),
diff -Nru firefox-98.0.1+build2/dom/localstorage/ActorsParent.cpp firefox-98.0.2+build1/dom/localstorage/ActorsParent.cpp
--- firefox-98.0.1+build2/dom/localstorage/ActorsParent.cpp	2022-03-13 20:58:11.000000000 +0000
+++ firefox-98.0.2+build1/dom/localstorage/ActorsParent.cpp	2022-03-23 06:26:30.000000000 +0000
@@ -3197,13 +3197,13 @@
   }
 
   if (NS_WARN_IF(!gPreparedDatastores)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
   PreparedDatastore* preparedDatastore = gPreparedDatastores->Get(aDatastoreId);
   if (NS_WARN_IF(!preparedDatastore)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
@@ -3272,13 +3272,13 @@
   }
 
   if (NS_WARN_IF(!gPreparedObsevers)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
   RefPtr observer = gPreparedObsevers->Get(aObserverId);
   if (NS_WARN_IF(!observer)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
@@ -5434,7 +5434,7 @@
 
   IProtocol* mgr = Manager();
   if (!PBackgroundLSDatabaseParent::Send__delete__(this)) {
-    return IPC_FAIL_NO_REASON(mgr);
+    return IPC_FAIL(mgr, "Send__delete__ failed!");
   }
   return IPC_OK();
 }
@@ -5443,8 +5443,7 @@
   AssertIsOnBackgroundThread();
 
   if (NS_WARN_IF(mAllowedToClose)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mAllowedToClose already set!");
   }
 
   AllowToClose();
@@ -5459,12 +5458,12 @@
   AssertIsOnBackgroundThread();
 
   if (NS_WARN_IF(aIncreasePeakUsage && aMinSize < 0)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
   if (NS_WARN_IF(mAllowedToClose)) {
-    MOZ_CRASH_UNLESS_FUZZING();
+    MOZ_ASSERT_UNLESS_FUZZING(false);
     return nullptr;
   }
 
@@ -5629,7 +5628,7 @@
 
   IProtocol* mgr = Manager();
   if (!PBackgroundLSSnapshotParent::Send__delete__(this)) {
-    return IPC_FAIL_NO_REASON(mgr);
+    return IPC_FAIL(mgr, "Send__delete__ failed!");
   }
   return IPC_OK();
 }
@@ -5641,13 +5640,11 @@
   MOZ_ASSERT(mPeakUsage >= mUsage);
 
   if (NS_WARN_IF(aWriteInfos.IsEmpty())) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "aWriteInfos is empty!");
   }
 
   if (NS_WARN_IF(mHasOtherProcessObservers)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mHasOtherProcessObservers already set!");
   }
 
   mDatastore->BeginUpdateBatch(mUsage);
@@ -5695,13 +5692,11 @@
   MOZ_ASSERT(mPeakUsage >= mUsage);
 
   if (NS_WARN_IF(aWriteAndNotifyInfos.IsEmpty())) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "aWriteAndNotifyInfos is empty!");
   }
 
   if (NS_WARN_IF(!mHasOtherProcessObservers)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mHasOtherProcessObservers is not set!");
   }
 
   mDatastore->BeginUpdateBatch(mUsage);
@@ -5760,8 +5755,7 @@
   AssertIsOnBackgroundThread();
 
   if (NS_WARN_IF(mFinishReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mFinishReceived already set!");
   }
 
   Finish();
@@ -5773,23 +5767,19 @@
   AssertIsOnBackgroundThread();
 
   if (NS_WARN_IF(mFinishReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mFinishReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadedReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadedReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadedAllItems)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadedAllItems already set!");
   }
 
   if (NS_WARN_IF(mLoadKeysReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadKeysReceived already set!");
   }
 
   mLoadedReceived = true;
@@ -5812,23 +5802,23 @@
   MOZ_ASSERT(mDatastore);
 
   if (NS_WARN_IF(mFinishReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mFinishReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadedReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadedReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadedAllItems)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadedAllItems already set!");
   }
 
-  if (mLoadedItems.Contains(aKey) || mUnknownItems.Contains(aKey)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+  if (mLoadedItems.Contains(aKey)) {
+    return IPC_FAIL(this, "mLoadedItems already contains aKey!");
+  }
+
+  if (mUnknownItems.Contains(aKey)) {
+    return IPC_FAIL(this, "mUnknownItems already contains aKey!");
   }
 
   if (auto entry = mValues.Lookup(aKey)) {
@@ -5953,18 +5943,15 @@
   MOZ_ASSERT(mDatastore);
 
   if (NS_WARN_IF(mFinishReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mFinishReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadedReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadedReceived already set!");
   }
 
   if (NS_WARN_IF(mLoadKeysReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mLoadKeysReceived already set!");
   }
 
   mLoadKeysReceived = true;
@@ -5984,13 +5971,11 @@
   MOZ_ASSERT(aSize);
 
   if (NS_WARN_IF(aMinSize <= 0)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "aMinSize not valid!");
   }
 
   if (NS_WARN_IF(mFinishReceived)) {
-    MOZ_CRASH_UNLESS_FUZZING();
-    return IPC_FAIL_NO_REASON(this);
+    return IPC_FAIL(this, "mFinishReceived already set!");
   }
 
   int64_t size =
@@ -6067,7 +6052,7 @@
 
   IProtocol* mgr = Manager();
   if (!PBackgroundLSObserverParent::Send__delete__(this)) {
-    return IPC_FAIL_NO_REASON(mgr);
+    return IPC_FAIL(mgr, "Send__delete__ failed!");
   }
   return IPC_OK();
 }
@@ -6441,7 +6426,7 @@
 
   IProtocol* mgr = Manager();
   if (!PBackgroundLSRequestParent::Send__delete__(this, NS_ERROR_FAILURE)) {
-    return IPC_FAIL_NO_REASON(mgr);
+    return IPC_FAIL(mgr, "Send__delete__ failed!");
   }
 
   return IPC_OK();
diff -Nru firefox-98.0.1+build2/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocator.java firefox-98.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocator.java
--- firefox-98.0.1+build2/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocator.java	2022-03-13 20:58:23.000000000 +0000
+++ firefox-98.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceAllocator.java	2022-03-23 06:26:42.000000000 +0000
@@ -81,9 +81,13 @@
       }
 
       final GeckoSurface surface = sAllocator.acquireSurface(width, height, singleBufferMode);
+      if (surface == null) {
+        Log.w(LOGTAG, "Failed to acquire GeckoSurface: RemoteSurfaceAllocator returned null");
+        return null;
+      }
       sSurfaces.put(surface.getHandle(), surface);
 
-      if (surface != null && !surface.inProcess()) {
+      if (!surface.inProcess()) {
         sAllocator.configureSync(surface.initSyncSurface(width, height));
       }
       return surface;
diff -Nru firefox-98.0.1+build2/modules/libpref/init/StaticPrefList.yaml firefox-98.0.2+build1/modules/libpref/init/StaticPrefList.yaml
--- firefox-98.0.1+build2/modules/libpref/init/StaticPrefList.yaml	2022-03-13 20:58:23.000000000 +0000
+++ firefox-98.0.2+build1/modules/libpref/init/StaticPrefList.yaml	2022-03-23 06:26:42.000000000 +0000
@@ -9492,7 +9492,11 @@
 # reached. The total size of the ring-buffer is slightly bigger than this.
 - name: media.audio.audiosink.threshold_ms
   type: AtomicFloat
+#if defined(XP_MACOSX) && defined(__aarch64__)
   value: 1000.0
+#else
+  value: 200.0
+#endif
   mirror: always
 
 
diff -Nru firefox-98.0.1+build2/netwerk/base/LoadInfo.cpp firefox-98.0.2+build1/netwerk/base/LoadInfo.cpp
--- firefox-98.0.1+build2/netwerk/base/LoadInfo.cpp	2022-03-13 20:58:23.000000000 +0000
+++ firefox-98.0.2+build1/netwerk/base/LoadInfo.cpp	2022-03-23 06:26:42.000000000 +0000
@@ -1840,9 +1840,12 @@
   MOZ_DIAGNOSTIC_ASSERT(mInitialClientInfo.isNothing());
   // Treat assignments of the same value as a no-op.  The emplace below
   // will normally assert when overwriting an existing value.
-  if (mReservedClientInfo.isSome() &&
-      mReservedClientInfo.ref() == aClientInfo) {
-    return;
+  if (mReservedClientInfo.isSome()) {
+    if (mReservedClientInfo.ref() == aClientInfo) {
+      return;
+    }
+    MOZ_DIAGNOSTIC_ASSERT(false, "mReservedClientInfo already set");
+    mReservedClientInfo.reset();
   }
   mReservedClientInfo.emplace(aClientInfo);
 }
diff -Nru firefox-98.0.1+build2/services/settings/dumps/blocklists/addons-bloomfilters.json firefox-98.0.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json
--- firefox-98.0.1+build2/services/settings/dumps/blocklists/addons-bloomfilters.json	2022-03-13 20:58:25.000000000 +0000
+++ firefox-98.0.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json	2022-03-23 06:26:44.000000000 +0000
@@ -3,6 +3,114 @@
     {
       "stash": {
         "blocked": [
+          "ols@f-secure.com:2.218.7700",
+          "ols@f-secure.com:2.210.7353",
+          "ols@f-secure.com:2.236.8012",
+          "ols@f-secure.com:2.237.8018",
+          "ols@f-secure.com:2.216.7560",
+          "ols@f-secure.com:2.220.7818",
+          "ols@f-secure.com:2.234.7980",
+          "ols@f-secure.com:3.0.32",
+          "ols@f-secure.com:2.218.7669",
+          "ols@f-secure.com:3.0.2",
+          "ols@f-secure.com:2.235.7991",
+          "ols@f-secure.com:2.200.6884",
+          "ols@f-secure.com:2.198.6718",
+          "ols@f-secure.com:2.208.7282",
+          "ols@f-secure.com:2.211.7392",
+          "ols@f-secure.com:3.0.27",
+          "ols@f-secure.com:2.225.7869",
+          "ols@f-secure.com:2.202.7041",
+          "ols@f-secure.com:2.232.7959",
+          "ols@f-secure.com:2.208.7289",
+          "ols@f-secure.com:4.0.52",
+          "ols@f-secure.com:2.215.7447",
+          "ols@f-secure.com:3.0.16",
+          "ols@f-secure.com:2.204.7103",
+          "ols@f-secure.com:2.220.7791",
+          "ols@f-secure.com:2.216.7581",
+          "ols@f-secure.com:2.208.7298",
+          "ols@f-secure.com:2.201.6961",
+          "ols@f-secure.com:2.198.6588",
+          "ols@f-secure.com:2.216.7528",
+          "ols@f-secure.com:2.229.7912",
+          "ols@f-secure.com:2.216.7574",
+          "ols@f-secure.com:2.216.7455",
+          "ols@f-secure.com:2.203.7079",
+          "ols@f-secure.com:3.0.7",
+          "ols@f-secure.com:2.235.7986",
+          "ols@f-secure.com:2.209.7319",
+          "ols@f-secure.com:3.0.22",
+          "ols@f-secure.com:2.206.7237",
+          "ols@f-secure.com:3.0.8",
+          "ols@f-secure.com:2.214.7440",
+          "ols@f-secure.com:3.0.3",
+          "ols@f-secure.com:2.213.7420",
+          "ols@f-secure.com:2.199.6780",
+          "ols@f-secure.com:2.210.7376",
+          "ols@f-secure.com:2.225.7888",
+          "ols@f-secure.com:2.210.7362",
+          "ols@f-secure.com:2.220.7741",
+          "ols@f-secure.com:2.209.7351"
+        ],
+        "unblocked": []
+      },
+      "schema": 1647603683249,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1647606908120,
+      "id": "448ec411-adff-458d-9e00-a31dd423e410",
+      "last_modified": 1647607093105
+    },
+    {
+      "stash": {
+        "blocked": [
+          "websigner@softplan.com.br:2.13.1",
+          "websigner@softplan.com.br:2.7.0",
+          "websigner@softplan.com.br:2.7.3",
+          "websigner@softplan.com.br:2.8.0",
+          "{78db226a-5912-4e93-9131-9451cf39e549}:0.0.1",
+          "websigner@softplan.com.br:2.14.2",
+          "websigner@softplan.com.br:2.7.1"
+        ],
+        "unblocked": []
+      },
+      "schema": 1647434307680,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1647455708203,
+      "id": "882bdc6e-d8ea-42d8-8c8c-17e13cff2341",
+      "last_modified": 1647455905378
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": []
+      },
+      "schema": 1647348483409,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1647434108889,
+      "id": "ec2716c4-9649-4782-93b5-4e66d0793e0e",
+      "last_modified": 1647434307625
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{cdef9c8a-fa00-4334-91c8-54a7d2424765}:1.0",
+          "{d2c01590-0add-481e-a2e2-673339d62fd3}:0.4",
+          "{07971367-aaa1-47e7-bff1-d80c6c8ce8ba}:0.6",
+          "{972f4d17-e8c7-44da-bffa-abe57b238a69}:0.2",
+          "{ee4fecd3-2e71-4517-bf26-500446b09d20}:1.0.2"
+        ],
+        "unblocked": []
+      },
+      "schema": 1647281954531,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1647347707957,
+      "id": "db2685c9-b525-460a-931b-78d95acc843e",
+      "last_modified": 1647347904463
+    },
+    {
+      "stash": {
+        "blocked": [
           "{45bd75b9-f91d-439c-a265-f18a23fdcc23}:1.1",
           "{45bd75b9-f91d-439c-a265-f18a23fdcc23}:0.1",
           "{9eb47e6e-8134-4b2a-afcf-cefd687c5078}:0.1",
diff -Nru firefox-98.0.1+build2/services/settings/dumps/main/search-config.json firefox-98.0.2+build1/services/settings/dumps/main/search-config.json
--- firefox-98.0.1+build2/services/settings/dumps/main/search-config.json	2022-03-13 20:58:25.000000000 +0000
+++ firefox-98.0.2+build1/services/settings/dumps/main/search-config.json	2022-03-23 06:26:43.000000000 +0000
@@ -1,421 +1,6 @@
 {
   "data": [
     {
-      "schema": 1639069022290,
-      "appliesTo": [
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-drp"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "2039342",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-planb"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1857376",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-portals"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1923034",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-ru"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1923018",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-tr"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1953197",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-tr-gezginler"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1945716",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-tr-tamindir"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1945686",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "uk"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "yandex-uk"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "1923018",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ],
-          "webExtension": {
-            "locales": [
-              "ua"
-            ]
-          }
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "yandex-ru-mz"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "2320519",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            }
-          ]
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "ru",
-                "tr",
-                "be",
-                "kk"
-              ],
-              "startsWith": [
-                "en"
-              ]
-            },
-            "regions": [
-              "ru",
-              "tr",
-              "by",
-              "kz"
-            ]
-          },
-          "telemetryId": "yandex-en",
-          "webExtension": {
-            "locales": [
-              "en"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "az"
-              ]
-            }
-          },
-          "telemetryId": "yandex-az",
-          "webExtension": {
-            "locales": [
-              "az"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "be"
-              ]
-            }
-          },
-          "telemetryId": "yandex-by",
-          "webExtension": {
-            "locales": [
-              "by"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "kk"
-              ]
-            }
-          },
-          "telemetryId": "yandex-kk",
-          "webExtension": {
-            "locales": [
-              "kk"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "ru"
-              ]
-            }
-          },
-          "telemetryId": "yandex-ru",
-          "webExtension": {
-            "locales": [
-              "ru"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "tr"
-              ]
-            }
-          },
-          "telemetryId": "yandex-tr",
-          "webExtension": {
-            "locales": [
-              "tr"
-            ]
-          }
-        },
-        {
-          "default": "no",
-          "override": true,
-          "application": {
-            "distributions": [
-              "mailru-001",
-              "okru-001"
-            ]
-          }
-        },
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "text",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "application": {
-            "distributions": [
-              "mint-001"
-            ]
-          },
-          "extraParams": [
-            {
-              "name": "clid",
-              "value": "2508838",
-              "purpose": "searchbar",
-              "condition": "purpose"
-            },
-            {
-              "name": "clid",
-              "value": "2508841",
-              "purpose": "keyword",
-              "condition": "purpose"
-            }
-          ],
-          "telemetryId": "yandex-mint"
-        }
-      ],
-      "extraParams": [
-        {
-          "name": "clid",
-          "value": "2186618",
-          "purpose": "searchbar",
-          "condition": "purpose"
-        },
-        {
-          "name": "clid",
-          "value": "2186621",
-          "purpose": "keyword",
-          "condition": "purpose"
-        },
-        {
-          "name": "clid",
-          "value": "2186623",
-          "purpose": "contextmenu",
-          "condition": "purpose"
-        },
-        {
-          "name": "clid",
-          "value": "2186617",
-          "purpose": "homepage",
-          "condition": "purpose"
-        },
-        {
-          "name": "clid",
-          "value": "2186620",
-          "purpose": "newtab",
-          "condition": "purpose"
-        }
-      ],
-      "webExtension": {
-        "id": "yandex@search.mozilla.org"
-      },
-      "id": "a0e7f96a-14e0-4d56-9f54-e0c7e49fd306",
-      "last_modified": 1639155658146
-    },
-    {
       "params": {
         "searchUrlGetParams": [
           {
@@ -428,10 +13,18 @@
           }
         ]
       },
-      "schema": 1638818935195,
+      "schema": 1647173200890,
       "appliesTo": [
         {
           "default": "yes-if-no-other",
+          "excluded": {
+            "regions": [
+              "ru",
+              "tr",
+              "by",
+              "kz"
+            ]
+          },
           "included": {
             "everywhere": true
           }
@@ -469,67 +62,24 @@
           "telemetryId": "google-b-e"
         },
         {
-          "default": "no",
-          "included": {
-            "locales": {
-              "matches": [
-                "ru",
-                "tr",
-                "be",
-                "kk"
-              ],
-              "startsWith": [
-                "en"
-              ]
-            },
-            "regions": [
-              "ru",
-              "tr",
-              "by",
-              "kz"
-            ],
-            "telemetryId": "google"
-          }
-        },
-        {
           "params": {
             "searchUrlGetParams": [
               {
-                "name": "client",
-                "value": "firefox-b-e"
-              },
-              {
                 "name": "q",
                 "value": "{searchTerms}"
               }
             ]
           },
-          "default": "no",
+          "default": "yes",
           "included": {
-            "locales": {
-              "matches": [
-                "ru",
-                "tr",
-                "be",
-                "kk"
-              ],
-              "startsWith": [
-                "en"
-              ]
-            },
             "regions": [
               "ru",
               "tr",
               "by",
               "kz"
-            ],
-            "telemetryId": "google"
-          },
-          "application": {
-            "channel": [
-              "esr"
             ]
-          }
+          },
+          "telemetryId": "google-com-nocodes"
         },
         {
           "default": "no",
@@ -722,7 +272,7 @@
         "id": "google@search.mozilla.org"
       },
       "id": "cb8e7210-9f0b-48fa-8708-b9a03df79eea",
-      "last_modified": 1639155658144
+      "last_modified": 1647254756387
     },
     {
       "params": {
@@ -2653,225 +2203,6 @@
       "last_modified": 1589299342073
     },
     {
-      "schema": 1588177656482,
-      "appliesTo": [
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "ru"
-              ]
-            }
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "ru"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "mailru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "mailru001"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "az"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-az"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "en-US"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-en-US"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "hy-AM"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-hy-AM"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "kk"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-kk"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "ro"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-ro"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "ru"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-ru"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "tr"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-tr"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "uk"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-uk"
-            ]
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "uz"
-              ]
-            }
-          },
-          "application": {
-            "distributions": [
-              "okru-001"
-            ]
-          },
-          "webExtension": {
-            "locales": [
-              "okru-uz"
-            ]
-          }
-        }
-      ],
-      "webExtension": {
-        "id": "mailru@search.mozilla.org"
-      },
-      "id": "e0ca4964-e324-44e7-80b6-16a831706d17",
-      "last_modified": 1589299342033
-    },
-    {
       "schema": 1588177653636,
       "appliesTo": [
         {
diff -Nru firefox-98.0.1+build2/services/settings/dumps/main/search-telemetry-v2.json firefox-98.0.2+build1/services/settings/dumps/main/search-telemetry-v2.json
--- firefox-98.0.1+build2/services/settings/dumps/main/search-telemetry-v2.json	2022-03-13 20:58:25.000000000 +0000
+++ firefox-98.0.2+build1/services/settings/dumps/main/search-telemetry-v2.json	2022-03-23 06:26:43.000000000 +0000
@@ -1,6 +1,40 @@
 {
   "data": [
     {
+      "schema": 1647536413492,
+      "taggedCodes": [
+        "ffab",
+        "ffcm",
+        "ffhp",
+        "ffip",
+        "ffit",
+        "ffnt",
+        "ffocus",
+        "ffos",
+        "ffsb",
+        "fpas",
+        "fpsa",
+        "ftas",
+        "ftsa",
+        "newext"
+      ],
+      "telemetryId": "duckduckgo",
+      "organicCodes": [],
+      "codeParamName": "t",
+      "queryParamName": "q",
+      "searchPageRegexp": "^https://duckduckgo\\.com/",
+      "expectedOrganicCodes": [
+        "hz",
+        "h_"
+      ],
+      "extraAdServersRegexps": [
+        "^https://duckduckgo.com/y\\.js?.*ad_provider\\=",
+        "^https://www\\.amazon\\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)"
+      ],
+      "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca",
+      "last_modified": 1647619735693
+    },
+    {
       "schema": 1643096116299,
       "taggedCodes": [
         "MOZ2",
@@ -86,36 +120,6 @@
       "last_modified": 1643136933998
     },
     {
-      "schema": 1643100257574,
-      "taggedCodes": [
-        "ffab",
-        "ffcm",
-        "ffhp",
-        "ffip",
-        "ffit",
-        "ffnt",
-        "ffocus",
-        "ffos",
-        "ffsb",
-        "fpas",
-        "fpsa",
-        "ftas",
-        "ftsa",
-        "newext"
-      ],
-      "telemetryId": "duckduckgo",
-      "organicCodes": [],
-      "codeParamName": "t",
-      "queryParamName": "q",
-      "searchPageRegexp": "^https://duckduckgo\\.com/",
-      "extraAdServersRegexps": [
-        "^https://duckduckgo.com/y\\.js?.*ad_provider\\=",
-        "^https://www\\.amazon\\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)"
-      ],
-      "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca",
-      "last_modified": 1643136933995
-    },
-    {
       "schema": 1643100258578,
       "telemetryId": "yahoo",
       "queryParamName": "p",
diff -Nru firefox-98.0.1+build2/services/settings/dumps/security-state/intermediates.json firefox-98.0.2+build1/services/settings/dumps/security-state/intermediates.json
--- firefox-98.0.1+build2/services/settings/dumps/security-state/intermediates.json	2022-03-13 20:58:25.000000000 +0000
+++ firefox-98.0.2+build1/services/settings/dumps/security-state/intermediates.json	2022-03-23 06:26:44.000000000 +0000
@@ -1,6 +1,780 @@
 {
   "data": [
     {
+      "schema": 1647701328614,
+      "derHash": "mKDDuhiZJYWV0E8V0TTFcy6GS3VcZIpI0cF/CiYO9ac=",
+      "subject": "CN=TrustSafe TLS RSA SubCA R1,O=Isimtescil Bilisim A.S.,C=TR",
+      "subjectDN": "MFQxCzAJBgNVBAYTAlRSMSAwHgYDVQQKDBdJc2ltdGVzY2lsIEJpbGlzaW0gQS5TLjEjMCEGA1UEAwwaVHJ1c3RTYWZlIFRMUyBSU0EgU3ViQ0EgUjE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "90c93b3a50c031ef4beb4224d3085eafa66d1c8be8d4bc2bdeea1476967ed709",
+        "size": 2365,
+        "filename": "_SrUGYsWpDW44q_gIPL4e-vKroLPu0_n0OySZvb5g6U=.pem",
+        "location": "security-state-staging/intermediates/9849321e-0fe1-42f2-a509-ed0dcfa3b2e1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "/SrUGYsWpDW44q/gIPL4e+vKroLPu0/n0OySZvb5g6U=",
+      "crlite_enrolled": true,
+      "id": "0fc46ca8-adb2-450b-9bd7-49706b5eca52",
+      "last_modified": 1647701842317
+    },
+    {
+      "schema": 1647701328249,
+      "derHash": "mH/y47JaOhTLhD2Qezx/AHwnSSGvwQAX+F1PrnsMuLY=",
+      "subject": "CN=DigiCert Assured ID TLS RSA4096 SHA256 2022 CA1,O=DigiCert\\, Inc.,C=US",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgQXNzdXJlZCBJRCBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "ea98651742d65855a2b89e7d033a40bf1adf3bb22e730eda3ea9896019690d52",
+        "size": 2089,
+        "filename": "t6F6ltc_eNYw0WY4vUTTo7SvuavxVPXIIpqLyWMQG-g=.pem",
+        "location": "security-state-staging/intermediates/27c32677-48fe-4613-8b2f-ca869cef0d85.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "t6F6ltc/eNYw0WY4vUTTo7SvuavxVPXIIpqLyWMQG+g=",
+      "crlite_enrolled": true,
+      "id": "3ef3ce19-bcfb-484b-9e2e-253adcc956b5",
+      "last_modified": 1647701842304
+    },
+    {
+      "schema": 1647701328071,
+      "derHash": "lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=",
+      "subject": "CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
+      "subjectDN": "MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b",
+        "size": 1727,
+        "filename": "8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem",
+        "location": "security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=",
+      "crlite_enrolled": true,
+      "id": "549c92e2-3738-4c8c-ae37-407e4e6158ce",
+      "last_modified": 1647701842291
+    },
+    {
+      "schema": 1647701328427,
+      "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=",
+      "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN",
+      "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b",
+        "size": 1963,
+        "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem",
+        "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=",
+      "crlite_enrolled": true,
+      "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2",
+      "last_modified": 1647701842277
+    },
+    {
+      "schema": 1647680259122,
+      "derHash": "4i5rJZCOEQemB68GDgsk5QxtlWL/BPRVvg+N9BpQMsA=",
+      "subject": "CN=SZAFIR Trusted CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL",
+      "subjectDN": "MFQxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRswGQYDVQQDDBJTWkFGSVIgVHJ1c3RlZCBDQTI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "b998d1830338d9ca1bada5e5e1a33ef3a5f89c9c13ccfa1b8ea7a2f3aea980a1",
+        "size": 1825,
+        "filename": "Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=.pem",
+        "location": "security-state-staging/intermediates/d47f17a5-7858-4e12-ac5e-0454f2a87e62.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=",
+      "crlite_enrolled": true,
+      "id": "43f6861b-21c6-4ebd-a31e-6d9e61e879af",
+      "last_modified": 1647701842264
+    },
+    {
+      "schema": 1647701328797,
+      "derHash": "puYUXPpzIrIt1vuvHfgzN4jbefGbEbaVz8kHtA0paQg=",
+      "subject": "CN=PSW GROUP (RSA) OV CA,O=PSW GROUP GmbH & Co. KG,C=DE",
+      "subjectDN": "ME8xCzAJBgNVBAYTAkRFMSAwHgYDVQQKDBdQU1cgR1JPVVAgR21iSCAmIENvLiBLRzEeMBwGA1UEAxMVUFNXIEdST1VQIChSU0EpIE9WIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "89a81c5442a54c9e5195381aa5bf5118b69c785fe73b5919acc00fa7735b5960",
+        "size": 2081,
+        "filename": "XJxD3hWuTDkFb4_QXFPChkZ3hlp9UIhypa5Cf40iwOE=.pem",
+        "location": "security-state-staging/intermediates/ea0a20eb-041e-467e-9b0a-9cc38c85baf8.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "XJxD3hWuTDkFb4/QXFPChkZ3hlp9UIhypa5Cf40iwOE=",
+      "crlite_enrolled": true,
+      "id": "c79b7b86-d814-4f7c-aad6-03a1383c763c",
+      "last_modified": 1647701842252
+    },
+    {
+      "schema": 1647654826542,
+      "derHash": "NCY+lCTYGblLz6h+ad2e9DIF1OLehKU0lzFAY9gilps=",
+      "subject": "CN=Verokey High Assurance Verified Business ECC,O=Verokey,C=AU",
+      "subjectDN": "MFYxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MTUwMwYDVQQDEyxWZXJva2V5IEhpZ2ggQXNzdXJhbmNlIFZlcmlmaWVkIEJ1c2luZXNzIEVDQw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "b6f22240546a8b483896de6c2db0fccfb73386b23b7ad01978cf5ba9a6082950",
+        "size": 1260,
+        "filename": "bwcsf3KkBp7k-_kn61hwGrohcM2771HiHahosrGrHfc=.pem",
+        "location": "security-state-staging/intermediates/c9e91312-d78c-4dcb-ac34-fa8d5551fd6a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "bwcsf3KkBp7k+/kn61hwGrohcM2771HiHahosrGrHfc=",
+      "crlite_enrolled": false,
+      "id": "d6958d94-103f-4a2b-92b9-2b27cabf0600",
+      "last_modified": 1647658654006
+    },
+    {
+      "schema": 1647654825609,
+      "derHash": "XuWq1wSotpiIP0ApcgyPoct5yfo0Y8wkNAYp6+bFpis=",
+      "subject": "CN=Verokey Secure Web G2,O=Verokey,C=AU",
+      "subjectDN": "MD8xCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MR4wHAYDVQQDExVWZXJva2V5IFNlY3VyZSBXZWIgRzI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "8d08fa773eab40914d633ec0fc0c90f83553e8e8900c895ff3b9fac73917357c",
+        "size": 1683,
+        "filename": "YOICDd74CBBTQQEfP4A_1QP-tDZ8_JTzjErj5b1IsYo=.pem",
+        "location": "security-state-staging/intermediates/b1916190-6e0c-4a41-88c9-4b5aadcf3649.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "YOICDd74CBBTQQEfP4A/1QP+tDZ8/JTzjErj5b1IsYo=",
+      "crlite_enrolled": false,
+      "id": "c449be6f-2cc0-481e-af04-2182142ce9f1",
+      "last_modified": 1647658653997
+    },
+    {
+      "schema": 1647654824627,
+      "derHash": "vP0mFOQtY8WWkcPOi+x5LeL86JztT5xGDQqEhXMHT8s=",
+      "subject": "CN=Verokey Secure Web ECC,O=Verokey,C=AU",
+      "subjectDN": "MEAxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MR8wHQYDVQQDExZWZXJva2V5IFNlY3VyZSBXZWIgRUND",
+      "whitelist": false,
+      "attachment": {
+        "hash": "29224ac45981f9cd3a7eb1dce987dac6168937b2ad8eea795026a1f3d0a67941",
+        "size": 1191,
+        "filename": "XmuaPGGLJTHOHi-UMbaLYNSGsmun3VCxmY6w4RyyJuM=.pem",
+        "location": "security-state-staging/intermediates/e3df8599-af15-414f-9c42-298124ca648c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "XmuaPGGLJTHOHi+UMbaLYNSGsmun3VCxmY6w4RyyJuM=",
+      "crlite_enrolled": false,
+      "id": "ac31c3ff-db37-4e38-80a3-b0c09a6753df",
+      "last_modified": 1647658653989
+    },
+    {
+      "schema": 1647654822732,
+      "derHash": "269Y3r+7od6OBNyueiwWOwnTnn5zLpHeqGVcK9cyqwA=",
+      "subject": "CN=Verokey Secure Web,O=Verokey,C=AU",
+      "subjectDN": "MDwxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MRswGQYDVQQDExJWZXJva2V5IFNlY3VyZSBXZWI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c5f50c22da86ef7b7de5af316d9e01bee66bb2b8b74913b1b1b1ddca99ad5b8a",
+        "size": 1678,
+        "filename": "BLGkEY8QPCtAg4Yd-57Aiig-74Lh325P803f8vLhBoc=.pem",
+        "location": "security-state-staging/intermediates/36c3a520-0118-469c-a721-cfd21fcfa174.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "BLGkEY8QPCtAg4Yd+57Aiig+74Lh325P803f8vLhBoc=",
+      "crlite_enrolled": false,
+      "id": "8d5e7e22-7c97-431c-b156-e2e7c90dbc77",
+      "last_modified": 1647658653980
+    },
+    {
+      "schema": 1647654821815,
+      "derHash": "vokmSlgxMBK3SWA8m+vDzXkU23FqSeXg6pfkOjiDpd8=",
+      "subject": "CN=Verokey High Assurance Verified Business G2,O=Verokey,C=AU",
+      "subjectDN": "MFUxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MTQwMgYDVQQDEytWZXJva2V5IEhpZ2ggQXNzdXJhbmNlIFZlcmlmaWVkIEJ1c2luZXNzIEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "81e4f6e788d4f4a8e65ebc2209113e276031df40b369a1322d53a330142cfa5e",
+        "size": 2410,
+        "filename": "tlfNnL_wJhxfoQr77OWpEGwaZB50PiKeJS1xv1JczIc=.pem",
+        "location": "security-state-staging/intermediates/f3309154-7af6-449b-a26d-1fc2a0bf5a1f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "tlfNnL/wJhxfoQr77OWpEGwaZB50PiKeJS1xv1JczIc=",
+      "crlite_enrolled": false,
+      "id": "fc71f24e-260a-458c-b6fc-49efd9879a92",
+      "last_modified": 1647658653971
+    },
+    {
+      "schema": 1647654820829,
+      "derHash": "ftvm+MSaHjmIyq3UOLcvB7avnOdRz1g1FjFh1jyuTd8=",
+      "subject": "CN=Verokey Verified Business G2,O=Verokey,C=AU",
+      "subjectDN": "MEYxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MSUwIwYDVQQDExxWZXJva2V5IFZlcmlmaWVkIEJ1c2luZXNzIEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "bebdb836f3821f22a2cf8a9d37d5cf2f9b6170f67a088076c6a0a61f478c9e99",
+        "size": 1865,
+        "filename": "F0x5cftsPCB48ynEovjelRoxjTrQOKe0TVZJV_E5uNY=.pem",
+        "location": "security-state-staging/intermediates/7bc559dd-136e-4b22-bba0-46275c42e46a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "F0x5cftsPCB48ynEovjelRoxjTrQOKe0TVZJV/E5uNY=",
+      "crlite_enrolled": false,
+      "id": "fb5813da-8a74-4f21-8165-3fe6274ab2c0",
+      "last_modified": 1647658653962
+    },
+    {
+      "schema": 1647654819872,
+      "derHash": "8e07Nckvpdqqo91F+Z66O4I6L7HCSonO0WmdleAlZKI=",
+      "subject": "CN=Verokey Verified Business ECC,O=Verokey,C=AU",
+      "subjectDN": "MEcxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MSYwJAYDVQQDEx1WZXJva2V5IFZlcmlmaWVkIEJ1c2luZXNzIEVDQw==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "3f188e11517ee73f64bbd36e9ee158a73be3ad9815dbfc0fd11f743283d12684",
+        "size": 1199,
+        "filename": "OIPaHQX_1ijRXDAogCIp0fJvOFmAwNZfokh0jDupQ_s=.pem",
+        "location": "security-state-staging/intermediates/873835df-c179-4e1d-b67d-65d580190ce4.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "OIPaHQX/1ijRXDAogCIp0fJvOFmAwNZfokh0jDupQ/s=",
+      "crlite_enrolled": false,
+      "id": "42dc8291-ec41-4fad-8526-b3a45b3daaa0",
+      "last_modified": 1647658653954
+    },
+    {
+      "schema": 1647654818889,
+      "derHash": "1sxXuSYOmwEt+sQKgb/AIrktkfpJt8RcWd+GcCqsKQY=",
+      "subject": "CN=Verokey Verified Business,O=Verokey,C=AU",
+      "subjectDN": "MEMxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MSIwIAYDVQQDExlWZXJva2V5IFZlcmlmaWVkIEJ1c2luZXNz",
+      "whitelist": false,
+      "attachment": {
+        "hash": "ad91c21bd6c4e12bab1179f64d3061f1a8c3f99e4e8edc9902360c09c0d6f009",
+        "size": 1687,
+        "filename": "jVuisrysh5HDay17vNJwtigzbmgB6GyT5_TBkYrj7aQ=.pem",
+        "location": "security-state-staging/intermediates/88d20507-b598-4ce5-9ba2-761d21a4e419.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "jVuisrysh5HDay17vNJwtigzbmgB6GyT5/TBkYrj7aQ=",
+      "crlite_enrolled": false,
+      "id": "4e6df119-41d9-4a2f-833f-eded8105015b",
+      "last_modified": 1647658653945
+    },
+    {
+      "schema": 1647654823652,
+      "derHash": "Lw44WGTS3KiseuSBZCh7/kUSbGvNkukbs98SUMey2ro=",
+      "subject": "CN=Verokey High Assurance Verified Business,O=Verokey,C=AU",
+      "subjectDN": "MFIxCzAJBgNVBAYTAkFVMRAwDgYDVQQKEwdWZXJva2V5MTEwLwYDVQQDEyhWZXJva2V5IEhpZ2ggQXNzdXJhbmNlIFZlcmlmaWVkIEJ1c2luZXNz",
+      "whitelist": false,
+      "attachment": {
+        "hash": "046bc1ca834973eaf6354dd03041477d215c49ce451e42a47d536a0ed8881434",
+        "size": 1707,
+        "filename": "ta5zRgM3pICBxt5qegtMsZETN77Zk1tN6gApXWT5Oz0=.pem",
+        "location": "security-state-staging/intermediates/e513b328-655a-441e-86ca-5d563a8439fd.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "ta5zRgM3pICBxt5qegtMsZETN77Zk1tN6gApXWT5Oz0=",
+      "crlite_enrolled": false,
+      "id": "5163308a-7837-468c-9467-d3cb0e6db613",
+      "last_modified": 1647658653936
+    },
+    {
+      "schema": 1647442638278,
+      "derHash": "slTzzerx0pq1PLQ56A+5lvHpCig+m1CFuHSdGOT1mHs=",
+      "subject": "CN=GlobalSign Atlas R3 DV ACME CA H2 2021,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgSDIgMjAyMQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "9b7764d2dd9d44f3454ff2c69278ccacf175873333cb4bc22bb78001354c66f5",
+        "size": 1715,
+        "filename": "Drirt5siv6auOz2CsdX1ih0Gq_A2hFkwS82cYSyOOSc=.pem",
+        "location": "security-state-staging/intermediates/be7d54ce-f543-44f1-8741-28214b2ee3cd.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Drirt5siv6auOz2CsdX1ih0Gq/A2hFkwS82cYSyOOSc=",
+      "crlite_enrolled": false,
+      "id": "1ea36836-d34e-48ad-a1c3-679ebae83102",
+      "last_modified": 1647464240149
+    },
+    {
+      "schema": 1647442123610,
+      "derHash": "gCRH7lIcxmbNt7uuk6OF5V8gDXaj0TVqhURaxMvb7RI=",
+      "subject": "CN=Cybertrust Global Root,O=Cybertrust\\, Inc",
+      "subjectDN": "MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0311ba514ea52c161164a44190d3ff8d3f21d7e178936261c9f0f3b873c30bc0",
+        "size": 1317,
+        "filename": "foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem",
+        "location": "security-state-staging/intermediates/a7042ba0-a0c3-40c6-a970-0ee5cdb75e39.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=",
+      "crlite_enrolled": false,
+      "id": "75d60e87-9f16-4a0c-bd57-5fc185f8e40b",
+      "last_modified": 1647442637728
+    },
+    {
+      "schema": 1647406128599,
+      "derHash": "HIhGxAasYpT68NMqWhTnnIQThaV/EVm2HpAUYF435ek=",
+      "subject": "CN=DigiCert Assured ID G3 TLS ECC384 SHA384 2022 CA1,O=DigiCert\\, Inc.,C=US",
+      "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE6MDgGA1UEAxMxRGlnaUNlcnQgQXNzdXJlZCBJRCBHMyBUTFMgRUNDMzg0IFNIQTM4NCAyMDIyIENBMQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "682a6d671295b8e0ca15d671be54d68c7d5786b8b33b65eb4e943f238772b094",
+        "size": 1288,
+        "filename": "otVuF_gByhb3Aev07shrO8GeUcthd4Qw5N_K1L0fizo=.pem",
+        "location": "security-state-staging/intermediates/d6b7ddd7-f249-4342-9621-2f56bffe26af.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "otVuF/gByhb3Aev07shrO8GeUcthd4Qw5N/K1L0fizo=",
+      "crlite_enrolled": true,
+      "id": "e0227843-5910-4bd0-adaa-01d35e7a7005",
+      "last_modified": 1647406642091
+    },
+    {
+      "schema": 1647406127910,
+      "derHash": "RCLpY+5TzVjMn4XNQL9f/sAJX98aFUU1ZhwcBrytxps=",
+      "subject": "CN=RapidSSL TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBSU0EgQ0EgRzE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "69d032f5f19ec96ac1d0f6f0b439e8d2c2bfd00ab74cdabf88312932bac1b34f",
+        "size": 1691,
+        "filename": "E3tYcwo9CiqATmKtpMLW5V-pzIq-ZoDmpXSiJlXGmTo=.pem",
+        "location": "security-state-staging/intermediates/9eebdfa1-1d2e-4e19-abdd-69d9d51be643.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "E3tYcwo9CiqATmKtpMLW5V+pzIq+ZoDmpXSiJlXGmTo=",
+      "crlite_enrolled": true,
+      "id": "f7aa6ee8-81ba-45d2-8cff-4314c6e506ad",
+      "last_modified": 1647406642057
+    },
+    {
+      "schema": 1647406129124,
+      "derHash": "GFwK5HBCO51GeKfBBVtbSNkHBVBbeU4hXAY4UTNpgfQ=",
+      "subject": "CN=GeoTrust EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIFJTQSBDQSAyMDE4",
+      "whitelist": false,
+      "attachment": {
+        "hash": "a0a4b49c90bff29d9b9a8c5f2ef42bb769f854311f7a16f1b9861161f8870867",
+        "size": 1666,
+        "filename": "yWulDX8E5Q0XG4-9jVDljmO2FvAVzIRhn2MppW4vyUM=.pem",
+        "location": "security-state-staging/intermediates/69bd0c27-8b17-47e6-8656-b35a53ad9631.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "yWulDX8E5Q0XG4+9jVDljmO2FvAVzIRhn2MppW4vyUM=",
+      "crlite_enrolled": true,
+      "id": "1cc0b067-f5fa-460a-b0ce-63e242f5c312",
+      "last_modified": 1647406642046
+    },
+    {
+      "schema": 1647406128777,
+      "derHash": "Sv/k/vOUZNF4jGYK9ZHV5gGyYcSBHfCj3Z1hyv6OXtg=",
+      "subject": "CN=TrustAsia EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN",
+      "subjectDN": "MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgRVYgVExTIFBybyBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "9a34bc6ed9a54f81e18afe77e80e21229b781d54bc55db04519ecea2fb3e30f4",
+        "size": 1658,
+        "filename": "JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem",
+        "location": "security-state-staging/intermediates/50647d00-cffd-4a34-99f4-97db530d09bd.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=",
+      "crlite_enrolled": true,
+      "id": "58b5207a-569c-440d-b868-afae280ff8f2",
+      "last_modified": 1647406642035
+    },
+    {
+      "schema": 1647406128086,
+      "derHash": "/BbVMgO9kYfWnMmdLaVRB2tNyymBQNZ1H3oBKWbJn90=",
+      "subject": "CN=RapidSSL TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBFQ0MgQ0EgRzE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "5ab29482e9032bced4020a6ffd28ba40b857897ed628b88bc1554bc73e84f763",
+        "size": 1199,
+        "filename": "cBtUiO-mwdgMfNeEp_qKuEHswRn2nHp2FDUKVi_aTDw=.pem",
+        "location": "security-state-staging/intermediates/154391f2-0f93-44b9-b118-5fc88dafa782.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "cBtUiO+mwdgMfNeEp/qKuEHswRn2nHp2FDUKVi/aTDw=",
+      "crlite_enrolled": true,
+      "id": "de84a7ad-8fc1-4cf5-96dd-67d123f93d29",
+      "last_modified": 1647406642024
+    },
+    {
+      "schema": 1647406128422,
+      "derHash": "wG4wf3z8HTL6cqTAM8h7kAGa8hbwd11kl4ouymyKIw4=",
+      "subject": "CN=GeoTrust TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBSU0EgQ0EgRzE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "79eaef52d1cceae208d6f4e81408cb6e81bd7358789d8d112f8acbab4bbf4f9c",
+        "size": 1638,
+        "filename": "SDG5orEv8iX6MNenIAxa8nQFNpROB_6-llsZdXHZNqs=.pem",
+        "location": "security-state-staging/intermediates/9987d215-bbb5-4e1e-8e50-33173b65ca32.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "SDG5orEv8iX6MNenIAxa8nQFNpROB/6+llsZdXHZNqs=",
+      "crlite_enrolled": true,
+      "id": "3a3c5d35-1116-4a25-9c6e-f43057fdd426",
+      "last_modified": 1647406642013
+    },
+    {
+      "schema": 1647406127393,
+      "derHash": "qDhAXrsD9d/Y1KlXKubg4/NW7E7BNDdaWdt7GV3D7EQ=",
+      "subject": "CN=GeoTrust TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBFQ0MgQ0EgRzE=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c0c946701c933eed603c99ac71fe696329ac344e1eb857450da9a3c6fc6b28e7",
+        "size": 1146,
+        "filename": "5UDBgr_RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=.pem",
+        "location": "security-state-staging/intermediates/9ec06331-3cbe-42b8-91ab-ca659d7ff6e1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "5UDBgr/RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=",
+      "crlite_enrolled": true,
+      "id": "500a38fb-8a19-47cf-b4b5-4000d9bf8da1",
+      "last_modified": 1647406642002
+    },
+    {
+      "schema": 1647406128950,
+      "derHash": "OIPm3kkXpGtZTswtKsapXUPn6qjgiakfm8EE/xbfjeY=",
+      "subject": "CN=Secure Site Pro Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "873a9affb573886082637d5874421893f652b55adfa77a32cb7cd76d35bb12b5",
+        "size": 1695,
+        "filename": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem",
+        "location": "security-state-staging/intermediates/809d29c1-5609-421a-be6f-b48dc16e8d28.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=",
+      "crlite_enrolled": true,
+      "id": "127c9f06-6f9a-4d9e-b4f9-e0f7b637cd96",
+      "last_modified": 1647406641991
+    },
+    {
+      "schema": 1647399296865,
+      "derHash": "S8xeI0/oHt5Or4g6oZwxM1sLJuheBmuZReTLYVPrIMI=",
+      "subject": "CN=Thawte TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgUlNBIENBIEcx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "ab46e21b2e6e52647007f65c64b45ece54a6f9162bf19babfd723021d1ed126d",
+        "size": 1634,
+        "filename": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG-CipUmaM=.pem",
+        "location": "security-state-staging/intermediates/1acc8b9e-e1d0-4bbd-92ab-c45c37b76729.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG+CipUmaM=",
+      "crlite_enrolled": true,
+      "id": "763c82cc-5847-4f29-a81a-d189fde21751",
+      "last_modified": 1647406641979
+    },
+    {
+      "schema": 1647406126872,
+      "derHash": "01M7cypRim2mjvJmCF4R39EUwOsAks1DUwpE1UuRPtE=",
+      "subject": "CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "93b4a44bb6fe2449a59754db745e41e1157b80bf49f3c2f364ac5f13eaca7195",
+        "size": 1662,
+        "filename": "3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem",
+        "location": "security-state-staging/intermediates/179c0ac1-bf62-4ad7-8373-95d6baefb9a3.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=",
+      "crlite_enrolled": true,
+      "id": "4353f974-e604-4be1-b7e8-63cd2a9fe2c7",
+      "last_modified": 1647406641968
+    },
+    {
+      "schema": 1647406128251,
+      "derHash": "AJhxw6TGBzEeWukvAQlfm/dhALh5SrCppSEOZ5TIYHw=",
+      "subject": "CN=Trust Provider B.V. TLS RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL",
+      "subjectDN": "MHYxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEqMCgGA1UEAxMhVHJ1c3QgUHJvdmlkZXIgQi5WLiBUTFMgUlNBIENBIEcx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "be93cbc768b2a781054d69b3d1b32596d09aabb573a067ff44e5770bc18fb99e",
+        "size": 1687,
+        "filename": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN_FbGZLM=.pem",
+        "location": "security-state-staging/intermediates/f158c5a3-4e14-476d-a5ac-d85b7f4fcedc.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN/FbGZLM=",
+      "crlite_enrolled": true,
+      "id": "f7673261-e96a-4f2c-a927-d30881e9e80f",
+      "last_modified": 1647406641957
+    },
+    {
+      "schema": 1647406127221,
+      "derHash": "90w7LH5FXWVNnuWqpxJ4nMsme5YcGhzkimnIYM0ZNng=",
+      "subject": "CN=Thawte EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBFQ0MgQ0EgMjAxOA==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "029e038309e109b338a8e5d3d4e6300803b81c7d7d64ed413d523864ea9f6f9d",
+        "size": 1390,
+        "filename": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS_jwKtxLc=.pem",
+        "location": "security-state-staging/intermediates/6c018133-a6a4-4913-a016-38a7d1ab820a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS/jwKtxLc=",
+      "crlite_enrolled": true,
+      "id": "2032121f-569e-449d-8b03-3e918762323e",
+      "last_modified": 1647406641946
+    },
+    {
+      "schema": 1647406129472,
+      "derHash": "vzVY+HfonSfapg2pZxZ2Vw376yFdhKxaNxItZ3a3j24=",
+      "subject": "CN=GeoTrust EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIEVDQyBDQSAyMDE4",
+      "whitelist": false,
+      "attachment": {
+        "hash": "76fd10b988ddc4d10ef675e1353505739b36be3396db70baccebfc087010c5f1",
+        "size": 1390,
+        "filename": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4_NrxCA=.pem",
+        "location": "security-state-staging/intermediates/0f71a53f-9fe4-41e8-bc4d-6053d563e69f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4/NrxCA=",
+      "crlite_enrolled": true,
+      "id": "d0f17c7c-e4ae-4815-966e-de2dfd1be49e",
+      "last_modified": 1647406641936
+    },
+    {
+      "schema": 1647406127564,
+      "derHash": "Go15Cvmys0191q9htapM8TgLhglcusK8qzW9Vm0BgMM=",
+      "subject": "CN=Secure Site Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIlNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0E=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "8c560a22b1260bcb7f9b8c62c6d191f6064d6125f0146ef483820a79ada1e21a",
+        "size": 1687,
+        "filename": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem",
+        "location": "security-state-staging/intermediates/6bf4e11e-3aa2-4af0-a5f5-ac98a4454b33.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=",
+      "crlite_enrolled": true,
+      "id": "9ad85c01-2205-4529-a221-9f9977a9a3d0",
+      "last_modified": 1647406641924
+    },
+    {
+      "schema": 1647406129298,
+      "derHash": "k1abJqpTXj4HyJHGvS+p3Ak5wk20s3Jq2FMe2xfEl8o=",
+      "subject": "CN=Thawte EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBSU0EgQ0EgMjAxOA==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "aa41f2f1317c4207a1ce000f100f89792938ebbd08ccc7367391461f45499ac8",
+        "size": 1662,
+        "filename": "LrLVqGD-UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm_U=.pem",
+        "location": "security-state-staging/intermediates/d6fae8ae-c5f1-47b9-82bc-084bf846e9fe.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "LrLVqGD+UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm/U=",
+      "crlite_enrolled": true,
+      "id": "62d8fb8a-2660-4ea7-991d-107ab02539e5",
+      "last_modified": 1647406641913
+    },
+    {
+      "schema": 1647406127050,
+      "derHash": "roIgH1ZeBDm39K1okydZTrl0pPeBsabL/tWb04IxfxM=",
+      "subject": "CN=Thawte TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgRUNDIENBIEcx",
+      "whitelist": false,
+      "attachment": {
+        "hash": "add9d8816c4153cd678d313dec7135ed32f3b5d71e1c1b6f73bf061cd4162394",
+        "size": 1142,
+        "filename": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO-bYvpiEQI=.pem",
+        "location": "security-state-staging/intermediates/f2a22335-497e-40e7-830a-378eeea47a5b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO+bYvpiEQI=",
+      "crlite_enrolled": true,
+      "id": "e4a64544-b0f8-45bd-9a58-20355ebc5549",
+      "last_modified": 1647406641902
+    },
+    {
+      "schema": 1647406126704,
+      "derHash": "sU1QiQecHY92SduaXTzvsarAb2avxJIlxb4qoZ/UGjU=",
+      "subject": "CN=Entrust Certification Authority - L1N,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US",
+      "subjectDN": "MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFO",
+      "whitelist": false,
+      "attachment": {
+        "hash": "2a107eb8056c22e82435858002ab7da59ecfe298d1cafd19ef86a74343e7a1bb",
+        "size": 2207,
+        "filename": "vJyqpf--OgJrh0WkGBWAggmVgZ5-o9t2KvyRdPxvIhs=.pem",
+        "location": "security-state-staging/intermediates/119f868d-4224-48fa-aca4-4e950d595c12.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "vJyqpf++OgJrh0WkGBWAggmVgZ5+o9t2KvyRdPxvIhs=",
+      "crlite_enrolled": true,
+      "id": "b03bf780-0b68-4f48-9034-834ec2d038db",
+      "last_modified": 1647406641891
+    },
+    {
+      "schema": 1647355730713,
+      "derHash": "w4BN5R6MFwUiIK4crT04PlTVt9wohDxC8NvZkTwehlg=",
+      "subject": "CN=Secure Site Pro Extended Validation ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0888b26cf00bcea2525da774e654b5c2ea18871782615c5140d3fb8b3541ab28",
+        "size": 1463,
+        "filename": "_Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB_j8=.pem",
+        "location": "security-state-staging/intermediates/8d999ad8-e345-4822-9bab-90e25accc007.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "/Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB/j8=",
+      "crlite_enrolled": false,
+      "id": "7044462a-7235-4d46-9816-525da44a50c7",
+      "last_modified": 1647376760212
+    },
+    {
+      "schema": 1647355729782,
+      "derHash": "vRk8R15OZ5OL7zQSK5i1WKKILn7ZQ2mmywETIO8VYjw=",
+      "subject": "CN=AlwaysOnSSL TLS ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE",
+      "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIEVDQyBDQSBHMQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "499064f03f4574c2c427e17330ae382a5058acecff6c7f5b7cbdc36b9933961b",
+        "size": 1175,
+        "filename": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=.pem",
+        "location": "security-state-staging/intermediates/f68d6d6e-b755-46b8-bb2c-3cd51783d68f.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=",
+      "crlite_enrolled": false,
+      "id": "484a309f-c38f-4673-b797-7cb431b40f5e",
+      "last_modified": 1647376760204
+    },
+    {
+      "schema": 1647355728800,
+      "derHash": "qK0cJcxYCyEx/Mb8bWUTdG846pm9FiyBtcU5NJUXWxg=",
+      "subject": "CN=STRATO TLS RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE",
+      "subjectDN": "MFwxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRowGAYDVQQDExFTVFJBVE8gVExTIFJTQSBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d4b8e211872849d13a1e260cdc06a24464432a0fa7627e3f666d44abf76f5a34",
+        "size": 1654,
+        "filename": "_MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=.pem",
+        "location": "security-state-staging/intermediates/1930fc08-5dc1-4765-b773-cc763308de9b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "/MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=",
+      "crlite_enrolled": false,
+      "id": "8fb8c000-9fe8-49dd-9c15-ac4bfdac08fb",
+      "last_modified": 1647376760195
+    },
+    {
+      "schema": 1647355727754,
+      "derHash": "A2oY9fDrndXuAreFTfXDOEVgHYk5z7e2B/adFCwB2Qk=",
+      "subject": "CN=TrustAsia TLS RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN",
+      "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBSU0EgQ0EgRzg=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "cbb7a86cf96f690954bcd21bb8c71a00ef436ee942cd65831bf21c11cbc25909",
+        "size": 1687,
+        "filename": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=.pem",
+        "location": "security-state-staging/intermediates/350bd8d3-2749-4c3e-a988-02288c0e6441.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=",
+      "crlite_enrolled": false,
+      "id": "d4d9e729-0cc2-44c4-8964-b32181486d06",
+      "last_modified": 1647376760186
+    },
+    {
+      "schema": 1647355724829,
+      "derHash": "MZiW45VNUQ2jpLdTh+jIcLO8LDIo2FUJFuvpq9y3+SE=",
+      "subject": "CN=Oracle TLS RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US",
+      "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRPcmFjbGUgVExTIFJTQSBDQSBHMQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "450ac021db301c37c528daccbe40e94f74a28f7ae6f6ba039650b6aae3c3d13e",
+        "size": 1678,
+        "filename": "92UUNzSFrSZZ2mG20rm7eFX2MV_e3zCq8ck0jTA9zMw=.pem",
+        "location": "security-state-staging/intermediates/393f3a10-429e-4ce1-845e-2beac5162af1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "92UUNzSFrSZZ2mG20rm7eFX2MV/e3zCq8ck0jTA9zMw=",
+      "crlite_enrolled": false,
+      "id": "66444cbb-0d77-4545-aeac-9f96adedc3a3",
+      "last_modified": 1647376760160
+    },
+    {
+      "schema": 1647355722905,
+      "derHash": "KkG6gZ62Elr1y0uLDp6VTs55jCp+5D3Nr305WYfE1VI=",
+      "subject": "CN=AlwaysOnSSL TLS RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE",
+      "subjectDN": "MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIFJTQSBDQSBHMQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "60ae06b06554f13d49fcd4ab75f5917d8c57dc17bd11f157428e11c66db10d22",
+        "size": 1670,
+        "filename": "DOdL2thyQw2ljWo5qhqUbm1_3EZBtYXxLKw14G9PO30=.pem",
+        "location": "security-state-staging/intermediates/236d592d-f7d5-465e-984d-3511d1792286.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "DOdL2thyQw2ljWo5qhqUbm1/3EZBtYXxLKw14G9PO30=",
+      "crlite_enrolled": false,
+      "id": "008c16c8-e2f9-4205-b90d-97ce5e46862c",
+      "last_modified": 1647376760143
+    },
+    {
+      "schema": 1647355720132,
+      "derHash": "sayM+xgbnJNU4Xdfy9/P54mMXMmhfXYxW1fBEu7lUjQ=",
+      "subject": "CN=Encryption Everywhere DV TLS CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c75d6fc5179d7bb7baea5ffe48d9fda3810fdcb1340a3ca83e1e7b97a4af6478",
+        "size": 1678,
+        "filename": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX-qzRMqb9Xoa1w=.pem",
+        "location": "security-state-staging/intermediates/de3a4a27-9c47-4b4a-978f-e8d3aadc9b3d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX+qzRMqb9Xoa1w=",
+      "crlite_enrolled": false,
+      "id": "6e35ba55-d2c3-4701-8e11-9d023cee4140",
+      "last_modified": 1647376760114
+    },
+    {
+      "schema": 1647355719183,
+      "derHash": "9/veuCvpnUHNykGfyRhZ0+UobAdiBODpA9Z4uyE+2Js=",
+      "subject": "CN=Hostpoint TLS RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH",
+      "subjectDN": "MGIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRIb3N0cG9pbnQgVExTIFJTQSBDQQ==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "e06a612c20a2679cb1522f8e77265194fd2509fa105e19f74503f5f6e26acc68",
+        "size": 1662,
+        "filename": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa_YPtUtL6yZ_DvU=.pem",
+        "location": "security-state-staging/intermediates/699e988e-5291-4075-86bd-3e5b69bb9553.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Q5l5uNBWZnOf3EnCFMK3ciNhPZboa/YPtUtL6yZ/DvU=",
+      "crlite_enrolled": false,
+      "id": "d685f4b6-0528-48c0-95fe-4fa3050ce971",
+      "last_modified": 1647376760106
+    },
+    {
+      "schema": 1647355715297,
+      "derHash": "h38kznD0owR+TqcL7BvDG+m2Uzrf86OT/5v7PIEClEY=",
+      "subject": "CN=TrustAsia TLS ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN",
+      "subjectDN": "MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBFQ0MgQ0EgRzk=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "619365f9c59d0f0dcfcb64ba525d68621f75fadebe181e15429e3dc854262b7c",
+        "size": 1191,
+        "filename": "z_Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=.pem",
+        "location": "security-state-staging/intermediates/42a61717-4f98-46d0-b662-78febf5ba323.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "z/Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=",
+      "crlite_enrolled": false,
+      "id": "50846adc-e121-40f2-b176-43cc90696068",
+      "last_modified": 1647376760070
+    },
+    {
       "schema": 1647046118886,
       "derHash": "AgcFbRcsgL37bcRb6eWAiEYHjR5u7xtu1wJZqzMqZME=",
       "subject": "CN=Cybertrust Japan SureServer CA G4,O=Cybertrust Japan Co.\\, Ltd.,C=JP",
@@ -73,24 +847,6 @@
       "last_modified": 1647053840388
     },
     {
-      "schema": 1647046118696,
-      "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=",
-      "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN",
-      "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b",
-        "size": 1963,
-        "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem",
-        "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=",
-      "crlite_enrolled": true,
-      "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2",
-      "last_modified": 1647053840376
-    },
-    {
       "schema": 1646966924057,
       "derHash": "AYGythcxeVYudWMjRAN8pSMBhhin9xaCaaPrhTZ/91w=",
       "subject": "CN=DigiCert Assured ID Grid TLS RSA2048 SHA256 2022 CA1,O=DigiCert\\, Inc.,C=US",
@@ -289,60 +1045,6 @@
       "last_modified": 1646449054467
     },
     {
-      "schema": 1646448544694,
-      "derHash": "mKDDuhiZJYWV0E8V0TTFcy6GS3VcZIpI0cF/CiYO9ac=",
-      "subject": "CN=TrustSafe TLS RSA SubCA R1,O=Isimtescil Bilisim A.S.,C=TR",
-      "subjectDN": "MFQxCzAJBgNVBAYTAlRSMSAwHgYDVQQKDBdJc2ltdGVzY2lsIEJpbGlzaW0gQS5TLjEjMCEGA1UEAwwaVHJ1c3RTYWZlIFRMUyBSU0EgU3ViQ0EgUjE=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "90c93b3a50c031ef4beb4224d3085eafa66d1c8be8d4bc2bdeea1476967ed709",
-        "size": 2365,
-        "filename": "_SrUGYsWpDW44q_gIPL4e-vKroLPu0_n0OySZvb5g6U=.pem",
-        "location": "security-state-staging/intermediates/9849321e-0fe1-42f2-a509-ed0dcfa3b2e1.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "/SrUGYsWpDW44q/gIPL4e+vKroLPu0/n0OySZvb5g6U=",
-      "crlite_enrolled": false,
-      "id": "0fc46ca8-adb2-450b-9bd7-49706b5eca52",
-      "last_modified": 1646449054457
-    },
-    {
-      "schema": 1646362120882,
-      "derHash": "HIhGxAasYpT68NMqWhTnnIQThaV/EVm2HpAUYF435ek=",
-      "subject": "CN=DigiCert Assured ID G3 TLS ECC384 SHA384 2022 CA1,O=DigiCert\\, Inc.,C=US",
-      "subjectDN": "MGIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE6MDgGA1UEAxMxRGlnaUNlcnQgQXNzdXJlZCBJRCBHMyBUTFMgRUNDMzg0IFNIQTM4NCAyMDIyIENBMQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "682a6d671295b8e0ca15d671be54d68c7d5786b8b33b65eb4e943f238772b094",
-        "size": 1288,
-        "filename": "otVuF_gByhb3Aev07shrO8GeUcthd4Qw5N_K1L0fizo=.pem",
-        "location": "security-state-staging/intermediates/d6b7ddd7-f249-4342-9621-2f56bffe26af.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "otVuF/gByhb3Aev07shrO8GeUcthd4Qw5N/K1L0fizo=",
-      "crlite_enrolled": false,
-      "id": "e0227843-5910-4bd0-adaa-01d35e7a7005",
-      "last_modified": 1646362650618
-    },
-    {
-      "schema": 1646362122200,
-      "derHash": "mH/y47JaOhTLhD2Qezx/AHwnSSGvwQAX+F1PrnsMuLY=",
-      "subject": "CN=DigiCert Assured ID TLS RSA4096 SHA256 2022 CA1,O=DigiCert\\, Inc.,C=US",
-      "subjectDN": "MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgQXNzdXJlZCBJRCBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "ea98651742d65855a2b89e7d033a40bf1adf3bb22e730eda3ea9896019690d52",
-        "size": 2089,
-        "filename": "t6F6ltc_eNYw0WY4vUTTo7SvuavxVPXIIpqLyWMQG-g=.pem",
-        "location": "security-state-staging/intermediates/27c32677-48fe-4613-8b2f-ca869cef0d85.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "t6F6ltc/eNYw0WY4vUTTo7SvuavxVPXIIpqLyWMQG+g=",
-      "crlite_enrolled": false,
-      "id": "3ef3ce19-bcfb-484b-9e2e-253adcc956b5",
-      "last_modified": 1646362650608
-    },
-    {
       "schema": 1646254109453,
       "derHash": "YZB58QCmv7ZcsumIkN0KxJK2RmXiVKZqUp2PWRfYKrE=",
       "subject": "CN=SSL.com EV TLS Transit ECC CA R1,O=SSL Corp,C=US",
@@ -2053,24 +2755,6 @@
       "last_modified": 1645579198073
     },
     {
-      "schema": 1645578759591,
-      "derHash": "puYUXPpzIrIt1vuvHfgzN4jbefGbEbaVz8kHtA0paQg=",
-      "subject": "CN=PSW GROUP (RSA) OV CA,O=PSW GROUP GmbH & Co. KG,C=DE",
-      "subjectDN": "ME8xCzAJBgNVBAYTAkRFMSAwHgYDVQQKDBdQU1cgR1JPVVAgR21iSCAmIENvLiBLRzEeMBwGA1UEAxMVUFNXIEdST1VQIChSU0EpIE9WIENB",
-      "whitelist": false,
-      "attachment": {
-        "hash": "89a81c5442a54c9e5195381aa5bf5118b69c785fe73b5919acc00fa7735b5960",
-        "size": 2081,
-        "filename": "XJxD3hWuTDkFb4_QXFPChkZ3hlp9UIhypa5Cf40iwOE=.pem",
-        "location": "security-state-staging/intermediates/ea0a20eb-041e-467e-9b0a-9cc38c85baf8.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "XJxD3hWuTDkFb4/QXFPChkZ3hlp9UIhypa5Cf40iwOE=",
-      "crlite_enrolled": true,
-      "id": "c79b7b86-d814-4f7c-aad6-03a1383c763c",
-      "last_modified": 1645579198060
-    },
-    {
       "schema": 1645578770223,
       "derHash": "9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=",
       "subject": "CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM",
@@ -5725,24 +6409,6 @@
       "last_modified": 1645373937715
     },
     {
-      "schema": 1645051712843,
-      "derHash": "s5xKRZbTGRr6Oz0lTSjlxIL80NUA4Kkzf5knfLii7vg=",
-      "subject": "CN=TrustID Server CA A52,OU=TrustID Server,O=IdenTrust,C=US",
-      "subjectDN": "MFoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR4wHAYDVQQDExVUcnVzdElEIFNlcnZlciBDQSBBNTI=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "98d3cfa7dab9b95ecb8cc38637e485c249a12ae6ca445e96105f2708a82c09fa",
-        "size": 2442,
-        "filename": "baHWPQeCjK_t6GB-okH73C13ZXVDr2QAVt6jQTsq2Ys=.pem",
-        "location": "security-state-staging/intermediates/fce94b6e-1e43-4d74-8a2d-cfe52aa9d807.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "baHWPQeCjK/t6GB+okH73C13ZXVDr2QAVt6jQTsq2Ys=",
-      "crlite_enrolled": false,
-      "id": "57eb281e-444c-4634-bcd1-8b742ffc9da6",
-      "last_modified": 1645153040489
-    },
-    {
       "schema": 1645145331886,
       "derHash": "z20DM9C+LGmkLUU5YN7p4QnZ6IQ+owYaFnHW6vhet9g=",
       "subject": "CN=emSign Class 1 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN",
@@ -6913,24 +7579,6 @@
       "last_modified": 1643540241691
     },
     {
-      "schema": 1643539738281,
-      "derHash": "slTzzerx0pq1PLQ56A+5lvHpCig+m1CFuHSdGOT1mHs=",
-      "subject": "CN=GlobalSign Atlas R3 DV ACME CA H2 2021,O=GlobalSign nv-sa,C=BE",
-      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgSDIgMjAyMQ==",
-      "whitelist": false,
-      "attachment": {
-        "hash": "9b7764d2dd9d44f3454ff2c69278ccacf175873333cb4bc22bb78001354c66f5",
-        "size": 1715,
-        "filename": "Drirt5siv6auOz2CsdX1ih0Gq_A2hFkwS82cYSyOOSc=.pem",
-        "location": "security-state-staging/intermediates/be7d54ce-f543-44f1-8741-28214b2ee3cd.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "Drirt5siv6auOz2CsdX1ih0Gq/A2hFkwS82cYSyOOSc=",
-      "crlite_enrolled": true,
-      "id": "1ea36836-d34e-48ad-a1c3-679ebae83102",
-      "last_modified": 1643540241681
-    },
-    {
       "schema": 1643539725512,
       "derHash": "kK8bYaCCZipjnKpoxqP7Qeu6N2DDUaSh6J+22srUhvw=",
       "subject": "CN=GlobalSign Atlas ECCR5 OV TLS CA H2 2021,O=GlobalSign nv-sa,C=BE",
@@ -9505,24 +10153,6 @@
       "last_modified": 1641481036891
     },
     {
-      "schema": 1641434250667,
-      "derHash": "lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=",
-      "subject": "CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US",
-      "subjectDN": "MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy",
-      "whitelist": false,
-      "attachment": {
-        "hash": "a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b",
-        "size": 1727,
-        "filename": "8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem",
-        "location": "security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=",
-      "crlite_enrolled": true,
-      "id": "549c92e2-3738-4c8c-ae37-407e4e6158ce",
-      "last_modified": 1641437839063
-    },
-    {
       "schema": 1641305381754,
       "derHash": "xCpNjAkEuyEZBvQ7RBu7ybWgA7o2EYef00rldvfC92Q=",
       "subject": "CN=DigiCert QuoVadis TLS ICA QV Root CA 1 G3,O=DigiCert\\, Inc,C=US",
@@ -16507,24 +17137,6 @@
       "last_modified": 1576536533799
     },
     {
-      "schema": 1576535891125,
-      "derHash": "sU1QiQecHY92SduaXTzvsarAb2avxJIlxb4qoZ/UGjU=",
-      "subject": "CN=Entrust Certification Authority - L1N,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US",
-      "subjectDN": "MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFO",
-      "whitelist": false,
-      "attachment": {
-        "hash": "2a107eb8056c22e82435858002ab7da59ecfe298d1cafd19ef86a74343e7a1bb",
-        "size": 2207,
-        "filename": "vJyqpf--OgJrh0WkGBWAggmVgZ5-o9t2KvyRdPxvIhs=.pem",
-        "location": "security-state-staging/intermediates/119f868d-4224-48fa-aca4-4e950d595c12.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "vJyqpf++OgJrh0WkGBWAggmVgZ5+o9t2KvyRdPxvIhs=",
-      "crlite_enrolled": false,
-      "id": "b03bf780-0b68-4f48-9034-834ec2d038db",
-      "last_modified": 1576536533758
-    },
-    {
       "schema": 1576535893935,
       "derHash": "4MLr0fa61P6q4xoxB+aavukC2zi5374z8FcL2jSUwgo=",
       "subject": "CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE",
@@ -21061,24 +21673,6 @@
       "last_modified": 1562025171553
     },
     {
-      "schema": 1562025166063,
-      "derHash": "4i5rJZCOEQemB68GDgsk5QxtlWL/BPRVvg+N9BpQMsA=",
-      "subject": "CN=SZAFIR Trusted CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL",
-      "subjectDN": "MFQxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRswGQYDVQQDDBJTWkFGSVIgVHJ1c3RlZCBDQTI=",
-      "whitelist": false,
-      "attachment": {
-        "hash": "b998d1830338d9ca1bada5e5e1a33ef3a5f89c9c13ccfa1b8ea7a2f3aea980a1",
-        "size": 1825,
-        "filename": "Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=.pem",
-        "location": "security-state-staging/intermediates/f9a9ee57-a010-4240-a6e4-f16037c4556f.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "pubKeyHash": "Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=",
-      "crlite_enrolled": true,
-      "id": "acce9c9e-9a82-41d4-b3c0-5cd8eeaf7bef",
-      "last_modified": 1562025166794
-    },
-    {
       "schema": 1562025160859,
       "derHash": "rB7FVjGOPqcPjwTgOg8mM7/nOZI1moEBRf/fGkJzlu4=",
       "subject": "CN=TeleSec ServerPass Class 2 CA,OU=T-Systems Trust Center,O=T-Systems International GmbH,POSTALCODE=57250,STREET=Untere Industriestr. 20,L=Netphen,ST=Nordrhein Westfalen,C=DE",
diff -Nru firefox-98.0.1+build2/SOURCE_CHANGESET firefox-98.0.2+build1/SOURCE_CHANGESET
--- firefox-98.0.1+build2/SOURCE_CHANGESET	2022-03-13 20:58:45.000000000 +0000
+++ firefox-98.0.2+build1/SOURCE_CHANGESET	2022-03-23 06:27:11.000000000 +0000
@@ -1 +1 @@
-35fe60c82cf055b425d1196a394dcc4cd0d09d44
\ No newline at end of file
+cc23a50fcf60e8f94b168659870d765dc502ea56
\ No newline at end of file
diff -Nru firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js
--- firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js	2022-03-13 20:58:39.000000000 +0000
+++ firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js	2022-03-23 06:26:57.000000000 +0000
@@ -72,150 +72,6 @@
 }
 
 tests.push({
-  locale: "ru",
-  distribution: "mailru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900201") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900201") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "ru",
-  region: "RU",
-  distribution: "mailru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900201") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900201") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "az",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900209") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900209") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "en-US",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900205") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900205") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "hy-AM",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900211") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900211") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "kk",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900206") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900206") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "kk",
-  region: "KZ",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900206") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900206") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "ro",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900207") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900207") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "ru",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900203") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900203") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "ru",
-  region: "RU",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900203") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900203") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "tr",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900210") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900210") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "tr",
-  region: "TR",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900210") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900210") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "uk",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900204") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900204") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
-  locale: "uz",
-  distribution: "okru-001",
-  test: engines =>
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "gp=900208") &&
-    hasParams(engines, "Поиск Mail.Ru", "searchbar", "frc=900208") &&
-    hasDefault(engines, "Поиск Mail.Ru") &&
-    hasEnginesFirst(engines, ["Поиск Mail.Ru"]),
-});
-
-tests.push({
   locale: "zh-CN",
   region: "CN",
   distribution: "MozillaOnline",
@@ -463,89 +319,6 @@
 });
 
 tests.push({
-  locale: "ru",
-  distribution: "yandex-drp",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=2039342") &&
-    // Test that fallback works correct as well.
-    hasParams(engines, "Яндекс", "contextmenu", "clid=2039342") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
-  locale: "ru",
-  distribution: "yandex-planb",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=1857376") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
-  locale: "ru",
-  distribution: "yandex-portals",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=1923034") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
-  locale: "ru",
-  distribution: "yandex-ru",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=1923018") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
-  locale: "tr",
-  distribution: "yandex-tr",
-  test: engines =>
-    hasParams(engines, "Yandex", "searchbar", "clid=1953197") &&
-    hasDefault(engines, "Yandex") &&
-    hasEnginesFirst(engines, ["Yandex"]),
-});
-
-tests.push({
-  locale: "tr",
-  distribution: "yandex-tr-gezginler",
-  test: engines =>
-    hasParams(engines, "Yandex", "searchbar", "clid=1945716") &&
-    hasDefault(engines, "Yandex") &&
-    hasEnginesFirst(engines, ["Yandex"]),
-});
-
-tests.push({
-  locale: "tr",
-  distribution: "yandex-tr-tamindir",
-  test: engines =>
-    hasParams(engines, "Yandex", "searchbar", "clid=1945686") &&
-    hasDefault(engines, "Yandex") &&
-    hasEnginesFirst(engines, ["Yandex"]),
-});
-
-tests.push({
-  locale: "uk",
-  distribution: "yandex-uk",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=1923018") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
-  locale: "ru",
-  distribution: "yandex-ru-mz",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=2320519") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]),
-});
-
-tests.push({
   locale: "en-US",
   region: "US",
   distribution: "mint-001",
@@ -567,21 +340,6 @@
     hasTelemetryId(engines, "Google", "google-b-lm"),
 });
 
-tests.push({
-  locale: "ru",
-  region: "RU",
-  distribution: "mint-001",
-  test: engines =>
-    hasParams(engines, "Яндекс", "searchbar", "clid=2508838") &&
-    hasParams(engines, "Яндекс", "contextmenu", "clid=2508838") &&
-    hasParams(engines, "Яндекс", "homepage", "clid=2508838") &&
-    hasParams(engines, "Яндекс", "newtab", "clid=2508838") &&
-    hasParams(engines, "Яндекс", "keyword", "clid=2508841") &&
-    hasDefault(engines, "Яндекс") &&
-    hasEnginesFirst(engines, ["Яндекс"]) &&
-    hasTelemetryId(engines, "Яндекс", "yandex-mint"),
-});
-
 function hasURLs(engines, engineName, url, suggestURL) {
   let engine = engines.find(e => e._name === engineName);
   Assert.ok(engine, `Should be able to find ${engineName}`);
diff -Nru firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_google.js firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_google.js
--- firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_google.js	2022-03-13 20:58:39.000000000 +0000
+++ firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_google.js	2022-03-23 06:26:57.000000000 +0000
@@ -15,13 +15,6 @@
     // just excluding what Yandex and Baidu include.
     excluded: [
       {
-        regions: ["ru", "tr", "by", "kz"],
-        locales: {
-          matches: ["ru", "tr", "be", "kk"],
-          startsWith: ["en"],
-        },
-      },
-      {
         regions: ["cn"],
         locales: {
           matches: ["zh-CN"],
@@ -38,10 +31,8 @@
     {
       included: [{ regions: ["us"] }],
       domain: "google.com",
-      telemetryId: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
-        ? "google-b-1-e"
-        : "google-b-1-d",
-      codes: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
+      telemetryId: AppConstants.IS_ESR ? "google-b-1-e" : "google-b-1-d",
+      codes: AppConstants.IS_ESR
         ? "client=firefox-b-1-e"
         : "client=firefox-b-1-d",
     },
@@ -49,20 +40,13 @@
       excluded: [{ regions: ["us", "by", "kz", "ru", "tr"] }],
       included: [{}],
       domain: "google.com",
-      telemetryId: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
-        ? "google-b-e"
-        : "google-b-d",
-      codes: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
-        ? "client=firefox-b-e"
-        : "client=firefox-b-d",
+      telemetryId: AppConstants.IS_ESR ? "google-b-e" : "google-b-d",
+      codes: AppConstants.IS_ESR ? "client=firefox-b-e" : "client=firefox-b-d",
     },
     {
-      excluded: [{ regions: ["us"] }],
       included: [{ regions: ["by", "kz", "ru", "tr"] }],
       domain: "google.com",
-      codes: AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")
-        ? "client=firefox-b-e"
-        : "client=firefox-b-d",
+      telemetryId: "google-com-nocodes",
     },
   ],
 });
diff -Nru firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_mailru.js firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_mailru.js
--- firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_mailru.js	2022-03-13 20:58:39.000000000 +0000
+++ firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_mailru.js	2022-03-23 06:26:57.000000000 +0000
@@ -35,4 +35,4 @@
 
 add_task(async function test_searchConfig_mailru() {
   await test.run();
-});
+}).skip();
diff -Nru firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_yandex.js firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_yandex.js
--- firefox-98.0.1+build2/toolkit/components/search/tests/xpcshell/searchconfigs/test_yandex.js	2022-03-13 20:58:39.000000000 +0000
+++ firefox-98.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_yandex.js	2022-03-23 06:26:58.000000000 +0000
@@ -114,4 +114,4 @@
 
 add_task(async function test_searchConfig_yandex() {
   await test.run();
-});
+}).skip();
diff -Nru firefox-98.0.1+build2/widget/nsBaseWidget.cpp firefox-98.0.2+build1/widget/nsBaseWidget.cpp
--- firefox-98.0.1+build2/widget/nsBaseWidget.cpp	2022-03-13 20:58:39.000000000 +0000
+++ firefox-98.0.2+build1/widget/nsBaseWidget.cpp	2022-03-23 06:26:58.000000000 +0000
@@ -362,8 +362,11 @@
     mAPZC = nullptr;
     SetCompositorWidgetDelegate(nullptr);
     mCompositorBridgeChild = nullptr;
-    mCompositorSession->Shutdown();
-    mCompositorSession = nullptr;
+
+    // XXX CompositorBridgeChild and CompositorBridgeParent might be re-created
+    // in ClientLayerManager destructor. See bug 1133426.
+    RefPtr session = std::move(mCompositorSession);
+    session->Shutdown();
   }
 }