Merging upstream version 115.8.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 839 insertions, 559 deletions

diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json
index 79e7e55e2e..26981d9a31 100644
--- a/services/settings/dumps/blocklists/addons-bloomfilters.json
+++ b/services/settings/dumps/blocklists/addons-bloomfilters.json
@@ -3,6 +3,49 @@
     {
       "stash": {
         "blocked": [
+          "@windscribeffcustom:9.4.11.1",
+          "softphone.service@five9.com:11.5.0",
+          "softphone.service@five9.com:13.0.0",
+          "softphone.service@five9.com:10.0.0",
+          "{7f7ac8a6-57ec-4d91-99dc-8674cf1e367b}:1.0.1",
+          "softphone.service@five9.com:11.5.1",
+          "extension@skye.sh:1.83",
+          "softphone.service@five9.com:13.1.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1706196941217,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1706272504279,
+      "id": "737f77b0-2066-458d-ad65-108184b66e2e",
+      "last_modified": 1706272559513
+    },
+    {
+      "stash": {
+        "blocked": [
+          "LightspeedHelper@lightspeedsystems.com:1.4.2203.16197",
+          "LightspeedHelper@lightspeedsystems.com:1.2.2108.10069",
+          "LightspeedHelper@lightspeedsystems.com:1.9.2307.6082",
+          "LightspeedHelper@lightspeedsystems.com:1.1.2102.18114",
+          "LightspeedHelper@lightspeedsystems.com:1.8.2303.30076",
+          "LightspeedHelper@lightspeedsystems.com:1.1.2103.2115",
+          "LightspeedHelper@lightspeedsystems.com:1.1.2102.12155",
+          "LightspeedHelper@lightspeedsystems.com:1.4.2203.14144",
+          "LightspeedHelper@lightspeedsystems.com:1.3.2201.4104",
+          "LightspeedHelper@lightspeedsystems.com:1.1.2102.16158",
+          "LightspeedHelper@lightspeedsystems.com:1.4.2203.16165"
+        ],
+        "unblocked": []
+      },
+      "schema": 1704911757706,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1705343704656,
+      "id": "6fb30dab-5bb6-4c8f-819a-eaca9fdb32e8",
+      "last_modified": 1705343757476
+    },
+    {
+      "stash": {
+        "blocked": [
           "{4a53adf1-5b2b-4a2d-a912-46c74932eea6}:1.2.32.3",
           "Aternity-WebExt-12.1.4@aternity.com:12.1.4.2",
           "Aternity-WebExt-12.1.4@aternity.com:12.1.4.15",
@@ -3395,5 +3438,5 @@
       "last_modified": 1690223886167
     }
   ],
-  "timestamp": 1704911757478
+  "timestamp": 1706272559513
 }
diff --git a/services/settings/dumps/main/devtools-compatibility-browsers.json b/services/settings/dumps/main/devtools-compatibility-browsers.json
index 3c52aa6867..698bfd4130 100644
--- a/services/settings/dumps/main/devtools-compatibility-browsers.json
+++ b/services/settings/dumps/main/devtools-compatibility-browsers.json
@@ -1,220 +1,229 @@
 {
   "data": [
     {
-      "name": "Edge",
-      "schema": 1705104306985,
-      "status": "planned",
-      "version": "123",
-      "browserid": "edge",
-      "id": "d0c3d84f-8d27-455b-8746-7e25607e5b78",
-      "last_modified": 1705307946112
+      "name": "Deno",
+      "schema": 1706659507818,
+      "status": "current",
+      "version": "1.40",
+      "browserid": "deno",
+      "id": "15c381ea-e194-48f1-99dc-3d8cd2ffdcfb",
+      "last_modified": 1706695152746
     },
     {
-      "name": "Edge",
-      "schema": 1704903174781,
+      "name": "Safari on iOS",
+      "schema": 1706659508024,
       "status": "beta",
-      "version": "121",
-      "browserid": "edge",
-      "id": "52bfc592-a35d-4208-ba7b-0810d88970d0",
-      "last_modified": 1705307946108
+      "version": "17.4",
+      "browserid": "safari_ios",
+      "id": "b99772c5-e366-42c6-b2db-330aca62dba5",
+      "last_modified": 1706695152744
     },
     {
       "name": "Edge",
-      "schema": 1705104306922,
-      "status": "nightly",
-      "version": "122",
+      "schema": 1706659507960,
+      "status": "current",
+      "version": "121",
       "browserid": "edge",
-      "id": "5ad01f1f-b345-4f24-9b88-4f456a928c76",
-      "last_modified": 1705307946106
+      "id": "52bfc592-a35d-4208-ba7b-0810d88970d0",
+      "last_modified": 1706695152735
     },
     {
       "name": "Firefox",
-      "schema": 1703376307846,
+      "schema": 1706313907801,
       "status": "planned",
-      "version": "124",
+      "version": "125",
       "browserid": "firefox",
-      "id": "7f93cadc-411f-4e31-938c-cc5bfc173f85",
-      "last_modified": 1704181096583
+      "id": "5ae5bd40-deb0-40c4-bba6-cd411b78ee16",
+      "last_modified": 1706515991128
     },
     {
       "name": "Firefox for Android",
-      "schema": 1703376308305,
+      "schema": 1706313908206,
       "status": "planned",
-      "version": "124",
+      "version": "125",
       "browserid": "firefox_android",
-      "id": "1b3c619a-5ca8-4f5f-8f0b-57a3a27a589f",
-      "last_modified": 1704181096580
+      "id": "a8f570e9-574d-4193-891f-fa8e0a875388",
+      "last_modified": 1706515991125
     },
     {
-      "name": "Firefox",
-      "schema": 1703376307472,
+      "name": "Opera",
+      "schema": 1706313908329,
+      "status": "beta",
+      "version": "107",
+      "browserid": "opera",
+      "id": "8d9d78bb-ebc3-4931-a98b-bdefc339061d",
+      "last_modified": 1706515991123
+    },
+    {
+      "name": "Opera Android",
+      "schema": 1706313908456,
+      "status": "current",
+      "version": "80",
+      "browserid": "opera_android",
+      "id": "534dc626-14f0-479e-9912-043e3da31e91",
+      "last_modified": 1706515991120
+    },
+    {
+      "name": "Safari",
+      "schema": 1706313908648,
+      "status": "beta",
+      "version": "17.4",
+      "browserid": "safari",
+      "id": "380463f2-6aa8-499e-b186-5f80cf4cc573",
+      "last_modified": 1706515991117
+    },
+    {
+      "name": "WebView Android",
+      "schema": 1706313908992,
       "status": "beta",
       "version": "122",
-      "browserid": "firefox",
-      "id": "956ca361-9275-40af-a48f-6b67c5ab01c9",
-      "last_modified": 1704181096576
+      "browserid": "webview_android",
+      "id": "62230e68-ea11-4915-a2f8-bab6c2f5cb8d",
+      "last_modified": 1706515991114
     },
     {
-      "name": "Firefox for Android",
-      "schema": 1703376308153,
+      "name": "Chrome Android",
+      "schema": 1706313907490,
       "status": "beta",
       "version": "122",
-      "browserid": "firefox_android",
-      "id": "f849a913-a54d-4a46-bac3-e50d11e4fb59",
-      "last_modified": 1704181096573
+      "browserid": "chrome_android",
+      "id": "62f0c9c3-37c5-4b86-a63b-5be819cc9ff3",
+      "last_modified": 1706515991111
     },
     {
-      "name": "Firefox for Android",
-      "schema": 1703376308089,
-      "status": "current",
-      "version": "121",
-      "browserid": "firefox_android",
-      "id": "23a8ddf5-b9a1-40c9-b72b-27fefb20f9b9",
-      "last_modified": 1704181096571
+      "name": "Chrome",
+      "schema": 1706313907280,
+      "status": "beta",
+      "version": "122",
+      "browserid": "chrome",
+      "id": "e7c93856-0896-474c-b772-06edfae76234",
+      "last_modified": 1706515991109
     },
     {
-      "name": "Firefox",
-      "schema": 1703376307401,
+      "name": "Chrome Android",
+      "schema": 1706313907431,
       "status": "current",
       "version": "121",
-      "browserid": "firefox",
-      "id": "6fa4f808-5e0b-4f2a-a108-600e52ea90f9",
-      "last_modified": 1704181096568
-    },
-    {
-      "name": "Firefox for Android",
-      "schema": 1703376308213,
-      "status": "nightly",
-      "version": "123",
-      "browserid": "firefox_android",
-      "id": "d9b7089d-7091-4794-9051-49f794c0c854",
-      "last_modified": 1704181096559
+      "browserid": "chrome_android",
+      "id": "b03b5ac4-0239-4e0c-8685-1ffaa2d0995f",
+      "last_modified": 1706515991101
     },
     {
-      "name": "Firefox",
-      "schema": 1703376307789,
-      "status": "nightly",
-      "version": "123",
-      "browserid": "firefox",
-      "id": "2aed6f85-b118-4e91-b95a-481030c3bb78",
-      "last_modified": 1704181096556
+      "name": "WebView Android",
+      "schema": 1706313908928,
+      "status": "current",
+      "version": "121",
+      "browserid": "webview_android",
+      "id": "a73ddf02-4e9d-425b-b9bb-6a8eb50abd46",
+      "last_modified": 1706515991097
     },
     {
-      "name": "Node.js",
-      "schema": 1702685107693,
-      "status": "esr",
-      "version": "20.10.0",
-      "browserid": "nodejs",
-      "id": "0d78585f-e9e0-41e8-816a-22461158e36d",
-      "last_modified": 1702890886929
+      "name": "Chrome",
+      "schema": 1706313907218,
+      "status": "current",
+      "version": "121",
+      "browserid": "chrome",
+      "id": "5693902f-f878-4936-984d-044b573430a6",
+      "last_modified": 1706515991094
     },
     {
-      "name": "Opera Android",
-      "schema": 1702685107820,
+      "name": "Safari on iOS",
+      "schema": 1706313908779,
       "status": "current",
-      "version": "79",
-      "browserid": "opera_android",
-      "id": "8cbd1672-6d05-4c4f-9ad6-7955804a3f0c",
-      "last_modified": 1702890886926
+      "version": "17.3",
+      "browserid": "safari_ios",
+      "id": "f8eb9101-134d-481e-b713-42a1543008e5",
+      "last_modified": 1706515991084
     },
     {
       "name": "Safari",
-      "schema": 1702685108023,
-      "status": "beta",
+      "schema": 1706313908588,
+      "status": "current",
       "version": "17.3",
       "browserid": "safari",
       "id": "7eb602be-e2c9-47d6-9491-29f8a42c3ddd",
-      "last_modified": 1702890886922
+      "last_modified": 1706515991082
     },
     {
-      "name": "Safari on iOS",
-      "schema": 1702685108210,
+      "name": "Firefox",
+      "schema": 1706313907687,
       "status": "beta",
-      "version": "17.3",
-      "browserid": "safari_ios",
-      "id": "f8eb9101-134d-481e-b713-42a1543008e5",
-      "last_modified": 1702890886919
-    },
-    {
-      "name": "Safari on iOS",
-      "schema": 1702685108148,
-      "status": "current",
-      "version": "17.2",
-      "browserid": "safari_ios",
-      "id": "0709a73b-ba98-4e14-a086-6515bb7fa106",
-      "last_modified": 1702890886904
+      "version": "123",
+      "browserid": "firefox",
+      "id": "2aed6f85-b118-4e91-b95a-481030c3bb78",
+      "last_modified": 1706515991077
     },
     {
-      "name": "Safari",
-      "schema": 1702685107959,
-      "status": "current",
-      "version": "17.2",
-      "browserid": "safari",
-      "id": "0358e297-4312-4137-87b7-08e6d5f03bb5",
-      "last_modified": 1702890886900
+      "name": "Firefox for Android",
+      "schema": 1706313907997,
+      "status": "beta",
+      "version": "123",
+      "browserid": "firefox_android",
+      "id": "d9b7089d-7091-4794-9051-49f794c0c854",
+      "last_modified": 1706515991074
     },
     {
-      "name": "Edge",
-      "schema": 1702166707858,
+      "name": "Firefox for Android",
+      "schema": 1706313907923,
       "status": "current",
-      "version": "120",
-      "browserid": "edge",
-      "id": "74e217cb-3eb9-44b3-82d4-c14d54e78187",
-      "last_modified": 1702283211298
+      "version": "122",
+      "browserid": "firefox_android",
+      "id": "f849a913-a54d-4a46-bac3-e50d11e4fb59",
+      "last_modified": 1706515991065
     },
     {
-      "name": "Chrome",
-      "schema": 1701561906927,
+      "name": "Firefox",
+      "schema": 1706313907623,
       "status": "current",
-      "version": "120",
-      "browserid": "chrome",
-      "id": "cf6b3ef6-f749-47bb-abe0-81bd0f134ff9",
-      "last_modified": 1701778564575
+      "version": "122",
+      "browserid": "firefox",
+      "id": "956ca361-9275-40af-a48f-6b67c5ab01c9",
+      "last_modified": 1706515991063
     },
     {
-      "name": "Chrome",
-      "schema": 1701561907067,
-      "status": "beta",
-      "version": "121",
-      "browserid": "chrome",
-      "id": "5693902f-f878-4936-984d-044b573430a6",
-      "last_modified": 1701778564573
+      "name": "Firefox for Android",
+      "schema": 1706313908145,
+      "status": "nightly",
+      "version": "124",
+      "browserid": "firefox_android",
+      "id": "1b3c619a-5ca8-4f5f-8f0b-57a3a27a589f",
+      "last_modified": 1706515991060
     },
     {
-      "name": "WebView Android",
-      "schema": 1701561907585,
-      "status": "beta",
-      "version": "121",
-      "browserid": "webview_android",
-      "id": "a73ddf02-4e9d-425b-b9bb-6a8eb50abd46",
-      "last_modified": 1701778564566
+      "name": "Firefox",
+      "schema": 1706313907745,
+      "status": "nightly",
+      "version": "124",
+      "browserid": "firefox",
+      "id": "7f93cadc-411f-4e31-938c-cc5bfc173f85",
+      "last_modified": 1706515991057
     },
     {
-      "name": "WebView Android",
-      "schema": 1701561907530,
-      "status": "current",
-      "version": "120",
-      "browserid": "webview_android",
-      "id": "7d5df0e5-3460-4fc6-8b19-d4148790d79c",
-      "last_modified": 1701778564563
+      "name": "Edge",
+      "schema": 1705104306985,
+      "status": "planned",
+      "version": "123",
+      "browserid": "edge",
+      "id": "d0c3d84f-8d27-455b-8746-7e25607e5b78",
+      "last_modified": 1705307946112
     },
     {
-      "name": "Chrome Android",
-      "schema": 1701561907255,
-      "status": "beta",
-      "version": "121",
-      "browserid": "chrome_android",
-      "id": "b03b5ac4-0239-4e0c-8685-1ffaa2d0995f",
-      "last_modified": 1701778564558
+      "name": "Edge",
+      "schema": 1705104306922,
+      "status": "nightly",
+      "version": "122",
+      "browserid": "edge",
+      "id": "5ad01f1f-b345-4f24-9b88-4f456a928c76",
+      "last_modified": 1705307946106
     },
     {
-      "name": "Chrome Android",
-      "schema": 1701561907193,
-      "status": "current",
-      "version": "120",
-      "browserid": "chrome_android",
-      "id": "4f1ee2e5-7dd6-4e30-bd15-893611cd4a7f",
-      "last_modified": 1701778564556
+      "name": "Node.js",
+      "schema": 1702685107693,
+      "status": "esr",
+      "version": "20.10.0",
+      "browserid": "nodejs",
+      "id": "0d78585f-e9e0-41e8-816a-22461158e36d",
+      "last_modified": 1702890886929
     },
     {
       "name": "Node.js",
@@ -227,15 +236,6 @@
     },
     {
       "name": "Opera",
-      "schema": 1700957104707,
-      "status": "beta",
-      "version": "106",
-      "browserid": "opera",
-      "id": "63669ffc-728c-4e8a-b761-6939841f9d61",
-      "last_modified": 1701078578064
-    },
-    {
-      "name": "Opera",
       "schema": 1700957104647,
       "status": "current",
       "version": "105",
@@ -262,42 +262,6 @@
       "last_modified": 1699453952078
     },
     {
-      "name": "Chrome",
-      "schema": 1699401908120,
-      "status": "planned",
-      "version": "122",
-      "browserid": "chrome",
-      "id": "e7c93856-0896-474c-b772-06edfae76234",
-      "last_modified": 1699453952071
-    },
-    {
-      "name": "Chrome Android",
-      "schema": 1699401908542,
-      "status": "planned",
-      "version": "122",
-      "browserid": "chrome_android",
-      "id": "62f0c9c3-37c5-4b86-a63b-5be819cc9ff3",
-      "last_modified": 1699453952060
-    },
-    {
-      "name": "Deno",
-      "schema": 1699401908655,
-      "status": "current",
-      "version": "1.38",
-      "browserid": "deno",
-      "id": "40834129-97c0-45cc-9449-b2448bad1d2b",
-      "last_modified": 1699453952057
-    },
-    {
-      "name": "WebView Android",
-      "schema": 1699401909096,
-      "status": "planned",
-      "version": "122",
-      "browserid": "webview_android",
-      "id": "62230e68-ea11-4915-a2f8-bab6c2f5cb8d",
-      "last_modified": 1699453952042
-    },
-    {
       "name": "Node.js",
       "schema": 1695216243625,
       "status": "esr",
@@ -325,5 +289,5 @@
       "last_modified": 1665656484764
     }
   ],
-  "timestamp": 1705307946112
+  "timestamp": 1706695152746
 }
diff --git a/services/settings/dumps/main/search-config.json b/services/settings/dumps/main/search-config.json
index de3c5edda2..2d5c0a6790 100644
--- a/services/settings/dumps/main/search-config.json
+++ b/services/settings/dumps/main/search-config.json
@@ -1,120 +1,11 @@
 {
   "data": [
     {
-      "schema": 1701806001667,
-      "appliesTo": [
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "cs"
-              ]
-            }
-          }
-        }
-      ],
-      "webExtension": {
-        "id": "seznam-cz@search.mozilla.org"
-      },
-      "id": "c50dcc87-0192-4461-bb88-17a55ba181c7",
-      "last_modified": 1701806851414
-    },
-    {
-      "params": {
-        "searchUrlGetParams": [
-          {
-            "name": "ie",
-            "value": "utf-8"
-          },
-          {
-            "name": "wd",
-            "value": "{searchTerms}"
-          }
-        ],
-        "suggestUrlGetParams": [
-          {
-            "name": "ie",
-            "value": "utf-8"
-          },
-          {
-            "name": "action",
-            "value": "opensearch"
-          },
-          {
-            "name": "wd",
-            "value": "{searchTerms}"
-          }
-        ]
-      },
-      "schema": 1701806000003,
-      "appliesTo": [
-        {
-          "params": {
-            "searchUrlGetParams": [
-              {
-                "name": "ie",
-                "value": "utf-8"
-              },
-              {
-                "name": "wd",
-                "value": "{searchTerms}"
-              }
-            ],
-            "suggestUrlGetParams": [
-              {
-                "name": "ie",
-                "value": "utf-8"
-              },
-              {
-                "name": "action",
-                "value": "opensearch"
-              },
-              {
-                "name": "wd",
-                "value": "{searchTerms}"
-              }
-            ]
-          },
-          "default": "yes",
-          "override": true,
-          "orderHint": 3000,
-          "application": {
-            "distributions": [
-              "MozillaOnline"
-            ]
-          }
-        },
-        {
-          "included": {
-            "locales": {
-              "matches": [
-                "zh-CN"
-              ]
-            }
-          }
-        },
-        {
-          "default": "yes",
-          "included": {
-            "locales": {
-              "matches": [
-                "zh-CN"
-              ]
-            },
-            "regions": [
-              "cn"
-            ]
-          }
+      "urls": {
+        "trending": {
+          "fullPath": "https://www.bing.com/osjson.aspx"
         }
-      ],
-      "telemetryId": "baidu",
-      "webExtension": {
-        "id": "baidu@search.mozilla.org"
       },
-      "id": "52dd490a-89e8-45f2-96b0-f2c72e157526",
-      "last_modified": 1701806851411
-    },
-    {
       "params": {
         "searchUrlGetParams": [
           {
@@ -127,7 +18,7 @@
           }
         ]
       },
-      "schema": 1701771233688,
+      "schema": 1706313607068,
       "appliesTo": [
         {
           "included": {
@@ -343,7 +234,121 @@
         "id": "bing@search.mozilla.org"
       },
       "id": "7ec766f6-639a-4618-91bc-33eb3d4378c6",
-      "last_modified": 1701806851408
+      "last_modified": 1707231832220
+    },
+    {
+      "schema": 1701806001667,
+      "appliesTo": [
+        {
+          "included": {
+            "locales": {
+              "matches": [
+                "cs"
+              ]
+            }
+          }
+        }
+      ],
+      "webExtension": {
+        "id": "seznam-cz@search.mozilla.org"
+      },
+      "id": "c50dcc87-0192-4461-bb88-17a55ba181c7",
+      "last_modified": 1701806851414
+    },
+    {
+      "params": {
+        "searchUrlGetParams": [
+          {
+            "name": "ie",
+            "value": "utf-8"
+          },
+          {
+            "name": "wd",
+            "value": "{searchTerms}"
+          }
+        ],
+        "suggestUrlGetParams": [
+          {
+            "name": "ie",
+            "value": "utf-8"
+          },
+          {
+            "name": "action",
+            "value": "opensearch"
+          },
+          {
+            "name": "wd",
+            "value": "{searchTerms}"
+          }
+        ]
+      },
+      "schema": 1701806000003,
+      "appliesTo": [
+        {
+          "params": {
+            "searchUrlGetParams": [
+              {
+                "name": "ie",
+                "value": "utf-8"
+              },
+              {
+                "name": "wd",
+                "value": "{searchTerms}"
+              }
+            ],
+            "suggestUrlGetParams": [
+              {
+                "name": "ie",
+                "value": "utf-8"
+              },
+              {
+                "name": "action",
+                "value": "opensearch"
+              },
+              {
+                "name": "wd",
+                "value": "{searchTerms}"
+              }
+            ]
+          },
+          "default": "yes",
+          "override": true,
+          "orderHint": 3000,
+          "application": {
+            "distributions": [
+              "MozillaOnline"
+            ]
+          }
+        },
+        {
+          "included": {
+            "locales": {
+              "matches": [
+                "zh-CN"
+              ]
+            }
+          }
+        },
+        {
+          "default": "yes",
+          "included": {
+            "locales": {
+              "matches": [
+                "zh-CN"
+              ]
+            },
+            "regions": [
+              "cn"
+            ]
+          }
+        }
+      ],
+      "telemetryId": "baidu",
+      "webExtension": {
+        "id": "baidu@search.mozilla.org"
+      },
+      "id": "52dd490a-89e8-45f2-96b0-f2c72e157526",
+      "last_modified": 1701806851411
     },
     {
       "urls": {
@@ -2675,5 +2680,5 @@
       "last_modified": 1583937832210
     }
   ],
-  "timestamp": 1701806851414
+  "timestamp": 1707231832220
 }
diff --git a/services/settings/dumps/main/search-telemetry-v2.json b/services/settings/dumps/main/search-telemetry-v2.json
index 43b22ec101..716a6a9c57 100644
--- a/services/settings/dumps/main/search-telemetry-v2.json
+++ b/services/settings/dumps/main/search-telemetry-v2.json
@@ -1,128 +1,38 @@
 {
   "data": [
     {
-      "schema": 1698656464939,
-      "taggedCodes": [
-        "monline_dg",
-        "monline_3_dg",
-        "monline_4_dg",
-        "monline_7_dg"
-      ],
-      "telemetryId": "baidu",
-      "organicCodes": [],
-      "codeParamName": "tn",
-      "queryParamName": "wd",
-      "queryParamNames": [
-        "wd",
-        "word"
-      ],
-      "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)",
-      "followOnParamNames": [
-        "oq"
-      ],
-      "extraAdServersRegexps": [
-        "^https?://www\\.baidu\\.com/baidu\\.php?"
-      ],
-      "id": "19c434a3-d173-4871-9743-290ac92a3f6a",
-      "last_modified": 1698666532326
-    },
-    {
-      "schema": 1698656463945,
+      "schema": 1705948294201,
       "components": [
         {
           "type": "ad_carousel",
           "included": {
             "parent": {
-              "selector": ".product-ads-carousel"
+              "selector": ".pla-exp-container"
             },
             "related": {
-              "selector": ".snippet__control"
+              "selector": "g-right-button, g-left-button, .exp-button"
             },
             "children": [
               {
-                "selector": ".product-ads-carousel__item",
+                "selector": "[data-dtld]",
                 "countChildren": true
               }
             ]
           }
         },
         {
-          "type": "ad_link",
-          "included": {
-            "parent": {
-              "selector": ".ad-result"
-            },
-            "children": [
-              {
-                "type": "ad_sitelink",
-                "selector": ".result__extra-content .deep-links--descriptions"
-              }
-            ]
-          }
-        },
-        {
-          "type": "incontent_searchbox",
+          "type": "refined_search_buttons",
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form.search-form"
-            },
-            "related": {
-              "selector": ".search-form__suggestions"
-            },
-            "children": [
-              {
-                "selector": ".search-form__input, .search-form__submit"
-              }
-            ]
-          }
-        },
-        {
-          "type": "ad_link",
-          "default": true
-        }
-      ],
-      "shoppingTab": {
-        "regexp": "/shopping?",
-        "selector": "nav li[data-test-id='search-navigation-item-shopping'] a"
-      },
-      "taggedCodes": [
-        "mzl",
-        "813cf1dd",
-        "16eeffc4"
-      ],
-      "telemetryId": "ecosia",
-      "organicCodes": [],
-      "codeParamName": "tt",
-      "queryParamName": "q",
-      "queryParamNames": [
-        "q"
-      ],
-      "searchPageRegexp": "^https://www\\.ecosia\\.org/",
-      "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0",
-      "expectedOrganicCodes": [],
-      "extraAdServersRegexps": [
-        "^https://www\\.bing\\.com/acli?c?k"
-      ],
-      "id": "9a487171-3a06-4647-8866-36250ec84f3a",
-      "last_modified": 1698666532324
-    },
-    {
-      "schema": 1698656462833,
-      "components": [
-        {
-          "type": "ad_carousel",
-          "included": {
-            "parent": {
-              "selector": ".adsMvCarousel"
+              "selector": "#appbar g-scrolling-carousel"
             },
             "related": {
-              "selector": ".cr"
+              "selector": "g-right-button, g-left-button"
             },
             "children": [
               {
-                "selector": ".pa_item",
-                "countChildren": true
+                "selector": "a"
               }
             ]
           }
@@ -131,17 +41,17 @@
           "type": "ad_link",
           "excluded": {
             "parent": {
-              "selector": "aside"
+              "selector": "#rhs"
             }
           },
           "included": {
             "parent": {
-              "selector": ".sb_adTA"
+              "selector": "[data-text-ad='1']"
             },
             "children": [
               {
                 "type": "ad_sitelink",
-                "selector": ".b_vlist2col"
+                "selector": "[role='list']"
               }
             ]
           }
@@ -150,11 +60,11 @@
           "type": "ad_sidebar",
           "included": {
             "parent": {
-              "selector": "aside"
+              "selector": "#rhs"
             },
             "children": [
               {
-                "selector": ".pa_item, .sb_adTA",
+                "selector": ".pla-unit, .mnr-c",
                 "countChildren": true
               }
             ]
@@ -165,14 +75,36 @@
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form#sb_form"
+              "selector": "form[role='search']"
             },
             "related": {
-              "selector": "#sw_as"
+              "selector": "div.logo + div + div"
             },
             "children": [
               {
-                "selector": "input[name='q']"
+                "selector": "input[type='text']"
+              },
+              {
+                "selector": "textarea[name='q']"
+              }
+            ]
+          }
+        },
+        {
+          "type": "ad_image_row",
+          "excluded": {
+            "parent": {
+              "selector": ".pla-exp-container"
+            }
+          },
+          "included": {
+            "parent": {
+              "selector": ".top-pla-group-inner"
+            },
+            "children": [
+              {
+                "selector": "[data-dtld]",
+                "countChildren": true
               }
             ]
           }
@@ -183,59 +115,81 @@
         }
       ],
       "shoppingTab": {
-        "regexp": "^/shop?",
-        "selector": "#b-scopeListItem-shop a"
+        "regexp": "&tbm=shop",
+        "selector": "div[role='navigation'] a",
+        "inspectRegexpInSERP": true
       },
       "taggedCodes": [
-        "MOZ2",
-        "MOZ4",
-        "MOZ5",
-        "MOZA",
-        "MOZB",
-        "MOZD",
-        "MOZE",
-        "MOZI",
-        "MOZL",
-        "MOZM",
-        "MOZO",
-        "MOZR",
-        "MOZT",
-        "MOZW",
-        "MOZX",
-        "MZSL01",
-        "MZSL02",
-        "MZSL03"
+        "firefox-a",
+        "firefox-b",
+        "firefox-b-1",
+        "firefox-b-ab",
+        "firefox-b-1-ab",
+        "firefox-b-d",
+        "firefox-b-1-d",
+        "firefox-b-e",
+        "firefox-b-1-e",
+        "firefox-b-m",
+        "firefox-b-1-m",
+        "firefox-b-o",
+        "firefox-b-1-o",
+        "firefox-b-lm",
+        "firefox-b-1-lm",
+        "firefox-b-lg",
+        "firefox-b-huawei-h1611",
+        "firefox-b-is-oem1",
+        "firefox-b-oem1",
+        "firefox-b-oem2",
+        "firefox-b-tinno",
+        "firefox-b-pn-wt",
+        "firefox-b-pn-wt-us",
+        "ubuntu",
+        "ubuntu-sn"
       ],
-      "telemetryId": "bing",
+      "telemetryId": "google",
       "organicCodes": [],
-      "codeParamName": "pc",
+      "codeParamName": "client",
       "queryParamName": "q",
-      "followOnCookies": [
-        {
-          "host": "www.bing.com",
-          "name": "SRCHS",
-          "codeParamName": "PC",
-          "extraCodePrefixes": [
-            "QBRE"
-          ],
-          "extraCodeParamName": "form"
-        }
-      ],
       "queryParamNames": [
         "q"
       ],
-      "searchPageRegexp": "^https://www\\.bing\\.com/search",
+      "domainExtraction": {
+        "ads": [
+          {
+            "method": "data-attribute",
+            "options": {
+              "dataAttributeKey": "dtld"
+            },
+            "selectors": "[data-dtld]"
+          }
+        ],
+        "nonAds": [
+          {
+            "method": "href",
+            "selectors": "#rso div.g[jscontroller] > div > div > div > div a[data-usg]"
+          }
+        ]
+      },
+      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",
       "nonAdsLinkRegexps": [
-        "^https://www.bing.com/ck/a"
+        "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url="
+      ],
+      "adServerAttributes": [
+        "rw"
+      ],
+      "followOnParamNames": [
+        "oq",
+        "ved",
+        "ei"
       ],
       "extraAdServersRegexps": [
-        "^https://www\\.bing\\.com/acli?c?k"
+        "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"
       ],
-      "id": "e1eec461-f1f3-40de-b94b-3b670b78108c",
-      "last_modified": 1698666532321
+      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",
+      "last_modified": 1706198445460
     },
     {
-      "schema": 1698656461540,
+      "schema": 1705363206938,
       "components": [
         {
           "type": "ad_carousel",
@@ -337,6 +291,23 @@
       "queryParamNames": [
         "q"
       ],
+      "domainExtraction": {
+        "ads": [
+          {
+            "method": "href",
+            "options": {
+              "queryParamKey": "ad_domain"
+            },
+            "selectors": ".products-carousel a.js-carousel-item-title, [data-testid='ad'] a[data-testid='result-title-a']"
+          }
+        ],
+        "nonAds": [
+          {
+            "method": "href",
+            "selectors": "[data-layout='organic'] a[data-testid='result-title-a']"
+          }
+        ]
+      },
       "searchPageRegexp": "^https://duckduckgo\\.com/",
       "expectedOrganicCodes": [
         "h_",
@@ -372,41 +343,131 @@
         "^https://www\\.amazon\\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)"
       ],
       "id": "9dfd626b-26f2-4913-9d0a-27db6cb7d8ca",
-      "last_modified": 1698666532318
+      "last_modified": 1706198445456
     },
     {
-      "schema": 1698333339811,
+      "schema": 1698656464939,
+      "taggedCodes": [
+        "monline_dg",
+        "monline_3_dg",
+        "monline_4_dg",
+        "monline_7_dg"
+      ],
+      "telemetryId": "baidu",
+      "organicCodes": [],
+      "codeParamName": "tn",
+      "queryParamName": "wd",
+      "queryParamNames": [
+        "wd",
+        "word"
+      ],
+      "searchPageRegexp": "^https://(?:m|www)\\.baidu\\.com/(?:s|baidu)",
+      "followOnParamNames": [
+        "oq"
+      ],
+      "extraAdServersRegexps": [
+        "^https?://www\\.baidu\\.com/baidu\\.php?"
+      ],
+      "id": "19c434a3-d173-4871-9743-290ac92a3f6a",
+      "last_modified": 1698666532326
+    },
+    {
+      "schema": 1698656463945,
       "components": [
         {
           "type": "ad_carousel",
           "included": {
             "parent": {
-              "selector": ".pla-exp-container"
+              "selector": ".product-ads-carousel"
             },
             "related": {
-              "selector": "g-right-button, g-left-button, .exp-button"
+              "selector": ".snippet__control"
             },
             "children": [
               {
-                "selector": "[data-dtld]",
+                "selector": ".product-ads-carousel__item",
                 "countChildren": true
               }
             ]
           }
         },
         {
-          "type": "refined_search_buttons",
+          "type": "ad_link",
+          "included": {
+            "parent": {
+              "selector": ".ad-result"
+            },
+            "children": [
+              {
+                "type": "ad_sitelink",
+                "selector": ".result__extra-content .deep-links--descriptions"
+              }
+            ]
+          }
+        },
+        {
+          "type": "incontent_searchbox",
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "#appbar g-scrolling-carousel"
+              "selector": "form.search-form"
             },
             "related": {
-              "selector": "g-right-button, g-left-button"
+              "selector": ".search-form__suggestions"
             },
             "children": [
               {
-                "selector": "a"
+                "selector": ".search-form__input, .search-form__submit"
+              }
+            ]
+          }
+        },
+        {
+          "type": "ad_link",
+          "default": true
+        }
+      ],
+      "shoppingTab": {
+        "regexp": "/shopping?",
+        "selector": "nav li[data-test-id='search-navigation-item-shopping'] a"
+      },
+      "taggedCodes": [
+        "mzl",
+        "813cf1dd",
+        "16eeffc4"
+      ],
+      "telemetryId": "ecosia",
+      "organicCodes": [],
+      "codeParamName": "tt",
+      "queryParamName": "q",
+      "queryParamNames": [
+        "q"
+      ],
+      "searchPageRegexp": "^https://www\\.ecosia\\.org/",
+      "filter_expression": "env.version|versionCompare(\"110.0a1\")>=0",
+      "expectedOrganicCodes": [],
+      "extraAdServersRegexps": [
+        "^https://www\\.bing\\.com/acli?c?k"
+      ],
+      "id": "9a487171-3a06-4647-8866-36250ec84f3a",
+      "last_modified": 1698666532324
+    },
+    {
+      "schema": 1698656462833,
+      "components": [
+        {
+          "type": "ad_carousel",
+          "included": {
+            "parent": {
+              "selector": ".adsMvCarousel"
+            },
+            "related": {
+              "selector": ".cr"
+            },
+            "children": [
+              {
+                "selector": ".pa_item",
+                "countChildren": true
               }
             ]
           }
@@ -415,17 +476,17 @@
           "type": "ad_link",
           "excluded": {
             "parent": {
-              "selector": "#rhs"
+              "selector": "aside"
             }
           },
           "included": {
             "parent": {
-              "selector": "[data-text-ad='1']"
+              "selector": ".sb_adTA"
             },
             "children": [
               {
                 "type": "ad_sitelink",
-                "selector": "[role='list']"
+                "selector": ".b_vlist2col"
               }
             ]
           }
@@ -434,11 +495,11 @@
           "type": "ad_sidebar",
           "included": {
             "parent": {
-              "selector": "#rhs"
+              "selector": "aside"
             },
             "children": [
               {
-                "selector": ".pla-unit, .mnr-c",
+                "selector": ".pa_item, .sb_adTA",
                 "countChildren": true
               }
             ]
@@ -449,36 +510,14 @@
           "topDown": true,
           "included": {
             "parent": {
-              "selector": "form[role='search']"
+              "selector": "form#sb_form"
             },
             "related": {
-              "selector": "div.logo + div + div"
-            },
-            "children": [
-              {
-                "selector": "input[type='text']"
-              },
-              {
-                "selector": "textarea[name='q']"
-              }
-            ]
-          }
-        },
-        {
-          "type": "ad_image_row",
-          "excluded": {
-            "parent": {
-              "selector": ".pla-exp-container"
-            }
-          },
-          "included": {
-            "parent": {
-              "selector": ".top-pla-group-inner"
+              "selector": "#sw_as"
             },
             "children": [
               {
-                "selector": "[data-dtld]",
-                "countChildren": true
+                "selector": "input[name='q']"
               }
             ]
           }
@@ -489,62 +528,57 @@
         }
       ],
       "shoppingTab": {
-        "regexp": "&tbm=shop",
-        "selector": "div[role='navigation'] a",
-        "inspectRegexpInSERP": true
+        "regexp": "^/shop?",
+        "selector": "#b-scopeListItem-shop a"
       },
       "taggedCodes": [
-        "firefox-a",
-        "firefox-b",
-        "firefox-b-1",
-        "firefox-b-ab",
-        "firefox-b-1-ab",
-        "firefox-b-d",
-        "firefox-b-1-d",
-        "firefox-b-e",
-        "firefox-b-1-e",
-        "firefox-b-m",
-        "firefox-b-1-m",
-        "firefox-b-o",
-        "firefox-b-1-o",
-        "firefox-b-lm",
-        "firefox-b-1-lm",
-        "firefox-b-lg",
-        "firefox-b-huawei-h1611",
-        "firefox-b-is-oem1",
-        "firefox-b-oem1",
-        "firefox-b-oem2",
-        "firefox-b-tinno",
-        "firefox-b-pn-wt",
-        "firefox-b-pn-wt-us",
-        "ubuntu",
-        "ubuntu-sn"
+        "MOZ2",
+        "MOZ4",
+        "MOZ5",
+        "MOZA",
+        "MOZB",
+        "MOZD",
+        "MOZE",
+        "MOZI",
+        "MOZL",
+        "MOZM",
+        "MOZO",
+        "MOZR",
+        "MOZT",
+        "MOZW",
+        "MOZX",
+        "MZSL01",
+        "MZSL02",
+        "MZSL03"
       ],
-      "telemetryId": "google",
+      "telemetryId": "bing",
       "organicCodes": [],
-      "codeParamName": "client",
+      "codeParamName": "pc",
       "queryParamName": "q",
+      "followOnCookies": [
+        {
+          "host": "www.bing.com",
+          "name": "SRCHS",
+          "codeParamName": "PC",
+          "extraCodePrefixes": [
+            "QBRE"
+          ],
+          "extraCodeParamName": "form"
+        }
+      ],
       "queryParamNames": [
         "q"
       ],
-      "searchPageRegexp": "^https://www\\.google\\.(?:.+)/search",
+      "searchPageRegexp": "^https://www\\.bing\\.com/search",
       "nonAdsLinkRegexps": [
-        "^https?://www\\.google\\.(?:.+)/url?(?:.+)&url="
-      ],
-      "adServerAttributes": [
-        "rw"
-      ],
-      "followOnParamNames": [
-        "oq",
-        "ved",
-        "ei"
+        "^https://www.bing.com/ck/a"
       ],
       "extraAdServersRegexps": [
-        "^https?://www\\.google(?:adservices)?\\.com/(?:pagead/)?aclk"
+        "^https://www\\.bing\\.com/acli?c?k"
       ],
-      "id": "635a3325-1995-42d6-be09-dbe4b2a95453",
-      "last_modified": 1698666532316
+      "id": "e1eec461-f1f3-40de-b94b-3b670b78108c",
+      "last_modified": 1698666532321
     }
   ],
-  "timestamp": 1698666532326
+  "timestamp": 1706198445460
 }
diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json
index 9603b2837d..bb75d6bf03 100644
--- a/services/settings/dumps/security-state/intermediates.json
+++ b/services/settings/dumps/security-state/intermediates.json
@@ -1,6 +1,240 @@
 {
   "data": [
     {
+      "schema": 1705981670999,
+      "derHash": "edV7Fd+mXChw6v4Rtjd2WQnP6Te0nBXOfxlAMMqzla0=",
+      "subject": "CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US",
+      "subjectDN": "MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "f2e183bb8adad66608733a2817b33625fa77430aedac090ac258cb9b32b84bab",
+        "size": 1618,
+        "filename": "i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl_s2uC_CY=.pem",
+        "location": "security-state-staging/intermediates/938b215a-776f-42e1-8cba-efd54169311d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl/s2uC/CY=",
+      "crlite_enrolled": false,
+      "id": "57b18913-6deb-4a87-b1e2-3379aeecfc35",
+      "last_modified": 1705982223073
+    },
+    {
+      "schema": 1705503186346,
+      "derHash": "BOgIYDvkayU0Vi494jf0rnq+K14xQdjexHCoIjcNPbc=",
+      "subject": "CN=GlobalSign Atlas E46 EV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBUTFMgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "3536d13c9902bfb62e34f8554dc470da81f30b5c0fd377fec2bf2ba505ec29c7",
+        "size": 1199,
+        "filename": "660nVcvNRcFsR3s7oHScFMybbR6KiQzPeKvSK--DK_k=.pem",
+        "location": "security-state-staging/intermediates/e8b772ed-1da9-4055-a9a2-9c31cd486a1d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "660nVcvNRcFsR3s7oHScFMybbR6KiQzPeKvSK++DK/k=",
+      "crlite_enrolled": false,
+      "id": "e6083412-2f4f-451a-874b-5a62037d7f8a",
+      "last_modified": 1705503423155
+    },
+    {
+      "schema": 1705503185461,
+      "derHash": "TeYXXzsPyjciFZ27waeNDElfbtryMwQKr8JVmIjBdqU=",
+      "subject": "CN=GlobalSign Atlas R3 OV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDI0IFEy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "97421ca04b528adadb2bbdf3bc52173447be4eda67b9f4108d27b36bf946b337",
+        "size": 1642,
+        "filename": "X5G5wFKv3dVearZKW5IcSCUd4PodgUWV3pEScHg27Cw=.pem",
+        "location": "security-state-staging/intermediates/a0d2ec79-24e8-4f5c-ad15-87901c0d4a05.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "X5G5wFKv3dVearZKW5IcSCUd4PodgUWV3pEScHg27Cw=",
+      "crlite_enrolled": false,
+      "id": "a977f162-c8b1-41f2-b9e4-8b906e543559",
+      "last_modified": 1705503423152
+    },
+    {
+      "schema": 1705503185156,
+      "derHash": "0+cioFIOcvdW/em93z1WSfaoWkDKvcyTf3dwCnxF4vw=",
+      "subject": "CN=GlobalSign Atlas ECCR5 DV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDI0IFEy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "0a96038c9db62e0ed417b812459719d29b8655948ad62ac1a47684eab7e06c9a",
+        "size": 1199,
+        "filename": "2L1kc7V6u1WOJipF5zt2aOWEIvM_mpQgRFouJxsVPqM=.pem",
+        "location": "security-state-staging/intermediates/4d0c782c-a2d9-401c-a679-dbde994e9764.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "2L1kc7V6u1WOJipF5zt2aOWEIvM/mpQgRFouJxsVPqM=",
+      "crlite_enrolled": false,
+      "id": "8d4f98e5-d355-45af-b9b0-c7fa7664889f",
+      "last_modified": 1705503423149
+    },
+    {
+      "schema": 1705503184874,
+      "derHash": "q0N8awz3bf4+1wAXQ2gKFRabjYiuwAqfcabCgkro/0E=",
+      "subject": "CN=GlobalSign Atlas R3 OV ACME CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIE9WIEFDTUUgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "910bf03cdf3fa3ae1c6d6d0e6fc94c87191aa74efcf445b57e3233a2cfa17c40",
+        "size": 1642,
+        "filename": "sTITjdyzbufqQcFMCyTHS_F6AxlzIWMLyJM8V8Bk_T4=.pem",
+        "location": "security-state-staging/intermediates/5b0e8b09-8b61-4587-8e16-ec4ffb6b7125.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "sTITjdyzbufqQcFMCyTHS/F6AxlzIWMLyJM8V8Bk/T4=",
+      "crlite_enrolled": false,
+      "id": "eebd2808-c11c-42f2-a774-8c3603f2a033",
+      "last_modified": 1705503423147
+    },
+    {
+      "schema": 1705503184603,
+      "derHash": "O3TYFdCt2LpBKjdmyAXk8R+UaUO+jxip0Ze1JvtCBrw=",
+      "subject": "CN=GlobalSign Atlas ECCR5 DV ACME CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTIwMAYDVQQDEylHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIEFDTUUgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "f43a7319419277da02713d279b13c9c47c4b2c27cf274950950e869a2a80fdd2",
+        "size": 1199,
+        "filename": "Tqawg980bEmVmlcprDRzsWCQaVSSAyhXqTZKLixoUJY=.pem",
+        "location": "security-state-staging/intermediates/75bf6801-9feb-4ef7-a8ff-8ca9a44efb83.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Tqawg980bEmVmlcprDRzsWCQaVSSAyhXqTZKLixoUJY=",
+      "crlite_enrolled": false,
+      "id": "2c45c42f-5c83-4ab5-8e5f-a29a5186bdb1",
+      "last_modified": 1705503423144
+    },
+    {
+      "schema": 1705503184291,
+      "derHash": "zhGwCtONMJLmGASIZdKLXugtNn1ylt2DOJgYxVx32j4=",
+      "subject": "CN=GlobalSign Atlas R3 AlphaSSL CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIEF0bGFzIFIzIEFscGhhU1NMIENBIDIwMjQgUTI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "2549757a47de6df222ba832a4e2dc80ddc101798aecca4ba08115212fbefb8ea",
+        "size": 1646,
+        "filename": "9c92ps9ViIvqXXEV20RON5_nuySPkzdOhK2H-pSFAMo=.pem",
+        "location": "security-state-staging/intermediates/8848d0fc-3773-482e-b90b-9b0e8793a0c9.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "9c92ps9ViIvqXXEV20RON5/nuySPkzdOhK2H+pSFAMo=",
+      "crlite_enrolled": false,
+      "id": "54348587-ce92-452b-af71-eea27d062170",
+      "last_modified": 1705503423142
+    },
+    {
+      "schema": 1705503185739,
+      "derHash": "U/Ly08L5UlVUB7i7dwEiKcKk5H9zy0UTLclfbO3UOW8=",
+      "subject": "CN=GlobalSign Atlas R3 DV ACME CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "7c02bd82b20db1ffcb06f5729b3f0a33e97dfd07279714141f1f7922f46816b3",
+        "size": 1642,
+        "filename": "FqaePH4NiGiiiCLz2DJLzJLm1kRkah4MGHua8wvYqdQ=.pem",
+        "location": "security-state-staging/intermediates/4df6fb56-e304-4c87-9919-0e50bcf8d887.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "FqaePH4NiGiiiCLz2DJLzJLm1kRkah4MGHua8wvYqdQ=",
+      "crlite_enrolled": false,
+      "id": "21f97b0d-72c0-437a-9741-f1fbd8f04bd2",
+      "last_modified": 1705503423139
+    },
+    {
+      "schema": 1705503183954,
+      "derHash": "meY7Gp5MMkZkApw0AnXjCMYQGMvC6EzY6iNmVC6qMJw=",
+      "subject": "CN=GlobalSign Atlas ECCR5 OV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDI0IFEy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "311cc1bba7123536e422149dbead2358daf0ac44b490f73530151d2f01a23cbe",
+        "size": 1199,
+        "filename": "TllTpSwnffvffqGBbCRqwBy-Y5hzCrkbySiflulE_PA=.pem",
+        "location": "security-state-staging/intermediates/9f00d1ae-c133-495d-96d0-628305873ab1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "TllTpSwnffvffqGBbCRqwBy+Y5hzCrkbySiflulE/PA=",
+      "crlite_enrolled": false,
+      "id": "72c8b3ce-4055-4ae8-817f-119b691b2d87",
+      "last_modified": 1705503423137
+    },
+    {
+      "schema": 1705503183024,
+      "derHash": "DmxS8W/05adTLvOad2cpnw4oTMLGtkcTwfuoggmMXfU=",
+      "subject": "CN=GlobalSign Atlas ECCR5 OV ACME CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTIwMAYDVQQDEylHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIEFDTUUgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d3bbde30e424be7fa55d0b64376efcd2c0b7e91ad4bb18e37d73a9039d1ccdc0",
+        "size": 1199,
+        "filename": "mwOXezCyOlYUkGDPtQ1qCaweeHsWLUN-TwW2E3CCkX0=.pem",
+        "location": "security-state-staging/intermediates/20e730f2-8925-4c16-ab19-78935db805dd.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "mwOXezCyOlYUkGDPtQ1qCaweeHsWLUN+TwW2E3CCkX0=",
+      "crlite_enrolled": false,
+      "id": "b48c7f1b-a756-4e92-83e4-e6f07074f699",
+      "last_modified": 1705503423134
+    },
+    {
+      "schema": 1705503183660,
+      "derHash": "1YFqf9X6GNPgxEx4Jz+oVr4KOpk0KIJnY+OogIYxGYY=",
+      "subject": "CN=GlobalSign Atlas R46 EV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBUTFMgQ0EgMjAyNCBRMg==",
+      "whitelist": false,
+      "attachment": {
+        "hash": "25cf51c651ba51648dc30752317d3087872de9fe09f47fe666561ecc041e6578",
+        "size": 2345,
+        "filename": "r6Epwm7CLuojciskFB3GG7NjyZ764bd_d0-TRHGz-0Q=.pem",
+        "location": "security-state-staging/intermediates/cc45e7df-a37a-4b92-8ba4-59e1a3d6d3ff.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "r6Epwm7CLuojciskFB3GG7NjyZ764bd/d0+TRHGz+0Q=",
+      "crlite_enrolled": false,
+      "id": "91436012-4de3-47ae-ab28-3d365774ad8f",
+      "last_modified": 1705503423131
+    },
+    {
+      "schema": 1705503183372,
+      "derHash": "kd3cuVyCWFo9hkX2Zc57i2BlafaUHTO9ndozil721MI=",
+      "subject": "CN=GlobalSign Atlas R6 EV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDI0IFEy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "414b7347871b9c265c22269427a1dd2358873f023cf2bdd96bf3935afdb4db31",
+        "size": 2353,
+        "filename": "8YpzQ5_S0kZObvnXnzFciK6491At9Pgmj8U9tMfTfLU=.pem",
+        "location": "security-state-staging/intermediates/935f48c1-a48e-4ce1-8733-b31354e1edba.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "8YpzQ5/S0kZObvnXnzFciK6491At9Pgmj8U9tMfTfLU=",
+      "crlite_enrolled": false,
+      "id": "ca348f59-2062-4859-b472-05d853b03fdc",
+      "last_modified": 1705503423129
+    },
+    {
+      "schema": 1705503186030,
+      "derHash": "HSBE4nvcRBHKP6NA0ILBzDKxNmNH1AY+iYRjr6w//wY=",
+      "subject": "CN=GlobalSign Atlas R3 DV TLS CA 2024 Q2,O=GlobalSign nv-sa,C=BE",
+      "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDI0IFEy",
+      "whitelist": false,
+      "attachment": {
+        "hash": "2546a507b0a7567c5e95eede4e0d04fedc7bee333865b42e75f2061ff57338d8",
+        "size": 1642,
+        "filename": "Q8EnsLk8vTIWNzmsmTAWeaot9K_dGpLZbJMW-qEIQHE=.pem",
+        "location": "security-state-staging/intermediates/ec6453f9-5bf8-4ee9-8e17-c79cc8cb0c54.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "Q8EnsLk8vTIWNzmsmTAWeaot9K/dGpLZbJMW+qEIQHE=",
+      "crlite_enrolled": false,
+      "id": "f96ed8cd-a04a-4851-9925-344181aeed2a",
+      "last_modified": 1705503423126
+    },
+    {
       "schema": 1704923284170,
       "derHash": "u2FAiu2fUwsuwFReU7osjr6qV9mXZEfbFmPO1GAM1rc=",
       "subject": "CN=UCA Global G2 Root,O=UniTrust,C=CN",
@@ -29683,5 +29917,5 @@
       "last_modified": 1559865884636
     }
   ],
-  "timestamp": 1704923823508
+  "timestamp": 1705982223073
 }
diff --git a/services/settings/test/unit/test_remote_settings_signatures/collection_signing_ee.pem b/services/settings/test/unit/test_remote_settings_signatures/collection_signing_ee.pem
index 4a31a53abc..7ffa37ea98 100644
--- a/services/settings/test/unit/test_remote_settings_signatures/collection_signing_ee.pem
+++ b/services/settings/test/unit/test_remote_settings_signatures/collection_signing_ee.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICdTCCAV2gAwIBAgIUUUM5QQqbDKU02LlGaCuge99SOokwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY29sbGVjdGlvbi1zaWduZXItaW50LUNBMCIYDzIwMjEx
-MTI3MDAwMDAwWhgPMjAyNDAyMDUwMDAwMDBaMCYxJDAiBgNVBAMMG2NvbGxlY3Rp
+MIICdTCCAV2gAwIBAgIUBSXZTtLSPDKor9Sfq1wT7jVpFHkwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY29sbGVjdGlvbi1zaWduZXItaW50LUNBMCIYDzIwMjIx
+MTI3MDAwMDAwWhgPMjAyNTAyMDQwMDAwMDBaMCYxJDAiBgNVBAMMG2NvbGxlY3Rp
 b24tc2lnbmVyLWVlLWludC1DQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABKFockM2
 K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMtqM6Y6DFTTmqcDAsJyNY5regy
 BuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC8Fr3Gh/dzIN0qm6pzqNIMEYw
 EwYDVR0lBAwwCgYIKwYBBQUHAwMwLwYDVR0RBCgwJoIkb25lY3JsLmNvbnRlbnQt
-c2lnbmF0dXJlLm1vemlsbGEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAUwZjGceKB
-w4KxrHHi51ZPCd+VivUZcgeMjXgljmKOGFvqiMnVZGhDbcuCo5idnjEOK33WdHBb
-oxKnVA/IsXAXJFkOEYIV2bKCZYaCtVPus/b2bu40k1xtKp6lj1q8xALCpBwVPWam
-rBOQf039il/mSgXIO3kQE4ueT9KbasMYyI3fdCG8K1PU15xdf9NKRoQz3T+j8+8a
-p/WMDNUBErRNGRCTmIsfj4XIMiiXNn+7chitcL2Kvg/v9WnmyIekXNApM9CC9bpY
-RYMXIcHs01T8JL6Lwkw00l1KVCDh/QH30k986yP/oG/zc7Na6bTR1emoGrkFURa5
-DRVif8+I88Kd
+c2lnbmF0dXJlLm1vemlsbGEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAX1R1MDiqc
+/wfvPd+Bj10cRatAZHVjlL/UOmJ3FnLB1JDhdNsbUBbnQGySQxeFtX7fHav2fV2Z
+25xHnTEVh/Xe0gHJ/f5rZVY/lWlHpfD8Gm5YieGXUWHb5qaUoSIOkG6t31vfWs2W
+VFTR4+E1yu073gUcJNcSNIUWv0Bih7qkb6GaEnz5nagGUsOAr4lvXm0gJDdxqO0/
+ODyveWYSCjBdIJYNN0vYVMz7oywpk9VSr2Tc0bkREQEXulb6gQbp0Jc4BREQ9XCQ
+H6L5jyiCeQcBCoFigBgpjy8BN2UH3pS14qKbKOfnTgNJWDgkabf27XkzhyaqvAs2
+fastfud0EAre
 -----END CERTIFICATE-----
diff --git a/services/settings/test/unit/test_remote_settings_signatures/collection_signing_int.pem b/services/settings/test/unit/test_remote_settings_signatures/collection_signing_int.pem
index db96075e80..0c7941a72e 100644
--- a/services/settings/test/unit/test_remote_settings_signatures/collection_signing_int.pem
+++ b/services/settings/test/unit/test_remote_settings_signatures/collection_signing_int.pem
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIUZ0EUMclrdAM3H/nCxRm3Fa2xBNcwDQYJKoZIhvcNAQEL
+MIIDAzCCAeugAwIBAgIUNeLBp+Y0kXOPVq3thvrPmUeBIR4wDQYJKoZIhvcNAQEL
 BQAwKTEnMCUGA1UEAwweeHBjc2hlbGwgc2lnbmVkIGFwcHMgdGVzdCByb290MCIY
-DzIwMjExMTI3MDAwMDAwWhgPMjAyNDAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGNv
+DzIwMjIxMTI3MDAwMDAwWhgPMjAyNTAyMDQwMDAwMDBaMCMxITAfBgNVBAMMGGNv
 bGxlY3Rpb24tc2lnbmVyLWludC1DQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72x
 nAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lM
@@ -9,11 +9,11 @@ wmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF
 4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMlMCMwDAYDVR0TBAUwAwEB/zAT
-BgNVHSUEDDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAZzxJzD1HA7C3
-VnFxOop9ZATDuALX8MXjf0obe3rvnOldqIAyOjT6NUmrJGul64u95FloVojIp8N6
-cYvviRZOjaV/J4hjN+p7193vdxaxDKtfUFHUnB3Wjqi3UJM/xfj7qxPgxQoy/Rvg
-mBmmqBUDM2N49sp5ZiXyJfJzA4jzQsJoFxBzgJEl5t+luWTFsBtGmu2KRTxSeOdX
-AJJwWawYr6oB8tSk5xweGVOZx/U27Z4e30JbWDzBRmMDX2aBGDcch+i48+tYbRyp
-KGjKPK69iJg0t4Q27jsFkBnL+ayW08YtixhA7lqix87PkVHjW+ITOwR/45QRQ3AE
-h4Bxt3g47Q==
+BgNVHSUEDDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAQEAEw0lySZX8x5B
+mZVBIhs9oqsKjQX6Wi82MhDjAruCDjbB+jhnJw1sx0jFIYA6nALGplMRVdiyYtP5
+fAo/HTIKOQbh7wEnEsYr1rmvw/Huwim+FVL82VHwU2xhgl1TPIi07EmD2sXwaJYM
+haF0QPicpQPILgTSbDp/jLuW/cGWguvPp/+jZPe6XkQCb004UfDQ4YE2pSEBMU/p
+5ojqf81KSpkJf6s/tl5H9KC+bB8Ck5YMTLXP+fB0LpH1MqEZ2MGIQ+84UeMimCLH
+7sHpU/ESUIHFtuZm21LpwuOY9+cQ2idz0WU0QLm3MKdDqSCtuyTnsxJhGm6dAP9G
+LJBxb4T+lg==
 -----END CERTIFICATE-----