From 74c1e53e86fbb8e51470ed6c14109b2092a18a9d Mon Sep 17 00:00:00 2001
From: Andrey Zinovyev <azinovyev@mozilla.com>
Date: Fri, 6 Feb 2026 15:10:02 +0000
Subject: [PATCH 01/93] Bug 2013322 - Remove (activity as HomeActivity) casts
 in TopSiteController.kt r=android-reviewers,jonalmeida

Differential Revision: https://phabricator.services.mozilla.com/D280980
---
 .../main/java/org/mozilla/fenix/home/HomeFragment.kt  |  2 +-
 .../mozilla/fenix/home/topsites/ShortcutsFragment.kt  |  3 +--
 .../home/topsites/controller/TopSiteController.kt     | 11 +++++++----
 .../controller/DefaultTopSiteControllerTest.kt        |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 29d4b26938d85..7356107eec503 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -621,7 +621,7 @@ class HomeFragment : Fragment() {
                 appStore = components.appStore,
             ),
             topSiteController = DefaultTopSiteController(
-                activityRef = WeakReference(activity),
+                activityRef = WeakReference(requireActivity()),
                 store = store,
                 navControllerRef = WeakReference(findNavController()),
                 settings = components.settings,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/ShortcutsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/ShortcutsFragment.kt
index b1189549ce38d..b305cb917e57f 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/ShortcutsFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/ShortcutsFragment.kt
@@ -18,7 +18,6 @@ import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.flow.map
 import mozilla.components.feature.top.sites.presenter.DefaultTopSitesPresenter
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.components.components
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.home.topsites.controller.DefaultTopSiteController
@@ -44,7 +43,7 @@ class ShortcutsFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         controller = DefaultTopSiteController(
-            activityRef = WeakReference(activity as HomeActivity),
+            activityRef = WeakReference(requireActivity()),
             store = requireComponents.core.store,
             navControllerRef = WeakReference(findNavController()),
             settings = requireComponents.settings,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/controller/TopSiteController.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/controller/TopSiteController.kt
index c201933b0c2af..04a6052aaacae 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/controller/TopSiteController.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/controller/TopSiteController.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.home.topsites.controller
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.widget.EditText
@@ -36,9 +37,9 @@ import mozilla.telemetry.glean.private.NoExtras
 import org.mozilla.fenix.GleanMetrics.Pings
 import org.mozilla.fenix.GleanMetrics.ShortcutsLibrary
 import org.mozilla.fenix.GleanMetrics.TopSites
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
+import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.metrics.MetricsUtils
 import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
 import org.mozilla.fenix.ext.components
@@ -112,7 +113,7 @@ interface TopSiteController {
  */
 @Suppress("LongParameterList")
 class DefaultTopSiteController(
-    private val activityRef: WeakReference<HomeActivity>,
+    private val activityRef: WeakReference<Activity>,
     private val navControllerRef: WeakReference<NavController>,
     private val store: BrowserStore,
     private val settings: Settings,
@@ -125,7 +126,7 @@ class DefaultTopSiteController(
     private val viewLifecycleScope: CoroutineScope,
 ) : TopSiteController {
 
-    private val activity: HomeActivity
+    private val activity: Activity
         get() = requireNotNull(activityRef.get())
 
     private val navController: NavController
@@ -138,7 +139,9 @@ class DefaultTopSiteController(
             TopSites.openInPrivateTab.record(NoExtras())
         }
 
-        activity.browsingModeManager.mode = BrowsingMode.Private
+        activity.components.appStore.dispatch(
+            AppAction.BrowsingModeManagerModeChanged(BrowsingMode.Private),
+        )
 
         if (navController.currentDestination?.id == R.id.shortcutsFragment) {
             navController.navigate(ShortcutsFragmentDirections.actionShortcutsFragmentToBrowserFragment())
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/topsites/controller/DefaultTopSiteControllerTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/topsites/controller/DefaultTopSiteControllerTest.kt
index 271a29f068b54..ffd75e8d995c5 100644
--- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/topsites/controller/DefaultTopSiteControllerTest.kt
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/topsites/controller/DefaultTopSiteControllerTest.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.home.topsites.controller
 
+import android.app.Activity
 import androidx.navigation.NavController
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.coVerify
@@ -37,7 +38,6 @@ import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.Pings
 import org.mozilla.fenix.GleanMetrics.ShortcutsLibrary
 import org.mozilla.fenix.GleanMetrics.TopSites
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.Analytics
 import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
@@ -55,7 +55,7 @@ class DefaultTopSiteControllerTest {
     @get:Rule
     val gleanTestRule = FenixGleanTestRule(testContext)
 
-    private val activity: HomeActivity = mockk(relaxed = true)
+    private val activity: Activity = mockk(relaxed = true)
     private val navController: NavController = mockk(relaxed = true)
     private val tabsUseCases: TabsUseCases = mockk(relaxed = true)
     private val selectTabUseCase: TabsUseCases = mockk(relaxed = true)

From 2ef746250dc8efe9568c1d262b3a1182f61bc7ee Mon Sep 17 00:00:00 2001
From: Greg Stoll <gstoll@mozilla.com>
Date: Fri, 6 Feb 2026 15:12:14 +0000
Subject: [PATCH 02/93] Bug 1994918 part 2 - improve windows message debug
 output for WM_NCHITTEST r=win-reviewers,handyman

Differential Revision: https://phabricator.services.mozilla.com/D274823
---
 widget/windows/nsWindowDbg.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/widget/windows/nsWindowDbg.cpp b/widget/windows/nsWindowDbg.cpp
index 6552fb8103271..0055396b59570 100644
--- a/widget/windows/nsWindowDbg.cpp
+++ b/widget/windows/nsWindowDbg.cpp
@@ -377,6 +377,7 @@ bool NativeEventLogger::NativeEventLoggerInternal() {
       }
       const char* resultMsg = [&]() {
         if (!mResult.isSome()) return "initial call";
+        if (!mResult.value()) return "false";
         if (mMsg == WM_NCHITTEST) {
           auto const& htr = HitTestResults();
           if (auto const it = htr.find(mRetValue); it != htr.end()) {
@@ -384,7 +385,7 @@ bool NativeEventLogger::NativeEventLoggerInternal() {
           }
           return "undocumented value?";
         }
-        return mResult.value() ? "true" : "false";
+        return "true";
       }();
 
       nsAutoCString logMessage;
@@ -561,9 +562,12 @@ void VirtualKeyParamInfo(nsCString& result, uint64_t param, const char* name,
                          bool /* isPreCall */) {
   // check that `name` is of length 2
   constexpr static const auto ASCII_KEY_ENTRY_HELPER =
-      [](const char(&name)[2]) -> uint64_t { return name[0]; };
+      [](const char (&name)[2]) -> uint64_t { return name[0]; };
 
-#define ASCII_KEY_ENTRY(name) {ASCII_KEY_ENTRY_HELPER(name), name}
+#define ASCII_KEY_ENTRY(name)          \
+  {                                    \
+    ASCII_KEY_ENTRY_HELPER(name), name \
+  }
 
   const static std::unordered_map<uint64_t, const char*> virtualKeys{
       VALANDNAME_ENTRY(VK_LBUTTON),

From c5868a99b4c0710d430673891631d650af9ac936 Mon Sep 17 00:00:00 2001
From: Rebecca King <rking@mozilla.com>
Date: Fri, 6 Feb 2026 15:20:35 +0000
Subject: [PATCH 03/93] Bug 2000718 - Trigger in-panel bandwidth limit warning
 messages at 75 and 90 percent usage -
 r=ip-protection-reviewers,fluent-reviewers,bolsson,kpatenio

Differential Revision: https://phabricator.services.mozilla.com/D281691
---
 .../ipprotection/IPProtectionPanel.sys.mjs    |  47 +++++-
 .../content/ipprotection-content.css          |   6 +
 .../content/ipprotection-content.mjs          |  15 +-
 .../browser_ipprotection_message_bar.js       | 138 +++++++++++++++++-
 .../browser_ipprotection_status_card.js       |   1 +
 .../ipprotection/tests/browser/head.js        |   1 -
 6 files changed, 198 insertions(+), 10 deletions(-)

diff --git a/browser/components/ipprotection/IPProtectionPanel.sys.mjs b/browser/components/ipprotection/IPProtectionPanel.sys.mjs
index 6c5f0c941638e..c5887c3859345 100644
--- a/browser/components/ipprotection/IPProtectionPanel.sys.mjs
+++ b/browser/components/ipprotection/IPProtectionPanel.sys.mjs
@@ -35,6 +35,7 @@ import {
 } from "chrome://browser/content/ipprotection/ipprotection-constants.mjs";
 
 const EGRESS_LOCATION_PREF = "browser.ipProtection.egressLocationEnabled";
+const BANDWIDTH_THRESHOLD_PREF = "browser.ipProtection.bandwidthThreshold";
 const DEFAULT_EGRESS_LOCATION = { name: "United States", code: "us" };
 
 XPCOMUtils.defineLazyPreferenceGetter(
@@ -51,6 +52,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
   false
 );
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "BANDWIDTH_THRESHOLD",
+  "browser.ipProtection.bandwidthThreshold",
+  0
+);
+
 let hasCustomElements = new WeakSet();
 
 /**
@@ -129,6 +137,7 @@ export class IPProtectionPanel {
   panel = null;
   initiatedUpgrade = false;
   #window = null;
+  #lastBandwidthWarningMessageDismissed = 0;
 
   /**
    * Gets the gBrowser from the weak reference to the window.
@@ -195,7 +204,7 @@ export class IPProtectionPanel {
       isSiteExceptionsEnabled: this.isExceptionsFeatureEnabled,
       siteData: this.#getSiteData(),
       bandwidthUsage: lazy.BANDWIDTH_USAGE_ENABLED
-        ? { currentBandwidthUsage: 0, maxBandwidth: 150 }
+        ? { currentBandwidthUsage: 0, maxBandwidth: 50 }
         : null,
       isActivating:
         lazy.IPPProxyManager.state === lazy.IPPProxyStates.ACTIVATING,
@@ -505,6 +514,10 @@ export class IPProtectionPanel {
       "IPProtection:UserDisableVPNForSite",
       this.handleEvent
     );
+    doc.addEventListener(
+      "IPProtection:DismissBandwidthWarning",
+      this.handleEvent
+    );
   }
 
   #removePanelListeners(doc) {
@@ -522,6 +535,10 @@ export class IPProtectionPanel {
       "IPProtection:UserDisableVPNForSite",
       this.handleEvent
     );
+    doc.removeEventListener(
+      "IPProtection:DismissBandwidthWarning",
+      this.handleEvent
+    );
   }
 
   #addProxyListeners() {
@@ -576,10 +593,15 @@ export class IPProtectionPanel {
 
   #addPrefObserver() {
     Services.prefs.addObserver(EGRESS_LOCATION_PREF, this.handlePrefChange);
+    Services.prefs.addObserver(BANDWIDTH_THRESHOLD_PREF, this.handlePrefChange);
   }
 
   #removePrefObserver() {
     Services.prefs.removeObserver(EGRESS_LOCATION_PREF, this.handlePrefChange);
+    Services.prefs.removeObserver(
+      BANDWIDTH_THRESHOLD_PREF,
+      this.handlePrefChange
+    );
   }
 
   #handlePrefChange(subject, topic, data) {
@@ -588,6 +610,25 @@ export class IPProtectionPanel {
       this.setState({
         location: isEnabled ? DEFAULT_EGRESS_LOCATION : null,
       });
+    } else if (data === BANDWIDTH_THRESHOLD_PREF) {
+      const threshold = lazy.BANDWIDTH_THRESHOLD;
+
+      // Reset dismissed warnings when threshold is cleared (e.g., new month)
+      if (threshold === 0) {
+        this.#lastBandwidthWarningMessageDismissed = 0;
+        return;
+      }
+
+      // Only show warning if threshold is 75 or 90
+      if (threshold !== 75 && threshold !== 90) {
+        return;
+      }
+
+      // Show warning only if current threshold is higher than dismissed threshold
+      // This allows warning to reappear when going from 75% → 90%
+      if (threshold > this.#lastBandwidthWarningMessageDismissed) {
+        this.setState({ bandwidthWarning: true });
+      }
     }
   }
 
@@ -711,6 +752,10 @@ export class IPProtectionPanel {
       lazy.IPPExceptionsManager.setExclusion(principal, true);
 
       this.#reloadCurrentTab(win);
+    } else if (event.type == "IPProtection:DismissBandwidthWarning") {
+      // Store the dismissed threshold level
+      this.#lastBandwidthWarningMessageDismissed = event.detail.threshold;
+      this.setState({ bandwidthWarning: false });
     }
   }
 }
diff --git a/browser/components/ipprotection/content/ipprotection-content.css b/browser/components/ipprotection/content/ipprotection-content.css
index a23ddf6187629..78ca565ff9725 100644
--- a/browser/components/ipprotection/content/ipprotection-content.css
+++ b/browser/components/ipprotection/content/ipprotection-content.css
@@ -92,6 +92,12 @@ hr {
   margin: 0;
 }
 
+ipprotection-message-bar.vpn-top-content {
+  margin-inline: var(--space-small);
+  margin-block-start: 0;
+  margin-block-end: var(--space-small);
+}
+
 @media (prefers-color-scheme: dark) {
   #unauthenticated-vpn-img {
     content: url("chrome://browser/content/ipprotection/assets/vpn-panel-get-started-dark.svg");
diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index a3c310be8893f..d1299dffe7780 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -177,7 +177,14 @@ export default class IPProtectionContentElement extends MozLitElement {
       this._showMessageBar = false;
       this._messageDismissed = true;
       this.state.error = "";
-      this.state.bandwidthWarning = false;
+
+      if (this.state.bandwidthWarning) {
+        this.dispatchEvent(
+          new CustomEvent("IPProtection:DismissBandwidthWarning", {
+            bubbles: true,
+          })
+        );
+      }
     }
   }
 
@@ -232,9 +239,10 @@ export default class IPProtectionContentElement extends MozLitElement {
       messageId = "ipprotection-message-bandwidth-warning";
       messageType = "warning";
       messageLinkL10nArgs = JSON.stringify({
-        usageLeft:
+        usageLeft: (
           this.state.bandwidthUsage.maxBandwidth -
-          this.state.bandwidthUsage.currentBandwidthUsage,
+          this.state.bandwidthUsage.currentBandwidthUsage
+        ).toFixed(0),
         maxUsage: this.state.bandwidthUsage.maxBandwidth,
       });
     } else if (this.state.onboardingMessage) {
@@ -263,6 +271,7 @@ export default class IPProtectionContentElement extends MozLitElement {
         .messageLink=${ifDefined(messageLink)}
         .messageLinkl10nId=${ifDefined(messageLinkl10nId)}
         .messageLinkL10nArgs=${ifDefined(messageLinkL10nArgs)}
+        .bandwidthUsage=${ifDefined(this.state.bandwidthUsage)}
       ></ipprotection-message-bar>
     `;
   }
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
index 365e98742e32c..d39802f3bf4ae 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
@@ -50,17 +50,29 @@ add_task(async function test_generic_error() {
 });
 
 /**
- * Tests the warning message bar
+ * Tests the warning message bar triggered by bandwidth threshold preference
  */
 add_task(async function test_warning_message() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.ipProtection.bandwidth.enabled", true],
+      ["browser.ipProtection.bandwidthThreshold", 0],
+    ],
+  });
+
+  // Start with no bandwidth usage
   let content = await openPanel({
     isSignedOut: false,
     error: "",
+    bandwidthUsage: {
+      currentBandwidthUsage: 0,
+      maxBandwidth: 50,
+    },
   });
 
   let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
 
-  Assert.ok(!messageBar, "Message bar should not be present");
+  Assert.ok(!messageBar, "Message bar should not be present initially");
 
   let messageBarLoadedPromise = BrowserTestUtils.waitForMutationCondition(
     content.shadowRoot,
@@ -68,17 +80,26 @@ add_task(async function test_warning_message() {
     () => content.shadowRoot.querySelector("ipprotection-message-bar")
   );
 
+  // Simulate bandwidth usage increasing to 75% (37.5 GB used, 12.5 GB remaining)
   await setPanelState({
     isSignedOut: false,
     error: "",
-    bandwidthWarning: true,
-    bandwidthUsage: { currentBandwidthUsage: 55, maxBandwidth: 150 },
+    bandwidthUsage: {
+      currentBandwidthUsage: 37.5,
+      maxBandwidth: 50,
+    },
+  });
+
+  // Set threshold to 75% to trigger warning
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.bandwidthThreshold", 75]],
   });
+
   await messageBarLoadedPromise;
 
   messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
 
-  Assert.ok(messageBar, "Message bar should be present");
+  Assert.ok(messageBar, "Message bar should be present after threshold change");
   Assert.ok(
     messageBar.mozMessageBarEl,
     "Wrapped moz-message-bar should be present"
@@ -90,7 +111,113 @@ add_task(async function test_warning_message() {
     "Warning message id should match"
   );
 
+  // Verify bandwidth data is passed to the message bar
+  Assert.ok(
+    messageBar.bandwidthUsage,
+    "Bandwidth usage data should be passed to message bar"
+  );
+  Assert.equal(
+    messageBar.bandwidthUsage.currentBandwidthUsage,
+    37.5,
+    "Current bandwidth usage should match (37.5 GB used at 75% threshold)"
+  );
+  Assert.equal(
+    messageBar.bandwidthUsage.maxBandwidth,
+    50,
+    "Max bandwidth should match (50 GB limit)"
+  );
+
+  // Dismiss the 75% warning
+  let closeButton = messageBar.mozMessageBarEl.closeButton;
+  Assert.ok(closeButton, "Message bar should have close button");
+
+  let dismissEvent = BrowserTestUtils.waitForEvent(
+    document,
+    messageBar.DISMISS_EVENT
+  );
+  let messageBarUnloadedPromise = BrowserTestUtils.waitForMutationCondition(
+    content.shadowRoot,
+    { childList: true, subtree: true },
+    () => !content.shadowRoot.querySelector("ipprotection-message-bar")
+  );
+
+  closeButton.click();
+
+  await dismissEvent;
+  await messageBarUnloadedPromise;
+
+  Assert.ok(
+    !content.shadowRoot.querySelector("ipprotection-message-bar"),
+    "Message bar should be dismissed after clicking close button"
+  );
+
+  await closePanel();
+
+  // Simulate bandwidth usage increasing to 90% (45 GB used, 5 GB remaining)
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.bandwidthThreshold", 90]],
+  });
+  // Simulate bandwidth usage increasing to 90% (45 GB used, 5 GB remaining)
+  content = await openPanel({
+    isSignedOut: false,
+    error: "",
+    bandwidthUsage: {
+      currentBandwidthUsage: 45,
+      maxBandwidth: 50,
+    },
+  });
+
+  messageBarLoadedPromise = BrowserTestUtils.waitForMutationCondition(
+    content.shadowRoot,
+    { childList: true, subtree: true },
+    () => content.shadowRoot.querySelector("ipprotection-message-bar")
+  );
+
+  // The 90% warning should appear
+  await messageBarLoadedPromise;
+
+  messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
+
+  Assert.ok(
+    messageBar,
+    "Message bar should reappear at 90% threshold after 75% was dismissed"
+  );
+  Assert.equal(messageBar.type, "warning", "Message bar should be warning");
+  Assert.equal(
+    messageBar.messageId,
+    "ipprotection-message-bandwidth-warning",
+    "Warning message id should match"
+  );
+
+  // Verify updated bandwidth data
+  Assert.equal(
+    messageBar.bandwidthUsage.currentBandwidthUsage,
+    45,
+    "Current bandwidth usage should be updated (45 GB used at 90% threshold)"
+  );
+  Assert.equal(
+    messageBar.bandwidthUsage.maxBandwidth,
+    50,
+    "Max bandwidth should match (50 GB limit)"
+  );
+
+  dismissEvent = BrowserTestUtils.waitForEvent(
+    document,
+    messageBar.DISMISS_EVENT
+  );
+  messageBarUnloadedPromise = BrowserTestUtils.waitForMutationCondition(
+    content.shadowRoot,
+    { childList: true, subtree: true },
+    () => !content.shadowRoot.querySelector("ipprotection-message-bar")
+  );
+  closeButton = messageBar.mozMessageBarEl.closeButton;
+  closeButton.click();
+
+  await dismissEvent;
+  await messageBarUnloadedPromise;
+
   await closePanel();
+  await SpecialPowers.popPrefEnv();
 });
 
 /**
@@ -101,6 +228,7 @@ add_task(async function test_dismiss() {
   let content = await openPanel({
     isSignedOut: false,
     error: "",
+    bandwidthWarning: false,
   });
 
   let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
index 2db6851bb5755..342340371d3f3 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
@@ -46,6 +46,7 @@ async function setupStatusCardTest(
 }
 
 async function cleanupStatusCardTest() {
+  await SpecialPowers.popPrefEnv();
   cleanupService();
 }
 
diff --git a/browser/components/ipprotection/tests/browser/head.js b/browser/components/ipprotection/tests/browser/head.js
index c58203080b1c5..0242157641acf 100644
--- a/browser/components/ipprotection/tests/browser/head.js
+++ b/browser/components/ipprotection/tests/browser/head.js
@@ -312,7 +312,6 @@ add_setup(async function setupVPN() {
     Services.prefs.clearUserPref("browser.ipProtection.entitlementCache");
     Services.prefs.clearUserPref("browser.ipProtection.locationListCache");
     Services.prefs.clearUserPref("browser.ipProtection.onboardingMessageMask");
-    Services.prefs.clearUserPref("browser.ipProtection.bandwidth.enabled");
     Services.prefs.clearUserPref("browser.ipProtection.egressLocationEnabled");
   });
 });

From 136b2ccc2c80f8964a5516955d04a02e9525729a Mon Sep 17 00:00:00 2001
From: Giulia Cardieri <gcardieri@mozilla.com>
Date: Fri, 6 Feb 2026 15:31:46 +0000
Subject: [PATCH 04/93] Bug 2010422 - Add loader for chat assistant
 r=ai-frontend-reviewers,Mardak

[[ https://www.figma.com/design/5KuePTGmOEUFyCHBHCsGim/AI-Mode-%E2%80%94%C2%A0MVP-Scope-Design?node-id=16507-34414&m=dev | Figma example (no text for now) ]]

**Goal**: add a loader element, it is visible after the user sends a message and before the assistant responds. Based on the back-end, the analyzing search text might appear after the search page is visible and while the assistant is loading their summary of it.

Differential Revision: https://phabricator.services.mozilla.com/D281502
---
 .../components/aiwindow/ui/assets/loader.svg  |  5 ++
 .../ai-chat-content/ai-chat-content.css       | 32 ------------
 .../ai-chat-content/ai-chat-content.mjs       | 29 +++++------
 .../chat-assistant-loader.css                 | 41 ++++++++++++++++
 .../chat-assistant-loader.mjs                 | 49 +++++++++++++++++++
 browser/components/aiwindow/ui/jar.mn         |  3 ++
 .../test/browser/browser_actor_user_prompt.js | 46 +++++++++++++++++
 7 files changed, 156 insertions(+), 49 deletions(-)
 create mode 100644 browser/components/aiwindow/ui/assets/loader.svg
 create mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
 create mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs

diff --git a/browser/components/aiwindow/ui/assets/loader.svg b/browser/components/aiwindow/ui/assets/loader.svg
new file mode 100644
index 0000000000000..c063a09187c32
--- /dev/null
+++ b/browser/components/aiwindow/ui/assets/loader.svg
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><mask id="b" fill="#fff"><path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Z"/></mask><g clip-path="url(#a)" mask="url(#b)"><foreignObject width="2583.33" height="2583.33" x="-1291.67" y="-1291.67" transform="rotate(180 4 4) scale(.008)"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(160,114,226,0) 0deg,#a072e2 360deg);height:100%;width:100%;opacity:1"/></foreignObject></g><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/><defs><clipPath id="a"><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
index 2db95c66c7497..3b334e651f086 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
@@ -66,35 +66,3 @@
   gap: var(--space-small);
   width: 100%;
 }
-
-.searching-indicator {
-  align-items: center;
-  flex-direction: row;
-  gap: var(--space-small);
-}
-
-.searching-text {
-  color: var(--text-color-deemphasized);
-  font-style: italic;
-}
-
-.searching-indicator::before {
-  animation: pulse 1.5s ease-in-out infinite;
-  background: var(--color-accent-primary);
-  border-radius: 50%;
-  content: "";
-  height: 8px;
-  width: 8px;
-}
-
-@keyframes pulse {
-  0%,
-  100% {
-    opacity: 0.4;
-    transform: scale(0.8);
-  }
-  50% {
-    opacity: 1;
-    transform: scale(1.2);
-  }
-}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
index 413d95a3c57b9..9fec20b632120 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
@@ -6,6 +6,8 @@ import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 // eslint-disable-next-line import/no-unassigned-import
 import "chrome://browser/content/aiwindow/components/assistant-message-footer.mjs";
+// eslint-disable-next-line import/no-unassigned-import
+import "chrome://browser/content/aiwindow/components/chat-assistant-loader.mjs";
 
 /**
  * A custom element for managing AI Chat Content
@@ -15,14 +17,14 @@ export class AIChatContent extends MozLitElement {
     conversationState: { type: Array },
     tokens: { type: Object },
     isSearching: { type: Boolean },
-    searchQuery: { type: String },
+    assistantIsLoading: { type: Boolean },
   };
 
   constructor() {
     super();
     this.conversationState = [];
     this.isSearching = false;
-    this.searchQuery = null;
+    this.assistantIsLoading = false;
   }
 
   connectedCallback() {
@@ -145,9 +147,9 @@ export class AIChatContent extends MozLitElement {
   }
 
   handleLoadingEvent(event) {
-    const { isSearching, searchQuery } = event.detail;
+    const { isSearching } = event.detail;
     this.isSearching = !!isSearching;
-    this.searchQuery = searchQuery || null;
+    this.assistantIsLoading = true;
     this.requestUpdate();
     this.#scrollToBottom();
   }
@@ -160,6 +162,7 @@ export class AIChatContent extends MozLitElement {
 
   handleUserPromptEvent(event) {
     const { convId, content, ordinal } = event.detail;
+    this.assistantIsLoading = true;
     this.conversationState[ordinal] = {
       role: "user",
       body: content.body,
@@ -178,7 +181,7 @@ export class AIChatContent extends MozLitElement {
 
   handleAIResponseEvent(event) {
     this.isSearching = false;
-    this.searchQuery = null;
+    this.assistantIsLoading = false;
 
     const {
       convId,
@@ -277,18 +280,10 @@ export class AIChatContent extends MozLitElement {
             </div>
           `;
         })}
-        ${this.isSearching
-          ? html`
-              <div
-                class="chat-bubble chat-bubble-assistant searching-indicator"
-              >
-                <span class="searching-text">
-                  ${this.searchQuery
-                    ? `Searching for: "${this.searchQuery}"`
-                    : "Searching the web..."}
-                </span>
-              </div>
-            `
+        ${this.assistantIsLoading
+          ? html`<chat-assistant-loader
+              .isSearch=${this.isSearching}
+            ></chat-assistant-loader>`
           : nothing}
       </div>
     `;
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
new file mode 100644
index 0000000000000..6376c07977670
--- /dev/null
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
@@ -0,0 +1,41 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+:host {
+  --chat-assistant-loader-size: var(--size-item-small);
+  --chat-assistant-loader-light-pink: color-mix(in srgb, var(--color-blue-40) 38.74%, var(--color-purple-10) 61.26%);
+  --chat-assistant-loader-dark-pink: var(--color-purple-60);
+}
+
+.chat-assistant-loader {
+  display: flex;
+  gap: calc(var(--space-xxsmall) + var(--space-xsmall));
+}
+
+.chat-assistant-loader__spinner {
+  animation: 0.9s spinLoader infinite linear;
+  background-image: url("chrome://browser/content/aiwindow/assets/loader.svg");
+  background-size: var(--chat-assistant-loader-size);
+  height: var(--chat-assistant-loader-size);
+  width: var(--chat-assistant-loader-size);
+  will-change: transform;
+}
+
+@keyframes spinLoader {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.chat-assistant-loader__text {
+  background: linear-gradient(90deg, var(--chat-assistant-loader-light-pink) 14.17%, var(--chat-assistant-loader-dark-pink) 91.21%);
+  background-clip: text;
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
+  color: transparent;
+  font-weight: var(--font-weight-semibold);
+  margin: 0;
+}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
new file mode 100644
index 0000000000000..48be3c156f981
--- /dev/null
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
+import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
+
+/**
+ * Loader/spinner visible while the assistant is thinking
+ *
+ * isSearch - true when this component is being used for loading a search handoff action
+ */
+export class ChatAssistantLoader extends MozLitElement {
+  static properties = {
+    isSearch: { type: Boolean },
+  };
+
+  constructor() {
+    super();
+    this.isSearch = false;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+  }
+
+  render() {
+    return html`
+      <link
+        rel="stylesheet"
+        href="chrome://browser/content/aiwindow/components/chat-assistant-loader.css"
+      />
+      <!-- TO DO: add fluent string when UX writing team finished copy - https://bugzilla.mozilla.org/show_bug.cgi?id=2014907 -->
+      <div
+        class="chat-assistant-loader"
+        aria-label=" ${this.isSearch ? `` : `Loading assistant response`}"
+      >
+        <span class="chat-assistant-loader__spinner"></span>
+        ${this.isSearch
+          ? html`
+              <p class="chat-assistant-loader__text">Analyzing web search</p>
+            `
+          : nothing}
+      </div>
+    `;
+  }
+}
+
+customElements.define("chat-assistant-loader", ChatAssistantLoader);
diff --git a/browser/components/aiwindow/ui/jar.mn b/browser/components/aiwindow/ui/jar.mn
index d0f22bcb03619..1217776c10c1e 100644
--- a/browser/components/aiwindow/ui/jar.mn
+++ b/browser/components/aiwindow/ui/jar.mn
@@ -9,6 +9,9 @@ browser.jar:
   content/browser/aiwindow/assets/input-cta-arrow-icon.svg          (assets/input-cta-arrow-icon.svg)
   content/browser/aiwindow/components/ai-chat-content.mjs           (components/ai-chat-content/ai-chat-content.mjs)
   content/browser/aiwindow/components/ai-chat-content.css           (components/ai-chat-content/ai-chat-content.css)
+  content/browser/aiwindow/components/chat-assistant-loader.mjs     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs)
+  content/browser/aiwindow/components/chat-assistant-loader.css     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css)
+  content/browser/aiwindow/assets/loader.svg                        (assets/loader.svg)
   content/browser/aiwindow/components/ai-chat-message.mjs           (components/ai-chat-message/ai-chat-message.mjs)
   content/browser/aiwindow/components/ai-chat-message.css           (components/ai-chat-message/ai-chat-message.css)
   content/browser/aiwindow/components/ai-chat-search-button.mjs     (components/ai-chat-search-button/ai-chat-search-button.mjs)
diff --git a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
index fe26e5c88426e..5f0653efc8d02 100644
--- a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
+++ b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
@@ -56,3 +56,49 @@ add_task(async function test_streaming_ai_response() {
 
   await SpecialPowers.popPrefEnv();
 });
+
+/**
+ * Test if the loader shows after the user prompt is submitted
+ */
+add_task(async function test_loader_shows_on_user_submit() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.smartwindow.enabled", true]],
+  });
+
+  await BrowserTestUtils.withNewTab("about:aichatcontent", async browser => {
+    const actor =
+      browser.browsingContext.currentWindowGlobal.getActor("AIChatContent");
+
+    const userPrompt = {
+      role: "user",
+      content: { body: "Show loader please" },
+    };
+
+    await actor.dispatchMessageToChatContent(userPrompt);
+
+    await SpecialPowers.spawn(browser, [], async () => {
+      const contentEl = content.document.querySelector("ai-chat-content");
+      await contentEl.updateComplete;
+
+      let loaderEl;
+      await ContentTaskUtils.waitForMutationCondition(
+        contentEl.shadowRoot,
+        { childList: true, subtree: true },
+        () => {
+          loaderEl = contentEl.shadowRoot.querySelector(
+            "chat-assistant-loader"
+          );
+          return loaderEl;
+        }
+      );
+      Assert.ok(loaderEl, "Loader element exists");
+
+      const inner = loaderEl.shadowRoot?.querySelector(
+        ".chat-assistant-loader"
+      );
+      Assert.ok(inner, "Loader has the correct content");
+    });
+  });
+
+  await SpecialPowers.popPrefEnv();
+});

From 40d36ba49cf6d720479d6ce8821d7025f4646a1b Mon Sep 17 00:00:00 2001
From: Alex Hochheiden <ahochheiden@mozilla.com>
Date: Fri, 6 Feb 2026 15:34:57 +0000
Subject: [PATCH 05/93] Bug 2010200 - Add default `distribution.ini` for
 official Linux builds
 r=firefox-build-system-reviewers,glandium,omc-reviewers,mimi

Differential Revision: https://phabricator.services.mozilla.com/D281651
---
 browser/app/distribution/distribution.ini     |  4 ++++
 browser/app/distribution/moz.build            | 12 ++++++++++
 browser/app/moz.build                         |  2 ++
 .../about/browser_aboutDialog_distribution.js |  1 +
 .../browser/browser_asrouter_targeting.js     | 20 +++++++++++-----
 .../components/uitour/test/browser_UITour.js  | 21 +++++++++++------
 browser/config/mozconfigs/linux64/common-opt  |  2 ++
 browser/installer/package-manifest.in         |  4 ++++
 .../test/browser/browser_ClientEnvironment.js | 23 ++++++++++++-------
 toolkit/modules/AppConstants.sys.mjs          |  7 ++++++
 toolkit/moz.configure                         |  6 +++++
 tools/update-packaging/common.sh              |  3 ++-
 12 files changed, 83 insertions(+), 22 deletions(-)
 create mode 100644 browser/app/distribution/distribution.ini
 create mode 100644 browser/app/distribution/moz.build

diff --git a/browser/app/distribution/distribution.ini b/browser/app/distribution/distribution.ini
new file mode 100644
index 0000000000000..5c16c3bab161e
--- /dev/null
+++ b/browser/app/distribution/distribution.ini
@@ -0,0 +1,4 @@
+[Global]
+id=mozilla-official
+version=1.0
+about=Mozilla Firefox Official Build
\ No newline at end of file
diff --git a/browser/app/distribution/moz.build b/browser/app/distribution/moz.build
new file mode 100644
index 0000000000000..a97ea6cce4bff
--- /dev/null
+++ b/browser/app/distribution/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIST_SUBDIR = ""
+
+if CONFIG["BUILT_BY_MOZILLA"]:
+    FINAL_TARGET_FILES.distribution += [
+        "distribution.ini",
+    ]
diff --git a/browser/app/moz.build b/browser/app/moz.build
index a23bb7812a03b..b5f5461fd0835 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -29,6 +29,8 @@ with Files("profile/channel-prefs.js"):
 with Files("profile/firefox.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
+DIRS += ["distribution"]
+
 if CONFIG["MOZ_MACBUNDLE_NAME"]:
     DIRS += ["macbuild/Contents"]
 
diff --git a/browser/base/content/test/about/browser_aboutDialog_distribution.js b/browser/base/content/test/about/browser_aboutDialog_distribution.js
index 8f52533bbc52c..2b9c41b2f6fd9 100644
--- a/browser/base/content/test/about/browser_aboutDialog_distribution.js
+++ b/browser/base/content/test/about/browser_aboutDialog_distribution.js
@@ -13,6 +13,7 @@ add_task(async function verify_distribution_info_hides() {
 
   defaultBranch.setCharPref("distribution.id", "mozilla-test-distribution-id");
   defaultBranch.setCharPref("distribution.version", "1.0");
+  defaultBranch.setCharPref("distribution.about", "");
 
   let aboutDialog = await waitForAboutDialog();
 
diff --git a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
index 2fd4dfde9584b..5fbcd72df48d5 100644
--- a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
+++ b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
@@ -1212,6 +1212,7 @@ add_task(async function checkPatternsValid() {
 
 add_task(async function check_isChinaRepack() {
   const prefDefaultBranch = Services.prefs.getDefaultBranch("distribution.");
+  const originalDistributionId = prefDefaultBranch.getCharPref("id", "");
   const messages = [
     { id: "msg_for_china_repack", targeting: "isChinaRepack == true" },
     { id: "msg_for_everyone_else", targeting: "isChinaRepack == false" },
@@ -1254,7 +1255,7 @@ add_task(async function check_isChinaRepack() {
     "should select the message for non China repack users"
   );
 
-  prefDefaultBranch.deleteBranch("");
+  prefDefaultBranch.setCharPref("id", originalDistributionId);
 });
 
 add_task(async function check_userId() {
@@ -1513,22 +1514,29 @@ add_task(async function check_userPrefersReducedMotion() {
 });
 
 add_task(async function test_distributionId() {
+  let expectedDefault = Services.prefs
+    .getDefaultBranch(null)
+    .getCharPref("distribution.id", "");
   is(
     ASRouterTargeting.Environment.distributionId,
-    "",
-    "Should return an empty distribution Id"
+    expectedDefault,
+    "Should return the expected default distribution Id"
   );
 
   Services.prefs.getDefaultBranch(null).setCharPref("distribution.id", "test");
-
   is(
     ASRouterTargeting.Environment.distributionId,
     "test",
     "Should return the correct distribution Id"
   );
 
-  // clean up default branch distribution.id
-  Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
+  if (expectedDefault) {
+    Services.prefs
+      .getDefaultBranch(null)
+      .setCharPref("distribution.id", expectedDefault);
+  } else {
+    Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
+  }
 });
 
 add_task(async function test_fxViewButtonAreaType_default() {
diff --git a/browser/components/uitour/test/browser_UITour.js b/browser/components/uitour/test/browser_UITour.js
index 662a58dff1503..4e5867b3726f0 100644
--- a/browser/components/uitour/test/browser_UITour.js
+++ b/browser/components/uitour/test/browser_UITour.js
@@ -509,15 +509,22 @@ var tests = [
         "undefined",
         "Check distribution isn't undefined."
       );
-      // distribution id defaults to "default" for most builds, and
-      // "mozilla-MSIX" for MSIX builds.
+      // distribution id defaults to "default" for most builds,
+      // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
+      // official Mozilla builds.
+      let expectedDistribution = "default";
+      if (
+        AppConstants.platform === "win" &&
+        Services.sysinfo.getProperty("hasWinPackageId")
+      ) {
+        expectedDistribution = "mozilla-MSIX";
+      } else if (AppConstants.BUILT_BY_MOZILLA) {
+        expectedDistribution = "mozilla-official";
+      }
       is(
         result.distribution,
-        AppConstants.platform === "win" &&
-          Services.sysinfo.getProperty("hasWinPackageId")
-          ? "mozilla-MSIX"
-          : "default",
-        'Should be "default" without preference set.'
+        expectedDistribution,
+        "Should have expected distribution value."
       );
 
       let defaults = Services.prefs.getDefaultBranch("distribution.");
diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
index 7181c511ba8b7..179a31324acc6 100644
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@@ -10,5 +10,7 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+ac_add_options --built-by-mozilla
+
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index d3ef68f4c184a..7eb90525444dc 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -449,3 +449,7 @@ bin/libfreebl_64int_3.so
 #if defined(DESKTOP_LAUNCHER_ENABLED)
 @BINPATH@/desktop-launcher/desktop-launcher@BIN_SUFFIX@
 #endif
+
+#if defined(BUILT_BY_MOZILLA)
+@RESPATH@/distribution/*
+#endif
diff --git a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
index f1322cffae248..76ba82d9a5e27 100644
--- a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
+++ b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
@@ -62,21 +62,28 @@ add_task(async function testUserId() {
 });
 
 add_task(async function testDistribution() {
-  // distribution id defaults to "default" for most builds, and
-  // "mozilla-MSIX" for MSIX builds.
+  // distribution id defaults to "default" for most builds,
+  // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
+  // official Mozilla builds.
+  let expectedDistribution = "default";
+  if (
+    AppConstants.platform === "win" &&
+    Services.sysinfo.getProperty("hasWinPackageId")
+  ) {
+    expectedDistribution = "mozilla-MSIX";
+  } else if (AppConstants.BUILT_BY_MOZILLA) {
+    expectedDistribution = "mozilla-official";
+  }
   is(
     ClientEnvironment.distribution,
-    AppConstants.platform === "win" &&
-      Services.sysinfo.getProperty("hasWinPackageId")
-      ? "mozilla-MSIX"
-      : "default",
+    expectedDistribution,
     "distribution has a default value"
   );
 
   // distribution id is read from a preference
   Services.prefs
     .getDefaultBranch(null)
-    .setStringPref("distribution.id", "funnelcake");
+    .setCharPref("distribution.id", "funnelcake");
   is(
     ClientEnvironment.distribution,
     "funnelcake",
@@ -84,7 +91,7 @@ add_task(async function testDistribution() {
   );
   Services.prefs
     .getDefaultBranch(null)
-    .setStringPref("distribution.id", "default");
+    .setCharPref("distribution.id", "default");
 });
 
 const mockClassify = { country: "FR", request_time: new Date(2017, 1, 1) };
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
index 7c57a768e679a..a51aa0459c5c4 100644
--- a/toolkit/modules/AppConstants.sys.mjs
+++ b/toolkit/modules/AppConstants.sys.mjs
@@ -31,6 +31,13 @@ export var AppConstants = Object.freeze({
 
   MOZ_OFFICIAL_BRANDING: @MOZ_OFFICIAL_BRANDING_BOOL@,
 
+  BUILT_BY_MOZILLA:
+#ifdef BUILT_BY_MOZILLA
+  true,
+#else
+  false,
+#endif
+
   MOZ_DEV_EDITION: @MOZ_DEV_EDITION_BOOL@,
 
   MOZ_SERVICES_SYNC: @MOZ_SERVICES_SYNC_BOOL@,
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 64f527d9e8053..c301e8ab4e5dd 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -94,6 +94,12 @@ option(
 )
 set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
 
+option(
+    "--built-by-mozilla",
+    help="Enable Mozilla official build designation",
+)
+set_config("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
+set_define("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
 
 @depends("MOZ_APP_VENDOR", build_project)
 def check_moz_app_vendor(moz_app_vendor, build_project):
diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh
index e055b1c24efd5..be2061b98cbba 100755
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -95,7 +95,8 @@ check_for_add_if_not_update() {
   if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
         "$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
         "$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
-        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
+        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ || \
+        "$(basename "$add_if_not_file_chk")" = "distribution.ini" ]]; then
     ## "true"
     return 0;
   fi

From 214a01a4ec0caf0edbe53c50e34dd98f48832650 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 6 Feb 2026 15:35:46 +0000
Subject: [PATCH 06/93] Bug 2014616: Always create the Profile Groups folder in
 case it is missing. r=profiles-reviewers,jhirsch

Differential Revision: https://phabricator.services.mozilla.com/D282027
---
 .../profiles/tests/unit/test_fail_recover_storeID.js |  4 ++--
 toolkit/profile/ProfilesDatastoreService.sys.mjs     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/profiles/tests/unit/test_fail_recover_storeID.js b/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
index edd980221b17c..4d4f4c8a9e873 100644
--- a/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
+++ b/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
@@ -14,8 +14,8 @@ add_task(async function test_recover_storeID() {
   await SelectableProfileService.init();
 
   Assert.ok(
-    !ProfilesDatastoreService.initialized,
-    "Didn't initialize the datastore service"
+    ProfilesDatastoreService.initialized,
+    "Initialized the datastore service"
   );
   Assert.ok(
     !SelectableProfileService.initialized,
diff --git a/toolkit/profile/ProfilesDatastoreService.sys.mjs b/toolkit/profile/ProfilesDatastoreService.sys.mjs
index e572969143f62..4a5e912b0ea54 100644
--- a/toolkit/profile/ProfilesDatastoreService.sys.mjs
+++ b/toolkit/profile/ProfilesDatastoreService.sys.mjs
@@ -521,15 +521,11 @@ class ProfilesDatastoreServiceClass {
     this.#connection = null;
   }
 
-  async maybeCreateProfilesStorePath() {
+  maybeCreateStoreID() {
     if (this.#storeID) {
       return;
     }
 
-    await IOUtils.makeDirectory(
-      ProfilesDatastoreServiceClass.PROFILE_GROUPS_DIR
-    );
-
     const storageID = Services.uuid
       .generateUUID()
       .toString()
@@ -541,7 +537,7 @@ class ProfilesDatastoreServiceClass {
   }
 
   async getProfilesStorePath() {
-    await this.maybeCreateProfilesStorePath();
+    this.maybeCreateStoreID();
 
     // If we are not running in a named nsIToolkitProfile, the datastore path
     // should be in the profile directory. This is true in a local build or a
@@ -553,6 +549,10 @@ class ProfilesDatastoreServiceClass {
       );
     }
 
+    await IOUtils.makeDirectory(
+      ProfilesDatastoreServiceClass.PROFILE_GROUPS_DIR
+    );
+
     return getSharedProfilesStorePath(this.#storeID);
   }
 }

From 1a313f1fa95c3738754c4097e9d4f2ec0db54b87 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Fri, 6 Feb 2026 15:35:52 +0000
Subject: [PATCH 07/93] Bug 2015047 - Fix disabled UI tests that leave the Tabs
 Tray/Tab manager via Close all tabs or closing the last tab r=aaronmt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The UI tests were [[ https://bugzilla.mozilla.org/show_bug.cgi?id=1989405 | disabled ]] by Noah a while ago because after some changes he made, if the last tab was closed or all tabs were closed VIA the "Close all tabs" button the UI remained stuck.

Managed to re-enable 3 UI tests.

All 3 successfully passed 50x on Firebase ✅

Differential Revision: https://phabricator.services.mozilla.com/D282176
---
 .../androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt    | 4 ++--
 .../androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt   | 1 -
 .../java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt           | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
index 3730ebbeb9b75..b66005cacd228 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BookmarksTest.kt
@@ -20,6 +20,7 @@ import org.mozilla.fenix.helpers.TestAssetHelper.htmlControlsFormAsset
 import org.mozilla.fenix.helpers.TestHelper.clickSnackbarButton
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.verifySnackBarText
+import org.mozilla.fenix.helpers.TestHelper.waitForAppWindowToBeUpdated
 import org.mozilla.fenix.helpers.TestSetup
 import org.mozilla.fenix.helpers.perf.DetectMemoryLeaksRule
 import org.mozilla.fenix.ui.robots.browserScreen
@@ -143,7 +144,6 @@ class BookmarksTest : TestSetup() {
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/2833702
     @SmokeTest
-    @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405")
     @Test
     fun openMultipleSelectedBookmarksInANewTabTest() {
         val webPages = listOf(
@@ -168,7 +168,7 @@ class BookmarksTest : TestSetup() {
             verifyTabTrayIsOpen()
             verifyNormalBrowsingButtonIsSelected()
             verifyNormalTabsList()
-            verifyExistingOpenTabs(webPages[0].title, webPages[1].title)
+            verifyExistingOpenTabs(webPages[0].url.toString(), webPages[1].url.toString())
         }
     }
 
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
index d49dacff2be69..226699c14eb10 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt
@@ -75,7 +75,6 @@ class HomeScreenTest : TestSetup() {
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/1364362
     @SmokeTest
-    @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405")
     @Test
     fun verifyJumpBackInSectionTest() {
         composeTestRule.activityRule.applySettingsExceptions {
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
index 10611e1ae401d..e2c09267a823d 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -62,7 +62,6 @@ class TabbedBrowsingTest : TestSetup() {
     // val retryTestRule = RetryTestRule(3)
 
     // TestRail link: https://mozilla.testrail.io/index.php?/cases/view/903599
-    @Ignore("disabled - https://bugzilla.mozilla.org/show_bug.cgi?id=1989405")
     @Test
     fun closeAllTabsTest() {
         val defaultWebPage = mockWebServer.getGenericAsset(1)
@@ -89,7 +88,7 @@ class TabbedBrowsingTest : TestSetup() {
         }.openThreeDotMenu {
             verifyCloseAllTabsButton()
         }.closeAllTabs {
-            verifyTabCounter("0")
+            verifyTabCounter("0", isPrivateBrowsingEnabled = true)
         }
     }
 

From a595f56a6e1fbaaff00d0f37fceccd5f7fcbf18c Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Fri, 6 Feb 2026 15:44:45 +0000
Subject: [PATCH 08/93] Bug 2015073 - don't submit a repo-update patch to phab
 when running from try. r=RyanVM DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D282193
---
 taskcluster/docker/periodic-updates/runme.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/taskcluster/docker/periodic-updates/runme.sh b/taskcluster/docker/periodic-updates/runme.sh
index dd6054b120664..ffdf00da4fea2 100755
--- a/taskcluster/docker/periodic-updates/runme.sh
+++ b/taskcluster/docker/periodic-updates/runme.sh
@@ -57,6 +57,9 @@ then
   PARAMS="${PARAMS} -d"
 fi
 
+if [ "${BRANCH}" = try ]; then
+  PARAMS="${PARAMS} --skip-push"
+fi
 
 export ARTIFACTS_DIR="/home/worker/artifacts"
 mkdir -p "$ARTIFACTS_DIR"

From 51835764ccd26f9baa32f86e17d38103c7a70bd0 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Fri, 6 Feb 2026 18:19:46 +0200
Subject: [PATCH 09/93] Revert "Bug 2010422 - Add loader for chat assistant
 r=ai-frontend-reviewers,Mardak" for causing bc failures @
 browser_parsable_css.js

This reverts commit 136b2ccc2c80f8964a5516955d04a02e9525729a.
---
 .../components/aiwindow/ui/assets/loader.svg  |  5 --
 .../ai-chat-content/ai-chat-content.css       | 32 ++++++++++++
 .../ai-chat-content/ai-chat-content.mjs       | 29 ++++++-----
 .../chat-assistant-loader.css                 | 41 ----------------
 .../chat-assistant-loader.mjs                 | 49 -------------------
 browser/components/aiwindow/ui/jar.mn         |  3 --
 .../test/browser/browser_actor_user_prompt.js | 46 -----------------
 7 files changed, 49 insertions(+), 156 deletions(-)
 delete mode 100644 browser/components/aiwindow/ui/assets/loader.svg
 delete mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
 delete mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs

diff --git a/browser/components/aiwindow/ui/assets/loader.svg b/browser/components/aiwindow/ui/assets/loader.svg
deleted file mode 100644
index c063a09187c32..0000000000000
--- a/browser/components/aiwindow/ui/assets/loader.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><mask id="b" fill="#fff"><path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Z"/></mask><g clip-path="url(#a)" mask="url(#b)"><foreignObject width="2583.33" height="2583.33" x="-1291.67" y="-1291.67" transform="rotate(180 4 4) scale(.008)"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(160,114,226,0) 0deg,#a072e2 360deg);height:100%;width:100%;opacity:1"/></foreignObject></g><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/><defs><clipPath id="a"><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
index 3b334e651f086..2db95c66c7497 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
@@ -66,3 +66,35 @@
   gap: var(--space-small);
   width: 100%;
 }
+
+.searching-indicator {
+  align-items: center;
+  flex-direction: row;
+  gap: var(--space-small);
+}
+
+.searching-text {
+  color: var(--text-color-deemphasized);
+  font-style: italic;
+}
+
+.searching-indicator::before {
+  animation: pulse 1.5s ease-in-out infinite;
+  background: var(--color-accent-primary);
+  border-radius: 50%;
+  content: "";
+  height: 8px;
+  width: 8px;
+}
+
+@keyframes pulse {
+  0%,
+  100% {
+    opacity: 0.4;
+    transform: scale(0.8);
+  }
+  50% {
+    opacity: 1;
+    transform: scale(1.2);
+  }
+}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
index 9fec20b632120..413d95a3c57b9 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
@@ -6,8 +6,6 @@ import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 // eslint-disable-next-line import/no-unassigned-import
 import "chrome://browser/content/aiwindow/components/assistant-message-footer.mjs";
-// eslint-disable-next-line import/no-unassigned-import
-import "chrome://browser/content/aiwindow/components/chat-assistant-loader.mjs";
 
 /**
  * A custom element for managing AI Chat Content
@@ -17,14 +15,14 @@ export class AIChatContent extends MozLitElement {
     conversationState: { type: Array },
     tokens: { type: Object },
     isSearching: { type: Boolean },
-    assistantIsLoading: { type: Boolean },
+    searchQuery: { type: String },
   };
 
   constructor() {
     super();
     this.conversationState = [];
     this.isSearching = false;
-    this.assistantIsLoading = false;
+    this.searchQuery = null;
   }
 
   connectedCallback() {
@@ -147,9 +145,9 @@ export class AIChatContent extends MozLitElement {
   }
 
   handleLoadingEvent(event) {
-    const { isSearching } = event.detail;
+    const { isSearching, searchQuery } = event.detail;
     this.isSearching = !!isSearching;
-    this.assistantIsLoading = true;
+    this.searchQuery = searchQuery || null;
     this.requestUpdate();
     this.#scrollToBottom();
   }
@@ -162,7 +160,6 @@ export class AIChatContent extends MozLitElement {
 
   handleUserPromptEvent(event) {
     const { convId, content, ordinal } = event.detail;
-    this.assistantIsLoading = true;
     this.conversationState[ordinal] = {
       role: "user",
       body: content.body,
@@ -181,7 +178,7 @@ export class AIChatContent extends MozLitElement {
 
   handleAIResponseEvent(event) {
     this.isSearching = false;
-    this.assistantIsLoading = false;
+    this.searchQuery = null;
 
     const {
       convId,
@@ -280,10 +277,18 @@ export class AIChatContent extends MozLitElement {
             </div>
           `;
         })}
-        ${this.assistantIsLoading
-          ? html`<chat-assistant-loader
-              .isSearch=${this.isSearching}
-            ></chat-assistant-loader>`
+        ${this.isSearching
+          ? html`
+              <div
+                class="chat-bubble chat-bubble-assistant searching-indicator"
+              >
+                <span class="searching-text">
+                  ${this.searchQuery
+                    ? `Searching for: "${this.searchQuery}"`
+                    : "Searching the web..."}
+                </span>
+              </div>
+            `
           : nothing}
       </div>
     `;
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
deleted file mode 100644
index 6376c07977670..0000000000000
--- a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-:host {
-  --chat-assistant-loader-size: var(--size-item-small);
-  --chat-assistant-loader-light-pink: color-mix(in srgb, var(--color-blue-40) 38.74%, var(--color-purple-10) 61.26%);
-  --chat-assistant-loader-dark-pink: var(--color-purple-60);
-}
-
-.chat-assistant-loader {
-  display: flex;
-  gap: calc(var(--space-xxsmall) + var(--space-xsmall));
-}
-
-.chat-assistant-loader__spinner {
-  animation: 0.9s spinLoader infinite linear;
-  background-image: url("chrome://browser/content/aiwindow/assets/loader.svg");
-  background-size: var(--chat-assistant-loader-size);
-  height: var(--chat-assistant-loader-size);
-  width: var(--chat-assistant-loader-size);
-  will-change: transform;
-}
-
-@keyframes spinLoader {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.chat-assistant-loader__text {
-  background: linear-gradient(90deg, var(--chat-assistant-loader-light-pink) 14.17%, var(--chat-assistant-loader-dark-pink) 91.21%);
-  background-clip: text;
-  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
-  color: transparent;
-  font-weight: var(--font-weight-semibold);
-  margin: 0;
-}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
deleted file mode 100644
index 48be3c156f981..0000000000000
--- a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
+++ /dev/null
@@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
-import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
-
-/**
- * Loader/spinner visible while the assistant is thinking
- *
- * isSearch - true when this component is being used for loading a search handoff action
- */
-export class ChatAssistantLoader extends MozLitElement {
-  static properties = {
-    isSearch: { type: Boolean },
-  };
-
-  constructor() {
-    super();
-    this.isSearch = false;
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-  }
-
-  render() {
-    return html`
-      <link
-        rel="stylesheet"
-        href="chrome://browser/content/aiwindow/components/chat-assistant-loader.css"
-      />
-      <!-- TO DO: add fluent string when UX writing team finished copy - https://bugzilla.mozilla.org/show_bug.cgi?id=2014907 -->
-      <div
-        class="chat-assistant-loader"
-        aria-label=" ${this.isSearch ? `` : `Loading assistant response`}"
-      >
-        <span class="chat-assistant-loader__spinner"></span>
-        ${this.isSearch
-          ? html`
-              <p class="chat-assistant-loader__text">Analyzing web search</p>
-            `
-          : nothing}
-      </div>
-    `;
-  }
-}
-
-customElements.define("chat-assistant-loader", ChatAssistantLoader);
diff --git a/browser/components/aiwindow/ui/jar.mn b/browser/components/aiwindow/ui/jar.mn
index 1217776c10c1e..d0f22bcb03619 100644
--- a/browser/components/aiwindow/ui/jar.mn
+++ b/browser/components/aiwindow/ui/jar.mn
@@ -9,9 +9,6 @@ browser.jar:
   content/browser/aiwindow/assets/input-cta-arrow-icon.svg          (assets/input-cta-arrow-icon.svg)
   content/browser/aiwindow/components/ai-chat-content.mjs           (components/ai-chat-content/ai-chat-content.mjs)
   content/browser/aiwindow/components/ai-chat-content.css           (components/ai-chat-content/ai-chat-content.css)
-  content/browser/aiwindow/components/chat-assistant-loader.mjs     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs)
-  content/browser/aiwindow/components/chat-assistant-loader.css     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css)
-  content/browser/aiwindow/assets/loader.svg                        (assets/loader.svg)
   content/browser/aiwindow/components/ai-chat-message.mjs           (components/ai-chat-message/ai-chat-message.mjs)
   content/browser/aiwindow/components/ai-chat-message.css           (components/ai-chat-message/ai-chat-message.css)
   content/browser/aiwindow/components/ai-chat-search-button.mjs     (components/ai-chat-search-button/ai-chat-search-button.mjs)
diff --git a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
index 5f0653efc8d02..fe26e5c88426e 100644
--- a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
+++ b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
@@ -56,49 +56,3 @@ add_task(async function test_streaming_ai_response() {
 
   await SpecialPowers.popPrefEnv();
 });
-
-/**
- * Test if the loader shows after the user prompt is submitted
- */
-add_task(async function test_loader_shows_on_user_submit() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.smartwindow.enabled", true]],
-  });
-
-  await BrowserTestUtils.withNewTab("about:aichatcontent", async browser => {
-    const actor =
-      browser.browsingContext.currentWindowGlobal.getActor("AIChatContent");
-
-    const userPrompt = {
-      role: "user",
-      content: { body: "Show loader please" },
-    };
-
-    await actor.dispatchMessageToChatContent(userPrompt);
-
-    await SpecialPowers.spawn(browser, [], async () => {
-      const contentEl = content.document.querySelector("ai-chat-content");
-      await contentEl.updateComplete;
-
-      let loaderEl;
-      await ContentTaskUtils.waitForMutationCondition(
-        contentEl.shadowRoot,
-        { childList: true, subtree: true },
-        () => {
-          loaderEl = contentEl.shadowRoot.querySelector(
-            "chat-assistant-loader"
-          );
-          return loaderEl;
-        }
-      );
-      Assert.ok(loaderEl, "Loader element exists");
-
-      const inner = loaderEl.shadowRoot?.querySelector(
-        ".chat-assistant-loader"
-      );
-      Assert.ok(inner, "Loader has the correct content");
-    });
-  });
-
-  await SpecialPowers.popPrefEnv();
-});

From a3689c31dc3174bc4c93872a89d4b0634a96c7cd Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Fri, 6 Feb 2026 18:44:07 +0200
Subject: [PATCH 10/93] Revert "Bug 2014616: Always create the Profile Groups
 folder in case it is missing. r=profiles-reviewers,jhirsch" for causing
 multiple failures

This reverts commit 214a01a4ec0caf0edbe53c50e34dd98f48832650.
---
 .../profiles/tests/unit/test_fail_recover_storeID.js |  4 ++--
 toolkit/profile/ProfilesDatastoreService.sys.mjs     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/profiles/tests/unit/test_fail_recover_storeID.js b/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
index 4d4f4c8a9e873..edd980221b17c 100644
--- a/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
+++ b/browser/components/profiles/tests/unit/test_fail_recover_storeID.js
@@ -14,8 +14,8 @@ add_task(async function test_recover_storeID() {
   await SelectableProfileService.init();
 
   Assert.ok(
-    ProfilesDatastoreService.initialized,
-    "Initialized the datastore service"
+    !ProfilesDatastoreService.initialized,
+    "Didn't initialize the datastore service"
   );
   Assert.ok(
     !SelectableProfileService.initialized,
diff --git a/toolkit/profile/ProfilesDatastoreService.sys.mjs b/toolkit/profile/ProfilesDatastoreService.sys.mjs
index 4a5e912b0ea54..e572969143f62 100644
--- a/toolkit/profile/ProfilesDatastoreService.sys.mjs
+++ b/toolkit/profile/ProfilesDatastoreService.sys.mjs
@@ -521,11 +521,15 @@ class ProfilesDatastoreServiceClass {
     this.#connection = null;
   }
 
-  maybeCreateStoreID() {
+  async maybeCreateProfilesStorePath() {
     if (this.#storeID) {
       return;
     }
 
+    await IOUtils.makeDirectory(
+      ProfilesDatastoreServiceClass.PROFILE_GROUPS_DIR
+    );
+
     const storageID = Services.uuid
       .generateUUID()
       .toString()
@@ -537,7 +541,7 @@ class ProfilesDatastoreServiceClass {
   }
 
   async getProfilesStorePath() {
-    this.maybeCreateStoreID();
+    await this.maybeCreateProfilesStorePath();
 
     // If we are not running in a named nsIToolkitProfile, the datastore path
     // should be in the profile directory. This is true in a local build or a
@@ -549,10 +553,6 @@ class ProfilesDatastoreServiceClass {
       );
     }
 
-    await IOUtils.makeDirectory(
-      ProfilesDatastoreServiceClass.PROFILE_GROUPS_DIR
-    );
-
     return getSharedProfilesStorePath(this.#storeID);
   }
 }

From 93dfeeec2fac835cfc496b85216cdf192728a0bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Feb 2026 16:02:46 +0000
Subject: [PATCH 11/93] Bug 2013011 - Check implicit anchor validity.
 r=layout-anchor-positioning-reviewers,layout-reviewers,dshin

The invoker can be anywhere in the dom, have to confirm that it's an
acceptable anchor. I _think_ pseudo elements should always pass this
check but worth doing regardless.

This also fixes bug 2013896, while at it, gotta add a test for that, if
this doesn't cause any progression.

Differential Revision: https://phabricator.services.mozilla.com/D282173
---
 layout/base/AnchorPositioningUtils.cpp        | 80 ++++++++++---------
 ...self-referencing-invoker-anchor-crash.html | 17 ++++
 2 files changed, 61 insertions(+), 36 deletions(-)
 create mode 100644 testing/web-platform/tests/css/css-anchor-position/self-referencing-invoker-anchor-crash.html

diff --git a/layout/base/AnchorPositioningUtils.cpp b/layout/base/AnchorPositioningUtils.cpp
index 09da39cbba1fa..73eedd7b7e61b 100644
--- a/layout/base/AnchorPositioningUtils.cpp
+++ b/layout/base/AnchorPositioningUtils.cpp
@@ -457,7 +457,7 @@ class LazyAncestorHolder {
 };
 
 bool IsAcceptableAnchorElement(
-    const nsIFrame* aPossibleAnchorFrame, const ScopedNameRef& aName,
+    const nsIFrame* aPossibleAnchorFrame, const ScopedNameRef* aName,
     const nsIFrame* aPositionedFrame,
     LazyAncestorHolder& aPositionedFrameAncestorHolder) {
   MOZ_ASSERT(aPossibleAnchorFrame);
@@ -476,14 +476,23 @@ bool IsAcceptableAnchorElement(
   // The phrase "element or a fully styleable tree-abiding pseudo-element"
   // used by the spec is taken to mean
   // "either not a pseudo-element or a pseudo-element of a specific kind".
-  return (IsFullyStyleableTreeAbidingOrNotPseudoElement(aPossibleAnchorFrame) &&
-          IsAnchorLaidOutStrictlyBeforeElement(
-              aPossibleAnchorFrame, aPositionedFrame,
-              aPositionedFrameAncestorHolder.GetAncestors()) &&
-          IsAnchorInScopeForPositionedElement(aName, aPossibleAnchorFrame,
-                                              aPositionedFrame) &&
-          IsPositionedElementAlsoSkippedWhenAnchorIsSkipped(
-              aPossibleAnchorFrame, aPositionedFrame));
+  if (!IsFullyStyleableTreeAbidingOrNotPseudoElement(aPossibleAnchorFrame)) {
+    return false;
+  }
+  if (!IsAnchorLaidOutStrictlyBeforeElement(
+          aPossibleAnchorFrame, aPositionedFrame,
+          aPositionedFrameAncestorHolder.GetAncestors())) {
+    return false;
+  }
+  if (aName && !IsAnchorInScopeForPositionedElement(
+                   *aName, aPossibleAnchorFrame, aPositionedFrame)) {
+    return false;
+  }
+  if (!IsPositionedElementAlsoSkippedWhenAnchorIsSkipped(aPossibleAnchorFrame,
+                                                         aPositionedFrame)) {
+    return false;
+  }
+  return true;
 }
 
 }  // namespace
@@ -548,7 +557,7 @@ nsIFrame* AnchorPositioningUtils::FindFirstAcceptableAnchor(
     }
 
     // Check if the possible anchor is an acceptable anchor element.
-    if (IsAcceptableAnchorElement(*it, aName, aPositionedFrame,
+    if (IsAcceptableAnchorElement(*it, &aName, aPositionedFrame,
                                   positionedFrameAncestorHolder)) {
       return *it;
     }
@@ -942,42 +951,41 @@ Maybe<ScopedNameRef> AnchorPositioningUtils::GetUsedAnchorName(
   return Nothing{};
 }
 
-auto AnchorPositioningUtils::GetAnchorPosImplicitAnchor(const nsIFrame* aFrame)
-    -> ImplicitAnchorResult {
+static std::pair<nsIContent*, AnchorPositioningUtils::ImplicitAnchorKind>
+GetImplicitAnchorContent(const nsIFrame* aFrame) {
   const auto* element = dom::Element::FromNodeOrNull(aFrame->GetContent());
-  if (!aFrame->Style()->IsPseudoElement() && !element) {
+  if (!element) [[unlikely]] {
     return {};
   }
-
-  if (element) [[likely]] {
-    if (const dom::PopoverData* popoverData = element->GetPopoverData())
-        [[unlikely]] {
-      if (const RefPtr<dom::Element>& invoker = popoverData->GetInvoker()) {
-        return {invoker->GetPrimaryFrame(), ImplicitAnchorKind::Popover};
-      }
+  if (const auto* popoverData = element->GetPopoverData()) [[unlikely]] {
+    if (RefPtr invoker = popoverData->GetInvoker()) {
+      return {invoker.get(),
+              AnchorPositioningUtils::ImplicitAnchorKind::Popover};
     }
   }
-
-  const auto* pseudoRoot = aFrame->GetClosestNativeAnonymousSubtreeRoot();
-  if (!pseudoRoot) {
+  if (!aFrame->Style()->IsPseudoElement()) {
     return {};
   }
+  return {element->GetClosestNativeAnonymousSubtreeRootParentOrHost(),
+          AnchorPositioningUtils::ImplicitAnchorKind::PseudoElement};
+}
 
-  auto* pseudoRootFrame = pseudoRoot->GetPrimaryFrame();
-  if (!pseudoRootFrame) {
+auto AnchorPositioningUtils::GetAnchorPosImplicitAnchor(const nsIFrame* aFrame)
+    -> ImplicitAnchorResult {
+  auto [implicitAnchor, kind] = GetImplicitAnchorContent(aFrame);
+  if (!implicitAnchor) {
     return {};
   }
-
-  // FIXME(emilio, bug 2013896): Is this really right? It's just returning the
-  // in-flow parent of the pseudo-element, but
-  // GetClosestNativeAnonymousSubtreeRootParent()'s primary frame seems most
-  // likely to be the intended thing in presence of anonymous boxes like
-  // fieldsets and so on...
-  auto* implicitAnchor =
-      pseudoRootFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW)
-          ? pseudoRootFrame->GetPlaceholderFrame()->GetParent()
-          : pseudoRootFrame->GetParent();
-  return {implicitAnchor, ImplicitAnchorKind::PseudoElement};
+  auto* anchorFrame = implicitAnchor->GetPrimaryFrame();
+  if (!anchorFrame) {
+    return {};
+  }
+  LazyAncestorHolder ancestorHolder(aFrame);
+  if (!IsAcceptableAnchorElement(anchorFrame, /* aName = */ nullptr, aFrame,
+                                 ancestorHolder)) {
+    return {};
+  }
+  return {anchorFrame, kind};
 }
 
 AnchorPositioningUtils::ContainingBlockInfo
diff --git a/testing/web-platform/tests/css/css-anchor-position/self-referencing-invoker-anchor-crash.html b/testing/web-platform/tests/css/css-anchor-position/self-referencing-invoker-anchor-crash.html
new file mode 100644
index 0000000000000..d8e028e19f84f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-anchor-position/self-referencing-invoker-anchor-crash.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=2013011">
+<style>
+  :last-of-type {
+    bottom: anchor-size(--anchor-name_0);
+  }
+</style>
+<script>
+  document.addEventListener("DOMContentLoaded", async () => {
+    const cite = document.createElementNS("http://www.w3.org/1999/xhtml", "cite")
+    document.documentElement.appendChild(cite)
+    cite.popover = "auto"
+    cite.showPopover({
+      "source": cite
+    })
+  })
+</script>

From c77441ec61a03fc1b77e4c1044b8eda6f95101bb Mon Sep 17 00:00:00 2001
From: Diego Escalante <descalante@mozilla.com>
Date: Fri, 6 Feb 2026 16:09:11 +0000
Subject: [PATCH 12/93] Bug 1986639 - Invalidate elements with styles that
 reference custom attributes and update wpt expectations.
 r=emilio,firefox-style-system-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D281793
---
 layout/style/RestyleManager.cpp                  |  3 +++
 servo/ports/geckolib/glue.rs                     | 16 ++++++++++++++++
 .../css/css-values/attr-invalidation.html.ini    |  3 ---
 .../attr-pseudo-elem-invalidation.html.ini       | 12 ------------
 4 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini

diff --git a/layout/style/RestyleManager.cpp b/layout/style/RestyleManager.cpp
index 3c74b95b176cc..fb31c7268fb56 100644
--- a/layout/style/RestyleManager.cpp
+++ b/layout/style/RestyleManager.cpp
@@ -3489,6 +3489,9 @@ void RestyleManager::AttributeWillChange(Element* aElement,
                                          int32_t aNameSpaceID,
                                          nsAtom* aAttribute,
                                          AttrModType aModType) {
+  if (Servo_Element_ReferencesAttribute(aElement, aAttribute)) {
+    PostRestyleEvent(aElement, RestyleHint::RECASCADE_SELF, nsChangeHint(0));
+  }
   TakeSnapshotForAttributeChange(*aElement, aNameSpaceID, aAttribute);
 }
 
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index 2142bc34ed095..23479b822cb8c 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -1586,6 +1586,22 @@ pub extern "C" fn Servo_Element_MayHaveStartingStyle(element: &RawGeckoElement)
         .contains(data::ElementDataFlags::MAY_HAVE_STARTING_STYLE)
 }
 
+#[no_mangle]
+pub extern "C" fn Servo_Element_ReferencesAttribute(
+    element: &RawGeckoElement,
+    attr: *const nsAtom,
+) -> bool {
+    let element = GeckoElement(element);
+    let Some(data) = element.borrow_data() else {
+        return false;
+    };
+    let Some(ref attrs) = data.styles.primary().attribute_references else {
+        return false;
+    };
+
+    unsafe { Atom::with(attr, |attr| attrs.contains(AtomIdent::cast(attr))) }
+}
+
 fn mode_to_origin(mode: SheetParsingMode) -> Origin {
     match mode {
         SheetParsingMode::eAuthorSheetFeatures => Origin::Author,
diff --git a/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
deleted file mode 100644
index 111ec1b397568..0000000000000
--- a/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[attr-invalidation.html]
-  [CSS Values and Units Test: attr() invalidation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
deleted file mode 100644
index 167cc146d9a2d..0000000000000
--- a/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[attr-pseudo-elem-invalidation.html]
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 1]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 3]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 4]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 5]
-    expected: FAIL

From c4a43cb42238b866ad5aa0ba5107f4e537b8cff3 Mon Sep 17 00:00:00 2001
From: Chidam Gopal <cgopal@mozilla.com>
Date: Fri, 6 Feb 2026 16:18:14 +0000
Subject: [PATCH 13/93] Bug 2010062 - set message length threshold for memory
 generation from conversation r=cdipersio,ai-models-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D282061
---
 .../aiwindow/models/memories/MemoriesChatSource.sys.mjs    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs
index 36cbb5166a854..0eb8098f4188c 100644
--- a/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs
+++ b/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs
@@ -15,6 +15,7 @@ import { BlockListManager } from "chrome://global/content/ml/Utils.sys.mjs";
 // Chat fetch defaults
 const DEFAULT_MAX_RESULTS = 50;
 const DEFAULT_HALF_LIFE_DAYS = 7;
+const MESSAGE_LENGTH_THRESHOLD = 1000;
 const MS_PER_SEC = 1_000;
 const SEC_PER_MIN = 60;
 const MINS_PER_HOUR = 60;
@@ -71,10 +72,14 @@ export async function getRecentChats(
   const chatMessages = filtered.map(msg => {
     const createdDate = msg.createdDate;
     const freshness_score = computeFreshnessScore(createdDate, halfLifeDays);
+    let content = msg.content?.body ?? null;
+    if (content && content.length > MESSAGE_LENGTH_THRESHOLD) {
+      content = content.substring(0, MESSAGE_LENGTH_THRESHOLD);
+    }
     return {
       createdDate,
       role: msg.role,
-      content: msg.content?.body ?? null,
+      content,
       pageUrl: msg.pageUrl,
       freshness_score,
     };

From 8522c4315d082e05f4f71fb8644957f6e6b373b9 Mon Sep 17 00:00:00 2001
From: Chidam Gopal <cgopal@mozilla.com>
Date: Fri, 6 Feb 2026 16:19:10 +0000
Subject: [PATCH 14/93] Bug 2014320 - Memories generation to handle bigger
 inputs r=cdipersio,ai-models-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D281706
---
 .../memories/MemoriesHistoryScheduler.sys.mjs |   2 +-
 .../memories/MemoriesHistorySource.sys.mjs    |  31 ++++-
 .../models/memories/MemoriesManager.sys.mjs   | 121 +++++++++++++++++-
 .../xpcshell/test_MemoriesHistorySource.js    | 118 +++++++++++++++++
 4 files changed, 266 insertions(+), 6 deletions(-)

diff --git a/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs
index 37b2770cbfb31..93d1e0e3c3442 100644
--- a/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs
+++ b/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs
@@ -29,7 +29,7 @@ ChromeUtils.defineLazyGetter(lazy, "console", function () {
 const INITIAL_MEMORIES_PAGES_THRESHOLD = 0;
 
 // Only run if at least this many pages have been visited.
-const MEMORIES_SCHEDULER_PAGES_THRESHOLD = 2;
+const MEMORIES_SCHEDULER_PAGES_THRESHOLD = 30;
 
 // Memories history schedule every 2 mins
 const MEMORIES_SCHEDULER_INTERVAL_MS = 2 * 60 * 1000;
diff --git a/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs
index 00dcd5f21b479..eb57cd1611962 100644
--- a/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs
+++ b/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs
@@ -212,7 +212,8 @@ export async function getRecentHistory(opts = {}) {
           const onlyTitle = row.getResultByName("title") || "";
           let title;
           if (onlyTitle) {
-            title = onlyTitle + " | " + host;
+            const sanitizedTitle = sanitizeTitle(onlyTitle);
+            title = sanitizedTitle + " | " + host;
           } else {
             title = onlyTitle;
           }
@@ -761,11 +762,39 @@ function round2(x) {
   return Math.round(Number(x) * 100) / 100;
 }
 
+/**
+ * Sanitize title text to prevent JSON parsing issues in LLM outputs.
+ * Removes/replaces characters that commonly cause problems:
+ * - Backslashes (replaced with forward slashes)
+ * - Control characters (replaced with spaces)
+ *
+ * @param {string} title - Raw title from Places database
+ * @returns {string} - Sanitized title
+ */
+function sanitizeTitle(title) {
+  if (typeof title !== "string") {
+    return "";
+  }
+
+  return (
+    title
+      .replace(/\\/g, "/") // Replace backslash with forward slash
+      // eslint-disable-next-line no-control-regex
+      .replace(/[\x00-\x1F\x7F]/g, " ") // Replace control chars (0-31, 127) with space
+      .replace(/\s+/g, " ") // Collapse multiple spaces
+      .trim()
+  );
+}
+
 // for tests only
 export function _setBlockListManagerForTesting(mgr) {
   _mgr = mgr;
 }
 
+export function _sanitizeTitleForTesting(title) {
+  return sanitizeTitle(title);
+}
+
 /**
  * Return the number of history visits since `days` ago.
  *
diff --git a/browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs
index 0af1f751202ce..ef8bae1eae226 100644
--- a/browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs
+++ b/browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs
@@ -37,12 +37,16 @@ import { EveryWindow } from "resource:///modules/EveryWindow.sys.mjs";
 import { AIWindowAccountAuth } from "moz-src:///browser/components/aiwindow/ui/modules/AIWindowAccountAuth.sys.mjs";
 
 const K_DOMAINS_FULL = 100;
-const K_TITLES_FULL = 60;
+const K_TITLES_FULL = 100;
 const K_SEARCHES_FULL = 10;
+
 const K_DOMAINS_DELTA = 30;
 const K_TITLES_DELTA = 60;
 const K_SEARCHES_DELTA = 10;
 
+// for initial memory generation batches
+const TOKEN_BUDGET = 2000;
+
 const DEFAULT_HISTORY_FULL_LOOKUP_DAYS = 60;
 const DEFAULT_HISTORY_FULL_MAX_RESULTS = 3000;
 const DEFAULT_HISTORY_DELTA_MAX_RESULTS = 500;
@@ -240,10 +244,24 @@ export class MemoriesManager {
       return [];
     }
 
-    return await this.generateAndSaveMemoriesFromSources(
-      sources,
-      SOURCE_HISTORY
+    const batches = this._createHistoryBatches(
+      domainItems,
+      titleItems,
+      searchItems,
+      TOKEN_BUDGET
     );
+
+    const allGeneratedMemories = [];
+    for (let i = 0; i < batches.length; i++) {
+      const batchSources = { history: batches[i] };
+      const batchMemories = await this.generateAndSaveMemoriesFromSources(
+        batchSources,
+        SOURCE_HISTORY
+      );
+      allGeneratedMemories.push(...batchMemories);
+    }
+
+    return allGeneratedMemories;
   }
 
   /**
@@ -600,4 +618,99 @@ export class MemoriesManager {
   static async countRecentVisits(opts = {}) {
     return await countRecentVisits(opts);
   }
+
+  // Helper: Estimate token count for history items
+  static _estimateHistoryTokens(domainItems, titleItems, searchItems) {
+    let chars = 0;
+
+    // Domains: "domain.com,99.5\n"
+    chars += domainItems.reduce(
+      (sum, [domain, _score]) => sum + domain.length + 10,
+      0
+    );
+
+    // Titles: "Long Title | domain.com,99.5\n"
+    chars += titleItems.reduce(
+      (sum, [title, _score]) => sum + title.length + 10,
+      0
+    );
+
+    // Searches: can have multiple queries per item
+    chars += searchItems.reduce(
+      (sum, item) => sum + (item.q || []).join(",").length + 20,
+      0
+    );
+
+    // CSV headers and formatting overhead
+    chars += 1000;
+
+    // Rough conversion: 1 token ≈ 4 characters
+    return Math.ceil(chars / 4);
+  }
+
+  // Helper: Split history items into token-budget-compliant batches
+  static _createHistoryBatches(
+    domainItems,
+    titleItems,
+    searchItems,
+    tokenBudget
+  ) {
+    const batches = [];
+
+    // Calculate how many items per batch based on average item size
+    const totalItems =
+      domainItems.length + titleItems.length + searchItems.length;
+    const avgTokensPerItem =
+      this._estimateHistoryTokens(domainItems, titleItems, searchItems) /
+      totalItems;
+
+    const itemsPerBatch = Math.max(
+      10, // Minimum batch size
+      Math.floor((tokenBudget * 0.9) / avgTokensPerItem) // 0.9 for safety margin
+    );
+
+    // Calculate proportional splits
+    const domainRatio = domainItems.length / totalItems;
+    const titleRatio = titleItems.length / totalItems;
+    const searchRatio = searchItems.length / totalItems;
+
+    const domainsPerBatch = Math.ceil(itemsPerBatch * domainRatio);
+    const titlesPerBatch = Math.ceil(itemsPerBatch * titleRatio);
+    const searchesPerBatch = Math.ceil(itemsPerBatch * searchRatio);
+
+    let domainIdx = 0;
+    let titleIdx = 0;
+    let searchIdx = 0;
+
+    while (
+      domainIdx < domainItems.length ||
+      titleIdx < titleItems.length ||
+      searchIdx < searchItems.length
+    ) {
+      const batchDomains = domainItems.slice(
+        domainIdx,
+        domainIdx + domainsPerBatch
+      );
+      const batchTitles = titleItems.slice(titleIdx, titleIdx + titlesPerBatch);
+      const batchSearches = searchItems.slice(
+        searchIdx,
+        searchIdx + searchesPerBatch
+      );
+
+      // Only add batch if it has content
+      if (
+        !!batchDomains.length ||
+        !!batchTitles.length ||
+        batchSearches.length
+      ) {
+        batches.push([batchDomains, batchTitles, batchSearches]);
+      }
+
+      domainIdx += domainsPerBatch;
+      titleIdx += titlesPerBatch;
+      searchIdx += searchesPerBatch;
+    }
+
+    return batches;
+  }
 }
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_MemoriesHistorySource.js b/browser/components/aiwindow/models/tests/xpcshell/test_MemoriesHistorySource.js
index 9dd64df1df4e2..5c96a2b776b79 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_MemoriesHistorySource.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_MemoriesHistorySource.js
@@ -8,6 +8,7 @@ const {
   generateProfileInputs,
   aggregateSessions,
   topkAggregates,
+  _sanitizeTitleForTesting,
 } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs"
 );
@@ -759,3 +760,120 @@ add_task(function test_topkAggregates_recency_and_ranking() {
   );
   Assert.equal(secondDomain, "old.com", "Older domain comes second");
 });
+
+add_task(function test_sanitizeTitle_basic() {
+  // Normal title - should pass through unchanged
+  const normal = "Example Page Title";
+  Assert.equal(
+    _sanitizeTitleForTesting(normal),
+    normal,
+    "Normal title unchanged"
+  );
+});
+
+add_task(function test_sanitizeTitle_backslash() {
+  // Backslash - primary issue that caused JSON parse failures
+  const withBackslash = "Claude's new constitution \\ Anthropic";
+  const expected = "Claude's new constitution / Anthropic";
+  Assert.equal(
+    _sanitizeTitleForTesting(withBackslash),
+    expected,
+    "Backslash replaced with forward slash"
+  );
+
+  // Multiple backslashes
+  const multipleBackslashes = "Path\\to\\file\\name.txt";
+  const expectedMultiple = "Path/to/file/name.txt";
+  Assert.equal(
+    _sanitizeTitleForTesting(multipleBackslashes),
+    expectedMultiple,
+    "Multiple backslashes replaced"
+  );
+
+  // Windows path
+  const windowsPath = "C:\\Users\\Documents\\file.txt";
+  const expectedPath = "C:/Users/Documents/file.txt";
+  Assert.equal(
+    _sanitizeTitleForTesting(windowsPath),
+    expectedPath,
+    "Windows path backslashes replaced"
+  );
+});
+
+add_task(function test_sanitizeTitle_control_characters() {
+  // Newline
+  const withNewline = "Title\nwith\nnewlines";
+  Assert.equal(
+    _sanitizeTitleForTesting(withNewline),
+    "Title with newlines",
+    "Newlines replaced with spaces"
+  );
+
+  // Tab
+  const withTab = "Title\twith\ttabs";
+  Assert.equal(
+    _sanitizeTitleForTesting(withTab),
+    "Title with tabs",
+    "Tabs replaced with spaces"
+  );
+
+  // Carriage return
+  const withCarriageReturn = "Title\rwith\rCR";
+  Assert.equal(
+    _sanitizeTitleForTesting(withCarriageReturn),
+    "Title with CR",
+    "Carriage returns replaced with spaces"
+  );
+
+  // Mixed control characters
+  const mixed = "Title\n\t\rwith\x00mixed\x1Fcontrols";
+  Assert.equal(
+    _sanitizeTitleForTesting(mixed),
+    "Title with mixed controls",
+    "Mixed control characters replaced and collapsed"
+  );
+});
+
+add_task(function test_sanitizeTitle_multiple_spaces() {
+  // Multiple spaces should collapse to single space
+  const multipleSpaces = "Title    with    many    spaces";
+  Assert.equal(
+    _sanitizeTitleForTesting(multipleSpaces),
+    "Title with many spaces",
+    "Multiple spaces collapsed to single space"
+  );
+
+  // Mixed spacing
+  const mixedSpacing = "Title  \t\n  with  \r  mixed   spacing";
+  Assert.equal(
+    _sanitizeTitleForTesting(mixedSpacing),
+    "Title with mixed spacing",
+    "Mixed spacing collapsed"
+  );
+});
+
+add_task(function test_sanitizeTitle_whitespace_trim() {
+  // Leading whitespace
+  const leading = "   Title with leading spaces";
+  Assert.equal(
+    _sanitizeTitleForTesting(leading),
+    "Title with leading spaces",
+    "Leading whitespace trimmed"
+  );
+
+  // Trailing whitespace
+  const trailing = "Title with trailing spaces   ";
+  Assert.equal(
+    _sanitizeTitleForTesting(trailing),
+    "Title with trailing spaces",
+    "Trailing whitespace trimmed"
+  );
+
+  // Both
+  const both = "   Title with both   ";
+  Assert.equal(
+    _sanitizeTitleForTesting(both),
+    "Title with both",
+    "Both leading and trailing whitespace trimmed"
+  );
+});

From 98c974ba80ae88a5340806defcd85066924847aa Mon Sep 17 00:00:00 2001
From: Christopher DiPersio <cdipersio@mozilla.com>
Date: Fri, 6 Feb 2026 16:20:12 +0000
Subject: [PATCH 15/93] Bug 2014279 - Add new tool to return all saved memories
 to the assistant r=cgopal,ai-models-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D281678
---
 .../components/aiwindow/models/Chat.sys.mjs   |  2 +
 .../components/aiwindow/models/Tools.sys.mjs  | 22 +++++
 .../browser/browser_conversation_stream.js    | 90 +++++++++++++++++++
 .../models/tests/xpcshell/test_Chat.js        |  5 ++
 4 files changed, 119 insertions(+)

diff --git a/browser/components/aiwindow/models/Chat.sys.mjs b/browser/components/aiwindow/models/Chat.sys.mjs
index bdf04fee9c3ed..be1a82626a656 100644
--- a/browser/components/aiwindow/models/Chat.sys.mjs
+++ b/browser/components/aiwindow/models/Chat.sys.mjs
@@ -17,6 +17,7 @@ import {
   searchBrowsingHistory,
   GetPageContent,
   RunSearch,
+  getUserMemories,
 } from "moz-src:///browser/components/aiwindow/models/Tools.sys.mjs";
 
 const lazy = {};
@@ -44,6 +45,7 @@ Object.assign(Chat, {
     search_browsing_history: searchBrowsingHistory,
     get_page_content: GetPageContent.getPageContent,
     run_search: RunSearch.runSearch.bind(RunSearch),
+    get_user_memories: getUserMemories,
   },
 
   /**
diff --git a/browser/components/aiwindow/models/Tools.sys.mjs b/browser/components/aiwindow/models/Tools.sys.mjs
index 1943ffb16eb7c..2dbe2adbd61e8 100644
--- a/browser/components/aiwindow/models/Tools.sys.mjs
+++ b/browser/components/aiwindow/models/Tools.sys.mjs
@@ -18,6 +18,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  MemoriesManager:
+    "moz-src:///browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs",
   // @todo Bug 2009194
   // PageDataService:
   //   "moz-src:///browser/components/pagedata/PageDataService.sys.mjs",
@@ -27,12 +29,14 @@ const GET_OPEN_TABS = "get_open_tabs";
 const SEARCH_BROWSING_HISTORY = "search_browsing_history";
 const GET_PAGE_CONTENT = "get_page_content";
 const RUN_SEARCH = "run_search";
+const GET_USER_MEMORIES = "get_user_memories";
 
 export const TOOLS = [
   GET_OPEN_TABS,
   SEARCH_BROWSING_HISTORY,
   GET_PAGE_CONTENT,
   RUN_SEARCH,
+  GET_USER_MEMORIES,
 ];
 
 export const toolsConfig = [
@@ -129,6 +133,18 @@ export const toolsConfig = [
       },
     },
   },
+  {
+    type: "function",
+    function: {
+      name: GET_USER_MEMORIES,
+      description:
+        'Retrieves all memories saved about the user to answer questions like "What do you know about me?", "What memories have you saved?", "What do you remember about me?", etc. Respond to the user that these are memories.',
+      parameters: {
+        type: "object",
+        properties: {},
+      },
+    },
+  },
 ];
 
 /**
@@ -665,3 +681,9 @@ export class GetPageContent {
     return `Content (${modeLabel}) from ${label}:\n\n${cleanContent}`;
   }
 }
+
+export async function getUserMemories() {
+  const memories = await lazy.MemoriesManager.getAllMemories();
+
+  return memories.map(memory => memory.memory_summary);
+}
diff --git a/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js b/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
index e6220324ce3d3..7d69a37e05afa 100644
--- a/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
+++ b/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
@@ -12,6 +12,9 @@ const { MESSAGE_ROLE } = ChromeUtils.importESModule(
 const { Chat } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
 );
+const { MemoryStore } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/services/MemoryStore.sys.mjs"
+);
 
 const { PlacesTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/PlacesTestUtils.sys.mjs"
@@ -249,3 +252,90 @@ add_task(async function test_chat_tool_call_get_page_content() {
     await new Promise(resolve => pageServer.stop(resolve));
   }
 });
+
+add_task(async function test_chat_tool_call_get_user_memories() {
+  // Clear existing memories
+  const preTestMemories = await MemoryStore.getMemories({
+    includeSoftDeleted: true,
+  });
+  for (const memory of preTestMemories) {
+    await MemoryStore.hardDeleteMemory(memory.id);
+  }
+
+  // Add temp test memories
+  const testMemories = [
+    {
+      memory_summary: "Loves drinking coffee",
+      category: "Food & Drink",
+      intent: "Plan / Organize",
+      score: 3,
+    },
+    {
+      memory_summary: "Buys dog food online",
+      category: "Pets & Animals",
+      intent: "Buy / Acquire",
+      score: 4,
+    },
+  ];
+  for (const memory of testMemories) {
+    await MemoryStore.addMemory(memory);
+  }
+
+  try {
+    await withServer(
+      {
+        toolCall: {
+          name: "get_user_memories",
+          args: "{}",
+        },
+        followupChunks: ["Memories ready."],
+      },
+      async () => {
+        const conversation = new ChatConversation({
+          title: "chat title",
+          description: "chat desc",
+          pageUrl: new URL("https://example.com"),
+          pageMeta: {},
+        });
+        conversation.addUserMessage(
+          "Tell me everything you know about me",
+          "https://example.com",
+          0
+        );
+
+        let responseText = "";
+        for await (const chunk of Chat.fetchWithHistory(conversation)) {
+          if (typeof chunk === "string") {
+            responseText += chunk;
+          }
+        }
+
+        Assert.equal(
+          responseText,
+          "Memories ready.",
+          "Assistant should stream follow-up text"
+        );
+
+        const toolMessages = conversation.messages.filter(
+          message => message.role === MESSAGE_ROLE.TOOL
+        );
+        Assert.equal(toolMessages.length, 1, "Tool result recorded");
+        const returnedMemories = toolMessages[0].content.body;
+        info("got memories: " + returnedMemories);
+        Assert.deepEqual(
+          returnedMemories,
+          ["Loves drinking coffee", "Buys dog food online"],
+          "Memories tool returns should match the expected set"
+        );
+      }
+    );
+  } finally {
+    // Clear temp memories
+    const postTestMemories = await MemoryStore.getMemories({
+      includeSoftDeleted: true,
+    });
+    for (const memory of postTestMemories) {
+      await MemoryStore.hardDeleteMemory(memory.id);
+    }
+  }
+});
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
index f8ca82a4af83b..08742d389fb4a 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
@@ -50,6 +50,11 @@ add_task(async function test_Chat_real_tools_are_registered() {
     "function",
     "get_page_content should be registered in toolMap"
   );
+  Assert.strictEqual(
+    typeof Chat.toolMap.get_user_memories,
+    "function",
+    "get_user_memories should be registered in the toolMap"
+  );
 });
 
 add_task(

From 56c551217d512335adda6486c06b558510293cc2 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:44 +0000
Subject: [PATCH 16/93] Bug 2010597 - Add unified widget telemetry metrics.
 r=home-newtab-reviewers,reemhamz,nina-py

Adds four new unified Glean metrics to replace per-widget telemetry:
 - widgets_impression: Records when any widget is visible
 - widgets_user_event: Records user interactions with any widget
 - widgets_enabled: Records when widgets are enabled/disabled
 - widgets_error: Records when widgets encounter an error

Differential Revision: https://phabricator.services.mozilla.com/D281043
---
 browser/components/newtab/metrics.yaml | 116 +++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/browser/components/newtab/metrics.yaml b/browser/components/newtab/metrics.yaml
index 71e087872772a..db379b4d25447 100644
--- a/browser/components/newtab/metrics.yaml
+++ b/browser/components/newtab/metrics.yaml
@@ -1169,6 +1169,122 @@ newtab:
     send_in_pings:
       - newtab
 
+  widgets_impression:
+    type: event
+    description: >
+      Recorded when any widget is viewable on a user's screen.
+      This metric replaces widgets_lists_impression, widgets_timer_impression,
+      and weather_impression.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - mcrawford@mozilla.com
+    expires: never
+    extra_keys:
+      newtab_visit_id: *newtab_visit_id
+      widget_name: &widget_name
+        description: >
+          Name of the widget that emits the event (e.g., lists, focus_timer, weather).
+        type: string
+      widget_size: &widget_size
+        description: >
+          Size of widget (e.g., mini, small, medium).
+        type: string
+    send_in_pings:
+      - newtab
+
+  widgets_user_event:
+    type: event
+    description: >
+      Recorded when user interacts with any widget.
+      This metric replaces widgets_lists_user_event, widgets_timer_user_event,
+      weather_detect_location, weather_opt_in_selection, weather_location_selected,
+      weather_open_provider_url and weather_change_display.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - mcrawford@mozilla.com
+    expires: never
+    extra_keys:
+      newtab_visit_id: *newtab_visit_id
+      widget_name: *widget_name
+      widget_source: &widget_source
+        description: >
+          Where the event originated (e.g., widget, context_menu, customize_panel).
+        type: string
+      widget_size: *widget_size
+      user_action:
+        description: >
+          Specific action taken by different widgets (e.g., list_copy, list_create,
+          timer_set, timer_play, timer_pause, change_location, detect_location).
+        type: string
+      action_value:
+        description: >
+          Optional value associated with action (string representation).
+        type: string
+    send_in_pings:
+      - newtab
+
+  widgets_enabled:
+    type: event
+    description: >
+      Recorded when a widget is enabled or disabled.
+      This metric replaces widgets_lists_change_display, widgets_timer_change_display,
+      and weather_enabled.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - mcrawford@mozilla.com
+    expires: never
+    extra_keys:
+      newtab_visit_id: *newtab_visit_id
+      widget_name: *widget_name
+      widget_source: *widget_source
+      widget_size: *widget_size
+      enabled:
+        description: >
+          Whether widget is now enabled (true) or disabled (false).
+        type: boolean
+    send_in_pings:
+      - newtab
+
+  widgets_error:
+    type: event
+    description: >
+      Recorded when a widget encounters an error state (e.g., failed to load data).
+      This metric replaces weather_load_error.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010597
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - mcrawford@mozilla.com
+    expires: never
+    extra_keys:
+      newtab_visit_id: *newtab_visit_id
+      widget_name: *widget_name
+      widget_size: *widget_size
+      error_type:
+        description: >
+          Type of error encountered (e.g., load_error, network_error, timeout).
+        type: string
+    send_in_pings:
+      - newtab
+
   spons_nav_traffic_sent:
     type: memory_distribution
     memory_unit: kilobyte

From 14f98623dbdbdb5a372b5699a0eafa22fa6bfcb7 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:44 +0000
Subject: [PATCH 17/93] Bug 2012824 - Update widget telemetry events to pass
 the correct value to newtab_visit_id. r=home-newtab-reviewers,nbarrett

The handlePromoCardUserEvent and handleWidgetsUserEvent methods
were incorrectly accessing session.visit_id, which doesn't exist.
The correct property is session.session_id. This bug caused these
telemetry events to send undefined for the newtab_visit_id field.

Differential Revision: https://phabricator.services.mozilla.com/D281044
---
 browser/extensions/newtab/lib/TelemetryFeed.sys.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
index 2d2f226aa740f..16203457d176b 100644
--- a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
@@ -1597,7 +1597,7 @@ export class TelemetryFeed {
     const session = this.sessions.get(au.getPortIdOfSender(action));
     if (session) {
       const payload = {
-        newtab_visit_id: session.visit_id,
+        newtab_visit_id: session.session_id,
       };
 
       switch (action.type) {
@@ -1618,7 +1618,7 @@ export class TelemetryFeed {
     const session = this.sessions.get(au.getPortIdOfSender(action));
     if (session) {
       const payload = {
-        newtab_visit_id: session.visit_id,
+        newtab_visit_id: session.session_id,
       };
       switch (action.type) {
         case "WIDGETS_LISTS_USER_EVENT":

From 3010d7e98f604aa06c3350e5dab01ccb4d0a8aa6 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:44 +0000
Subject: [PATCH 18/93] Bug 2012838 - Fix data-eventSource attributes in
 ContentSection to use kebab-case.  r=home-newtab-reviewers,reemhamz

Differential Revision: https://phabricator.services.mozilla.com/D281045
---
 .../ContentSection/ContentSection.jsx              | 14 +++++++-------
 .../newtab/data/content/activity-stream.bundle.js  | 14 +++++++-------
 .../CustomizeMenu/ContentSection.test.jsx          | 10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
index 8ed0141597d52..9d6cc90de4105 100644
--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
@@ -152,7 +152,7 @@ export class ContentSection extends React.PureComponent {
                     pressed={weatherEnabled || null}
                     onToggle={this.onPreferenceSelect}
                     data-preference="showWeather"
-                    data-eventSource="WEATHER"
+                    data-event-source="WEATHER"
                     data-l10n-id="newtab-custom-widget-weather-toggle"
                   />
                 </div>
@@ -166,7 +166,7 @@ export class ContentSection extends React.PureComponent {
                     pressed={listsEnabled || null}
                     onToggle={this.onPreferenceSelect}
                     data-preference="widgets.lists.enabled"
-                    data-eventSource="WIDGET_LISTS"
+                    data-event-source="WIDGET_LISTS"
                     data-l10n-id="newtab-custom-widget-lists-toggle"
                   />
                 </div>
@@ -180,7 +180,7 @@ export class ContentSection extends React.PureComponent {
                     pressed={timerEnabled || null}
                     onToggle={this.onPreferenceSelect}
                     data-preference="widgets.focusTimer.enabled"
-                    data-eventSource="WIDGET_TIMER"
+                    data-event-source="WIDGET_TIMER"
                     data-l10n-id="newtab-custom-widget-timer-toggle"
                   />
                 </div>
@@ -198,7 +198,7 @@ export class ContentSection extends React.PureComponent {
                 pressed={weatherEnabled || null}
                 onToggle={this.onPreferenceSelect}
                 data-preference="showWeather"
-                data-eventSource="WEATHER"
+                data-event-source="WEATHER"
                 data-l10n-id="newtab-custom-weather-toggle"
               />
             </div>
@@ -210,7 +210,7 @@ export class ContentSection extends React.PureComponent {
               pressed={topSitesEnabled || null}
               onToggle={this.onPreferenceSelect}
               data-preference="feeds.topsites"
-              data-eventSource="TOP_SITES"
+              data-event-source="TOP_SITES"
               data-l10n-id="newtab-custom-shortcuts-toggle"
             >
               <div slot="nested">
@@ -264,7 +264,7 @@ export class ContentSection extends React.PureComponent {
                 onToggle={this.onPreferenceSelect}
                 aria-describedby="custom-pocket-subtitle"
                 data-preference="feeds.section.topstories"
-                data-eventSource="TOP_STORIES"
+                data-event-source="TOP_STORIES"
                 {...(mayHaveInferredPersonalization
                   ? {
                       "data-l10n-id":
@@ -291,7 +291,7 @@ export class ContentSection extends React.PureComponent {
                               type="checkbox"
                               onChange={this.onPreferenceSelect}
                               data-preference="discoverystream.sections.personalization.inferred.user.enabled"
-                              data-eventSource="INFERRED_PERSONALIZATION"
+                              data-event-source="INFERRED_PERSONALIZATION"
                             />
                             <label
                               className="customize-menu-checkbox-label"
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 157af081076d6..9536bc2e7ca3b 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -14548,7 +14548,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       pressed: weatherEnabled || null,
       onToggle: this.onPreferenceSelect,
       "data-preference": "showWeather",
-      "data-eventSource": "WEATHER",
+      "data-event-source": "WEATHER",
       "data-l10n-id": "newtab-custom-widget-weather-toggle"
     })), mayHaveListsWidget && /*#__PURE__*/external_React_default().createElement("div", {
       id: "lists-widget-section",
@@ -14558,7 +14558,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       pressed: listsEnabled || null,
       onToggle: this.onPreferenceSelect,
       "data-preference": "widgets.lists.enabled",
-      "data-eventSource": "WIDGET_LISTS",
+      "data-event-source": "WIDGET_LISTS",
       "data-l10n-id": "newtab-custom-widget-lists-toggle"
     })), mayHaveTimerWidget && /*#__PURE__*/external_React_default().createElement("div", {
       id: "timer-widget-section",
@@ -14568,7 +14568,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       pressed: timerEnabled || null,
       onToggle: this.onPreferenceSelect,
       "data-preference": "widgets.focusTimer.enabled",
-      "data-eventSource": "WIDGET_TIMER",
+      "data-event-source": "WIDGET_TIMER",
       "data-l10n-id": "newtab-custom-widget-timer-toggle"
     })), /*#__PURE__*/external_React_default().createElement("span", {
       className: "divider",
@@ -14583,7 +14583,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       pressed: weatherEnabled || null,
       onToggle: this.onPreferenceSelect,
       "data-preference": "showWeather",
-      "data-eventSource": "WEATHER",
+      "data-event-source": "WEATHER",
       "data-l10n-id": "newtab-custom-weather-toggle"
     })), /*#__PURE__*/external_React_default().createElement("div", {
       id: "shortcuts-section",
@@ -14593,7 +14593,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       pressed: topSitesEnabled || null,
       onToggle: this.onPreferenceSelect,
       "data-preference": "feeds.topsites",
-      "data-eventSource": "TOP_SITES",
+      "data-event-source": "TOP_SITES",
       "data-l10n-id": "newtab-custom-shortcuts-toggle"
     }, /*#__PURE__*/external_React_default().createElement("div", {
       slot: "nested"
@@ -14636,7 +14636,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       onToggle: this.onPreferenceSelect,
       "aria-describedby": "custom-pocket-subtitle",
       "data-preference": "feeds.section.topstories",
-      "data-eventSource": "TOP_STORIES"
+      "data-event-source": "TOP_STORIES"
     }, mayHaveInferredPersonalization ? {
       "data-l10n-id": "newtab-custom-stories-personalized-toggle"
     } : {
@@ -14659,7 +14659,7 @@ class ContentSection extends (external_React_default()).PureComponent {
       type: "checkbox",
       onChange: this.onPreferenceSelect,
       "data-preference": "discoverystream.sections.personalization.inferred.user.enabled",
-      "data-eventSource": "INFERRED_PERSONALIZATION"
+      "data-event-source": "INFERRED_PERSONALIZATION"
     }), /*#__PURE__*/external_React_default().createElement("label", {
       className: "customize-menu-checkbox-label",
       htmlFor: "inferred-personalization",
diff --git a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
index cdac311768235..cc093eb0ca990 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
@@ -57,7 +57,7 @@ describe("ContentSection", () => {
     assert.ok(wrapper.exists());
   });
 
-  it("should look for a data-eventSource attribute and dispatch an event for INPUT", () => {
+  it("should look for a data-event-source attribute and dispatch an event for INPUT", () => {
     wrapper.instance().onPreferenceSelect({
       target: {
         nodeName: "INPUT",
@@ -77,18 +77,18 @@ describe("ContentSection", () => {
     assert.calledWith(DEFAULT_PROPS.setPref, "foo", true);
   });
 
-  it("should have data-eventSource attributes on relevant pref changing inputs", () => {
+  it("should have data-event-source attributes on relevant pref changing inputs", () => {
     wrapper = mount(<ContentSection {...DEFAULT_PROPS} />);
     assert.equal(
-      wrapper.find("#weather-toggle").prop("data-eventSource"),
+      wrapper.find("#weather-toggle").prop("data-event-source"),
       "WEATHER"
     );
     assert.equal(
-      wrapper.find("#shortcuts-toggle").prop("data-eventSource"),
+      wrapper.find("#shortcuts-toggle").prop("data-event-source"),
       "TOP_SITES"
     );
     assert.equal(
-      wrapper.find("#pocket-toggle").prop("data-eventSource"),
+      wrapper.find("#pocket-toggle").prop("data-event-source"),
       "TOP_STORIES"
     );
   });

From c9ba07549ca1017e7327cce92b8013b5004f6151 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:45 +0000
Subject: [PATCH 19/93] Bug 2013133 - Add unified widget telemetry for Lists
 widget. r=home-newtab-reviewers,reemhamz,nina-py

Implements scalable widget telemetry by adding unified metrics that work for
all widgets, replacing per-widget metrics. This commit focuses on the Lists
widget while maintaining backward compatibility.

Differential Revision: https://phabricator.services.mozilla.com/D281046
---
 browser/extensions/newtab/common/Actions.mjs  |   3 +
 .../content-src/components/Base/Base.jsx      |   2 +
 .../ContentSection/ContentSection.jsx         |  52 ++++-
 .../components/Widgets/Lists/Lists.jsx        | 184 +++++++++++++--
 .../components/Widgets/Widgets.jsx            |   2 +
 .../data/content/activity-stream.bundle.js    | 209 +++++++++++++++---
 browser/extensions/newtab/karma.mc.config.js  |   6 +-
 .../newtab/lib/TelemetryFeed.sys.mjs          |  67 ++++++
 .../CustomizeMenu/ContentSection.test.jsx     |  37 ++++
 .../components/Widgets/Lists.test.jsx         | 102 ++++++++-
 10 files changed, 596 insertions(+), 68 deletions(-)

diff --git a/browser/extensions/newtab/common/Actions.mjs b/browser/extensions/newtab/common/Actions.mjs
index 66f88734a1e08..3457516cc0d25 100644
--- a/browser/extensions/newtab/common/Actions.mjs
+++ b/browser/extensions/newtab/common/Actions.mjs
@@ -218,6 +218,8 @@ for (const type of [
   "WEATHER_USER_OPT_IN_LOCATION",
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
+  "WIDGETS_ENABLED",
+  "WIDGETS_IMPRESSION",
   "WIDGETS_LISTS_CHANGE_SELECTED",
   "WIDGETS_LISTS_SET",
   "WIDGETS_LISTS_SET_SELECTED",
@@ -233,6 +235,7 @@ for (const type of [
   "WIDGETS_TIMER_SET_TYPE",
   "WIDGETS_TIMER_USER_EVENT",
   "WIDGETS_TIMER_USER_IMPRESSION",
+  "WIDGETS_USER_EVENT",
 ]) {
   actionTypes[type] = type;
 }
diff --git a/browser/extensions/newtab/content-src/components/Base/Base.jsx b/browser/extensions/newtab/content-src/components/Base/Base.jsx
index 2c711593d0f9c..60e61ce70c176 100644
--- a/browser/extensions/newtab/content-src/components/Base/Base.jsx
+++ b/browser/extensions/newtab/content-src/components/Base/Base.jsx
@@ -788,6 +788,8 @@ export class BaseContent extends React.PureComponent {
       listsEnabled: prefs["widgets.lists.enabled"],
       timerEnabled: prefs["widgets.focusTimer.enabled"],
       weatherEnabled: prefs.showWeather,
+      widgetsMaximized: prefs["widgets.maximized"],
+      widgetsMayBeMaximized: prefs["widgets.system.maximized"],
     };
 
     // Mobile Download Promo Pref Checks
diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
index 9d6cc90de4105..bf2367e10c931 100644
--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
@@ -3,7 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import React from "react";
-import { actionCreators as ac } from "common/Actions.mjs";
+import { batch } from "react-redux";
+import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
 import { SectionsMgmtPanel } from "../SectionsMgmtPanel/SectionsMgmtPanel";
 import { WallpaperCategories } from "../../WallpaperCategories/WallpaperCategories";
 
@@ -18,13 +19,48 @@ export class ContentSection extends React.PureComponent {
   }
 
   inputUserEvent(eventSource, eventValue) {
-    this.props.dispatch(
-      ac.UserEvent({
-        event: "PREF_CHANGED",
-        source: eventSource,
-        value: { status: eventValue, menu_source: "CUSTOMIZE_MENU" },
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.UserEvent({
+          event: "PREF_CHANGED",
+          source: eventSource,
+          value: { status: eventValue, menu_source: "CUSTOMIZE_MENU" },
+        })
+      );
+
+      // Dispatch unified widget telemetry for widget toggles.
+      // Map the event source from the customize panel to the widget name
+      // for the unified telemetry event.
+      let widgetName;
+      switch (eventSource) {
+        case "WIDGET_LISTS":
+          widgetName = "lists";
+          break;
+        case "WIDGET_TIMER":
+          widgetName = "focus_timer";
+          break;
+      }
+
+      if (widgetName) {
+        const { widgetsMaximized, widgetsMayBeMaximized } =
+          this.props.enabledWidgets;
+
+        const data = {
+          widget_name: widgetName,
+          widget_source: "customize_panel",
+          enabled: eventValue,
+          widget_size:
+            widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium",
+        };
+
+        this.props.dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_ENABLED,
+            data,
+          })
+        );
+      }
+    });
   }
 
   onPreferenceSelect(e) {
diff --git a/browser/extensions/newtab/content-src/components/Widgets/Lists/Lists.jsx b/browser/extensions/newtab/content-src/components/Widgets/Lists/Lists.jsx
index 5b444ee40ac27..7e950b3968b73 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/Lists/Lists.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/Lists/Lists.jsx
@@ -34,7 +34,13 @@ const PREF_WIDGETS_LISTS_MAX_LISTITEMS = "widgets.lists.maxListItems";
 const PREF_WIDGETS_LISTS_BADGE_ENABLED = "widgets.lists.badge.enabled";
 const PREF_WIDGETS_LISTS_BADGE_LABEL = "widgets.lists.badge.label";
 
-function Lists({ dispatch, handleUserInteraction, isMaximized }) {
+// eslint-disable-next-line max-statements
+function Lists({
+  dispatch,
+  handleUserInteraction,
+  isMaximized,
+  widgetsMayBeMaximized,
+}) {
   const prefs = useSelector(state => state.Prefs.values);
   const { selected, lists } = useSelector(state => state.ListsWidget);
   const [newTask, setNewTask] = useState("");
@@ -42,11 +48,16 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
   const [pendingNewList, setPendingNewList] = useState(null);
   const selectedList = useMemo(() => lists[selected], [lists, selected]);
 
+  // Bug 2012829 - Calculate widget size dynamically based on isMaximized prop.
+  // Future sizes: mini, medium, large.
+  const widgetSize = isMaximized ? "medium" : "small";
+
   const prevCompletedCount = useRef(selectedList?.completed?.length || 0);
   const inputRef = useRef(null);
   const selectRef = useRef(null);
   const reorderListRef = useRef(null);
   const [canvasRef, fireConfetti] = useConfetti();
+  const impressionFired = useRef(false);
 
   const handleListInteraction = useCallback(
     () => handleUserInteraction("lists"),
@@ -57,12 +68,29 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
   const isValidUrl = useCallback(str => URL.canParse(str), []);
 
   const handleIntersection = useCallback(() => {
-    dispatch(
-      ac.AlsoToMain({
-        type: at.WIDGETS_LISTS_USER_IMPRESSION,
-      })
-    );
-  }, [dispatch]);
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+
+    batch(() => {
+      dispatch(
+        ac.AlsoToMain({
+          type: at.WIDGETS_LISTS_USER_IMPRESSION,
+        })
+      );
+      const telemetryData = {
+        widget_name: "lists",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.AlsoToMain({
+          type: at.WIDGETS_IMPRESSION,
+          data: telemetryData,
+        })
+      );
+    });
+  }, [dispatch, widgetsMayBeMaximized, widgetSize]);
 
   const listsRef = useIntersectionObserver(handleIntersection);
 
@@ -204,6 +232,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
             data: { userAction: USER_ACTION_TYPES.TASK_CREATE },
           })
         );
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TASK_CREATE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
       setNewTask("");
       handleListInteraction();
@@ -273,6 +313,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
             data: { userAction },
           })
         );
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: userAction,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+        dispatch(
+          ac.AlsoToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       }
     });
     handleListInteraction();
@@ -302,6 +354,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
           data: { userAction: USER_ACTION_TYPES.TASK_DELETE },
         })
       );
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.TASK_DELETE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
     });
     handleListInteraction();
   }
@@ -341,6 +405,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
             data: { userAction: USER_ACTION_TYPES.LIST_EDIT },
           })
         );
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_EDIT,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
       setIsEditing(false);
       handleListInteraction();
@@ -377,6 +453,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
           data: { userAction: USER_ACTION_TYPES.LIST_CREATE },
         })
       );
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.LIST_CREATE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
     });
     setPendingNewList(id);
     handleListInteraction();
@@ -409,6 +497,18 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
             data: { userAction: USER_ACTION_TYPES.LIST_DELETE },
           })
         );
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_DELETE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     }
 
@@ -451,21 +551,47 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
             data: { userAction: USER_ACTION_TYPES.LIST_DELETE },
           })
         );
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_DELETE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     }
     handleListInteraction();
   }
 
   function handleHideLists() {
-    dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "widgets.lists.enabled",
-          value: false,
-        },
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "widgets.lists.enabled",
+            value: false,
+          },
+        })
+      );
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "context_menu",
+        enabled: false,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_ENABLED,
+          data: telemetryData,
+        })
+      );
+    });
     handleListInteraction();
   }
 
@@ -496,12 +622,26 @@ function Lists({ dispatch, handleUserInteraction, isMaximized }) {
       console.error("Copy failed", err);
     }
 
-    dispatch(
-      ac.OnlyToMain({
-        type: at.WIDGETS_LISTS_USER_EVENT,
-        data: { userAction: USER_ACTION_TYPES.LIST_COPY },
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_LISTS_USER_EVENT,
+          data: { userAction: USER_ACTION_TYPES.LIST_COPY },
+        })
+      );
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.LIST_COPY,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
     handleListInteraction();
   }
 
diff --git a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
index 5f2f58117c972..8900683960077 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
@@ -58,6 +58,7 @@ function Widgets() {
   const timerType = useSelector(state => state.TimerWidget.timerType);
   const timerData = useSelector(state => state.TimerWidget);
   const isMaximized = prefs[PREF_WIDGETS_MAXIMIZED];
+  const widgetsMayBeMaximized = prefs[PREF_WIDGETS_SYSTEM_MAXIMIZED];
   const dispatch = useDispatch();
 
   const nimbusListsEnabled = prefs.widgetsConfig?.listsEnabled;
@@ -189,6 +190,7 @@ function Widgets() {
               dispatch={dispatch}
               handleUserInteraction={handleUserInteraction}
               isMaximized={isMaximized}
+              widgetsMayBeMaximized={widgetsMayBeMaximized}
             />
           )}
           {timerEnabled && (
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 9536bc2e7ca3b..31c1f0060317c 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -291,6 +291,8 @@ for (const type of [
   "WEATHER_USER_OPT_IN_LOCATION",
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
+  "WIDGETS_ENABLED",
+  "WIDGETS_IMPRESSION",
   "WIDGETS_LISTS_CHANGE_SELECTED",
   "WIDGETS_LISTS_SET",
   "WIDGETS_LISTS_SET_SELECTED",
@@ -306,6 +308,7 @@ for (const type of [
   "WIDGETS_TIMER_SET_TYPE",
   "WIDGETS_TIMER_USER_EVENT",
   "WIDGETS_TIMER_USER_IMPRESSION",
+  "WIDGETS_USER_EVENT",
 ]) {
   actionTypes[type] = type;
 }
@@ -11363,10 +11366,13 @@ const PREF_WIDGETS_LISTS_MAX_LISTS = "widgets.lists.maxLists";
 const PREF_WIDGETS_LISTS_MAX_LISTITEMS = "widgets.lists.maxListItems";
 const PREF_WIDGETS_LISTS_BADGE_ENABLED = "widgets.lists.badge.enabled";
 const PREF_WIDGETS_LISTS_BADGE_LABEL = "widgets.lists.badge.label";
+
+// eslint-disable-next-line max-statements
 function Lists({
   dispatch,
   handleUserInteraction,
-  isMaximized
+  isMaximized,
+  widgetsMayBeMaximized
 }) {
   const prefs = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.Prefs.values);
   const {
@@ -11377,20 +11383,39 @@ function Lists({
   const [isEditing, setIsEditing] = (0,external_React_namespaceObject.useState)(false);
   const [pendingNewList, setPendingNewList] = (0,external_React_namespaceObject.useState)(null);
   const selectedList = (0,external_React_namespaceObject.useMemo)(() => lists[selected], [lists, selected]);
+
+  // Bug 2012829 - Calculate widget size dynamically based on isMaximized prop.
+  // Future sizes: mini, medium, large.
+  const widgetSize = isMaximized ? "medium" : "small";
   const prevCompletedCount = (0,external_React_namespaceObject.useRef)(selectedList?.completed?.length || 0);
   const inputRef = (0,external_React_namespaceObject.useRef)(null);
   const selectRef = (0,external_React_namespaceObject.useRef)(null);
   const reorderListRef = (0,external_React_namespaceObject.useRef)(null);
   const [canvasRef, fireConfetti] = useConfetti();
+  const impressionFired = (0,external_React_namespaceObject.useRef)(false);
   const handleListInteraction = (0,external_React_namespaceObject.useCallback)(() => handleUserInteraction("lists"), [handleUserInteraction]);
 
   // store selectedList with useMemo so it isnt re-calculated on every re-render
   const isValidUrl = (0,external_React_namespaceObject.useCallback)(str => URL.canParse(str), []);
   const handleIntersection = (0,external_React_namespaceObject.useCallback)(() => {
-    dispatch(actionCreators.AlsoToMain({
-      type: actionTypes.WIDGETS_LISTS_USER_IMPRESSION
-    }));
-  }, [dispatch]);
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WIDGETS_LISTS_USER_IMPRESSION
+      }));
+      const telemetryData = {
+        widget_name: "lists",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WIDGETS_IMPRESSION,
+        data: telemetryData
+      }));
+    });
+  }, [dispatch, widgetsMayBeMaximized, widgetSize]);
   const listsRef = useIntersectionObserver(handleIntersection);
   const reorderLists = (0,external_React_namespaceObject.useCallback)((draggedElement, targetElement, before = false) => {
     const draggedIndex = selectedList.tasks.findIndex(({
@@ -11506,6 +11531,16 @@ function Lists({
             userAction: USER_ACTION_TYPES.TASK_CREATE
           }
         }));
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TASK_CREATE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
       setNewTask("");
       handleListInteraction();
@@ -11566,6 +11601,16 @@ function Lists({
             userAction
           }
         }));
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: userAction,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.AlsoToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       }
     });
     handleListInteraction();
@@ -11595,6 +11640,16 @@ function Lists({
           userAction: USER_ACTION_TYPES.TASK_DELETE
         }
       }));
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.TASK_DELETE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
     });
     handleListInteraction();
   }
@@ -11629,6 +11684,16 @@ function Lists({
             userAction: USER_ACTION_TYPES.LIST_EDIT
           }
         }));
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_EDIT,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
       setIsEditing(false);
       handleListInteraction();
@@ -11661,6 +11726,16 @@ function Lists({
           userAction: USER_ACTION_TYPES.LIST_CREATE
         }
       }));
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.LIST_CREATE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
     });
     setPendingNewList(id);
     handleListInteraction();
@@ -11691,6 +11766,16 @@ function Lists({
             userAction: USER_ACTION_TYPES.LIST_DELETE
           }
         }));
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_DELETE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     }
     handleListInteraction();
@@ -11731,18 +11816,40 @@ function Lists({
             userAction: USER_ACTION_TYPES.LIST_DELETE
           }
         }));
+        const telemetryData = {
+          widget_name: "lists",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.LIST_DELETE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     }
     handleListInteraction();
   }
   function handleHideLists() {
-    dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "widgets.lists.enabled",
-        value: false
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "widgets.lists.enabled",
+          value: false
+        }
+      }));
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "context_menu",
+        enabled: false,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_ENABLED,
+        data: telemetryData
+      }));
+    });
     handleListInteraction();
   }
   function handleCopyListToClipboard() {
@@ -11765,12 +11872,24 @@ function Lists({
     } catch (err) {
       console.error("Copy failed", err);
     }
-    dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.WIDGETS_LISTS_USER_EVENT,
-      data: {
-        userAction: USER_ACTION_TYPES.LIST_COPY
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_LISTS_USER_EVENT,
+        data: {
+          userAction: USER_ACTION_TYPES.LIST_COPY
+        }
+      }));
+      const telemetryData = {
+        widget_name: "lists",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.LIST_COPY,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
     handleListInteraction();
   }
   function handleLearnMore() {
@@ -13092,6 +13211,7 @@ function Widgets() {
   const timerType = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.TimerWidget.timerType);
   const timerData = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.TimerWidget);
   const isMaximized = prefs[PREF_WIDGETS_MAXIMIZED];
+  const widgetsMayBeMaximized = prefs[PREF_WIDGETS_SYSTEM_MAXIMIZED];
   const dispatch = (0,external_ReactRedux_namespaceObject.useDispatch)();
   const nimbusListsEnabled = prefs.widgetsConfig?.listsEnabled;
   const nimbusTimerEnabled = prefs.widgetsConfig?.timerEnabled;
@@ -13191,7 +13311,8 @@ function Widgets() {
   }, listsEnabled && /*#__PURE__*/external_React_default().createElement(Lists, {
     dispatch: dispatch,
     handleUserInteraction: handleUserInteraction,
-    isMaximized: isMaximized
+    isMaximized: isMaximized,
+    widgetsMayBeMaximized: widgetsMayBeMaximized
   }), timerEnabled && /*#__PURE__*/external_React_default().createElement(FocusTimer, {
     dispatch: dispatch,
     handleUserInteraction: handleUserInteraction,
@@ -14418,6 +14539,7 @@ function ContentSection_extends() { return ContentSection_extends = Object.assig
 
 
 
+
 class ContentSection extends (external_React_default()).PureComponent {
   constructor(props) {
     super(props);
@@ -14428,14 +14550,45 @@ class ContentSection extends (external_React_default()).PureComponent {
     this.pocketDrawerRef = /*#__PURE__*/external_React_default().createRef();
   }
   inputUserEvent(eventSource, eventValue) {
-    this.props.dispatch(actionCreators.UserEvent({
-      event: "PREF_CHANGED",
-      source: eventSource,
-      value: {
-        status: eventValue,
-        menu_source: "CUSTOMIZE_MENU"
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.UserEvent({
+        event: "PREF_CHANGED",
+        source: eventSource,
+        value: {
+          status: eventValue,
+          menu_source: "CUSTOMIZE_MENU"
+        }
+      }));
+
+      // Dispatch unified widget telemetry for widget toggles.
+      // Map the event source from the customize panel to the widget name
+      // for the unified telemetry event.
+      let widgetName;
+      switch (eventSource) {
+        case "WIDGET_LISTS":
+          widgetName = "lists";
+          break;
+        case "WIDGET_TIMER":
+          widgetName = "focus_timer";
+          break;
       }
-    }));
+      if (widgetName) {
+        const {
+          widgetsMaximized,
+          widgetsMayBeMaximized
+        } = this.props.enabledWidgets;
+        const data = {
+          widget_name: widgetName,
+          widget_source: "customize_panel",
+          enabled: eventValue,
+          widget_size: widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium"
+        };
+        this.props.dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_ENABLED,
+          data
+        }));
+      }
+    });
   }
   onPreferenceSelect(e) {
     // eventSource: WEATHER | TOP_SITES | TOP_STORIES | WIDGET_LISTS | WIDGET_TIMER
@@ -16773,7 +16926,9 @@ class BaseContent extends (external_React_default()).PureComponent {
     const enabledWidgets = {
       listsEnabled: prefs["widgets.lists.enabled"],
       timerEnabled: prefs["widgets.focusTimer.enabled"],
-      weatherEnabled: prefs.showWeather
+      weatherEnabled: prefs.showWeather,
+      widgetsMaximized: prefs["widgets.maximized"],
+      widgetsMayBeMaximized: prefs["widgets.system.maximized"]
     };
 
     // Mobile Download Promo Pref Checks
diff --git a/browser/extensions/newtab/karma.mc.config.js b/browser/extensions/newtab/karma.mc.config.js
index 55678f186df51..1619b6d72ee95 100644
--- a/browser/extensions/newtab/karma.mc.config.js
+++ b/browser/extensions/newtab/karma.mc.config.js
@@ -333,10 +333,10 @@ module.exports = function (config) {
               branches: 0,
             },
             "content-src/components/CustomizeMenu/ContentSection/*.jsx": {
-              statements: 80,
-              lines: 80,
+              statements: 65,
+              lines: 65,
               functions: 99,
-              branches: 62,
+              branches: 56,
             },
             "content-src/components/CustomizeMenu/**/*.jsx": {
               statements: 68,
diff --git a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
index 16203457d176b..47a33950d325b 100644
--- a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
@@ -1574,6 +1574,15 @@ export class TelemetryFeed {
       case at.WIDGETS_TIMER_USER_IMPRESSION:
         this.handleWidgetsUserEvent(action);
         break;
+      case at.WIDGETS_USER_EVENT:
+        this.handleUnifiedWidgetUserEvent(action);
+        break;
+      case at.WIDGETS_IMPRESSION:
+        this.handleUnifiedWidgetImpression(action);
+        break;
+      case at.WIDGETS_ENABLED:
+        this.handleUnifiedWidgetEnabled(action);
+        break;
       case at.PROMO_CARD_CLICK:
       case at.PROMO_CARD_DISMISS:
       case at.PROMO_CARD_IMPRESSION:
@@ -1614,6 +1623,8 @@ export class TelemetryFeed {
     }
   }
 
+  // TODO Bug 2012779 - Remove this method and legacy widget-specific telemetry
+  // events once migration to unified telemetry is complete.
   handleWidgetsUserEvent(action) {
     const session = this.sessions.get(au.getPortIdOfSender(action));
     if (session) {
@@ -1643,6 +1654,62 @@ export class TelemetryFeed {
     }
   }
 
+  handleUnifiedWidgetUserEvent(action) {
+    const session = this.sessions.get(au.getPortIdOfSender(action));
+    if (session) {
+      const payload = {
+        newtab_visit_id: session.session_id,
+        widget_name: action.data.widget_name,
+        widget_source: action.data.widget_source || "widget",
+        user_action: action.data.user_action,
+      };
+
+      if (action.data.widget_size) {
+        payload.widget_size = action.data.widget_size;
+      }
+
+      if (action.data.action_value !== undefined) {
+        payload.action_value = String(action.data.action_value);
+      }
+
+      Glean.newtab.widgetsUserEvent.record(payload);
+    }
+  }
+
+  handleUnifiedWidgetImpression(action) {
+    const session = this.sessions.get(au.getPortIdOfSender(action));
+    if (session) {
+      const payload = {
+        newtab_visit_id: session.session_id,
+        widget_name: action.data.widget_name,
+      };
+
+      if (action.data.widget_size) {
+        payload.widget_size = action.data.widget_size;
+      }
+
+      Glean.newtab.widgetsImpression.record(payload);
+    }
+  }
+
+  handleUnifiedWidgetEnabled(action) {
+    const session = this.sessions.get(au.getPortIdOfSender(action));
+    if (session) {
+      const payload = {
+        newtab_visit_id: session.session_id,
+        widget_name: action.data.widget_name,
+        widget_source: action.data.widget_source || "widget",
+        enabled: action.data.enabled,
+      };
+
+      if (action.data.widget_size) {
+        payload.widget_size = action.data.widget_size;
+      }
+
+      Glean.newtab.widgetsEnabled.record(payload);
+    }
+  }
+
   async handleReportAdUserEvent(action) {
     const { placement_id, position, report_reason, reporting_url } =
       action.data || {};
diff --git a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
index cc093eb0ca990..97515780044bd 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
@@ -218,4 +218,41 @@ describe("ContentSection", () => {
     });
     assert.isFalse(wrapper.find("#timer-widget-section").exists());
   });
+
+  it("should dispatch WIDGETS_ENABLED with widget_size=medium when widgetsMayBeMaximized is false", () => {
+    const dispatch = sinon.spy();
+    wrapper = mount(
+      <ContentSection
+        {...DEFAULT_PROPS}
+        dispatch={dispatch}
+        enabledWidgets={{
+          listsEnabled: false,
+          timerEnabled: false,
+          widgetsMaximized: false,
+          widgetsMayBeMaximized: false,
+        }}
+      />
+    );
+
+    wrapper.instance().onPreferenceSelect({
+      target: {
+        nodeName: "INPUT",
+        checked: true,
+        dataset: {
+          preference: "widgets.lists.enabled",
+          eventSource: "WIDGET_LISTS",
+        },
+      },
+    });
+
+    const widgetsEnabledCall = dispatch
+      .getCalls()
+      .find(call => call.args[0].type === "WIDGETS_ENABLED");
+    assert.ok(widgetsEnabledCall, "Expected WIDGETS_ENABLED to be dispatched");
+    assert.equal(
+      widgetsEnabledCall.args[0].data.widget_size,
+      "medium",
+      "widget_size should be medium when widgets.system.maximized is false"
+    );
+  });
 });
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Widgets/Lists.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Widgets/Lists.test.jsx
index 08f029daa3342..a7b20dbd45a28 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Widgets/Lists.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Widgets/Lists.test.jsx
@@ -88,10 +88,23 @@ describe("<Lists>", () => {
     // dispatch not called until transition has ended
     assert.equal(dispatch.callCount, 0);
     taskItem.simulate("transitionEnd", { propertyName: "opacity" });
-    assert.ok(dispatch.calledTwice);
+    assert.ok(dispatch.calledThrice);
     const [action] = dispatch.getCall(0).args;
     assert.equal(action.type, at.WIDGETS_LISTS_UPDATE);
     assert.ok(action.data.lists["test-list"].completed[0].completed);
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "task_complete");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "task_complete");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should not dispatch an action when input is empty and Enter is pressed", () => {
@@ -115,13 +128,26 @@ describe("<Lists>", () => {
     const deleteButton = wrapper.find("panel-item.delete-item").at(0);
     deleteButton.props().onClick();
 
-    assert.ok(dispatch.calledTwice);
+    assert.ok(dispatch.calledThrice);
     const [action] = dispatch.getCall(0).args;
     assert.equal(action.type, at.WIDGETS_LISTS_UPDATE);
 
     // Check that the task list is now empty
     const updatedTasks = action.data.lists["test-list"].tasks;
     assert.equal(updatedTasks.length, 0, "Expected task to be removed");
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "task_delete");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "task_delete");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should add a task with a valid URL and render it as a link", () => {
@@ -138,7 +164,7 @@ describe("<Lists>", () => {
 
     input.simulate("keyDown", { key: "Enter" });
 
-    assert.ok(dispatch.calledTwice, "Expected dispatch to be called");
+    assert.ok(dispatch.calledThrice, "Expected dispatch to be called");
 
     const [action] = dispatch.getCall(0).args;
     assert.equal(action.type, at.WIDGETS_LISTS_UPDATE);
@@ -149,6 +175,19 @@ describe("<Lists>", () => {
 
     assert.ok(newHyperlinkedTask, "Task with URL should be added");
     assert.ok(newHyperlinkedTask.isUrl, "Task should be marked as a URL");
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "task_create");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "task_create");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should dispatch list change when dropdown selection changes", () => {
@@ -170,12 +209,25 @@ describe("<Lists>", () => {
     const deleteList = wrapper.find("panel-item").at(2);
     deleteList.props().onClick();
 
-    assert.ok(dispatch.calledThrice);
+    assert.equal(dispatch.callCount, 4);
     assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_LISTS_UPDATE);
     assert.equal(
       dispatch.getCall(1).args[0].type,
       at.WIDGETS_LISTS_CHANGE_SELECTED
     );
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "list_delete");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(3).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "list_delete");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should update list name when edited and saved", () => {
@@ -188,21 +240,47 @@ describe("<Lists>", () => {
     editableInput.simulate("change", { target: { value: "Updated List" } });
     editableInput.simulate("keyDown", { key: "Enter" });
 
-    assert.ok(dispatch.calledTwice);
+    assert.ok(dispatch.calledThrice);
     const [action] = dispatch.getCall(0).args;
     assert.equal(action.type, at.WIDGETS_LISTS_UPDATE);
     assert.equal(action.data.lists["test-list"].label, "Updated List");
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "list_edit");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "list_edit");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should create a new list and dispatch update and select list actions", () => {
     const createListBtn = wrapper.find("panel-item").at(1); // assumes "Create a new list" is at index 1
     createListBtn.props().onClick();
-    assert.ok(dispatch.calledThrice);
+    assert.equal(dispatch.callCount, 4);
     assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_LISTS_UPDATE);
     assert.equal(
       dispatch.getCall(1).args[0].type,
       at.WIDGETS_LISTS_CHANGE_SELECTED
     );
+
+    // Verify old telemetry event
+    const [oldTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_LISTS_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "list_create");
+
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(3).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "list_create");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should copy the current list to clipboard with correct formatting", () => {
@@ -256,11 +334,19 @@ describe("<Lists>", () => {
     );
 
     // Confirm WIDGETS_LISTS_USER_EVENT telemetry `list_copy` event
-    assert.ok(dispatch.calledOnce);
-    const [copyEvent] = dispatch.lastCall.args;
+    assert.ok(dispatch.calledTwice);
+    const [copyEvent] = dispatch.getCall(0).args;
     assert.equal(copyEvent.type, at.WIDGETS_LISTS_USER_EVENT);
     assert.equal(copyEvent.data.userAction, "list_copy");
 
+    // Verify new unified telemetry event
+    const [newTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "lists");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "list_copy");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
+
     clipboardWriteTextStub.restore();
   });
 

From 5d0de78bd3b8aa80585ece5f9d2f58867de89c97 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:45 +0000
Subject: [PATCH 20/93] Bug 2013134 - Add unified widget telemetry for
 FocusTimer widget. r=home-newtab-reviewers,reemhamz,nina-py

Implements scalable widget telemetry by adding unified metrics that work for
all widgets, replacing per-widget metrics. This commit focuses on the FocusTimer
widget while maintaining backward compatibility.

Differential Revision: https://phabricator.services.mozilla.com/D281047
---
 .../Widgets/FocusTimer/FocusTimer.jsx         | 208 ++++++++++++++++--
 .../components/Widgets/Widgets.jsx            |   1 +
 .../data/content/activity-stream.bundle.js    | 142 +++++++++++-
 .../components/Widgets/FocusTimer.test.jsx    | 159 ++++++++++++-
 4 files changed, 474 insertions(+), 36 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/Widgets/FocusTimer/FocusTimer.jsx b/browser/extensions/newtab/content-src/components/Widgets/FocusTimer/FocusTimer.jsx
index e706392ce519f..47a5fbc300ce8 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/FocusTimer/FocusTimer.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/FocusTimer/FocusTimer.jsx
@@ -108,6 +108,7 @@ export const FocusTimer = ({
   dispatch,
   handleUserInteraction,
   isMaximized,
+  widgetsMayBeMaximized,
 }) => {
   const [timeLeft, setTimeLeft] = useState(0);
   // calculated value for the progress circle; 1 = 100%
@@ -116,6 +117,7 @@ export const FocusTimer = ({
   const activeMinutesRef = useRef(null);
   const activeSecondsRef = useRef(null);
   const arcRef = useRef(null);
+  const impressionFired = useRef(false);
 
   const timerType = useSelector(state => state.TimerWidget.timerType);
   const timerData = useSelector(state => state.TimerWidget);
@@ -123,18 +125,38 @@ export const FocusTimer = ({
     timerData[timerType];
   const initialTimerDuration = timerData[timerType].initialDuration;
 
+  const widgetSize = isMaximized ? "medium" : "small";
+
   const handleTimerInteraction = useCallback(
     () => handleUserInteraction("focusTimer"),
     [handleUserInteraction]
   );
 
   const handleIntersection = useCallback(() => {
-    dispatch(
-      ac.AlsoToMain({
-        type: at.WIDGETS_TIMER_USER_IMPRESSION,
-      })
-    );
-  }, [dispatch]);
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+    batch(() => {
+      dispatch(
+        ac.AlsoToMain({
+          type: at.WIDGETS_TIMER_USER_IMPRESSION,
+        })
+      );
+
+      const telemetryData = {
+        widget_name: "focus_timer",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+
+      dispatch(
+        ac.AlsoToMain({
+          type: at.WIDGETS_IMPRESSION,
+          data: telemetryData,
+        })
+      );
+    });
+  }, [dispatch, widgetsMayBeMaximized, widgetSize]);
 
   const timerRef = useIntersectionObserver(handleIntersection);
 
@@ -186,6 +208,20 @@ export const FocusTimer = ({
                 data: { userAction: USER_ACTION_TYPES.TIMER_END },
               })
             );
+
+            const telemetryData = {
+              widget_name: "focus_timer",
+              widget_source: "widget",
+              user_action: USER_ACTION_TYPES.TIMER_END,
+              widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+            };
+
+            dispatch(
+              ac.OnlyToMain({
+                type: at.WIDGETS_USER_EVENT,
+                data: telemetryData,
+              })
+            );
           });
 
           // animate the progress circle to turn solid green
@@ -210,15 +246,29 @@ export const FocusTimer = ({
                   })
                 );
 
+                const userAction =
+                  timerType === "focus"
+                    ? USER_ACTION_TYPES.TIMER_TOGGLE_BREAK
+                    : USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS;
+
                 dispatch(
                   ac.OnlyToMain({
                     type: at.WIDGETS_TIMER_USER_EVENT,
-                    data: {
-                      userAction:
-                        timerType === "focus"
-                          ? USER_ACTION_TYPES.TIMER_TOGGLE_BREAK
-                          : USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS,
-                    },
+                    data: { userAction },
+                  })
+                );
+
+                const telemetryData = {
+                  widget_name: "focus_timer",
+                  widget_source: "widget",
+                  user_action: userAction,
+                  widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+                };
+
+                dispatch(
+                  ac.OnlyToMain({
+                    type: at.WIDGETS_USER_EVENT,
+                    data: telemetryData,
                   })
                 );
               });
@@ -256,6 +306,8 @@ export const FocusTimer = ({
     resetProgressCircle,
     timerType,
     initialTimerDuration,
+    widgetSize,
+    widgetsMayBeMaximized,
   ]);
 
   // Update the clip-path of the gradient circle to match the current progress value
@@ -300,12 +352,27 @@ export const FocusTimer = ({
             data: { timerType, duration: totalSeconds },
           })
         );
+
         dispatch(
           ac.OnlyToMain({
             type: at.WIDGETS_TIMER_USER_EVENT,
             data: { userAction: USER_ACTION_TYPES.TIMER_SET },
           })
         );
+
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TIMER_SET,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     }
     handleTimerInteraction();
@@ -321,12 +388,27 @@ export const FocusTimer = ({
             data: { timerType },
           })
         );
+
         dispatch(
           ac.OnlyToMain({
             type: at.WIDGETS_TIMER_USER_EVENT,
             data: { userAction: USER_ACTION_TYPES.TIMER_PLAY },
           })
         );
+
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TIMER_PLAY,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     } else if (isRunning) {
       // calculated to get the new baseline of the timer when it starts or resumes
@@ -341,12 +423,27 @@ export const FocusTimer = ({
             },
           })
         );
+
         dispatch(
           ac.OnlyToMain({
             type: at.WIDGETS_TIMER_USER_EVENT,
             data: { userAction: USER_ACTION_TYPES.TIMER_PAUSE },
           })
         );
+
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TIMER_PAUSE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     }
     handleTimerInteraction();
@@ -372,6 +469,20 @@ export const FocusTimer = ({
           data: { userAction: USER_ACTION_TYPES.TIMER_RESET },
         })
       );
+
+      const telemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.TIMER_RESET,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
     });
 
     // Reset progress value and gradient arc on the progress circle
@@ -403,6 +514,20 @@ export const FocusTimer = ({
         })
       );
 
+      const pauseTelemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: USER_ACTION_TYPES.TIMER_PAUSE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: pauseTelemetryData,
+        })
+      );
+
       // Sets the current timer type so it persists when opening a new tab
       dispatch(
         ac.AlsoToMain({
@@ -413,15 +538,29 @@ export const FocusTimer = ({
         })
       );
 
+      const toggleUserAction =
+        type === "focus"
+          ? USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS
+          : USER_ACTION_TYPES.TIMER_TOGGLE_BREAK;
+
       dispatch(
         ac.OnlyToMain({
           type: at.WIDGETS_TIMER_USER_EVENT,
-          data: {
-            userAction:
-              type === "focus"
-                ? USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS
-                : USER_ACTION_TYPES.TIMER_TOGGLE_BREAK,
-          },
+          data: { userAction: toggleUserAction },
+        })
+      );
+
+      const toggleTelemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: toggleUserAction,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: toggleTelemetryData,
         })
       );
     });
@@ -491,12 +630,27 @@ export const FocusTimer = ({
             },
           })
         );
+
         dispatch(
           ac.OnlyToMain({
             type: at.WIDGETS_TIMER_USER_EVENT,
             data: { userAction: USER_ACTION_TYPES.TIMER_PAUSE },
           })
         );
+
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: USER_ACTION_TYPES.TIMER_PAUSE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        };
+
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_USER_EVENT,
+            data: telemetryData,
+          })
+        );
       });
     }
 
@@ -570,7 +724,23 @@ export const FocusTimer = ({
             <panel-item
               data-l10n-id="newtab-widget-timer-menu-hide"
               onClick={() => {
-                handlePrefUpdate("widgets.focusTimer.enabled", false);
+                batch(() => {
+                  handlePrefUpdate("widgets.focusTimer.enabled", false);
+
+                  const telemetryData = {
+                    widget_name: "focus_timer",
+                    widget_source: "context_menu",
+                    enabled: false,
+                    widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+                  };
+
+                  dispatch(
+                    ac.OnlyToMain({
+                      type: at.WIDGETS_ENABLED,
+                      data: telemetryData,
+                    })
+                  );
+                });
               }}
             />
             <panel-item
diff --git a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
index 8900683960077..eeacd92ec4d2b 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
@@ -198,6 +198,7 @@ function Widgets() {
               dispatch={dispatch}
               handleUserInteraction={handleUserInteraction}
               isMaximized={isMaximized}
+              widgetsMayBeMaximized={widgetsMayBeMaximized}
             />
           )}
           {weatherForecastEnabled && (
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 31c1f0060317c..8cac176262a88 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -12352,7 +12352,8 @@ const getClipPath = progress => {
 const FocusTimer = ({
   dispatch,
   handleUserInteraction,
-  isMaximized
+  isMaximized,
+  widgetsMayBeMaximized
 }) => {
   const [timeLeft, setTimeLeft] = (0,external_React_namespaceObject.useState)(0);
   // calculated value for the progress circle; 1 = 100%
@@ -12360,6 +12361,7 @@ const FocusTimer = ({
   const activeMinutesRef = (0,external_React_namespaceObject.useRef)(null);
   const activeSecondsRef = (0,external_React_namespaceObject.useRef)(null);
   const arcRef = (0,external_React_namespaceObject.useRef)(null);
+  const impressionFired = (0,external_React_namespaceObject.useRef)(false);
   const timerType = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.TimerWidget.timerType);
   const timerData = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.TimerWidget);
   const {
@@ -12369,12 +12371,27 @@ const FocusTimer = ({
     isRunning
   } = timerData[timerType];
   const initialTimerDuration = timerData[timerType].initialDuration;
+  const widgetSize = isMaximized ? "medium" : "small";
   const handleTimerInteraction = (0,external_React_namespaceObject.useCallback)(() => handleUserInteraction("focusTimer"), [handleUserInteraction]);
   const handleIntersection = (0,external_React_namespaceObject.useCallback)(() => {
-    dispatch(actionCreators.AlsoToMain({
-      type: actionTypes.WIDGETS_TIMER_USER_IMPRESSION
-    }));
-  }, [dispatch]);
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WIDGETS_TIMER_USER_IMPRESSION
+      }));
+      const telemetryData = {
+        widget_name: "focus_timer",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WIDGETS_IMPRESSION,
+        data: telemetryData
+      }));
+    });
+  }, [dispatch, widgetsMayBeMaximized, widgetSize]);
   const timerRef = useIntersectionObserver(handleIntersection);
   const resetProgressCircle = (0,external_React_namespaceObject.useCallback)(() => {
     if (arcRef?.current) {
@@ -12416,6 +12433,16 @@ const FocusTimer = ({
                 userAction: FocusTimer_USER_ACTION_TYPES.TIMER_END
               }
             }));
+            const telemetryData = {
+              widget_name: "focus_timer",
+              widget_source: "widget",
+              user_action: FocusTimer_USER_ACTION_TYPES.TIMER_END,
+              widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+            };
+            dispatch(actionCreators.OnlyToMain({
+              type: actionTypes.WIDGETS_USER_EVENT,
+              data: telemetryData
+            }));
           });
 
           // animate the progress circle to turn solid green
@@ -12437,12 +12464,23 @@ const FocusTimer = ({
                     timerType: timerType === "focus" ? "break" : "focus"
                   }
                 }));
+                const userAction = timerType === "focus" ? FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_BREAK : FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS;
                 dispatch(actionCreators.OnlyToMain({
                   type: actionTypes.WIDGETS_TIMER_USER_EVENT,
                   data: {
-                    userAction: timerType === "focus" ? FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_BREAK : FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS
+                    userAction
                   }
                 }));
+                const telemetryData = {
+                  widget_name: "focus_timer",
+                  widget_source: "widget",
+                  user_action: userAction,
+                  widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+                };
+                dispatch(actionCreators.OnlyToMain({
+                  type: actionTypes.WIDGETS_USER_EVENT,
+                  data: telemetryData
+                }));
               });
             }, 500);
           }, 1000);
@@ -12465,7 +12503,7 @@ const FocusTimer = ({
       setProgress(0);
     }
     return () => clearInterval(interval);
-  }, [isRunning, startTime, duration, initialDuration, dispatch, resetProgressCircle, timerType, initialTimerDuration]);
+  }, [isRunning, startTime, duration, initialDuration, dispatch, resetProgressCircle, timerType, initialTimerDuration, widgetSize, widgetsMayBeMaximized]);
 
   // Update the clip-path of the gradient circle to match the current progress value
   (0,external_React_namespaceObject.useEffect)(() => {
@@ -12508,6 +12546,16 @@ const FocusTimer = ({
             userAction: FocusTimer_USER_ACTION_TYPES.TIMER_SET
           }
         }));
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: FocusTimer_USER_ACTION_TYPES.TIMER_SET,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     }
     handleTimerInteraction();
@@ -12529,6 +12577,16 @@ const FocusTimer = ({
             userAction: FocusTimer_USER_ACTION_TYPES.TIMER_PLAY
           }
         }));
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: FocusTimer_USER_ACTION_TYPES.TIMER_PLAY,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     } else if (isRunning) {
       // calculated to get the new baseline of the timer when it starts or resumes
@@ -12547,6 +12605,16 @@ const FocusTimer = ({
             userAction: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE
           }
         }));
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     }
     handleTimerInteraction();
@@ -12569,6 +12637,16 @@ const FocusTimer = ({
           userAction: FocusTimer_USER_ACTION_TYPES.TIMER_RESET
         }
       }));
+      const telemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: FocusTimer_USER_ACTION_TYPES.TIMER_RESET,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
     });
 
     // Reset progress value and gradient arc on the progress circle
@@ -12594,6 +12672,16 @@ const FocusTimer = ({
           userAction: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE
         }
       }));
+      const pauseTelemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: pauseTelemetryData
+      }));
 
       // Sets the current timer type so it persists when opening a new tab
       dispatch(actionCreators.AlsoToMain({
@@ -12602,12 +12690,23 @@ const FocusTimer = ({
           timerType: type
         }
       }));
+      const toggleUserAction = type === "focus" ? FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS : FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_BREAK;
       dispatch(actionCreators.OnlyToMain({
         type: actionTypes.WIDGETS_TIMER_USER_EVENT,
         data: {
-          userAction: type === "focus" ? FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_FOCUS : FocusTimer_USER_ACTION_TYPES.TIMER_TOGGLE_BREAK
+          userAction: toggleUserAction
         }
       }));
+      const toggleTelemetryData = {
+        widget_name: "focus_timer",
+        widget_source: "widget",
+        user_action: toggleUserAction,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: toggleTelemetryData
+      }));
     });
     handleTimerInteraction();
   };
@@ -12673,6 +12772,16 @@ const FocusTimer = ({
             userAction: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE
           }
         }));
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "widget",
+          user_action: FocusTimer_USER_ACTION_TYPES.TIMER_PAUSE,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_USER_EVENT,
+          data: telemetryData
+        }));
       });
     }
 
@@ -12732,7 +12841,19 @@ const FocusTimer = ({
   }), /*#__PURE__*/external_React_default().createElement("panel-item", {
     "data-l10n-id": "newtab-widget-timer-menu-hide",
     onClick: () => {
-      handlePrefUpdate("widgets.focusTimer.enabled", false);
+      (0,external_ReactRedux_namespaceObject.batch)(() => {
+        handlePrefUpdate("widgets.focusTimer.enabled", false);
+        const telemetryData = {
+          widget_name: "focus_timer",
+          widget_source: "context_menu",
+          enabled: false,
+          widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+        };
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_ENABLED,
+          data: telemetryData
+        }));
+      });
     }
   }), /*#__PURE__*/external_React_default().createElement("panel-item", {
     "data-l10n-id": "newtab-widget-timer-menu-learn-more",
@@ -13316,7 +13437,8 @@ function Widgets() {
   }), timerEnabled && /*#__PURE__*/external_React_default().createElement(FocusTimer, {
     dispatch: dispatch,
     handleUserInteraction: handleUserInteraction,
-    isMaximized: isMaximized
+    isMaximized: isMaximized,
+    widgetsMayBeMaximized: widgetsMayBeMaximized
   }), weatherForecastEnabled && /*#__PURE__*/external_React_default().createElement(WeatherForecast, {
     dispatch: dispatch,
     handleUserInteraction: handleUserInteraction,
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Widgets/FocusTimer.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Widgets/FocusTimer.test.jsx
index 759c9383e41dd..505b2d1c0f188 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Widgets/FocusTimer.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Widgets/FocusTimer.test.jsx
@@ -62,6 +62,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -99,6 +100,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -117,7 +119,20 @@ describe("<FocusTimer>", () => {
       .onClick();
     wrapper.update();
     assert.ok(wrapper.find(".progress-circle-wrapper").exists());
-    assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_TIMER_PLAY);
+
+    const [playAction] = dispatch.getCall(0).args;
+    assert.equal(playAction.type, at.WIDGETS_TIMER_PLAY);
+
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_TIMER_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "timer_play");
+
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "focus_timer");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "timer_play");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should pause the timer when pressing pause", () => {
@@ -139,6 +154,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -148,7 +164,20 @@ describe("<FocusTimer>", () => {
     );
     assert.ok(pauseBtn.exists(), "Pause button should be rendered");
     pauseBtn.props().onClick();
-    assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_TIMER_PAUSE);
+
+    const [pauseAction] = dispatch.getCall(0).args;
+    assert.equal(pauseAction.type, at.WIDGETS_TIMER_PAUSE);
+
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_TIMER_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "timer_pause");
+
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "focus_timer");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "timer_pause");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
   });
 
   it("should reset timer should be hidden when timer is not running", () => {
@@ -177,6 +206,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -187,7 +217,20 @@ describe("<FocusTimer>", () => {
 
     assert.ok(resetBtn.exists(), "Reset buttons should be rendered");
     resetBtn.props().onClick();
-    assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_TIMER_RESET);
+
+    const [resetAction] = dispatch.getCall(0).args;
+    assert.equal(resetAction.type, at.WIDGETS_TIMER_RESET);
+
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_TIMER_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "timer_reset");
+
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "focus_timer");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "timer_reset");
+    assert.equal(newTelemetryEvent.data.widget_size, "medium");
 
     const initialUserDuration = 12 * 60;
 
@@ -209,6 +252,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -233,6 +277,8 @@ describe("<FocusTimer>", () => {
       .filter(Boolean);
 
     assert.ok(types.includes(at.WIDGETS_TIMER_PAUSE));
+    assert.ok(types.includes(at.WIDGETS_TIMER_USER_EVENT));
+    assert.ok(types.includes(at.WIDGETS_USER_EVENT));
     assert.ok(types.includes(at.WIDGETS_TIMER_SET_TYPE));
 
     const findTypeToggled = dispatch
@@ -245,6 +291,32 @@ describe("<FocusTimer>", () => {
       "break",
       "timer should switch to break mode"
     );
+
+    const unifiedPauseEvent = dispatch
+      .getCalls()
+      .map(call => call.args[0])
+      .find(
+        action =>
+          action.type === at.WIDGETS_USER_EVENT &&
+          action.data.user_action === "timer_pause"
+      );
+
+    assert.ok(unifiedPauseEvent);
+    assert.equal(unifiedPauseEvent.data.widget_name, "focus_timer");
+    assert.equal(unifiedPauseEvent.data.widget_source, "widget");
+
+    const unifiedToggleEvent = dispatch
+      .getCalls()
+      .map(call => call.args[0])
+      .find(
+        action =>
+          action.type === at.WIDGETS_USER_EVENT &&
+          action.data.user_action === "timer_toggle_break"
+      );
+
+    assert.ok(unifiedToggleEvent);
+    assert.equal(unifiedToggleEvent.data.widget_name, "focus_timer");
+    assert.equal(unifiedToggleEvent.data.widget_source, "widget");
   });
 
   it("should dispatch set type when clicking the focus timer", () => {
@@ -260,6 +332,8 @@ describe("<FocusTimer>", () => {
       .filter(Boolean);
 
     assert.ok(types.includes(at.WIDGETS_TIMER_PAUSE));
+    assert.ok(types.includes(at.WIDGETS_TIMER_USER_EVENT));
+    assert.ok(types.includes(at.WIDGETS_USER_EVENT));
     assert.ok(types.includes(at.WIDGETS_TIMER_SET_TYPE));
 
     const findTypeToggled = dispatch
@@ -272,6 +346,19 @@ describe("<FocusTimer>", () => {
       "focus",
       "focus should switch to break mode"
     );
+
+    const unifiedToggleEvent = dispatch
+      .getCalls()
+      .map(call => call.args[0])
+      .find(
+        action =>
+          action.type === at.WIDGETS_USER_EVENT &&
+          action.data.user_action === "timer_toggle_focus"
+      );
+
+    assert.ok(unifiedToggleEvent);
+    assert.equal(unifiedToggleEvent.data.widget_name, "focus_timer");
+    assert.equal(unifiedToggleEvent.data.widget_source, "widget");
   });
 
   it("should toggle from focus to break timer automatically on end", () => {
@@ -294,6 +381,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -311,6 +399,8 @@ describe("<FocusTimer>", () => {
       .filter(Boolean);
 
     assert.ok(types.includes(at.WIDGETS_TIMER_END));
+    assert.ok(types.includes(at.WIDGETS_TIMER_USER_EVENT));
+    assert.ok(types.includes(at.WIDGETS_USER_EVENT));
     assert.ok(types.includes(at.WIDGETS_TIMER_SET_TYPE));
 
     const findTypeToggled = dispatch
@@ -323,6 +413,19 @@ describe("<FocusTimer>", () => {
       "break",
       "timer should switch to break mode"
     );
+
+    const unifiedEndEvent = dispatch
+      .getCalls()
+      .map(call => call.args[0])
+      .find(
+        action =>
+          action.type === at.WIDGETS_USER_EVENT &&
+          action.data.user_action === "timer_end"
+      );
+
+    assert.ok(unifiedEndEvent);
+    assert.equal(unifiedEndEvent.data.widget_name, "focus_timer");
+    assert.equal(unifiedEndEvent.data.widget_source, "widget");
   });
 
   it("should toggle from break to focus timer automatically on end", () => {
@@ -346,6 +449,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -360,6 +464,8 @@ describe("<FocusTimer>", () => {
     const types = dispatch.getCalls().map(call => call.args[0].type);
 
     assert.ok(types.includes(at.WIDGETS_TIMER_END));
+    assert.ok(types.includes(at.WIDGETS_TIMER_USER_EVENT));
+    assert.ok(types.includes(at.WIDGETS_USER_EVENT));
     assert.ok(types.includes(at.WIDGETS_TIMER_SET_TYPE));
 
     const findTypeToggled = dispatch
@@ -372,6 +478,19 @@ describe("<FocusTimer>", () => {
       "focus",
       "timer should switch to focus mode"
     );
+
+    const unifiedEndEvent = dispatch
+      .getCalls()
+      .map(call => call.args[0])
+      .find(
+        action =>
+          action.type === at.WIDGETS_USER_EVENT &&
+          action.data.user_action === "timer_end"
+      );
+
+    assert.ok(unifiedEndEvent);
+    assert.equal(unifiedEndEvent.data.widget_name, "focus_timer");
+    assert.equal(unifiedEndEvent.data.widget_source, "widget");
   });
 
   it("should pause when time input is focused", () => {
@@ -392,6 +511,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -400,7 +520,19 @@ describe("<FocusTimer>", () => {
     assert.ok(minutesSpan.exists());
 
     minutesSpan.simulate("focus");
-    assert.equal(dispatch.getCall(0).args[0].type, at.WIDGETS_TIMER_PAUSE);
+
+    const [pauseAction] = dispatch.getCall(0).args;
+    assert.equal(pauseAction.type, at.WIDGETS_TIMER_PAUSE);
+
+    const [oldTelemetryEvent] = dispatch.getCall(1).args;
+    assert.equal(oldTelemetryEvent.type, at.WIDGETS_TIMER_USER_EVENT);
+    assert.equal(oldTelemetryEvent.data.userAction, "timer_pause");
+
+    const [newTelemetryEvent] = dispatch.getCall(2).args;
+    assert.equal(newTelemetryEvent.type, at.WIDGETS_USER_EVENT);
+    assert.equal(newTelemetryEvent.data.widget_name, "focus_timer");
+    assert.equal(newTelemetryEvent.data.widget_source, "widget");
+    assert.equal(newTelemetryEvent.data.user_action, "timer_pause");
   });
 
   it("should reset to user's initial duration after timer ends", () => {
@@ -428,6 +560,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -483,6 +616,7 @@ describe("<FocusTimer>", () => {
         <FocusTimer
           dispatch={dispatch}
           handleUserInteraction={handleUserInteraction}
+          widgetsMayBeMaximized={false}
         />
       </WrapWithProvider>
     );
@@ -573,6 +707,7 @@ describe("<FocusTimer>", () => {
           <FocusTimer
             dispatch={dispatch}
             handleUserInteraction={handleUserInteraction}
+            widgetsMayBeMaximized={false}
           />
         </WrapWithProvider>
       );
@@ -611,9 +746,19 @@ describe("<FocusTimer>", () => {
       );
       menuItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
-      const [action] = dispatch.getCall(0).args;
-      assert.equal(action.type, at.SET_PREF);
+      assert.ok(dispatch.calledTwice);
+
+      const [setPrefAction] = dispatch.getCall(0).args;
+      assert.equal(setPrefAction.type, at.SET_PREF);
+      assert.equal(setPrefAction.data.name, "widgets.focusTimer.enabled");
+      assert.equal(setPrefAction.data.value, false);
+
+      const [telemetryEvent] = dispatch.getCall(1).args;
+      assert.equal(telemetryEvent.type, at.WIDGETS_ENABLED);
+      assert.equal(telemetryEvent.data.widget_name, "focus_timer");
+      assert.equal(telemetryEvent.data.widget_source, "context_menu");
+      assert.equal(telemetryEvent.data.enabled, false);
+      assert.equal(telemetryEvent.data.widget_size, "medium");
     });
 
     it("should dispatch OPEN_LINK when the Learn More option is clicked", () => {

From d2003011b6c2be9d2396400b00c185da977af9c0 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:46 +0000
Subject: [PATCH 21/93] Bug 2013136 - Migrate Weather widget context menu from
 LinkMenu to panel-list. r=home-newtab-reviewers,reemhamz,nina-py

Refactors Weather.jsx to use panel-list for context menu instead of LinkMenu,
matching the pattern used by Lists and FocusTimer widgets. This simplifies the
context menu implementation and prepares for unified telemetry integration.

Differential Revision: https://phabricator.services.mozilla.com/D281048
---
 .../components/Weather/Weather.jsx            | 254 +++++++++++------
 .../components/Weather/_Weather.scss          |   7 -
 .../content-src/lib/link-menu-options.mjs     |  71 -----
 .../extensions/newtab/css/activity-stream.css |   5 -
 .../data/content/activity-stream.bundle.js    | 261 +++++++++---------
 .../content-src/components/Weather.test.jsx   |  63 ++---
 6 files changed, 334 insertions(+), 327 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
index 3cf6287d8df5c..352a0ead88434 100644
--- a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
+++ b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
@@ -3,7 +3,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { connect, batch } from "react-redux";
-import { LinkMenu } from "content-src/components/LinkMenu/LinkMenu";
 import { LocationSearch } from "content-src/components/Weather/LocationSearch";
 import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
 import { useIntersectionObserver } from "../../lib/utils";
@@ -44,8 +43,6 @@ export class _Weather extends React.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      contextMenuKeyboard: false,
-      showContextMenu: false,
       url: "https://example.com",
       impressionSeen: false,
       errorSeen: false,
@@ -56,10 +53,12 @@ export class _Weather extends React.PureComponent {
     this.setErrorRef = element => {
       this.errorElement = element;
     };
-    this.onClick = this.onClick.bind(this);
-    this.onKeyDown = this.onKeyDown.bind(this);
-    this.onUpdate = this.onUpdate.bind(this);
+    this.setPanelRef = element => {
+      this.panelElement = element;
+    };
     this.onProviderClick = this.onProviderClick.bind(this);
+    this.onMenuButtonClick = this.onMenuButtonClick.bind(this);
+    this.onMenuButtonKeyDown = this.onMenuButtonKeyDown.bind(this);
   }
 
   componentDidMount() {
@@ -172,44 +171,117 @@ export class _Weather extends React.PureComponent {
     }
   }
 
-  openContextMenu(isKeyBoard) {
-    if (this.props.onUpdate) {
-      this.props.onUpdate(true);
-    }
-    this.setState({
-      showContextMenu: true,
-      contextMenuKeyboard: isKeyBoard,
-    });
+  onProviderClick() {
+    this.props.dispatch(
+      ac.OnlyToMain({
+        type: at.WEATHER_OPEN_PROVIDER_URL,
+        data: {
+          source: "WEATHER",
+        },
+      })
+    );
   }
 
-  onClick(event) {
-    event.preventDefault();
-    this.openContextMenu(false, event);
-  }
+  handleChangeLocation = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(
+      ac.BroadcastToContent({
+        type: at.WEATHER_SEARCH_ACTIVE,
+        data: true,
+      })
+    );
+  };
 
-  onKeyDown(event) {
-    if (event.key === "Enter" || event.key === " ") {
-      event.preventDefault();
-      this.openContextMenu(true, event);
+  handleDetectLocation = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
     }
-  }
+    this.props.dispatch(
+      ac.AlsoToMain({
+        type: at.WEATHER_USER_OPT_IN_LOCATION,
+      })
+    );
+  };
 
-  onUpdate(showContextMenu) {
-    if (this.props.onUpdate) {
-      this.props.onUpdate(showContextMenu);
+  handleChangeTempUnit = value => {
+    if (this.panelElement) {
+      this.panelElement.hide();
     }
-    this.setState({ showContextMenu });
-  }
+    this.props.dispatch(
+      ac.OnlyToMain({
+        type: at.SET_PREF,
+        data: {
+          name: "weather.temperatureUnits",
+          value,
+        },
+      })
+    );
+  };
 
-  onProviderClick() {
+  handleChangeDisplay = value => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
     this.props.dispatch(
       ac.OnlyToMain({
-        type: at.WEATHER_OPEN_PROVIDER_URL,
+        type: at.SET_PREF,
         data: {
-          source: "WEATHER",
+          name: "weather.display",
+          value,
+        },
+      })
+    );
+  };
+
+  handleHideWeather = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(
+      ac.OnlyToMain({
+        type: at.SET_PREF,
+        data: {
+          name: "showWeather",
+          value: false,
+        },
+      })
+    );
+  };
+
+  handleLearnMore = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(
+      ac.OnlyToMain({
+        type: at.OPEN_LINK,
+        data: {
+          url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page",
         },
       })
     );
+  };
+
+  onMenuButtonClick(e) {
+    e.preventDefault();
+    if (this.panelElement) {
+      this.panelElement.toggle(e.currentTarget);
+    }
+  }
+
+  onMenuButtonKeyDown(e) {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault();
+      if (this.panelElement) {
+        this.panelElement.toggle(e.currentTarget);
+      }
+    } else if (e.key === "Escape") {
+      if (this.panelElement) {
+        this.panelElement.hide();
+      }
+    }
   }
 
   handleRejectOptIn = () => {
@@ -264,11 +336,9 @@ export class _Weather extends React.PureComponent {
       return <WeatherPlaceholder />;
     }
 
-    const { showContextMenu } = this.state;
-
     const { props } = this;
 
-    const { dispatch, Prefs, Weather } = props;
+    const { Prefs, Weather } = props;
 
     const WEATHER_SUGGESTION = Weather.suggestions?.[0];
 
@@ -324,55 +394,78 @@ export class _Weather extends React.PureComponent {
     // - weather opt-in pref is enabled
     // - static weather data is enabled
     const showStaticData = isOptInEnabled && staticWeather;
+    const showFullMenu = !showStaticData;
+    const isLocationSearchEnabled =
+      Prefs.values["weather.locationSearchEnabled"];
+    const isFahrenheit = Prefs.values["weather.temperatureUnits"] === "f";
+    const isSimpleDisplay = Prefs.values["weather.display"] === "simple";
 
-    // Note: The temperature units/display options will become secondary menu items
-    const WEATHER_SOURCE_CONTEXT_MENU_OPTIONS = [
-      ...(Prefs.values["weather.locationSearchEnabled"]
-        ? ["ChangeWeatherLocation"]
-        : []),
-      ...(isOptInEnabled ? ["DetectLocation"] : []),
-      ...(Prefs.values["weather.temperatureUnits"] === "f"
-        ? ["ChangeTempUnitCelsius"]
-        : ["ChangeTempUnitFahrenheit"]),
-      ...(Prefs.values["weather.display"] === "simple"
-        ? ["ChangeWeatherDisplayDetailed"]
-        : ["ChangeWeatherDisplaySimple"]),
-      "HideWeather",
-      "OpenLearnMoreURL",
-    ];
-    const WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS = [
-      ...(Prefs.values["weather.locationSearchEnabled"]
-        ? ["ChangeWeatherLocation"]
-        : []),
-      ...(isOptInEnabled ? ["DetectLocation"] : []),
-      "HideWeather",
-      "OpenLearnMoreURL",
-    ];
-
-    const contextMenu = contextOpts => (
+    const contextMenu = (showFullContextMenu = true) => (
       <div className="weatherButtonContextMenuWrapper">
+        {/* Bug 2013136 - Using a custom button instead of moz-button due to styling constraints.
+            The moz-button component cannot be styled to match the existing design,
+            so we use a standard button element that can be fully controlled with CSS. */}
         <button
           aria-haspopup="true"
-          onKeyDown={this.onKeyDown}
-          onClick={this.onClick}
+          onKeyDown={this.onMenuButtonKeyDown}
+          onClick={this.onMenuButtonClick}
           data-l10n-id="newtab-menu-section-tooltip"
           className="weatherButtonContextMenu"
-        >
-          {showContextMenu ? (
-            <LinkMenu
-              dispatch={dispatch}
-              index={0}
-              source="WEATHER"
-              onUpdate={this.onUpdate}
-              options={contextOpts}
-              site={{
-                url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page",
-              }}
-              link="https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page"
-              shouldSendImpressionStats={false}
+        />
+        <panel-list id="weather-context-menu" ref={this.setPanelRef}>
+          {isLocationSearchEnabled && (
+            <panel-item
+              id="weather-menu-change-location"
+              data-l10n-id="newtab-weather-menu-change-location"
+              onClick={this.handleChangeLocation}
+            />
+          )}
+          {isOptInEnabled && (
+            <panel-item
+              id="weather-menu-detect-location"
+              data-l10n-id="newtab-weather-menu-detect-my-location"
+              onClick={this.handleDetectLocation}
             />
-          ) : null}
-        </button>
+          )}
+          {showFullContextMenu &&
+            (isFahrenheit ? (
+              <panel-item
+                id="weather-menu-temp-celsius"
+                data-l10n-id="newtab-weather-menu-change-temperature-units-celsius"
+                onClick={() => this.handleChangeTempUnit("c")}
+              />
+            ) : (
+              <panel-item
+                id="weather-menu-temp-fahrenheit"
+                data-l10n-id="newtab-weather-menu-change-temperature-units-fahrenheit"
+                onClick={() => this.handleChangeTempUnit("f")}
+              />
+            ))}
+          {showFullContextMenu &&
+            (isSimpleDisplay ? (
+              <panel-item
+                id="weather-menu-display-detailed"
+                data-l10n-id="newtab-weather-menu-change-weather-display-detailed"
+                onClick={() => this.handleChangeDisplay("detailed")}
+              />
+            ) : (
+              <panel-item
+                id="weather-menu-display-simple"
+                data-l10n-id="newtab-weather-menu-change-weather-display-simple"
+                onClick={() => this.handleChangeDisplay("simple")}
+              />
+            ))}
+          <panel-item
+            id="weather-menu-hide"
+            data-l10n-id="newtab-weather-menu-hide-weather-v2"
+            onClick={this.handleHideWeather}
+          />
+          <panel-item
+            id="weather-menu-learn-more"
+            data-l10n-id="newtab-weather-menu-learn-more"
+            onClick={this.handleLearnMore}
+          />
+        </panel-list>
       </div>
     );
 
@@ -463,11 +556,7 @@ export class _Weather extends React.PureComponent {
               </a>
             )}
 
-            {contextMenu(
-              showStaticData
-                ? WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS
-                : WEATHER_SOURCE_CONTEXT_MENU_OPTIONS
-            )}
+            {contextMenu(showFullMenu)}
           </div>
           <span className="weatherSponsorText" aria-hidden="true">
             <span
@@ -513,7 +602,8 @@ export class _Weather extends React.PureComponent {
         <div className="weatherNotAvailable">
           <span className="icon icon-info-warning" />{" "}
           <p data-l10n-id="newtab-weather-error-not-available"></p>
-          {contextMenu(WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS)}
+          {/* We're passing false to only render applicable menu items during an error */}
+          {contextMenu(false)}
         </div>
       </div>
     );
diff --git a/browser/extensions/newtab/content-src/components/Weather/_Weather.scss b/browser/extensions/newtab/content-src/components/Weather/_Weather.scss
index d81c31391410b..7b345a03ea6fb 100644
--- a/browser/extensions/newtab/content-src/components/Weather/_Weather.scss
+++ b/browser/extensions/newtab/content-src/components/Weather/_Weather.scss
@@ -42,13 +42,6 @@
       inset-inline-end: var(--space-xxlarge);
     }
   }
-
-  .context-menu {
-    inset-inline-end: 100%;
-    inset-inline-start: auto;
-    margin-inline-end: var(--space-xsmall);
-  }
-
 }
 
 .weather-placeholder {
diff --git a/browser/extensions/newtab/content-src/lib/link-menu-options.mjs b/browser/extensions/newtab/content-src/lib/link-menu-options.mjs
index d02dbd0438160..d5232bf30acc4 100644
--- a/browser/extensions/newtab/content-src/lib/link-menu-options.mjs
+++ b/browser/extensions/newtab/content-src/lib/link-menu-options.mjs
@@ -322,77 +322,6 @@ export const LinkMenuOptions = {
       : LinkMenuOptions.PinTopSite(site, index),
   OpenInPrivateWindow: (site, index, eventSource, isEnabled) =>
     isEnabled ? _OpenInPrivateWindow(site) : LinkMenuOptions.EmptyItem(),
-  ChangeWeatherLocation: () => ({
-    id: "newtab-weather-menu-change-location",
-    action: ac.BroadcastToContent({
-      type: at.WEATHER_SEARCH_ACTIVE,
-      data: true,
-    }),
-  }),
-  DetectLocation: () => ({
-    id: "newtab-weather-menu-detect-my-location",
-    action: ac.AlsoToMain({
-      type: at.WEATHER_USER_OPT_IN_LOCATION,
-    }),
-    userEvent: "WEATHER_DETECT_LOCATION",
-  }),
-  ChangeWeatherDisplaySimple: () => ({
-    id: "newtab-weather-menu-change-weather-display-simple",
-    action: ac.OnlyToMain({
-      type: at.SET_PREF,
-      data: {
-        name: "weather.display",
-        value: "simple",
-      },
-    }),
-  }),
-  ChangeWeatherDisplayDetailed: () => ({
-    id: "newtab-weather-menu-change-weather-display-detailed",
-    action: ac.OnlyToMain({
-      type: at.SET_PREF,
-      data: {
-        name: "weather.display",
-        value: "detailed",
-      },
-    }),
-  }),
-  ChangeTempUnitFahrenheit: () => ({
-    id: "newtab-weather-menu-change-temperature-units-fahrenheit",
-    action: ac.OnlyToMain({
-      type: at.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value: "f",
-      },
-    }),
-  }),
-  ChangeTempUnitCelsius: () => ({
-    id: "newtab-weather-menu-change-temperature-units-celsius",
-    action: ac.OnlyToMain({
-      type: at.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value: "c",
-      },
-    }),
-  }),
-  HideWeather: () => ({
-    id: "newtab-weather-menu-hide-weather-v2",
-    action: ac.OnlyToMain({
-      type: at.SET_PREF,
-      data: {
-        name: "showWeather",
-        value: false,
-      },
-    }),
-  }),
-  OpenLearnMoreURL: site => ({
-    id: "newtab-weather-menu-learn-more",
-    action: ac.OnlyToMain({
-      type: at.OPEN_LINK,
-      data: { url: site.url },
-    }),
-  }),
   SectionBlock: ({
     sectionPersonalization,
     sectionKey,
diff --git a/browser/extensions/newtab/css/activity-stream.css b/browser/extensions/newtab/css/activity-stream.css
index 5d2cdb3442a8e..84be38ad330b9 100644
--- a/browser/extensions/newtab/css/activity-stream.css
+++ b/browser/extensions/newtab/css/activity-stream.css
@@ -2773,11 +2773,6 @@ main section {
     inset-inline-end: var(--space-xxlarge);
   }
 }
-.weather .context-menu {
-  inset-inline-end: 100%;
-  inset-inline-start: auto;
-  margin-inline-end: var(--space-xsmall);
-}
 
 .weather-placeholder {
   width: 240px;
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 8cac176262a88..6af988bf7196c 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -2060,77 +2060,6 @@ const LinkMenuOptions = {
       : LinkMenuOptions.PinTopSite(site, index),
   OpenInPrivateWindow: (site, index, eventSource, isEnabled) =>
     isEnabled ? _OpenInPrivateWindow(site) : LinkMenuOptions.EmptyItem(),
-  ChangeWeatherLocation: () => ({
-    id: "newtab-weather-menu-change-location",
-    action: actionCreators.BroadcastToContent({
-      type: actionTypes.WEATHER_SEARCH_ACTIVE,
-      data: true,
-    }),
-  }),
-  DetectLocation: () => ({
-    id: "newtab-weather-menu-detect-my-location",
-    action: actionCreators.AlsoToMain({
-      type: actionTypes.WEATHER_USER_OPT_IN_LOCATION,
-    }),
-    userEvent: "WEATHER_DETECT_LOCATION",
-  }),
-  ChangeWeatherDisplaySimple: () => ({
-    id: "newtab-weather-menu-change-weather-display-simple",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.display",
-        value: "simple",
-      },
-    }),
-  }),
-  ChangeWeatherDisplayDetailed: () => ({
-    id: "newtab-weather-menu-change-weather-display-detailed",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.display",
-        value: "detailed",
-      },
-    }),
-  }),
-  ChangeTempUnitFahrenheit: () => ({
-    id: "newtab-weather-menu-change-temperature-units-fahrenheit",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value: "f",
-      },
-    }),
-  }),
-  ChangeTempUnitCelsius: () => ({
-    id: "newtab-weather-menu-change-temperature-units-celsius",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value: "c",
-      },
-    }),
-  }),
-  HideWeather: () => ({
-    id: "newtab-weather-menu-hide-weather-v2",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "showWeather",
-        value: false,
-      },
-    }),
-  }),
-  OpenLearnMoreURL: site => ({
-    id: "newtab-weather-menu-learn-more",
-    action: actionCreators.OnlyToMain({
-      type: actionTypes.OPEN_LINK,
-      data: { url: site.url },
-    }),
-  }),
   SectionBlock: ({
     sectionPersonalization,
     sectionKey,
@@ -15391,7 +15320,6 @@ const Search_Search = (0,external_ReactRedux_namespaceObject.connect)(state => (
 
 
 
-
 const Weather_VISIBLE = "visible";
 const Weather_VISIBILITY_CHANGE_EVENT = "visibilitychange";
 const PREF_SYSTEM_SHOW_WEATHER = "system.showWeather";
@@ -15423,8 +15351,6 @@ class _Weather extends (external_React_default()).PureComponent {
   constructor(props) {
     super(props);
     this.state = {
-      contextMenuKeyboard: false,
-      showContextMenu: false,
       url: "https://example.com",
       impressionSeen: false,
       errorSeen: false
@@ -15435,10 +15361,12 @@ class _Weather extends (external_React_default()).PureComponent {
     this.setErrorRef = element => {
       this.errorElement = element;
     };
-    this.onClick = this.onClick.bind(this);
-    this.onKeyDown = this.onKeyDown.bind(this);
-    this.onUpdate = this.onUpdate.bind(this);
+    this.setPanelRef = element => {
+      this.panelElement = element;
+    };
     this.onProviderClick = this.onProviderClick.bind(this);
+    this.onMenuButtonClick = this.onMenuButtonClick.bind(this);
+    this.onMenuButtonKeyDown = this.onMenuButtonKeyDown.bind(this);
   }
   componentDidMount() {
     const {
@@ -15524,33 +15452,6 @@ class _Weather extends (external_React_default()).PureComponent {
       }
     }
   }
-  openContextMenu(isKeyBoard) {
-    if (this.props.onUpdate) {
-      this.props.onUpdate(true);
-    }
-    this.setState({
-      showContextMenu: true,
-      contextMenuKeyboard: isKeyBoard
-    });
-  }
-  onClick(event) {
-    event.preventDefault();
-    this.openContextMenu(false, event);
-  }
-  onKeyDown(event) {
-    if (event.key === "Enter" || event.key === " ") {
-      event.preventDefault();
-      this.openContextMenu(true, event);
-    }
-  }
-  onUpdate(showContextMenu) {
-    if (this.props.onUpdate) {
-      this.props.onUpdate(showContextMenu);
-    }
-    this.setState({
-      showContextMenu
-    });
-  }
   onProviderClick() {
     this.props.dispatch(actionCreators.OnlyToMain({
       type: actionTypes.WEATHER_OPEN_PROVIDER_URL,
@@ -15559,6 +15460,88 @@ class _Weather extends (external_React_default()).PureComponent {
       }
     }));
   }
+  handleChangeLocation = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.BroadcastToContent({
+      type: actionTypes.WEATHER_SEARCH_ACTIVE,
+      data: true
+    }));
+  };
+  handleDetectLocation = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.AlsoToMain({
+      type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
+    }));
+  };
+  handleChangeTempUnit = value => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.OnlyToMain({
+      type: actionTypes.SET_PREF,
+      data: {
+        name: "weather.temperatureUnits",
+        value
+      }
+    }));
+  };
+  handleChangeDisplay = value => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.OnlyToMain({
+      type: actionTypes.SET_PREF,
+      data: {
+        name: "weather.display",
+        value
+      }
+    }));
+  };
+  handleHideWeather = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.OnlyToMain({
+      type: actionTypes.SET_PREF,
+      data: {
+        name: "showWeather",
+        value: false
+      }
+    }));
+  };
+  handleLearnMore = () => {
+    if (this.panelElement) {
+      this.panelElement.hide();
+    }
+    this.props.dispatch(actionCreators.OnlyToMain({
+      type: actionTypes.OPEN_LINK,
+      data: {
+        url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page"
+      }
+    }));
+  };
+  onMenuButtonClick(e) {
+    e.preventDefault();
+    if (this.panelElement) {
+      this.panelElement.toggle(e.currentTarget);
+    }
+  }
+  onMenuButtonKeyDown(e) {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault();
+      if (this.panelElement) {
+        this.panelElement.toggle(e.currentTarget);
+      }
+    } else if (e.key === "Escape") {
+      if (this.panelElement) {
+        this.panelElement.hide();
+      }
+    }
+  }
   handleRejectOptIn = () => {
     (0,external_ReactRedux_namespaceObject.batch)(() => {
       this.props.dispatch(actionCreators.SetPref("weather.optInAccepted", false));
@@ -15596,14 +15579,10 @@ class _Weather extends (external_React_default()).PureComponent {
     if (this.props.App.isForStartupCache.Weather || !this.props.Weather.initialized) {
       return /*#__PURE__*/external_React_default().createElement(WeatherPlaceholder, null);
     }
-    const {
-      showContextMenu
-    } = this.state;
     const {
       props
     } = this;
     const {
-      dispatch,
       Prefs,
       Weather
     } = props;
@@ -15644,30 +15623,54 @@ class _Weather extends (external_React_default()).PureComponent {
     // - weather opt-in pref is enabled
     // - static weather data is enabled
     const showStaticData = isOptInEnabled && staticWeather;
-
-    // Note: The temperature units/display options will become secondary menu items
-    const WEATHER_SOURCE_CONTEXT_MENU_OPTIONS = [...(Prefs.values["weather.locationSearchEnabled"] ? ["ChangeWeatherLocation"] : []), ...(isOptInEnabled ? ["DetectLocation"] : []), ...(Prefs.values["weather.temperatureUnits"] === "f" ? ["ChangeTempUnitCelsius"] : ["ChangeTempUnitFahrenheit"]), ...(Prefs.values["weather.display"] === "simple" ? ["ChangeWeatherDisplayDetailed"] : ["ChangeWeatherDisplaySimple"]), "HideWeather", "OpenLearnMoreURL"];
-    const WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS = [...(Prefs.values["weather.locationSearchEnabled"] ? ["ChangeWeatherLocation"] : []), ...(isOptInEnabled ? ["DetectLocation"] : []), "HideWeather", "OpenLearnMoreURL"];
-    const contextMenu = contextOpts => /*#__PURE__*/external_React_default().createElement("div", {
+    const showFullMenu = !showStaticData;
+    const isLocationSearchEnabled = Prefs.values["weather.locationSearchEnabled"];
+    const isFahrenheit = Prefs.values["weather.temperatureUnits"] === "f";
+    const isSimpleDisplay = Prefs.values["weather.display"] === "simple";
+    const contextMenu = (showFullContextMenu = true) => /*#__PURE__*/external_React_default().createElement("div", {
       className: "weatherButtonContextMenuWrapper"
     }, /*#__PURE__*/external_React_default().createElement("button", {
       "aria-haspopup": "true",
-      onKeyDown: this.onKeyDown,
-      onClick: this.onClick,
+      onKeyDown: this.onMenuButtonKeyDown,
+      onClick: this.onMenuButtonClick,
       "data-l10n-id": "newtab-menu-section-tooltip",
       className: "weatherButtonContextMenu"
-    }, showContextMenu ? /*#__PURE__*/external_React_default().createElement(LinkMenu, {
-      dispatch: dispatch,
-      index: 0,
-      source: "WEATHER",
-      onUpdate: this.onUpdate,
-      options: contextOpts,
-      site: {
-        url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page"
-      },
-      link: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page",
-      shouldSendImpressionStats: false
-    }) : null));
+    }), /*#__PURE__*/external_React_default().createElement("panel-list", {
+      id: "weather-context-menu",
+      ref: this.setPanelRef
+    }, isLocationSearchEnabled && /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-change-location",
+      "data-l10n-id": "newtab-weather-menu-change-location",
+      onClick: this.handleChangeLocation
+    }), isOptInEnabled && /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-detect-location",
+      "data-l10n-id": "newtab-weather-menu-detect-my-location",
+      onClick: this.handleDetectLocation
+    }), showFullContextMenu && (isFahrenheit ? /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-temp-celsius",
+      "data-l10n-id": "newtab-weather-menu-change-temperature-units-celsius",
+      onClick: () => this.handleChangeTempUnit("c")
+    }) : /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-temp-fahrenheit",
+      "data-l10n-id": "newtab-weather-menu-change-temperature-units-fahrenheit",
+      onClick: () => this.handleChangeTempUnit("f")
+    })), showFullContextMenu && (isSimpleDisplay ? /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-display-detailed",
+      "data-l10n-id": "newtab-weather-menu-change-weather-display-detailed",
+      onClick: () => this.handleChangeDisplay("detailed")
+    }) : /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-display-simple",
+      "data-l10n-id": "newtab-weather-menu-change-weather-display-simple",
+      onClick: () => this.handleChangeDisplay("simple")
+    })), /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-hide",
+      "data-l10n-id": "newtab-weather-menu-hide-weather-v2",
+      onClick: this.handleHideWeather
+    }), /*#__PURE__*/external_React_default().createElement("panel-item", {
+      id: "weather-menu-learn-more",
+      "data-l10n-id": "newtab-weather-menu-learn-more",
+      onClick: this.handleLearnMore
+    })));
     if (Weather.searchActive) {
       return /*#__PURE__*/external_React_default().createElement(LocationSearch, {
         outerClassName: outerClassName
@@ -15722,7 +15725,7 @@ class _Weather extends (external_React_default()).PureComponent {
         className: "weatherHighLowTemps"
       }, /*#__PURE__*/external_React_default().createElement("span", null, WEATHER_SUGGESTION.forecast.high[Prefs.values["weather.temperatureUnits"]], "\xB0", Prefs.values["weather.temperatureUnits"]), /*#__PURE__*/external_React_default().createElement("span", null, "\u2022"), /*#__PURE__*/external_React_default().createElement("span", null, WEATHER_SUGGESTION.forecast.low[Prefs.values["weather.temperatureUnits"]], "\xB0", Prefs.values["weather.temperatureUnits"])), /*#__PURE__*/external_React_default().createElement("span", {
         className: "weatherTextSummary"
-      }, WEATHER_SUGGESTION.current_conditions.summary)) : null)), contextMenu(showStaticData ? WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS : WEATHER_SOURCE_CONTEXT_MENU_OPTIONS)), /*#__PURE__*/external_React_default().createElement("span", {
+      }, WEATHER_SUGGESTION.current_conditions.summary)) : null)), contextMenu(showFullMenu)), /*#__PURE__*/external_React_default().createElement("span", {
         className: "weatherSponsorText",
         "aria-hidden": "true"
       }, /*#__PURE__*/external_React_default().createElement("span", {
@@ -15765,7 +15768,7 @@ class _Weather extends (external_React_default()).PureComponent {
       className: "icon icon-info-warning"
     }), " ", /*#__PURE__*/external_React_default().createElement("p", {
       "data-l10n-id": "newtab-weather-error-not-available"
-    }), contextMenu(WEATHER_SOURCE_SHORTENED_CONTEXT_MENU_OPTIONS)));
+    }), contextMenu(false)));
   }
 }
 const Weather_Weather = (0,external_ReactRedux_namespaceObject.connect)(state => ({
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
index 8bec8f2b9a97d..2922a029d4815 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
@@ -5,7 +5,6 @@ import { INITIAL_STATE, reducers } from "common/Reducers.sys.mjs";
 import { combineReducers, createStore } from "redux";
 import { Weather } from "content-src/components/Weather/Weather";
 import { actionTypes as at } from "common/Actions.mjs";
-import { LinkMenu } from "content-src/components/LinkMenu/LinkMenu";
 
 const PREF_SYS_SHOW_WEATHER = "system.showWeather";
 const PREF_SYS_SHOW_WEATHER_OPT_IN = "system.showWeatherOptIn";
@@ -165,27 +164,33 @@ describe("<Weather>", () => {
         </WrapWithProvider>
       );
 
-      // find the inner _Weather component (the real class)
-      const inner = wrapper.find("_Weather");
-      assert.ok(inner.exists(), "Inner _Weather component should exist");
+      // panel-list should render with only the shortened menu items
+      const panelList = wrapper.find("panel-list");
+      assert.ok(panelList.exists(), "Expected panel-list to render");
 
-      // toggle context menu state on the real instance
-      inner.instance().setState({ showContextMenu: true });
-      wrapper.update();
-
-      const menu = wrapper.find(LinkMenu);
+      // Check that the correct menu items are present
+      assert.ok(
+        wrapper.find("#weather-menu-change-location").exists(),
+        "ChangeWeatherLocation item should be present"
+      );
+      assert.ok(
+        wrapper.find("#weather-menu-detect-location").exists(),
+        "DetectLocation item should be present"
+      );
+      assert.ok(
+        wrapper.find("#weather-menu-hide").exists(),
+        "HideWeather item should be present"
+      );
       assert.ok(
-        menu.exists(),
-        "Expected LinkMenu to render when context menu opened"
+        wrapper.find("#weather-menu-learn-more").exists(),
+        "OpenLearnMoreURL item should be present"
       );
 
-      const contextMenuOptions = menu.prop("options");
-      assert.deepEqual(contextMenuOptions, [
-        "ChangeWeatherLocation",
-        "DetectLocation",
-        "HideWeather",
-        "OpenLearnMoreURL",
-      ]);
+      // Check that temperature/display options are NOT present (shortened menu)
+      assert.ok(
+        !wrapper.find("#weather-menu-temp-celsius").exists(),
+        "Temperature unit option should not be present in shortened menu"
+      );
     });
 
     it("should dispatch correct actions when 'Detect my location' option in context menu is clicked", () => {
@@ -198,26 +203,18 @@ describe("<Weather>", () => {
         </Provider>
       );
 
-      // find the inner _Weather component
-      const inner = wrapper.find("_Weather");
-      assert.ok(inner.exists(), "Inner _Weather component should exist");
+      // Mock the panel element's hide method
+      const weatherInstance = wrapper.find("_Weather").instance();
+      weatherInstance.panelElement = { hide: sinon.spy() };
 
-      // toggle context menu state on the real instance
-      inner.instance().setState({ showContextMenu: true });
-      wrapper.update();
+      // Find the detect location panel-item
+      const detectLocationBtn = wrapper.find("#weather-menu-detect-location");
 
-      const menu = wrapper.find(LinkMenu);
       assert.ok(
-        menu.exists(),
-        "Expected LinkMenu to render when context menu opened"
+        detectLocationBtn.exists(),
+        "Detect location button should exist"
       );
 
-      const detectLocationBtn = wrapper.find(
-        '[data-l10n-id="newtab-weather-menu-detect-my-location"]'
-      );
-
-      assert.ok(detectLocationBtn.exists());
-
       detectLocationBtn.simulate("click", { preventDefault() {} });
 
       const dispatchedActions = store.dispatch

From 04fd6b1e435dcf57241eb2afd5a0732f777565c9 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:47 +0000
Subject: [PATCH 22/93] Bug 2013138 - Add unified widget telemetry to Weather
 widget. r=home-newtab-reviewers,reemhamz,nina-py

Implements unified telemetry events for the Weather widget following the pattern
established in Lists and FocusTimer widgets. Maintains backward compatibility by
dual-emitting both old and new telemetry events.

Differential Revision: https://phabricator.services.mozilla.com/D281049
---
 browser/extensions/newtab/common/Actions.mjs  |   1 +
 .../ContentSection/ContentSection.jsx         |  14 +-
 .../components/Weather/Weather.jsx            | 301 ++++++++++++++----
 .../data/content/activity-stream.bundle.js    | 250 ++++++++++++---
 browser/extensions/newtab/karma.mc.config.js  |   4 +-
 .../newtab/lib/TelemetryFeed.sys.mjs          |  20 ++
 .../CustomizeMenu/ContentSection.test.jsx     |  40 +++
 .../content-src/components/Weather.test.jsx   | 121 +++++++
 8 files changed, 636 insertions(+), 115 deletions(-)

diff --git a/browser/extensions/newtab/common/Actions.mjs b/browser/extensions/newtab/common/Actions.mjs
index 3457516cc0d25..405c1bf3bad75 100644
--- a/browser/extensions/newtab/common/Actions.mjs
+++ b/browser/extensions/newtab/common/Actions.mjs
@@ -219,6 +219,7 @@ for (const type of [
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
   "WIDGETS_ENABLED",
+  "WIDGETS_ERROR",
   "WIDGETS_IMPRESSION",
   "WIDGETS_LISTS_CHANGE_SELECTED",
   "WIDGETS_LISTS_SET",
diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
index bf2367e10c931..826881ec91f73 100644
--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
@@ -33,6 +33,9 @@ export class ContentSection extends React.PureComponent {
       // for the unified telemetry event.
       let widgetName;
       switch (eventSource) {
+        case "WEATHER":
+          widgetName = "weather";
+          break;
         case "WIDGET_LISTS":
           widgetName = "lists";
           break;
@@ -45,12 +48,19 @@ export class ContentSection extends React.PureComponent {
         const { widgetsMaximized, widgetsMayBeMaximized } =
           this.props.enabledWidgets;
 
+        let widgetSize;
+        if (widgetName === "weather") {
+          widgetSize = "mini";
+        } else {
+          widgetSize =
+            widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
+        }
+
         const data = {
           widget_name: widgetName,
           widget_source: "customize_panel",
           enabled: eventValue,
-          widget_size:
-            widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium",
+          widget_size: widgetSize,
         };
 
         this.props.dispatch(
diff --git a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
index 352a0ead88434..3b6f9ee6b2efe 100644
--- a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
+++ b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
@@ -8,6 +8,16 @@ import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
 import { useIntersectionObserver } from "../../lib/utils";
 import React, { useState } from "react";
 
+const USER_ACTION_TYPES = {
+  CHANGE_DISPLAY: "change_weather_display",
+  CHANGE_LOCATION: "change_location",
+  CHANGE_TEMP_UNIT: "change_temperature_units",
+  DETECT_LOCATION: "detect_location",
+  LEARN_MORE: "learn_more",
+  OPT_IN_ACCEPTED: "opt_in_accepted",
+  PROVIDER_LINK_CLICK: "provider_link_click",
+};
+
 const VISIBLE = "visible";
 const VISIBILITY_CHANGE_EVENT = "visibilitychange";
 const PREF_SYSTEM_SHOW_WEATHER = "system.showWeather";
@@ -134,11 +144,25 @@ export class _Weather extends React.PureComponent {
           this.observer.unobserve(this.impressionElement);
         }
 
-        this.props.dispatch(
-          ac.OnlyToMain({
-            type: at.WEATHER_IMPRESSION,
-          })
-        );
+        batch(() => {
+          // Old event (keep for backward compatibility)
+          this.props.dispatch(
+            ac.OnlyToMain({
+              type: at.WEATHER_IMPRESSION,
+            })
+          );
+
+          // New unified event
+          this.props.dispatch(
+            ac.OnlyToMain({
+              type: at.WIDGETS_IMPRESSION,
+              data: {
+                widget_name: "weather",
+                widget_size: "mini",
+              },
+            })
+          );
+        });
 
         // Stop observing since element has been seen
         this.setState({
@@ -157,11 +181,26 @@ export class _Weather extends React.PureComponent {
           this.observer.unobserve(this.errorElement);
         }
 
-        this.props.dispatch(
-          ac.OnlyToMain({
-            type: at.WEATHER_LOAD_ERROR,
-          })
-        );
+        batch(() => {
+          // Old event (keep for backward compatibility)
+          this.props.dispatch(
+            ac.OnlyToMain({
+              type: at.WEATHER_LOAD_ERROR,
+            })
+          );
+
+          // New unified event
+          this.props.dispatch(
+            ac.OnlyToMain({
+              type: at.WIDGETS_ERROR,
+              data: {
+                widget_name: "weather",
+                widget_size: "mini",
+                error_type: "load_error",
+              },
+            })
+          );
+        });
 
         // Stop observing since element has been seen
         this.setState({
@@ -172,96 +211,200 @@ export class _Weather extends React.PureComponent {
   }
 
   onProviderClick() {
-    this.props.dispatch(
-      ac.OnlyToMain({
-        type: at.WEATHER_OPEN_PROVIDER_URL,
-        data: {
-          source: "WEATHER",
-        },
-      })
-    );
+    batch(() => {
+      // Old event (keep for backward compatibility)
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WEATHER_OPEN_PROVIDER_URL,
+          data: {
+            source: "WEATHER",
+          },
+        })
+      );
+
+      // New unified event
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "widget",
+            user_action: USER_ACTION_TYPES.PROVIDER_LINK_CLICK,
+            widget_size: "mini",
+          },
+        })
+      );
+    });
   }
 
   handleChangeLocation = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.BroadcastToContent({
-        type: at.WEATHER_SEARCH_ACTIVE,
-        data: true,
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.BroadcastToContent({
+          type: at.WEATHER_SEARCH_ACTIVE,
+          data: true,
+        })
+      );
+
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            user_action: USER_ACTION_TYPES.CHANGE_LOCATION,
+            widget_size: "mini",
+          },
+        })
+      );
+    });
   };
 
   handleDetectLocation = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.AlsoToMain({
-        type: at.WEATHER_USER_OPT_IN_LOCATION,
-      })
-    );
+    batch(() => {
+      // Old event (keep for backward compatibility)
+      this.props.dispatch(
+        ac.AlsoToMain({
+          type: at.WEATHER_USER_OPT_IN_LOCATION,
+        })
+      );
+
+      // New unified event
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            user_action: USER_ACTION_TYPES.DETECT_LOCATION,
+            widget_size: "mini",
+          },
+        })
+      );
+    });
   };
 
   handleChangeTempUnit = value => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "weather.temperatureUnits",
-          value,
-        },
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "weather.temperatureUnits",
+            value,
+          },
+        })
+      );
+
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            user_action: USER_ACTION_TYPES.CHANGE_TEMP_UNIT,
+            widget_size: "mini",
+            action_value: value,
+          },
+        })
+      );
+    });
   };
 
   handleChangeDisplay = value => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "weather.display",
-          value,
-        },
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "weather.display",
+            value,
+          },
+        })
+      );
+
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            user_action: USER_ACTION_TYPES.CHANGE_DISPLAY,
+            widget_size: "mini",
+            action_value: value,
+          },
+        })
+      );
+    });
   };
 
   handleHideWeather = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "showWeather",
-          value: false,
-        },
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "showWeather",
+            value: false,
+          },
+        })
+      );
+
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_ENABLED,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            enabled: false,
+            widget_size: "mini",
+          },
+        })
+      );
+    });
   };
 
   handleLearnMore = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(
-      ac.OnlyToMain({
-        type: at.OPEN_LINK,
-        data: {
-          url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page",
-        },
-      })
-    );
+    batch(() => {
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.OPEN_LINK,
+          data: {
+            url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page",
+          },
+        })
+      );
+
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "context_menu",
+            user_action: USER_ACTION_TYPES.LEARN_MORE,
+            widget_size: "mini",
+          },
+        })
+      );
+    });
   };
 
   onMenuButtonClick(e) {
@@ -289,17 +432,33 @@ export class _Weather extends React.PureComponent {
       this.props.dispatch(ac.SetPref("weather.optInAccepted", false));
       this.props.dispatch(ac.SetPref("weather.optInDisplayed", false));
 
+      // Old event (keep for backward compatibility)
       this.props.dispatch(
         ac.AlsoToMain({
           type: at.WEATHER_OPT_IN_PROMPT_SELECTION,
           data: "rejected opt-in",
         })
       );
+
+      // New unified event
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "widget",
+            user_action: USER_ACTION_TYPES.OPT_IN_ACCEPTED,
+            widget_size: "mini",
+            action_value: false,
+          },
+        })
+      );
     });
   };
 
   handleAcceptOptIn = () => {
     batch(() => {
+      // Old events (keep for backward compatibility)
       this.props.dispatch(
         ac.AlsoToMain({
           type: at.WEATHER_USER_OPT_IN_LOCATION,
@@ -312,6 +471,20 @@ export class _Weather extends React.PureComponent {
           data: "accepted opt-in",
         })
       );
+
+      // New unified event
+      this.props.dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: {
+            widget_name: "weather",
+            widget_source: "widget",
+            user_action: USER_ACTION_TYPES.OPT_IN_ACCEPTED,
+            widget_size: "mini",
+            action_value: true,
+          },
+        })
+      );
     });
   };
 
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 6af988bf7196c..f893fe7ed2259 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -292,6 +292,7 @@ for (const type of [
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
   "WIDGETS_ENABLED",
+  "WIDGETS_ERROR",
   "WIDGETS_IMPRESSION",
   "WIDGETS_LISTS_CHANGE_SELECTED",
   "WIDGETS_LISTS_SET",
@@ -14616,6 +14617,9 @@ class ContentSection extends (external_React_default()).PureComponent {
       // for the unified telemetry event.
       let widgetName;
       switch (eventSource) {
+        case "WEATHER":
+          widgetName = "weather";
+          break;
         case "WIDGET_LISTS":
           widgetName = "lists";
           break;
@@ -14628,11 +14632,17 @@ class ContentSection extends (external_React_default()).PureComponent {
           widgetsMaximized,
           widgetsMayBeMaximized
         } = this.props.enabledWidgets;
+        let widgetSize;
+        if (widgetName === "weather") {
+          widgetSize = "mini";
+        } else {
+          widgetSize = widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
+        }
         const data = {
           widget_name: widgetName,
           widget_source: "customize_panel",
           enabled: eventValue,
-          widget_size: widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium"
+          widget_size: widgetSize
         };
         this.props.dispatch(actionCreators.OnlyToMain({
           type: actionTypes.WIDGETS_ENABLED,
@@ -15320,6 +15330,15 @@ const Search_Search = (0,external_ReactRedux_namespaceObject.connect)(state => (
 
 
 
+const Weather_USER_ACTION_TYPES = {
+  CHANGE_DISPLAY: "change_weather_display",
+  CHANGE_LOCATION: "change_location",
+  CHANGE_TEMP_UNIT: "change_temperature_units",
+  DETECT_LOCATION: "detect_location",
+  LEARN_MORE: "learn_more",
+  OPT_IN_ACCEPTED: "opt_in_accepted",
+  PROVIDER_LINK_CLICK: "provider_link_click"
+};
 const Weather_VISIBLE = "visible";
 const Weather_VISIBILITY_CHANGE_EVENT = "visibilitychange";
 const PREF_SYSTEM_SHOW_WEATHER = "system.showWeather";
@@ -15423,9 +15442,21 @@ class _Weather extends (external_React_default()).PureComponent {
         if (this.impressionElement) {
           this.observer.unobserve(this.impressionElement);
         }
-        this.props.dispatch(actionCreators.OnlyToMain({
-          type: actionTypes.WEATHER_IMPRESSION
-        }));
+        (0,external_ReactRedux_namespaceObject.batch)(() => {
+          // Old event (keep for backward compatibility)
+          this.props.dispatch(actionCreators.OnlyToMain({
+            type: actionTypes.WEATHER_IMPRESSION
+          }));
+
+          // New unified event
+          this.props.dispatch(actionCreators.OnlyToMain({
+            type: actionTypes.WIDGETS_IMPRESSION,
+            data: {
+              widget_name: "weather",
+              widget_size: "mini"
+            }
+          }));
+        });
 
         // Stop observing since element has been seen
         this.setState({
@@ -15441,9 +15472,22 @@ class _Weather extends (external_React_default()).PureComponent {
         if (this.errorElement) {
           this.observer.unobserve(this.errorElement);
         }
-        this.props.dispatch(actionCreators.OnlyToMain({
-          type: actionTypes.WEATHER_LOAD_ERROR
-        }));
+        (0,external_ReactRedux_namespaceObject.batch)(() => {
+          // Old event (keep for backward compatibility)
+          this.props.dispatch(actionCreators.OnlyToMain({
+            type: actionTypes.WEATHER_LOAD_ERROR
+          }));
+
+          // New unified event
+          this.props.dispatch(actionCreators.OnlyToMain({
+            type: actionTypes.WIDGETS_ERROR,
+            data: {
+              widget_name: "weather",
+              widget_size: "mini",
+              error_type: "load_error"
+            }
+          }));
+        });
 
         // Stop observing since element has been seen
         this.setState({
@@ -15453,76 +15497,161 @@ class _Weather extends (external_React_default()).PureComponent {
     }
   }
   onProviderClick() {
-    this.props.dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.WEATHER_OPEN_PROVIDER_URL,
-      data: {
-        source: "WEATHER"
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      // Old event (keep for backward compatibility)
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WEATHER_OPEN_PROVIDER_URL,
+        data: {
+          source: "WEATHER"
+        }
+      }));
+
+      // New unified event
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "widget",
+          user_action: Weather_USER_ACTION_TYPES.PROVIDER_LINK_CLICK,
+          widget_size: "mini"
+        }
+      }));
+    });
   }
   handleChangeLocation = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.BroadcastToContent({
-      type: actionTypes.WEATHER_SEARCH_ACTIVE,
-      data: true
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.BroadcastToContent({
+        type: actionTypes.WEATHER_SEARCH_ACTIVE,
+        data: true
+      }));
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          user_action: Weather_USER_ACTION_TYPES.CHANGE_LOCATION,
+          widget_size: "mini"
+        }
+      }));
+    });
   };
   handleDetectLocation = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.AlsoToMain({
-      type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      // Old event (keep for backward compatibility)
+      this.props.dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
+      }));
+
+      // New unified event
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          user_action: Weather_USER_ACTION_TYPES.DETECT_LOCATION,
+          widget_size: "mini"
+        }
+      }));
+    });
   };
   handleChangeTempUnit = value => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "weather.temperatureUnits",
+          value
+        }
+      }));
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          user_action: Weather_USER_ACTION_TYPES.CHANGE_TEMP_UNIT,
+          widget_size: "mini",
+          action_value: value
+        }
+      }));
+    });
   };
   handleChangeDisplay = value => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.display",
-        value
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "weather.display",
+          value
+        }
+      }));
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          user_action: Weather_USER_ACTION_TYPES.CHANGE_DISPLAY,
+          widget_size: "mini",
+          action_value: value
+        }
+      }));
+    });
   };
   handleHideWeather = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "showWeather",
-        value: false
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "showWeather",
+          value: false
+        }
+      }));
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_ENABLED,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          enabled: false,
+          widget_size: "mini"
+        }
+      }));
+    });
   };
   handleLearnMore = () => {
     if (this.panelElement) {
       this.panelElement.hide();
     }
-    this.props.dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.OPEN_LINK,
-      data: {
-        url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page"
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.OPEN_LINK,
+        data: {
+          url: "https://support.mozilla.org/kb/customize-items-on-firefox-new-tab-page"
+        }
+      }));
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "context_menu",
+          user_action: Weather_USER_ACTION_TYPES.LEARN_MORE,
+          widget_size: "mini"
+        }
+      }));
+    });
   };
   onMenuButtonClick(e) {
     e.preventDefault();
@@ -15546,14 +15675,29 @@ class _Weather extends (external_React_default()).PureComponent {
     (0,external_ReactRedux_namespaceObject.batch)(() => {
       this.props.dispatch(actionCreators.SetPref("weather.optInAccepted", false));
       this.props.dispatch(actionCreators.SetPref("weather.optInDisplayed", false));
+
+      // Old event (keep for backward compatibility)
       this.props.dispatch(actionCreators.AlsoToMain({
         type: actionTypes.WEATHER_OPT_IN_PROMPT_SELECTION,
         data: "rejected opt-in"
       }));
+
+      // New unified event
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "widget",
+          user_action: Weather_USER_ACTION_TYPES.OPT_IN_ACCEPTED,
+          widget_size: "mini",
+          action_value: false
+        }
+      }));
     });
   };
   handleAcceptOptIn = () => {
     (0,external_ReactRedux_namespaceObject.batch)(() => {
+      // Old events (keep for backward compatibility)
       this.props.dispatch(actionCreators.AlsoToMain({
         type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
       }));
@@ -15561,6 +15705,18 @@ class _Weather extends (external_React_default()).PureComponent {
         type: actionTypes.WEATHER_OPT_IN_PROMPT_SELECTION,
         data: "accepted opt-in"
       }));
+
+      // New unified event
+      this.props.dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: {
+          widget_name: "weather",
+          widget_source: "widget",
+          user_action: Weather_USER_ACTION_TYPES.OPT_IN_ACCEPTED,
+          widget_size: "mini",
+          action_value: true
+        }
+      }));
     });
   };
   isEnabled() {
diff --git a/browser/extensions/newtab/karma.mc.config.js b/browser/extensions/newtab/karma.mc.config.js
index 1619b6d72ee95..db1c5930bfaf0 100644
--- a/browser/extensions/newtab/karma.mc.config.js
+++ b/browser/extensions/newtab/karma.mc.config.js
@@ -299,8 +299,8 @@ module.exports = function (config) {
               branches: 0,
             },
             "content-src/components/Weather/Weather.jsx": {
-              statements: 50,
-              lines: 50.94,
+              statements: 48,
+              lines: 49,
               functions: 31.2,
               branches: 31.2,
             },
diff --git a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
index 47a33950d325b..5bda02c81d5d4 100644
--- a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
@@ -1583,6 +1583,9 @@ export class TelemetryFeed {
       case at.WIDGETS_ENABLED:
         this.handleUnifiedWidgetEnabled(action);
         break;
+      case at.WIDGETS_ERROR:
+        this.handleUnifiedWidgetError(action);
+        break;
       case at.PROMO_CARD_CLICK:
       case at.PROMO_CARD_DISMISS:
       case at.PROMO_CARD_IMPRESSION:
@@ -1710,6 +1713,23 @@ export class TelemetryFeed {
     }
   }
 
+  handleUnifiedWidgetError(action) {
+    const session = this.sessions.get(au.getPortIdOfSender(action));
+    if (session) {
+      const payload = {
+        newtab_visit_id: session.session_id,
+        widget_name: action.data.widget_name,
+        error_type: action.data.error_type,
+      };
+
+      if (action.data.widget_size) {
+        payload.widget_size = action.data.widget_size;
+      }
+
+      Glean.newtab.widgetsError.record(payload);
+    }
+  }
+
   async handleReportAdUserEvent(action) {
     const { placement_id, position, report_reason, reporting_url } =
       action.data || {};
diff --git a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
index 97515780044bd..2f09e436cc7c7 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/CustomizeMenu/ContentSection.test.jsx
@@ -255,4 +255,44 @@ describe("ContentSection", () => {
       "widget_size should be medium when widgets.system.maximized is false"
     );
   });
+
+  it("should dispatch WIDGETS_ENABLED with widget_size=mini for Weather widget", () => {
+    const dispatch = sinon.spy();
+    wrapper = mount(
+      <ContentSection
+        {...DEFAULT_PROPS}
+        dispatch={dispatch}
+        enabledWidgets={{
+          widgetsMaximized: false,
+          widgetsMayBeMaximized: false,
+        }}
+      />
+    );
+
+    wrapper.instance().onPreferenceSelect({
+      target: {
+        nodeName: "INPUT",
+        checked: true,
+        dataset: {
+          preference: "showWeather",
+          eventSource: "WEATHER",
+        },
+      },
+    });
+
+    const widgetsEnabledCall = dispatch
+      .getCalls()
+      .find(call => call.args[0].type === "WIDGETS_ENABLED");
+    assert.ok(widgetsEnabledCall, "Expected WIDGETS_ENABLED to be dispatched");
+    assert.equal(
+      widgetsEnabledCall.args[0].data.widget_name,
+      "weather",
+      "widget_name should be weather"
+    );
+    assert.equal(
+      widgetsEnabledCall.args[0].data.widget_size,
+      "mini",
+      "widget_size should always be mini for Weather widget"
+    );
+  });
 });
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
index 2922a029d4815..f6f6234ff7ffb 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx
@@ -113,6 +113,7 @@ describe("<Weather>", () => {
         .getCalls()
         .map(call => call.args[0]);
 
+      // Old events (backward compatibility)
       assert.ok(
         dispatchedActions.some(
           action => action.type === at.WEATHER_USER_OPT_IN_LOCATION
@@ -128,6 +129,17 @@ describe("<Weather>", () => {
         ),
         "Expected WEATHER_OPT_IN_PROMPT_SELECTION with accepted opt-in"
       );
+
+      // New unified event
+      const unifiedEvent = dispatchedActions.find(
+        action => action.type === at.WIDGETS_USER_EVENT
+      );
+      assert.ok(unifiedEvent, "Expected WIDGETS_USER_EVENT to be dispatched");
+      assert.equal(unifiedEvent.data.widget_name, "weather");
+      assert.equal(unifiedEvent.data.widget_source, "widget");
+      assert.equal(unifiedEvent.data.user_action, "opt_in_accepted");
+      assert.equal(unifiedEvent.data.action_value, true);
+      assert.equal(unifiedEvent.data.widget_size, "mini");
     });
 
     it("should dispatch correct actions when user rejects weather opt-in", () => {
@@ -147,6 +159,7 @@ describe("<Weather>", () => {
         .getCalls()
         .map(call => call.args[0]);
 
+      // Old event (backward compatibility)
       assert.ok(
         dispatchedActions.some(
           action =>
@@ -155,6 +168,17 @@ describe("<Weather>", () => {
         ),
         "Expected WEATHER_OPT_IN_PROMPT_SELECTION with rejected opt-in"
       );
+
+      // New unified event
+      const unifiedEvent = dispatchedActions.find(
+        action => action.type === at.WIDGETS_USER_EVENT
+      );
+      assert.ok(unifiedEvent, "Expected WIDGETS_USER_EVENT to be dispatched");
+      assert.equal(unifiedEvent.data.widget_name, "weather");
+      assert.equal(unifiedEvent.data.widget_source, "widget");
+      assert.equal(unifiedEvent.data.user_action, "opt_in_accepted");
+      assert.equal(unifiedEvent.data.action_value, false);
+      assert.equal(unifiedEvent.data.widget_size, "mini");
     });
 
     it("should render a shorter context menu when system.showWeatherOptIn is enabled", () => {
@@ -221,12 +245,109 @@ describe("<Weather>", () => {
         .getCalls()
         .map(call => call.args[0]);
 
+      // Old event (backward compatibility)
       assert.ok(
         dispatchedActions.some(
           action => action.type === at.WEATHER_USER_OPT_IN_LOCATION
         ),
         "Expected WEATHER_USER_OPT_IN_LOCATION to be dispatched"
       );
+
+      // New unified event
+      const unifiedEvent = dispatchedActions.find(
+        action => action.type === at.WIDGETS_USER_EVENT
+      );
+      assert.ok(unifiedEvent, "Expected WIDGETS_USER_EVENT to be dispatched");
+      assert.equal(unifiedEvent.data.widget_name, "weather");
+      assert.equal(unifiedEvent.data.widget_source, "context_menu");
+      assert.equal(unifiedEvent.data.user_action, "detect_location");
+      assert.equal(unifiedEvent.data.widget_size, "mini");
+    });
+
+    it("should dispatch correct actions when weather display mode is changed", () => {
+      const fullMenuState = {
+        ...optInMockState,
+        Prefs: {
+          ...optInMockState.Prefs,
+          values: {
+            ...optInMockState.Prefs.values,
+            [PREF_STATIC_WEATHER_DATA]: false,
+          },
+        },
+      };
+      const store = createStore(combineReducers(reducers), fullMenuState);
+      sinon.spy(store, "dispatch");
+
+      wrapper = mount(
+        <Provider store={store}>
+          <Weather />
+        </Provider>
+      );
+
+      const weatherInstance = wrapper.find("_Weather").instance();
+      weatherInstance.panelElement = { hide: sinon.spy() };
+
+      const displayMenuItem = wrapper.find("#weather-menu-display-detailed");
+      assert.ok(displayMenuItem.exists(), "Display menu item should exist");
+
+      displayMenuItem.simulate("click", { preventDefault() {} });
+
+      const dispatchedActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const unifiedEvent = dispatchedActions.find(
+        action => action.type === at.WIDGETS_USER_EVENT
+      );
+      assert.ok(unifiedEvent, "Expected WIDGETS_USER_EVENT to be dispatched");
+      assert.equal(unifiedEvent.data.widget_name, "weather");
+      assert.equal(unifiedEvent.data.widget_source, "context_menu");
+      assert.equal(unifiedEvent.data.user_action, "change_weather_display");
+      assert.equal(unifiedEvent.data.action_value, "detailed");
+      assert.equal(unifiedEvent.data.widget_size, "mini");
+    });
+
+    it("should dispatch correct actions when temperature unit is changed", () => {
+      const fullMenuState = {
+        ...optInMockState,
+        Prefs: {
+          ...optInMockState.Prefs,
+          values: {
+            ...optInMockState.Prefs.values,
+            [PREF_STATIC_WEATHER_DATA]: false,
+          },
+        },
+      };
+      const store = createStore(combineReducers(reducers), fullMenuState);
+      sinon.spy(store, "dispatch");
+
+      wrapper = mount(
+        <Provider store={store}>
+          <Weather />
+        </Provider>
+      );
+
+      const weatherInstance = wrapper.find("_Weather").instance();
+      weatherInstance.panelElement = { hide: sinon.spy() };
+
+      const tempMenuItem = wrapper.find("#weather-menu-temp-fahrenheit");
+      assert.ok(tempMenuItem.exists(), "Temperature menu item should exist");
+
+      tempMenuItem.simulate("click", { preventDefault() {} });
+
+      const dispatchedActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const unifiedEvent = dispatchedActions.find(
+        action => action.type === at.WIDGETS_USER_EVENT
+      );
+      assert.ok(unifiedEvent, "Expected WIDGETS_USER_EVENT to be dispatched");
+      assert.equal(unifiedEvent.data.widget_name, "weather");
+      assert.equal(unifiedEvent.data.widget_source, "context_menu");
+      assert.equal(unifiedEvent.data.user_action, "change_temperature_units");
+      assert.equal(unifiedEvent.data.action_value, "f");
+      assert.equal(unifiedEvent.data.widget_size, "mini");
     });
   });
 });

From f992dc64abee49bb610b3d738cfe9cfd9cdc018e Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:47 +0000
Subject: [PATCH 23/93] Bug 2012821 - Add unified telemetry for widget
 container actions. r=home-newtab-reviewers,nina-py,reemhamz

Adds widgets_container_action event to track user interactions with widget
container controls (hide all widgets and toggle maximize/minimize buttons).

Differential Revision: https://phabricator.services.mozilla.com/D281050
---
 browser/components/newtab/metrics.yaml        |  27 ++
 browser/extensions/newtab/common/Actions.mjs  |   1 +
 .../components/Widgets/Widgets.jsx            |  95 +++++-
 .../data/content/activity-stream.bundle.js    |  77 ++++-
 .../newtab/lib/TelemetryFeed.sys.mjs          |  23 ++
 .../content-src/components/Widgets.test.jsx   | 319 ++++++++++++++++++
 6 files changed, 521 insertions(+), 21 deletions(-)

diff --git a/browser/components/newtab/metrics.yaml b/browser/components/newtab/metrics.yaml
index db379b4d25447..73a19d2464864 100644
--- a/browser/components/newtab/metrics.yaml
+++ b/browser/components/newtab/metrics.yaml
@@ -1285,6 +1285,33 @@ newtab:
     send_in_pings:
       - newtab
 
+  widgets_container_action:
+    type: event
+    description: >
+      Recorded when user interacts with widget container controls.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2012821
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2012821
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - mcrawford@mozilla.com
+    expires: never
+    extra_keys:
+      newtab_visit_id: *newtab_visit_id
+      widget_size: *widget_size
+      action_type:
+        description: >
+          Type of container action. (hide_all, toggle_maximize)
+        type: string
+      action_value:
+        description: >
+          Optional value for the action.
+        type: string
+    send_in_pings:
+      - newtab
+
   spons_nav_traffic_sent:
     type: memory_distribution
     memory_unit: kilobyte
diff --git a/browser/extensions/newtab/common/Actions.mjs b/browser/extensions/newtab/common/Actions.mjs
index 405c1bf3bad75..3dad0a97ab577 100644
--- a/browser/extensions/newtab/common/Actions.mjs
+++ b/browser/extensions/newtab/common/Actions.mjs
@@ -218,6 +218,7 @@ for (const type of [
   "WEATHER_USER_OPT_IN_LOCATION",
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
+  "WIDGETS_CONTAINER_ACTION",
   "WIDGETS_ENABLED",
   "WIDGETS_ERROR",
   "WIDGETS_IMPRESSION",
diff --git a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
index eeacd92ec4d2b..f490107e298f7 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
@@ -11,6 +11,11 @@ import { MessageWrapper } from "content-src/components/MessageWrapper/MessageWra
 import { WidgetsFeatureHighlight } from "../DiscoveryStreamComponents/FeatureHighlight/WidgetsFeatureHighlight";
 import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
 
+const CONTAINER_ACTION_TYPES = {
+  HIDE_ALL: "hide_all",
+  CHANGE_SIZE_ALL: "change_size_all",
+};
+
 const PREF_WIDGETS_LISTS_ENABLED = "widgets.lists.enabled";
 const PREF_WIDGETS_SYSTEM_LISTS_ENABLED = "widgets.system.lists.enabled";
 const PREF_WIDGETS_TIMER_ENABLED = "widgets.focusTimer.enabled";
@@ -88,6 +93,10 @@ function Widgets() {
     nimbusWeatherForecastTrainhopEnabled ||
     prefs[PREF_WIDGETS_SYSTEM_WEATHER_FORECAST_ENABLED];
 
+  // Widget size is "small" only when maximize feature is enabled and widgets
+  // are currently minimized. Otherwise defaults to "medium".
+  const widgetSize = widgetsMayBeMaximized && !isMaximized ? "small" : "medium";
+
   // track previous timerEnabled state to detect when it becomes disabled
   const prevTimerEnabledRef = useRef(timerEnabled);
 
@@ -105,35 +114,101 @@ function Widgets() {
     prevTimerEnabledRef.current = isTimerEnabled;
   }, [timerEnabled, timerData, dispatch, timerType]);
 
-  // Sends a dispatch to disable all widgets
-  function handleHideAllWidgetsClick(e) {
-    e.preventDefault();
+  // Bug 2013978 - Replace hardcoded widget list with programmatic registry
+  function hideAllWidgets() {
     batch(() => {
       dispatch(ac.SetPref(PREF_WIDGETS_LISTS_ENABLED, false));
       dispatch(ac.SetPref(PREF_WIDGETS_TIMER_ENABLED, false));
+
+      const telemetryData = {
+        action_type: CONTAINER_ACTION_TYPES.HIDE_ALL,
+        widget_size: widgetSize,
+      };
+
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_CONTAINER_ACTION,
+          data: telemetryData,
+        })
+      );
+
+      // Dispatch WIDGETS_ENABLED for each widget being hidden
+      if (listsEnabled) {
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_ENABLED,
+            data: {
+              widget_name: "lists",
+              widget_source: "widget",
+              enabled: false,
+              widget_size: widgetSize,
+            },
+          })
+        );
+      }
+
+      if (timerEnabled) {
+        dispatch(
+          ac.OnlyToMain({
+            type: at.WIDGETS_ENABLED,
+            data: {
+              widget_name: "focus_timer",
+              widget_source: "widget",
+              enabled: false,
+              widget_size: widgetSize,
+            },
+          })
+        );
+      }
     });
   }
 
+  function handleHideAllWidgetsClick(e) {
+    e.preventDefault();
+    hideAllWidgets();
+  }
+
   function handleHideAllWidgetsKeyDown(e) {
     if (e.key === "Enter" || e.key === " ") {
       e.preventDefault();
-      batch(() => {
-        dispatch(ac.SetPref(PREF_WIDGETS_LISTS_ENABLED, false));
-        dispatch(ac.SetPref(PREF_WIDGETS_TIMER_ENABLED, false));
-      });
+      hideAllWidgets();
     }
   }
 
-  // Toggles the maximized state of widgets
+  function toggleMaximize() {
+    const newMaximizedState = !isMaximized;
+    const newWidgetSize =
+      widgetsMayBeMaximized && !newMaximizedState ? "small" : "medium";
+
+    batch(() => {
+      dispatch(ac.SetPref(PREF_WIDGETS_MAXIMIZED, newMaximizedState));
+
+      const telemetryData = {
+        action_type: CONTAINER_ACTION_TYPES.CHANGE_SIZE_ALL,
+        action_value: newMaximizedState
+          ? "maximize widgets"
+          : "minimize widgets",
+        widget_size: newWidgetSize,
+      };
+
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_CONTAINER_ACTION,
+          data: telemetryData,
+        })
+      );
+    });
+  }
+
   function handleToggleMaximizeClick(e) {
     e.preventDefault();
-    dispatch(ac.SetPref(PREF_WIDGETS_MAXIMIZED, !isMaximized));
+    toggleMaximize();
   }
 
   function handleToggleMaximizeKeyDown(e) {
     if (e.key === "Enter" || e.key === " ") {
       e.preventDefault();
-      dispatch(ac.SetPref(PREF_WIDGETS_MAXIMIZED, !isMaximized));
+      toggleMaximize();
     }
   }
 
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index f893fe7ed2259..54d2226715bb6 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -291,6 +291,7 @@ for (const type of [
   "WEATHER_USER_OPT_IN_LOCATION",
   "WEBEXT_CLICK",
   "WEBEXT_DISMISS",
+  "WIDGETS_CONTAINER_ACTION",
   "WIDGETS_ENABLED",
   "WIDGETS_ERROR",
   "WIDGETS_IMPRESSION",
@@ -13219,6 +13220,10 @@ function WidgetsFeatureHighlight({
 
 
 
+const CONTAINER_ACTION_TYPES = {
+  HIDE_ALL: "hide_all",
+  CHANGE_SIZE_ALL: "change_size_all"
+};
 const PREF_WIDGETS_LISTS_ENABLED = "widgets.lists.enabled";
 const PREF_WIDGETS_SYSTEM_LISTS_ENABLED = "widgets.system.lists.enabled";
 const PREF_WIDGETS_TIMER_ENABLED = "widgets.focusTimer.enabled";
@@ -13274,6 +13279,10 @@ function Widgets() {
   const timerEnabled = (nimbusTimerTrainhopEnabled || nimbusTimerEnabled || prefs[PREF_WIDGETS_SYSTEM_TIMER_ENABLED]) && prefs[PREF_WIDGETS_TIMER_ENABLED];
   const weatherForecastEnabled = nimbusWeatherForecastTrainhopEnabled || prefs[PREF_WIDGETS_SYSTEM_WEATHER_FORECAST_ENABLED];
 
+  // Widget size is "small" only when maximize feature is enabled and widgets
+  // are currently minimized. Otherwise defaults to "medium".
+  const widgetSize = widgetsMayBeMaximized && !isMaximized ? "small" : "medium";
+
   // track previous timerEnabled state to detect when it becomes disabled
   const prevTimerEnabledRef = (0,external_React_namespaceObject.useRef)(timerEnabled);
 
@@ -13291,33 +13300,79 @@ function Widgets() {
     prevTimerEnabledRef.current = isTimerEnabled;
   }, [timerEnabled, timerData, dispatch, timerType]);
 
-  // Sends a dispatch to disable all widgets
-  function handleHideAllWidgetsClick(e) {
-    e.preventDefault();
+  // Bug 2013978 - Replace hardcoded widget list with programmatic registry
+  function hideAllWidgets() {
     (0,external_ReactRedux_namespaceObject.batch)(() => {
       dispatch(actionCreators.SetPref(PREF_WIDGETS_LISTS_ENABLED, false));
       dispatch(actionCreators.SetPref(PREF_WIDGETS_TIMER_ENABLED, false));
+      const telemetryData = {
+        action_type: CONTAINER_ACTION_TYPES.HIDE_ALL,
+        widget_size: widgetSize
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_CONTAINER_ACTION,
+        data: telemetryData
+      }));
+
+      // Dispatch WIDGETS_ENABLED for each widget being hidden
+      if (listsEnabled) {
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_ENABLED,
+          data: {
+            widget_name: "lists",
+            widget_source: "widget",
+            enabled: false,
+            widget_size: widgetSize
+          }
+        }));
+      }
+      if (timerEnabled) {
+        dispatch(actionCreators.OnlyToMain({
+          type: actionTypes.WIDGETS_ENABLED,
+          data: {
+            widget_name: "focus_timer",
+            widget_source: "widget",
+            enabled: false,
+            widget_size: widgetSize
+          }
+        }));
+      }
     });
   }
+  function handleHideAllWidgetsClick(e) {
+    e.preventDefault();
+    hideAllWidgets();
+  }
   function handleHideAllWidgetsKeyDown(e) {
     if (e.key === "Enter" || e.key === " ") {
       e.preventDefault();
-      (0,external_ReactRedux_namespaceObject.batch)(() => {
-        dispatch(actionCreators.SetPref(PREF_WIDGETS_LISTS_ENABLED, false));
-        dispatch(actionCreators.SetPref(PREF_WIDGETS_TIMER_ENABLED, false));
-      });
+      hideAllWidgets();
     }
   }
-
-  // Toggles the maximized state of widgets
+  function toggleMaximize() {
+    const newMaximizedState = !isMaximized;
+    const newWidgetSize = widgetsMayBeMaximized && !newMaximizedState ? "small" : "medium";
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.SetPref(PREF_WIDGETS_MAXIMIZED, newMaximizedState));
+      const telemetryData = {
+        action_type: CONTAINER_ACTION_TYPES.CHANGE_SIZE_ALL,
+        action_value: newMaximizedState ? "maximize widgets" : "minimize widgets",
+        widget_size: newWidgetSize
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_CONTAINER_ACTION,
+        data: telemetryData
+      }));
+    });
+  }
   function handleToggleMaximizeClick(e) {
     e.preventDefault();
-    dispatch(actionCreators.SetPref(PREF_WIDGETS_MAXIMIZED, !isMaximized));
+    toggleMaximize();
   }
   function handleToggleMaximizeKeyDown(e) {
     if (e.key === "Enter" || e.key === " ") {
       e.preventDefault();
-      dispatch(actionCreators.SetPref(PREF_WIDGETS_MAXIMIZED, !isMaximized));
+      toggleMaximize();
     }
   }
   function handleUserInteraction(widgetName) {
diff --git a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
index 5bda02c81d5d4..1c5ace5731274 100644
--- a/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/TelemetryFeed.sys.mjs
@@ -1580,6 +1580,9 @@ export class TelemetryFeed {
       case at.WIDGETS_IMPRESSION:
         this.handleUnifiedWidgetImpression(action);
         break;
+      case at.WIDGETS_CONTAINER_ACTION:
+        this.handleUnifiedWidgetContainerAction(action);
+        break;
       case at.WIDGETS_ENABLED:
         this.handleUnifiedWidgetEnabled(action);
         break;
@@ -1695,6 +1698,26 @@ export class TelemetryFeed {
     }
   }
 
+  handleUnifiedWidgetContainerAction(action) {
+    const session = this.sessions.get(au.getPortIdOfSender(action));
+    if (session) {
+      const payload = {
+        newtab_visit_id: session.session_id,
+        action_type: action.data.action_type,
+      };
+
+      if (action.data.widget_size) {
+        payload.widget_size = action.data.widget_size;
+      }
+
+      if (action.data.action_value) {
+        payload.action_value = action.data.action_value;
+      }
+
+      Glean.newtab.widgetsContainerAction.record(payload);
+    }
+  }
+
   handleUnifiedWidgetEnabled(action) {
     const session = this.sessions.get(au.getPortIdOfSender(action));
     if (session) {
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
index daeb95dab206f..46ef9119f9392 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
@@ -304,6 +304,252 @@ describe("<Widgets>", () => {
         );
       }
     });
+
+    it("should dispatch WIDGETS_CONTAINER_ACTION telemetry when hide button is clicked", () => {
+      const hideButton = wrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onClick")({ preventDefault: () => {} });
+
+      const dispatchedActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const containerAction = dispatchedActions.find(
+        action => action.type === at.WIDGETS_CONTAINER_ACTION
+      );
+
+      assert.ok(
+        containerAction,
+        "should dispatch WIDGETS_CONTAINER_ACTION event"
+      );
+      assert.equal(containerAction.data.action_type, "hide_all");
+      assert.equal(
+        containerAction.data.widget_size,
+        "medium",
+        "widget_size should be medium when widgets.system.maximized is false"
+      );
+      assert.equal(
+        containerAction.data.action_value,
+        undefined,
+        "hide_all should not have action_value"
+      );
+    });
+
+    it("should dispatch WIDGETS_CONTAINER_ACTION with medium size when widgets are maximized", () => {
+      const maximizedState = {
+        ...state,
+        Prefs: {
+          ...state.Prefs,
+          values: {
+            ...state.Prefs.values,
+            "widgets.maximized": true,
+            "widgets.system.maximized": true,
+          },
+        },
+      };
+      const maximizedStore = createStore(
+        combineReducers(reducers),
+        maximizedState
+      );
+      sinon.spy(maximizedStore, "dispatch");
+      const maximizedWrapper = mount(
+        <Provider store={maximizedStore}>
+          <Widgets />
+        </Provider>
+      );
+
+      const hideButton = maximizedWrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onClick")({ preventDefault: () => {} });
+
+      const dispatchedActions = maximizedStore.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const containerAction = dispatchedActions.find(
+        action => action.type === at.WIDGETS_CONTAINER_ACTION
+      );
+
+      assert.ok(containerAction, "should dispatch WIDGETS_CONTAINER_ACTION");
+      assert.equal(
+        containerAction.data.widget_size,
+        "medium",
+        "should report medium size when maximized"
+      );
+      maximizedStore.dispatch.restore();
+    });
+
+    it("should dispatch WIDGETS_ENABLED for each enabled widget when hide button is clicked", () => {
+      const hideButton = wrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onClick")({ preventDefault: () => {} });
+
+      const dispatchedActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const widgetsEnabledActions = dispatchedActions.filter(
+        action => action.type === at.WIDGETS_ENABLED
+      );
+
+      assert.equal(
+        widgetsEnabledActions.length,
+        2,
+        "should dispatch WIDGETS_ENABLED for both lists and timer"
+      );
+
+      const listsEnabledAction = widgetsEnabledActions.find(
+        action => action.data.widget_name === "lists"
+      );
+      const timerEnabledAction = widgetsEnabledActions.find(
+        action => action.data.widget_name === "focus_timer"
+      );
+
+      assert.ok(
+        listsEnabledAction,
+        "should dispatch WIDGETS_ENABLED for lists"
+      );
+      assert.equal(listsEnabledAction.data.widget_source, "widget");
+      assert.equal(listsEnabledAction.data.enabled, false);
+      assert.equal(listsEnabledAction.data.widget_size, "medium");
+
+      assert.ok(
+        timerEnabledAction,
+        "should dispatch WIDGETS_ENABLED for timer"
+      );
+      assert.equal(timerEnabledAction.data.widget_source, "widget");
+      assert.equal(timerEnabledAction.data.enabled, false);
+      assert.equal(timerEnabledAction.data.widget_size, "medium");
+    });
+
+    it("should dispatch WIDGETS_ENABLED only for enabled widgets", () => {
+      const partialState = {
+        ...state,
+        Prefs: {
+          ...state.Prefs,
+          values: {
+            ...state.Prefs.values,
+            [PREF_WIDGETS_LISTS_ENABLED]: true,
+            [PREF_WIDGETS_SYSTEM_LISTS_ENABLED]: true,
+            [PREF_WIDGETS_TIMER_ENABLED]: false,
+            [PREF_WIDGETS_SYSTEM_TIMER_ENABLED]: true,
+          },
+        },
+      };
+      const partialStore = createStore(combineReducers(reducers), partialState);
+      sinon.spy(partialStore, "dispatch");
+      const partialWrapper = mount(
+        <Provider store={partialStore}>
+          <Widgets />
+        </Provider>
+      );
+
+      const hideButton = partialWrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onClick")({ preventDefault: () => {} });
+
+      const widgetsEnabledActions = partialStore.dispatch
+        .getCalls()
+        .map(call => call.args[0])
+        .filter(action => action.type === at.WIDGETS_ENABLED);
+
+      assert.equal(
+        widgetsEnabledActions.length,
+        1,
+        "should only dispatch WIDGETS_ENABLED for lists (timer is already disabled)"
+      );
+
+      const listsEnabledAction = widgetsEnabledActions.find(
+        action => action.data.widget_name === "lists"
+      );
+
+      assert.ok(
+        listsEnabledAction,
+        "should dispatch WIDGETS_ENABLED for lists"
+      );
+      assert.equal(listsEnabledAction.data.enabled, false);
+
+      partialStore.dispatch.restore();
+    });
+
+    it("should dispatch WIDGETS_ENABLED with correct widget_size when maximized", () => {
+      const maximizedState = {
+        ...state,
+        Prefs: {
+          ...state.Prefs,
+          values: {
+            ...state.Prefs.values,
+            "widgets.maximized": true,
+            "widgets.system.maximized": true,
+          },
+        },
+      };
+      const maximizedStore = createStore(
+        combineReducers(reducers),
+        maximizedState
+      );
+      sinon.spy(maximizedStore, "dispatch");
+      const maximizedWrapper = mount(
+        <Provider store={maximizedStore}>
+          <Widgets />
+        </Provider>
+      );
+
+      const hideButton = maximizedWrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onClick")({ preventDefault: () => {} });
+
+      const widgetsEnabledActions = maximizedStore.dispatch
+        .getCalls()
+        .map(call => call.args[0])
+        .filter(action => action.type === at.WIDGETS_ENABLED);
+
+      assert.equal(widgetsEnabledActions.length, 2);
+
+      widgetsEnabledActions.forEach(action => {
+        assert.equal(
+          action.data.widget_size,
+          "medium",
+          "widget_size should be medium when maximized"
+        );
+      });
+
+      maximizedStore.dispatch.restore();
+    });
+
+    it("should dispatch WIDGETS_ENABLED for each enabled widget when Enter key is pressed", () => {
+      const hideButton = wrapper.find("#hide-all-widgets-button");
+      hideButton.prop("onKeyDown")({ key: "Enter", preventDefault: () => {} });
+
+      const widgetsEnabledActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0])
+        .filter(action => action.type === at.WIDGETS_ENABLED);
+
+      assert.equal(
+        widgetsEnabledActions.length,
+        2,
+        "should dispatch WIDGETS_ENABLED for both lists and timer"
+      );
+
+      const listsEnabledAction = widgetsEnabledActions.find(
+        action => action.data.widget_name === "lists"
+      );
+      const timerEnabledAction = widgetsEnabledActions.find(
+        action => action.data.widget_name === "focus_timer"
+      );
+
+      assert.ok(
+        listsEnabledAction,
+        "should dispatch WIDGETS_ENABLED for lists"
+      );
+      assert.equal(listsEnabledAction.data.widget_source, "widget");
+      assert.equal(listsEnabledAction.data.enabled, false);
+      assert.equal(listsEnabledAction.data.widget_size, "medium");
+
+      assert.ok(
+        timerEnabledAction,
+        "should dispatch WIDGETS_ENABLED for timer"
+      );
+      assert.equal(timerEnabledAction.data.widget_source, "widget");
+      assert.equal(timerEnabledAction.data.enabled, false);
+      assert.equal(timerEnabledAction.data.widget_size, "medium");
+    });
   });
 
   describe("handleToggleMaximize", () => {
@@ -497,5 +743,78 @@ describe("<Widgets>", () => {
 
       maximizedStore.dispatch.restore();
     });
+
+    it("should dispatch WIDGETS_CONTAINER_ACTION telemetry when toggle button is clicked", () => {
+      const toggleButton = wrapper.find("#toggle-widgets-size-button");
+      toggleButton.prop("onClick")({ preventDefault: () => {} });
+
+      const dispatchedActions = store.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const containerAction = dispatchedActions.find(
+        action => action.type === at.WIDGETS_CONTAINER_ACTION
+      );
+
+      assert.ok(
+        containerAction,
+        "should dispatch WIDGETS_CONTAINER_ACTION event"
+      );
+      assert.equal(containerAction.data.action_type, "change_size_all");
+      assert.equal(containerAction.data.action_value, "maximize widgets");
+      assert.equal(containerAction.data.widget_size, "medium");
+    });
+
+    it("should dispatch WIDGETS_CONTAINER_ACTION with correct values when toggling from maximized", () => {
+      const maximizedState = {
+        ...INITIAL_STATE,
+        Prefs: {
+          ...INITIAL_STATE.Prefs,
+          values: {
+            ...INITIAL_STATE.Prefs.values,
+            [PREF_WIDGETS_LISTS_ENABLED]: true,
+            [PREF_WIDGETS_SYSTEM_LISTS_ENABLED]: true,
+            "widgets.maximized": true,
+            "widgets.system.maximized": true,
+          },
+        },
+      };
+      const maximizedStore = createStore(
+        combineReducers(reducers),
+        maximizedState
+      );
+      sinon.spy(maximizedStore, "dispatch");
+      const maximizedWrapper = mount(
+        <Provider store={maximizedStore}>
+          <Widgets />
+        </Provider>
+      );
+
+      const toggleButton = maximizedWrapper.find("#toggle-widgets-size-button");
+      toggleButton.prop("onClick")({ preventDefault: () => {} });
+
+      const dispatchedActions = maximizedStore.dispatch
+        .getCalls()
+        .map(call => call.args[0]);
+
+      const containerAction = dispatchedActions.find(
+        action => action.type === at.WIDGETS_CONTAINER_ACTION
+      );
+
+      assert.ok(containerAction, "should dispatch WIDGETS_CONTAINER_ACTION");
+      assert.equal(containerAction.data.action_type, "change_size_all");
+      assert.equal(
+        containerAction.data.action_value,
+        "minimize widgets",
+        "action_value should indicate minimize widgets"
+      );
+      assert.equal(
+        containerAction.data.widget_size,
+        "small",
+        "should report new size (small) after minimizing"
+      );
+
+      maximizedStore.dispatch.restore();
+    });
   });
 });

From 31804e1ec014b484b5044c8df5184ec8ac94adc8 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 17:07:47 +0000
Subject: [PATCH 24/93] Bug 2011112 - Add telemetry for Weather Forecast
 widget. r=home-newtab-reviewers,nina-py

Differential Revision: https://phabricator.services.mozilla.com/D281565
---
 .../content-src/components/Base/Base.jsx      |   4 +
 .../ContentSection/ContentSection.jsx         |  10 +-
 .../CustomizeMenu/CustomizeMenu.jsx           |   2 +
 .../components/Weather/Weather.jsx            |   7 +-
 .../WeatherForecast/WeatherForecast.jsx       | 240 ++++++++++++++----
 .../WeatherForecast/WeatherForecast.scss      |   2 +-
 .../components/Widgets/Widgets.jsx            |   5 +-
 .../extensions/newtab/css/activity-stream.css |   2 +-
 .../data/content/activity-stream.bundle.js    | 216 ++++++++++++----
 .../content-src/components/Widgets.test.jsx   |   4 +-
 .../Widgets/WeatherForecast.test.jsx          | 141 +++++++++-
 11 files changed, 524 insertions(+), 109 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/Base/Base.jsx b/browser/extensions/newtab/content-src/components/Base/Base.jsx
index 60e61ce70c176..fcfaa680a20eb 100644
--- a/browser/extensions/newtab/content-src/components/Base/Base.jsx
+++ b/browser/extensions/newtab/content-src/components/Base/Base.jsx
@@ -969,6 +969,10 @@ export class BaseContent extends React.PureComponent {
             mayHaveWidgets={mayHaveWidgets}
             mayHaveTimerWidget={mayHaveTimerWidget}
             mayHaveListsWidget={mayHaveListsWidget}
+            mayHaveWeatherForecast={
+              prefs["widgets.system.weatherForecast.enabled"]
+            }
+            weatherDisplay={prefs["weather.display"]}
             showing={customizeMenuVisible}
             toggleSectionsMgmtPanel={this.toggleSectionsMgmtPanel}
             showSectionsMgmtPanel={this.state.showSectionsMgmtPanel}
diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
index 826881ec91f73..e3e290337295c 100644
--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
@@ -50,7 +50,15 @@ export class ContentSection extends React.PureComponent {
 
         let widgetSize;
         if (widgetName === "weather") {
-          widgetSize = "mini";
+          if (
+            this.props.mayHaveWeatherForecast &&
+            this.props.weatherDisplay === "detailed"
+          ) {
+            widgetSize =
+              widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
+          } else {
+            widgetSize = "mini";
+          }
         } else {
           widgetSize =
             widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx
index ce49627337ea8..02d859a665251 100644
--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx
+++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx
@@ -113,6 +113,8 @@ export class _CustomizeMenu extends React.PureComponent {
                 }
                 mayHaveWeather={this.props.mayHaveWeather}
                 mayHaveWidgets={this.props.mayHaveWidgets}
+                mayHaveWeatherForecast={this.props.mayHaveWeatherForecast}
+                weatherDisplay={this.props.weatherDisplay}
                 mayHaveTimerWidget={this.props.mayHaveTimerWidget}
                 mayHaveListsWidget={this.props.mayHaveListsWidget}
                 dispatch={this.props.dispatch}
diff --git a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
index 3b6f9ee6b2efe..1f75860727941 100644
--- a/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
+++ b/browser/extensions/newtab/content-src/components/Weather/Weather.jsx
@@ -321,6 +321,9 @@ export class _Weather extends React.PureComponent {
   };
 
   handleChangeDisplay = value => {
+    const weatherForecastEnabled =
+      this.props.Prefs.values["widgets.system.weatherForecast.enabled"];
+
     if (this.panelElement) {
       this.panelElement.hide();
     }
@@ -343,7 +346,9 @@ export class _Weather extends React.PureComponent {
             widget_source: "context_menu",
             user_action: USER_ACTION_TYPES.CHANGE_DISPLAY,
             widget_size: "mini",
-            action_value: value,
+            action_value: weatherForecastEnabled
+              ? "switch_to_forecast_widget"
+              : value,
           },
         })
       );
diff --git a/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.jsx b/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.jsx
index c0465e1c40abf..3af128de88bac 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.jsx
@@ -2,14 +2,48 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import React from "react";
-import { useSelector } from "react-redux";
+import React, { useCallback, useRef } from "react";
+import { useSelector, batch } from "react-redux";
 import { actionCreators as ac, actionTypes as at } from "common/Actions.mjs";
+import { useIntersectionObserver } from "../../../lib/utils";
 import { LocationSearch } from "content-src/components/Weather/LocationSearch";
 
-function WeatherForecast({ dispatch }) {
+const USER_ACTION_TYPES = {
+  CHANGE_LOCATION: "change_location",
+  DETECT_LOCATION: "detect_location",
+  CHANGE_TEMP_UNIT: "change_temperature_units",
+  CHANGE_DISPLAY: "change_weather_display",
+  LEARN_MORE: "learn_more",
+  PROVIDER_LINK_CLICK: "provider_link_click",
+};
+
+function WeatherForecast({ dispatch, isMaximized, widgetsMayBeMaximized }) {
   const prefs = useSelector(state => state.Prefs.values);
   const weatherData = useSelector(state => state.Weather);
+  const impressionFired = useRef(false);
+
+  const isSmallSize = !isMaximized && widgetsMayBeMaximized;
+  const widgetSize = isSmallSize ? "small" : "medium";
+
+  const handleIntersection = useCallback(() => {
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+
+    const telemetryData = {
+      widget_name: "weather",
+      widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+    };
+    dispatch(
+      ac.AlsoToMain({
+        type: at.WIDGETS_IMPRESSION,
+        data: telemetryData,
+      })
+    );
+  }, [dispatch, widgetSize, widgetsMayBeMaximized]);
+
+  const forecastRef = useIntersectionObserver(handleIntersection);
 
   const WEATHER_SUGGESTION = weatherData.suggestions?.[0];
 
@@ -53,75 +87,178 @@ function WeatherForecast({ dispatch }) {
   const isOptInEnabled = weatherOptIn || nimbusWeatherOptInEnabled;
 
   const { searchActive } = weatherData;
-  const maximizedWidgets = prefs["widgets.maximized"];
 
   function handleChangeLocation() {
-    dispatch(
-      ac.BroadcastToContent({
-        type: at.WEATHER_SEARCH_ACTIVE,
-        data: true,
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.BroadcastToContent({
+          type: at.WEATHER_SEARCH_ACTIVE,
+          data: true,
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: USER_ACTION_TYPES.CHANGE_LOCATION,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
   }
 
   function handleDetectLocation() {
-    dispatch(
-      ac.AlsoToMain({
-        type: at.WEATHER_USER_OPT_IN_LOCATION,
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.AlsoToMain({
+          type: at.WEATHER_USER_OPT_IN_LOCATION,
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: USER_ACTION_TYPES.DETECT_LOCATION,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
   }
 
   function handleChangeTempUnit(unit) {
-    dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "weather.temperatureUnits",
-          value: unit,
-        },
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "weather.temperatureUnits",
+            value: unit,
+          },
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: USER_ACTION_TYPES.CHANGE_TEMP_UNIT,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        action_value: unit,
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
   }
 
   function handleChangeDisplay(display) {
-    dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "weather.display",
-          value: display,
-        },
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "weather.display",
+            value: display,
+          },
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: USER_ACTION_TYPES.CHANGE_DISPLAY,
+        action_value: "switch_to_mini_widget",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
   }
 
   function handleHideWeather() {
-    dispatch(
-      ac.OnlyToMain({
-        type: at.SET_PREF,
-        data: {
-          name: "showWeather",
-          value: false,
-        },
-      })
-    );
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.SET_PREF,
+          data: {
+            name: "showWeather",
+            value: false,
+          },
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        enabled: false,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_ENABLED,
+          data: telemetryData,
+        })
+      );
+    });
   }
 
   function handleLearnMore() {
+    batch(() => {
+      dispatch(
+        ac.OnlyToMain({
+          type: at.OPEN_LINK,
+          data: {
+            url: "https://support.mozilla.org/kb/firefox-new-tab-widgets",
+          },
+        })
+      );
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: USER_ACTION_TYPES.LEARN_MORE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+      };
+      dispatch(
+        ac.OnlyToMain({
+          type: at.WIDGETS_USER_EVENT,
+          data: telemetryData,
+        })
+      );
+    });
+  }
+
+  function handleProviderLinkClick() {
+    const telemetryData = {
+      widget_name: "weather",
+      widget_source: "widget",
+      user_action: USER_ACTION_TYPES.PROVIDER_LINK_CLICK,
+      widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+    };
     dispatch(
       ac.OnlyToMain({
-        type: at.OPEN_LINK,
-        data: {
-          url: "https://support.mozilla.org/kb/firefox-new-tab-widgets",
-        },
+        type: at.WIDGETS_USER_EVENT,
+        data: telemetryData,
       })
     );
   }
 
   return (
     <article
-      className={`weather-forecast-widget${maximizedWidgets ? "" : " small-widget"}`}
+      className={`weather-forecast-widget${isSmallSize ? " small-widget" : ""}`}
+      ref={el => {
+        forecastRef.current = [el];
+      }}
     >
       <div className="city-wrapper">
         <div className="city-name">
@@ -137,7 +274,7 @@ function WeatherForecast({ dispatch }) {
             iconSrc="chrome://global/skin/icons/more.svg"
             menuId="weather-forecast-context-menu"
             type="ghost"
-            size={`${maximizedWidgets ? "default" : "small"}`}
+            size={`${isSmallSize ? "small" : "default"}`}
           />
           <panel-list id="weather-forecast-context-menu">
             {prefs["weather.locationSearchEnabled"] && (
@@ -185,7 +322,7 @@ function WeatherForecast({ dispatch }) {
           </panel-list>
         </div>
       </div>
-      {maximizedWidgets && (
+      {!isSmallSize && (
         <>
           <div className="current-weather-wrapper">
             <div className="weather-icon-column">
@@ -232,7 +369,7 @@ function WeatherForecast({ dispatch }) {
         </>
       )}
       <div className="forecast-row">
-        {maximizedWidgets && (
+        {!isSmallSize && (
           <p
             className="today-forecast"
             data-l10n-id="newtab-weather-todays-forecast"
@@ -279,9 +416,10 @@ function WeatherForecast({ dispatch }) {
 
       <div className="forecast-footer">
         <a
-          href="#"
+          href={WEATHER_SUGGESTION.forecast.url}
           className="full-forecast"
           data-l10n-id="newtab-weather-see-full-forecast"
+          onClick={handleProviderLinkClick}
         ></a>
         <span
           className="sponsored-text"
diff --git a/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.scss b/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.scss
index 3c1eb779aade8..63672ecf74b37 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.scss
+++ b/browser/extensions/newtab/content-src/components/Widgets/WeatherForecast/WeatherForecast.scss
@@ -273,7 +273,7 @@ hr {
 
 .forecast-row {
   .today-forecast {
-    margin-block-start: 0;
+    margin-block-start: var(--space-small);
     font-weight: var(--font-weight-semibold);
   }
 
diff --git a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
index f490107e298f7..d1c3b0093baf2 100644
--- a/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
+++ b/browser/extensions/newtab/content-src/components/Widgets/Widgets.jsx
@@ -186,8 +186,8 @@ function Widgets() {
       const telemetryData = {
         action_type: CONTAINER_ACTION_TYPES.CHANGE_SIZE_ALL,
         action_value: newMaximizedState
-          ? "maximize widgets"
-          : "minimize widgets",
+          ? "maximize_widgets"
+          : "minimize_widgets",
         widget_size: newWidgetSize,
       };
 
@@ -281,6 +281,7 @@ function Widgets() {
               dispatch={dispatch}
               handleUserInteraction={handleUserInteraction}
               isMaximized={isMaximized}
+              widgetsMayBeMaximized={widgetsMayBeMaximized}
             />
           )}
         </div>
diff --git a/browser/extensions/newtab/css/activity-stream.css b/browser/extensions/newtab/css/activity-stream.css
index 84be38ad330b9..a4847fa7c1dea 100644
--- a/browser/extensions/newtab/css/activity-stream.css
+++ b/browser/extensions/newtab/css/activity-stream.css
@@ -4998,7 +4998,7 @@ hr {
 }
 
 .forecast-row .today-forecast {
-  margin-block-start: 0;
+  margin-block-start: var(--space-small);
   font-weight: var(--font-weight-semibold);
 }
 .forecast-row .forecast-row-items {
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 54d2226715bb6..0ecbd0502977f 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -12990,11 +12990,40 @@ function LocationSearch({
 
 
 
+
+const WeatherForecast_USER_ACTION_TYPES = {
+  CHANGE_LOCATION: "change_location",
+  DETECT_LOCATION: "detect_location",
+  CHANGE_TEMP_UNIT: "change_temperature_units",
+  CHANGE_DISPLAY: "change_weather_display",
+  LEARN_MORE: "learn_more",
+  PROVIDER_LINK_CLICK: "provider_link_click"
+};
 function WeatherForecast({
-  dispatch
+  dispatch,
+  isMaximized,
+  widgetsMayBeMaximized
 }) {
   const prefs = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.Prefs.values);
   const weatherData = (0,external_ReactRedux_namespaceObject.useSelector)(state => state.Weather);
+  const impressionFired = (0,external_React_namespaceObject.useRef)(false);
+  const isSmallSize = !isMaximized && widgetsMayBeMaximized;
+  const widgetSize = isSmallSize ? "small" : "medium";
+  const handleIntersection = (0,external_React_namespaceObject.useCallback)(() => {
+    if (impressionFired.current) {
+      return;
+    }
+    impressionFired.current = true;
+    const telemetryData = {
+      widget_name: "weather",
+      widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+    };
+    dispatch(actionCreators.AlsoToMain({
+      type: actionTypes.WIDGETS_IMPRESSION,
+      data: telemetryData
+    }));
+  }, [dispatch, widgetSize, widgetsMayBeMaximized]);
+  const forecastRef = useIntersectionObserver(handleIntersection);
   const WEATHER_SUGGESTION = weatherData.suggestions?.[0];
   const nimbusWeatherDisplay = prefs.trainhopConfig?.weather?.display;
   const showDetailedView = nimbusWeatherDisplay === "detailed" || prefs["weather.display"] === "detailed";
@@ -13025,55 +13054,143 @@ function WeatherForecast({
   const {
     searchActive
   } = weatherData;
-  const maximizedWidgets = prefs["widgets.maximized"];
   function handleChangeLocation() {
-    dispatch(actionCreators.BroadcastToContent({
-      type: actionTypes.WEATHER_SEARCH_ACTIVE,
-      data: true
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.BroadcastToContent({
+        type: actionTypes.WEATHER_SEARCH_ACTIVE,
+        data: true
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: WeatherForecast_USER_ACTION_TYPES.CHANGE_LOCATION,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
   }
   function handleDetectLocation() {
-    dispatch(actionCreators.AlsoToMain({
-      type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.AlsoToMain({
+        type: actionTypes.WEATHER_USER_OPT_IN_LOCATION
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: WeatherForecast_USER_ACTION_TYPES.DETECT_LOCATION,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
   }
   function handleChangeTempUnit(unit) {
-    dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.temperatureUnits",
-        value: unit
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "weather.temperatureUnits",
+          value: unit
+        }
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: WeatherForecast_USER_ACTION_TYPES.CHANGE_TEMP_UNIT,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium",
+        action_value: unit
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
   }
   function handleChangeDisplay(display) {
-    dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "weather.display",
-        value: display
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "weather.display",
+          value: display
+        }
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: WeatherForecast_USER_ACTION_TYPES.CHANGE_DISPLAY,
+        action_value: "switch_to_mini_widget",
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
   }
   function handleHideWeather() {
-    dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.SET_PREF,
-      data: {
-        name: "showWeather",
-        value: false
-      }
-    }));
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.SET_PREF,
+        data: {
+          name: "showWeather",
+          value: false
+        }
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        enabled: false,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_ENABLED,
+        data: telemetryData
+      }));
+    });
   }
   function handleLearnMore() {
+    (0,external_ReactRedux_namespaceObject.batch)(() => {
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.OPEN_LINK,
+        data: {
+          url: "https://support.mozilla.org/kb/firefox-new-tab-widgets"
+        }
+      }));
+      const telemetryData = {
+        widget_name: "weather",
+        widget_source: "context_menu",
+        user_action: WeatherForecast_USER_ACTION_TYPES.LEARN_MORE,
+        widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+      };
+      dispatch(actionCreators.OnlyToMain({
+        type: actionTypes.WIDGETS_USER_EVENT,
+        data: telemetryData
+      }));
+    });
+  }
+  function handleProviderLinkClick() {
+    const telemetryData = {
+      widget_name: "weather",
+      widget_source: "widget",
+      user_action: WeatherForecast_USER_ACTION_TYPES.PROVIDER_LINK_CLICK,
+      widget_size: widgetsMayBeMaximized ? widgetSize : "medium"
+    };
     dispatch(actionCreators.OnlyToMain({
-      type: actionTypes.OPEN_LINK,
-      data: {
-        url: "https://support.mozilla.org/kb/firefox-new-tab-widgets"
-      }
+      type: actionTypes.WIDGETS_USER_EVENT,
+      data: telemetryData
     }));
   }
   return /*#__PURE__*/external_React_default().createElement("article", {
-    className: `weather-forecast-widget${maximizedWidgets ? "" : " small-widget"}`
+    className: `weather-forecast-widget${isSmallSize ? " small-widget" : ""}`,
+    ref: el => {
+      forecastRef.current = [el];
+    }
   }, /*#__PURE__*/external_React_default().createElement("div", {
     className: "city-wrapper"
   }, /*#__PURE__*/external_React_default().createElement("div", {
@@ -13087,7 +13204,7 @@ function WeatherForecast({
     iconSrc: "chrome://global/skin/icons/more.svg",
     menuId: "weather-forecast-context-menu",
     type: "ghost",
-    size: `${maximizedWidgets ? "default" : "small"}`
+    size: `${isSmallSize ? "small" : "default"}`
   }), /*#__PURE__*/external_React_default().createElement("panel-list", {
     id: "weather-forecast-context-menu"
   }, prefs["weather.locationSearchEnabled"] && /*#__PURE__*/external_React_default().createElement("panel-item", {
@@ -13114,7 +13231,7 @@ function WeatherForecast({
   }), /*#__PURE__*/external_React_default().createElement("panel-item", {
     "data-l10n-id": "newtab-weather-menu-learn-more",
     onClick: handleLearnMore
-  })))), maximizedWidgets && /*#__PURE__*/external_React_default().createElement((external_React_default()).Fragment, null, /*#__PURE__*/external_React_default().createElement("div", {
+  })))), !isSmallSize && /*#__PURE__*/external_React_default().createElement((external_React_default()).Fragment, null, /*#__PURE__*/external_React_default().createElement("div", {
     className: "current-weather-wrapper"
   }, /*#__PURE__*/external_React_default().createElement("div", {
     className: "weather-icon-column"
@@ -13138,7 +13255,7 @@ function WeatherForecast({
     className: "arrow-icon arrow-down"
   }), WEATHER_SUGGESTION.forecast.low[prefs["weather.temperatureUnits"]], "\xB0"))), /*#__PURE__*/external_React_default().createElement("hr", null)), /*#__PURE__*/external_React_default().createElement("div", {
     className: "forecast-row"
-  }, maximizedWidgets && /*#__PURE__*/external_React_default().createElement("p", {
+  }, !isSmallSize && /*#__PURE__*/external_React_default().createElement("p", {
     className: "today-forecast",
     "data-l10n-id": "newtab-weather-todays-forecast"
   }), /*#__PURE__*/external_React_default().createElement("ul", {
@@ -13156,9 +13273,10 @@ function WeatherForecast({
   }), /*#__PURE__*/external_React_default().createElement("span", null, "7:00")))), /*#__PURE__*/external_React_default().createElement("div", {
     className: "forecast-footer"
   }, /*#__PURE__*/external_React_default().createElement("a", {
-    href: "#",
+    href: WEATHER_SUGGESTION.forecast.url,
     className: "full-forecast",
-    "data-l10n-id": "newtab-weather-see-full-forecast"
+    "data-l10n-id": "newtab-weather-see-full-forecast",
+    onClick: handleProviderLinkClick
   }), /*#__PURE__*/external_React_default().createElement("span", {
     className: "sponsored-text",
     "data-l10n-id": "newtab-weather-sponsored",
@@ -13356,7 +13474,7 @@ function Widgets() {
       dispatch(actionCreators.SetPref(PREF_WIDGETS_MAXIMIZED, newMaximizedState));
       const telemetryData = {
         action_type: CONTAINER_ACTION_TYPES.CHANGE_SIZE_ALL,
-        action_value: newMaximizedState ? "maximize widgets" : "minimize widgets",
+        action_value: newMaximizedState ? "maximize_widgets" : "minimize_widgets",
         widget_size: newWidgetSize
       };
       dispatch(actionCreators.OnlyToMain({
@@ -13427,7 +13545,8 @@ function Widgets() {
   }), weatherForecastEnabled && /*#__PURE__*/external_React_default().createElement(WeatherForecast, {
     dispatch: dispatch,
     handleUserInteraction: handleUserInteraction,
-    isMaximized: isMaximized
+    isMaximized: isMaximized,
+    widgetsMayBeMaximized: widgetsMayBeMaximized
   }))), messageData?.content?.messageType === "WidgetMessage" && /*#__PURE__*/external_React_default().createElement(MessageWrapper, {
     dispatch: dispatch
   }, /*#__PURE__*/external_React_default().createElement(WidgetsFeatureHighlight, {
@@ -14689,7 +14808,11 @@ class ContentSection extends (external_React_default()).PureComponent {
         } = this.props.enabledWidgets;
         let widgetSize;
         if (widgetName === "weather") {
-          widgetSize = "mini";
+          if (this.props.mayHaveWeatherForecast && this.props.weatherDisplay === "detailed") {
+            widgetSize = widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
+          } else {
+            widgetSize = "mini";
+          }
         } else {
           widgetSize = widgetsMayBeMaximized && !widgetsMaximized ? "small" : "medium";
         }
@@ -15049,6 +15172,8 @@ class _CustomizeMenu extends (external_React_default()).PureComponent {
       mayHaveInferredPersonalization: this.props.mayHaveInferredPersonalization,
       mayHaveWeather: this.props.mayHaveWeather,
       mayHaveWidgets: this.props.mayHaveWidgets,
+      mayHaveWeatherForecast: this.props.mayHaveWeatherForecast,
+      weatherDisplay: this.props.weatherDisplay,
       mayHaveTimerWidget: this.props.mayHaveTimerWidget,
       mayHaveListsWidget: this.props.mayHaveListsWidget,
       dispatch: this.props.dispatch,
@@ -15640,6 +15765,7 @@ class _Weather extends (external_React_default()).PureComponent {
     });
   };
   handleChangeDisplay = value => {
+    const weatherForecastEnabled = this.props.Prefs.values["widgets.system.weatherForecast.enabled"];
     if (this.panelElement) {
       this.panelElement.hide();
     }
@@ -15658,7 +15784,7 @@ class _Weather extends (external_React_default()).PureComponent {
           widget_source: "context_menu",
           user_action: Weather_USER_ACTION_TYPES.CHANGE_DISPLAY,
           widget_size: "mini",
-          action_value: value
+          action_value: weatherForecastEnabled ? "switch_to_forecast_widget" : value
         }
       }));
     });
@@ -17355,6 +17481,8 @@ class BaseContent extends (external_React_default()).PureComponent {
       mayHaveWidgets: mayHaveWidgets,
       mayHaveTimerWidget: mayHaveTimerWidget,
       mayHaveListsWidget: mayHaveListsWidget,
+      mayHaveWeatherForecast: prefs["widgets.system.weatherForecast.enabled"],
+      weatherDisplay: prefs["weather.display"],
       showing: customizeMenuVisible,
       toggleSectionsMgmtPanel: this.toggleSectionsMgmtPanel,
       showSectionsMgmtPanel: this.state.showSectionsMgmtPanel
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
index 46ef9119f9392..40c70fead32de 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Widgets.test.jsx
@@ -761,7 +761,7 @@ describe("<Widgets>", () => {
         "should dispatch WIDGETS_CONTAINER_ACTION event"
       );
       assert.equal(containerAction.data.action_type, "change_size_all");
-      assert.equal(containerAction.data.action_value, "maximize widgets");
+      assert.equal(containerAction.data.action_value, "maximize_widgets");
       assert.equal(containerAction.data.widget_size, "medium");
     });
 
@@ -805,7 +805,7 @@ describe("<Widgets>", () => {
       assert.equal(containerAction.data.action_type, "change_size_all");
       assert.equal(
         containerAction.data.action_value,
-        "minimize widgets",
+        "minimize_widgets",
         "action_value should indicate minimize widgets"
       );
       assert.equal(
diff --git a/browser/extensions/newtab/test/unit/content-src/components/Widgets/WeatherForecast.test.jsx b/browser/extensions/newtab/test/unit/content-src/components/Widgets/WeatherForecast.test.jsx
index 569f23c7992a3..b5e4738aadc5d 100644
--- a/browser/extensions/newtab/test/unit/content-src/components/Widgets/WeatherForecast.test.jsx
+++ b/browser/extensions/newtab/test/unit/content-src/components/Widgets/WeatherForecast.test.jsx
@@ -255,80 +255,209 @@ describe("<WeatherForecast>", () => {
     });
 
     it("should dispatch WEATHER_SEARCH_ACTIVE when 'Change location' is clicked", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const changeLocationItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-change-location']"
       );
       changeLocationItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.WEATHER_SEARCH_ACTIVE);
       assert.equal(action.data, true);
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(telemetryAction.data.user_action, "change_location");
+      assert.equal(telemetryAction.data.widget_size, "small");
     });
 
     it("should dispatch WEATHER_USER_OPT_IN_LOCATION when 'Detect my location' is clicked", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const detectLocationItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-detect-my-location']"
       );
       detectLocationItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.WEATHER_USER_OPT_IN_LOCATION);
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(telemetryAction.data.user_action, "detect_location");
+      assert.equal(telemetryAction.data.widget_size, "small");
     });
 
     it("should dispatch SET_PREF to change temperature units to Celsius", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const changeTempItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-change-temperature-units-celsius']"
       );
       changeTempItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.SET_PREF);
       assert.equal(action.data.name, "weather.temperatureUnits");
       assert.equal(action.data.value, "c");
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(
+        telemetryAction.data.user_action,
+        "change_temperature_units"
+      );
+      assert.equal(telemetryAction.data.widget_size, "small");
+      assert.equal(telemetryAction.data.action_value, "c");
     });
 
     it("should dispatch SET_PREF to change display to simple", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const changeDisplayItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-change-weather-display-simple']"
       );
       changeDisplayItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.SET_PREF);
       assert.equal(action.data.name, "weather.display");
       assert.equal(action.data.value, "simple");
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(telemetryAction.data.user_action, "change_weather_display");
+      assert.equal(telemetryAction.data.widget_size, "small");
     });
 
     it("should dispatch SET_PREF to hide weather when 'Hide weather' is clicked", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const hideWeatherItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-hide-weather-v2']"
       );
       hideWeatherItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.SET_PREF);
       assert.equal(action.data.name, "showWeather");
       assert.equal(action.data.value, false);
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_ENABLED);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(telemetryAction.data.enabled, false);
+      assert.equal(telemetryAction.data.widget_size, "small");
     });
 
     it("should dispatch OPEN_LINK when 'Learn more' is clicked", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast
+            dispatch={dispatch}
+            isMaximized={false}
+            widgetsMayBeMaximized={true}
+          />
+        </WrapWithProvider>
+      );
+
       const learnMoreItem = wrapper.find(
         "panel-item[data-l10n-id='newtab-weather-menu-learn-more']"
       );
       learnMoreItem.props().onClick();
 
-      assert.ok(dispatch.calledOnce);
+      assert.ok(dispatch.calledTwice);
       const [action] = dispatch.getCall(0).args;
       assert.equal(action.type, at.OPEN_LINK);
       assert.equal(
         action.data.url,
         "https://support.mozilla.org/kb/firefox-new-tab-widgets"
       );
+
+      // Verify telemetry
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_name, "weather");
+      assert.equal(telemetryAction.data.widget_source, "context_menu");
+      assert.equal(telemetryAction.data.user_action, "learn_more");
+      assert.equal(telemetryAction.data.widget_size, "small");
+    });
+
+    it("should report widget_size as 'medium' when widget is maximized", () => {
+      wrapper = mount(
+        <WrapWithProvider state={mockState}>
+          <WeatherForecast dispatch={dispatch} isMaximized={true} />
+        </WrapWithProvider>
+      );
+
+      const changeLocationItem = wrapper.find(
+        "panel-item[data-l10n-id='newtab-weather-menu-change-location']"
+      );
+      changeLocationItem.props().onClick();
+
+      const [telemetryAction] = dispatch.getCall(1).args;
+      assert.equal(telemetryAction.type, at.WIDGETS_USER_EVENT);
+      assert.equal(telemetryAction.data.widget_size, "medium");
     });
   });
 });

From e98e47c20429bdabcd34f5b550bdbcb2d432a0a2 Mon Sep 17 00:00:00 2001
From: Thomas Wisniewski <twisniewski@mozilla.com>
Date: Fri, 6 Feb 2026 17:09:20 +0000
Subject: [PATCH 25/93] Bug 2013966 - use the page's JS context rather than an
 isolated sandbox, for our webcompat intervention content scripts where issues
 may arise during restart of the addon due to broken x-rays;
 r=webcompat-reviewers,ksenia

Differential Revision: https://phabricator.services.mozilla.com/D281714
---
 .../webcompat/data/interventions.json         |  33 +-
 ...est.justice.nsw.gov.au-shim-mozRTC-APIs.js |  21 +-
 ...575-perplexity.ai-covered-fixed-element.js |  39 +-
 ...lealchemy2.com-fix-audio-race-condition.js |  99 ++--
 .../js/bug1448747-fastclick-shim.js           |  20 +-
 .../js/bug1457335-histography.io-ua-change.js |  26 +-
 .../bug1472075-bankofamerica.com-ua-change.js |  12 +-
 ...79159-m.tailieu.vn-pdfjs-worker-disable.js |  40 +-
 ...bug1724868-news.yahoo.co.jp-ua-override.js |  60 ++-
 .../js/bug1739489-draftjs-beforeinput.js      |  52 +--
 .../js/bug1769762-tiktok.com-plugins-shim.js  |  22 +-
 .../js/bug1774005-installtrigger-shim.js      |  14 +-
 ...68-www.samsung.com-appVersion-linux-fix.js |  18 +-
 ...bug1799980-healow.com-infinite-loop-fix.js |  18 +-
 ...g1815733-outlook365-clipboard-read-noop.js |  27 +-
 .../js/bug1818818-fastclick-legacy-shim.js    |  15 +-
 .../js/bug1819450-cmbchina.com-ua-change.js   |  20 +-
 ...819678-free4talk.com-window-chrome-shim.js |  12 +-
 ...07-nintendo-window-OnetrustActiveGroups.js |  12 +-
 ...1730-www.korg.com-fix-broken-page-loads.js |   8 +-
 ...w.youtube.com-performance-now-precision.js |  41 +-
 ...bug1846742-microsoft.com-search-key-fix.js |  23 +-
 .../js/bug1847971-ebay.com-barcode-scanner.js |  76 +--
 .../js/bug1850998-chaturbate.com.js           |  27 +-
 .../js/bug1855014-eksiseyler.com.js           |  12 +-
 .../bug1859617-installtrigger-removal-shim.js |   4 +-
 ...ug1878024-g1.globo.com-fix-account-icon.js |  35 +-
 ...ffice365-email-handling-prompt-autohide.js |  37 +-
 ...1889505-bankmandiri.co.id-window.chrome.js |  10 +-
 ...app.sessionlinkpro.com-spoof-user-agent.js |  34 +-
 .../js/bug1898946-transcrib.io-chrome-shim.js |  32 +-
 ...1-hexagame.io-prevent-unsupported-alert.js |  27 +-
 .../js/bug1898952-digits.t-mobile.com.js      |  25 +-
 ...83-elibrary.ferc.gov-window-chrome-shim.js |  12 +-
 .../js/bug1898996-oculus.com-chrome-shims.js  |  33 +-
 ...g1901780-disable-legacy-mutation-events.js |  21 +-
 ...02379-adl.edu.tw-hide-unsupported-popup.js |  46 +-
 ...g1902406-sp.hi.co.kr-window-chrome-shim.js |  18 +-
 ...-www.sigadoc.mt.gov.br-user-agent-spoof.js |  42 +-
 ...afacil.com.br-prevent-unsupported-alert.js |  27 +-
 ...w.jamsune.com-prevent-unsupported-alert.js |  27 +-
 ...0-ace7.acecombat.jp-slow-down-scrolling.js |  29 +-
 ...rvizicie.interno.gov.it-spoof-as-chrome.js |  44 +-
 ...g1905069-one.geekie.com.br-chrome-shims.js |  33 +-
 ...p.powerbi.com-emulate-mousewheel-events.js |  32 +-
 .../bug1913599-shim-createencodedstreams.js   |  32 +-
 ...rts.com-getCurrentUser-script-error-fix.js |  33 +-
 ...eniodellapizza.com-fix-broken-scrolling.js |  29 +-
 ...devilhd.com-shim-WebkitMutationObserver.js |  13 +-
 ...7984-modules.sms-timing.com-chrome-shim.js |  18 +-
 ...8941-oasis.decart.ai-window-chrome-shim.js |  12 +-
 ...porepools.com-prevent-unsupported-alert.js |  59 +--
 .../bug1934908-www.cbsnews.com-ua-override.js |  31 +-
 ...1939248-rosasthai.com-load-event-helper.js |  21 +-
 ....capital.gr-suppress-constant-reloading.js |  33 +-
 ...lkeyway.com-prevent-unsupported-message.js |  37 +-
 ...50282-f1tv.formula1.com-unblock-firefox.js |  95 ++--
 ...1950282-formula1.com-platform-linux-fix.js |  18 +-
 ...-www.youtube.com-picture-in-picture-fix.js | 125 ++---
 ...8-www.signal-tech.com-round-pageYOffset.js |  20 +-
 ...-app.kosmi.io-unprefix-mozCaptureStream.js |  10 +-
 ...ug196916-mpi.mb.ca-polyfill-getWeekInfo.js |  18 +-
 ...er-van-week-end.fr-appVersion-linux-fix.js |  18 +-
 ...bug1975651-comic.k-manga.jp-ua-override.js |  30 +-
 ...drover.com-alias-WebKitMutationObserver.js |  13 +-
 ...ank.resursbank.se-autoclose-bankid-tabs.js |  37 +-
 .../js/bug1994562-shim-mstp-mstg-on-window.js | 440 ++++++++----------
 ...99198-anime-bit.ru-fix-broken-scrolling.js |  36 +-
 ...microsoft.com-disable-resizeMode-in-gDM.js |  42 +-
 .../extensions/webcompat/lib/interventions.js |  26 +-
 browser/extensions/webcompat/manifest.json    |   2 +-
 .../tests/browser/browser_aboutcompat.js      |  10 +-
 .../tests/browser/browser_interventions.js    |   7 +
 .../test_persistent_contentscripts.py         |  21 +-
 .../tests/test_1799968_samsung_com.py         |   2 +-
 75 files changed, 1371 insertions(+), 1232 deletions(-)

diff --git a/browser/extensions/webcompat/data/interventions.json b/browser/extensions/webcompat/data/interventions.json
index 125f968267d94..c41738651366a 100644
--- a/browser/extensions/webcompat/data/interventions.json
+++ b/browser/extensions/webcompat/data/interventions.json
@@ -485,10 +485,7 @@
         "platforms": ["linux", "android"],
         "content_scripts": {
           "all_frames": true,
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1724868-news.yahoo.co.jp-ua-override.js"
-          ]
+          "js": ["bug1724868-news.yahoo.co.jp-ua-override.js"]
         }
       }
     ]
@@ -2158,10 +2155,7 @@
       {
         "platforms": ["all"],
         "content_scripts": {
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1898929-app.sessionlinkpro.com-spoof-user-agent.js"
-          ]
+          "js": ["bug1898929-app.sessionlinkpro.com-spoof-user-agent.js"]
         }
       }
     ]
@@ -2701,10 +2695,7 @@
       {
         "platforms": ["all"],
         "content_scripts": {
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1902379-adl.edu.tw-hide-unsupported-popup.js"
-          ]
+          "js": ["bug1902379-adl.edu.tw-hide-unsupported-popup.js"]
         }
       }
     ]
@@ -2868,6 +2859,7 @@
       {
         "platforms": ["all"],
         "content_scripts": {
+          "isolated": true,
           "js": ["bug1902399-recochoku.jp-hide-unsupported-browser-warning.js"]
         }
       }
@@ -2964,10 +2956,7 @@
       {
         "platforms": ["all"],
         "content_scripts": {
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js"
-          ]
+          "js": ["bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js"]
         }
       }
     ]
@@ -3355,7 +3344,6 @@
         "platforms": ["android"],
         "content_scripts": {
           "js": [
-            "lib/ua_helpers.js",
             "bug1904952-idserver.servizicie.interno.gov.it-spoof-as-chrome.js"
           ]
         }
@@ -5069,10 +5057,7 @@
       {
         "platforms": ["android"],
         "content_scripts": {
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1975651-comic.k-manga.jp-ua-override.js"
-          ]
+          "js": ["bug1975651-comic.k-manga.jp-ua-override.js"]
         }
       }
     ]
@@ -5186,10 +5171,7 @@
         "platforms": ["android"],
         "content_scripts": {
           "all_frames": true,
-          "js": [
-            "lib/ua_helpers.js",
-            "bug1934908-www.cbsnews.com-ua-override.js"
-          ]
+          "js": ["bug1934908-www.cbsnews.com-ua-override.js"]
         }
       }
     ]
@@ -5630,6 +5612,7 @@
       {
         "platforms": ["desktop"],
         "content_scripts": {
+          "isolated": true,
           "js": ["1986438-gamma.app-hide-unsupported.js"]
         }
       }
diff --git a/browser/extensions/webcompat/injections/js/1994704-avlguest.justice.nsw.gov.au-shim-mozRTC-APIs.js b/browser/extensions/webcompat/injections/js/1994704-avlguest.justice.nsw.gov.au-shim-mozRTC-APIs.js
index 0f4adef781122..b45099e023483 100644
--- a/browser/extensions/webcompat/injections/js/1994704-avlguest.justice.nsw.gov.au-shim-mozRTC-APIs.js
+++ b/browser/extensions/webcompat/injections/js/1994704-avlguest.justice.nsw.gov.au-shim-mozRTC-APIs.js
@@ -11,17 +11,12 @@
  * needed. We can just set it to RTCPeerConnection.
  */
 
-/* globals exportFunction */
+if (!window.mozRTCPeerConnection) {
+  console.info(
+    "moz-prefixed JS APIs are being shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1994704 for details."
+  );
 
-console.info(
-  "moz-prefixed JS APIs are being shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1994704 for details."
-);
-
-window.wrappedJSObject.mozRTCPeerConnection =
-  window.wrappedJSObject.RTCPeerConnection;
-
-window.wrappedJSObject.mozRTCSessionDescription =
-  window.wrappedJSObject.RTCSessionDescription;
-
-window.wrappedJSObject.mozRTCIceCandidate =
-  window.wrappedJSObject.RTCIceCandidate;
+  window.mozRTCPeerConnection = window.RTCPeerConnection;
+  window.mozRTCSessionDescription = window.RTCSessionDescription;
+  window.mozRTCIceCandidate = window.RTCIceCandidate;
+}
diff --git a/browser/extensions/webcompat/injections/js/1997575-perplexity.ai-covered-fixed-element.js b/browser/extensions/webcompat/injections/js/1997575-perplexity.ai-covered-fixed-element.js
index 5111951dafcb4..c0a265378a3d4 100644
--- a/browser/extensions/webcompat/injections/js/1997575-perplexity.ai-covered-fixed-element.js
+++ b/browser/extensions/webcompat/injections/js/1997575-perplexity.ai-covered-fixed-element.js
@@ -10,22 +10,27 @@
  * Dynamic toolbar in Firefox for Android is covering the input field in Perplexity.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1756970) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1756970", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "interactive-widget is being applied for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1997575 for details."
-);
+  console.info(
+    "interactive-widget is being applied for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1997575 for details."
+  );
 
-document.addEventListener("DOMContentLoaded", () => {
-  let metaViewport = document.querySelector("meta[name=viewport]");
-  if (!metaViewport) {
-    return;
-  }
-  let content = metaViewport.content;
-  if (!content.includes("interactive-widget")) {
-    metaViewport.setAttribute(
-      "content",
-      content + ",interactive-widget=resizes-content"
-    );
-  }
-});
+  document.addEventListener("DOMContentLoaded", () => {
+    let metaViewport = document.querySelector("meta[name=viewport]");
+    if (!metaViewport) {
+      return;
+    }
+    let content = metaViewport.content;
+    if (!content.includes("interactive-widget")) {
+      metaViewport.setAttribute(
+        "content",
+        content + ",interactive-widget=resizes-content"
+      );
+    }
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1287715-littlealchemy2.com-fix-audio-race-condition.js b/browser/extensions/webcompat/injections/js/bug1287715-littlealchemy2.com-fix-audio-race-condition.js
index a12c7b6c2590d..7e7f08ab51e5a 100644
--- a/browser/extensions/webcompat/injections/js/bug1287715-littlealchemy2.com-fix-audio-race-condition.js
+++ b/browser/extensions/webcompat/injections/js/bug1287715-littlealchemy2.com-fix-audio-race-condition.js
@@ -12,52 +12,57 @@
  * for the event is attached. We can mimic that behavior here.
  */
 
-/* globals exportFunction */
-
-console.info(
-  "loadedmetadata event is being deferred until GAME_READY. See https://bugzilla.mozilla.org/show_bug.cgi?id=1287715 for details."
-);
-
-let loadedmetadataEvent;
-let loadedmetadataListener;
-
-const { prototype } = window.wrappedJSObject.EventTarget;
-const { addEventListener, dispatchEvent } = prototype;
-
-Object.defineProperty(prototype, "addEventListener", {
-  value: exportFunction(function (type, listener, cfg) {
-    if (type?.toLowerCase() === "loadedmetadata") {
-      loadedmetadataListener = listener;
-      return addEventListener.call(
-        this,
-        type,
-        exportFunction(e => {
-          loadedmetadataEvent = e;
-        }, window),
-        cfg
-      );
-    }
-    return addEventListener.call(this, type, listener, cfg);
-  }, window),
-});
-
-Object.defineProperty(prototype, "dispatchEvent", {
-  value: exportFunction(function (e) {
-    if (
-      e?.type === "GAME_READY" &&
-      loadedmetadataEvent &&
-      loadedmetadataListener
-    ) {
-      try {
-        (loadedmetadataListener?.handleEvent ?? loadedmetadataListener)(
-          loadedmetadataEvent
+if (!window.__firefoxWebCompatFixBug1287715) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1287715", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "loadedmetadata event is being deferred until GAME_READY. See https://bugzilla.mozilla.org/show_bug.cgi?id=1287715 for details."
+  );
+
+  let loadedmetadataEvent;
+  let loadedmetadataListener;
+
+  const { prototype } = EventTarget;
+  const { addEventListener, dispatchEvent } = prototype;
+
+  Object.defineProperty(prototype, "addEventListener", {
+    value(type, listener, cfg) {
+      if (type?.toLowerCase() === "loadedmetadata") {
+        loadedmetadataListener = listener;
+        return addEventListener.call(
+          this,
+          type,
+          e => {
+            loadedmetadataEvent = e;
+          },
+          cfg
         );
-      } catch (_) {
-        console.trace(_);
       }
-      loadedmetadataListener = undefined;
-      loadedmetadataEvent = undefined;
-    }
-    return dispatchEvent.call(this, e);
-  }, window),
-});
+      return addEventListener.call(this, type, listener, cfg);
+    },
+  });
+
+  Object.defineProperty(prototype, "dispatchEvent", {
+    value(e) {
+      if (
+        e?.type === "GAME_READY" &&
+        loadedmetadataEvent &&
+        loadedmetadataListener
+      ) {
+        try {
+          (loadedmetadataListener?.handleEvent ?? loadedmetadataListener)(
+            loadedmetadataEvent
+          );
+        } catch (_) {
+          console.trace(_);
+        }
+        loadedmetadataListener = undefined;
+        loadedmetadataEvent = undefined;
+      }
+      return dispatchEvent.call(this, e);
+    },
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1448747-fastclick-shim.js b/browser/extensions/webcompat/injections/js/bug1448747-fastclick-shim.js
index 5fe3fc2646dac..0e90aad25256e 100644
--- a/browser/extensions/webcompat/injections/js/bug1448747-fastclick-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1448747-fastclick-shim.js
@@ -13,20 +13,26 @@
  * by the library (mainly non-functioning drop-down lists).
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixFastclick) {
+  Object.defineProperty(window, "__firefoxWebCompatFixFastclick", {
+    configurable: false,
+    value: true,
+  });
 
-(function () {
-  const proto = (window.CSSStyleProperties ?? window.CSS2Properties).prototype
-    .wrappedJSObject;
+  console.info(
+    "FastClick is being disabled for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1448747 for details."
+  );
+
+  const proto = (window.CSSStyleProperties ?? window.CSS2Properties).prototype;
   const descriptor = Object.getOwnPropertyDescriptor(proto, "touchAction");
   const { get } = descriptor;
 
-  descriptor.get = exportFunction(function () {
+  descriptor.get = function () {
     if (new Error().stack?.includes("notNeeded")) {
       return "none";
     }
     return get.call(this);
-  }, window);
+  };
 
   Object.defineProperty(proto, "touchAction", descriptor);
-})();
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1457335-histography.io-ua-change.js b/browser/extensions/webcompat/injections/js/bug1457335-histography.io-ua-change.js
index 0415e077f77eb..3397539da8c29 100644
--- a/browser/extensions/webcompat/injections/js/bug1457335-histography.io-ua-change.js
+++ b/browser/extensions/webcompat/injections/js/bug1457335-histography.io-ua-change.js
@@ -13,20 +13,20 @@
  * values appropriately so we get recognized as Chrome.
  */
 
-/* globals exportFunction */
+if (!navigator.userAgent.includes("Chrome for WebCompat")) {
+  console.info(
+    "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1457335 for details."
+  );
 
-console.info(
-  "The user agent has been overridden for compatibility reasons. See https://webcompat.com/issues/1804 for details."
-);
+  const CHROME_UA = navigator.userAgent + " Chrome for WebCompat";
 
-const CHROME_UA = navigator.userAgent + " Chrome for WebCompat";
+  const nav = Object.getPrototypeOf(navigator);
 
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
 
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => CHROME_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
-
-const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
-vendor.get = exportFunction(() => "Google Inc.", window);
-Object.defineProperty(nav, "vendor", vendor);
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1472075-bankofamerica.com-ua-change.js b/browser/extensions/webcompat/injections/js/bug1472075-bankofamerica.com-ua-change.js
index d892242ef5888..d16ac61814cc4 100644
--- a/browser/extensions/webcompat/injections/js/bug1472075-bankofamerica.com-ua-change.js
+++ b/browser/extensions/webcompat/injections/js/bug1472075-bankofamerica.com-ua-change.js
@@ -14,11 +14,9 @@
  * as Firefox on Windows in those cases.
  */
 
-/* globals exportFunction */
-
 if (!navigator.platform.includes("Win")) {
   console.info(
-    "The user agent has been overridden for compatibility reasons. See https://webcompat.com/issues/2787 for details."
+    "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1472075 for details."
   );
 
   const WINDOWS_UA = navigator.userAgent.replace(
@@ -26,17 +24,17 @@ if (!navigator.platform.includes("Win")) {
     "(Windows NT 10.0; Win64; x64; rv:"
   );
 
-  const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
+  const nav = Object.getPrototypeOf(navigator);
 
   const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-  ua.get = exportFunction(() => WINDOWS_UA, window);
+  ua.get = () => WINDOWS_UA;
   Object.defineProperty(nav, "userAgent", ua);
 
   const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
-  appVersion.get = exportFunction(() => "appVersion", window);
+  appVersion.get = () => "appVersion";
   Object.defineProperty(nav, "appVersion", appVersion);
 
   const platform = Object.getOwnPropertyDescriptor(nav, "platform");
-  platform.get = exportFunction(() => "Win64", window);
+  platform.get = () => "Win64";
   Object.defineProperty(nav, "platform", platform);
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js b/browser/extensions/webcompat/injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js
index 65462ae05d8e1..c649285db09ac 100644
--- a/browser/extensions/webcompat/injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js
+++ b/browser/extensions/webcompat/injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js
@@ -12,23 +12,23 @@
  * Disabling worker to match Chrome behavior fixes the issue
  */
 
-/* globals exportFunction */
-
-console.info(
-  "window.PDFJS.disableWorker has been set to true for compatibility reasons. See https://webcompat.com/issues/39057 for details."
-);
-
-let globals = {};
-
-Object.defineProperty(window.wrappedJSObject, "PDFJS", {
-  configurable: true,
-
-  get: exportFunction(function () {
-    return globals;
-  }, window),
-
-  set: exportFunction(function (value = {}) {
-    globals = value;
-    globals.disableWorker = true;
-  }, window),
-});
+if (!window.PDFJS) {
+  console.info(
+    "window.PDFJS.disableWorker has been set to true for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1579159 for details."
+  );
+
+  let globals = {};
+
+  Object.defineProperty(window, "PDFJS", {
+    configurable: true,
+
+    get() {
+      return globals;
+    },
+
+    set(value = {}) {
+      globals = value;
+      globals.disableWorker = true;
+    },
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1724868-news.yahoo.co.jp-ua-override.js b/browser/extensions/webcompat/injections/js/bug1724868-news.yahoo.co.jp-ua-override.js
index 12bb6b8b0659c..77a4a1f0dae8b 100644
--- a/browser/extensions/webcompat/injections/js/bug1724868-news.yahoo.co.jp-ua-override.js
+++ b/browser/extensions/webcompat/injections/js/bug1724868-news.yahoo.co.jp-ua-override.js
@@ -14,10 +14,60 @@
  * content script allows playing the videos.
  */
 
-/* globals exportFunction, UAHelpers */
+if (!navigator.userAgent.includes("Chrome")) {
+  console.info(
+    "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1724868 for details."
+  );
 
-console.info(
-  "The user agent has been overridden for compatibility reasons. See https://webcompat.com/issues/82605 for details."
-);
+  const nav = Object.getPrototypeOf(navigator);
 
-UAHelpers.overrideWithDeviceAppropriateChromeUA({ OS: "nonLinux" });
+  const version = "143.0.0.0";
+  const userAgent = navigator.userAgent;
+  let osSegment = "Windows NT 11.0; Win64; x64";
+  if (userAgent.includes("Android")) {
+    const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+    const device = userAgent.includes("Mobile")
+      ? "Nexus 5 Build/MRA58N"
+      : "Nexus 7 Build/JSS15Q";
+    osSegment = `Linux; ${androidVer}; ${device}`;
+  } else {
+    // Linux
+    const brands = [
+      {
+        brand: "Not/A)Brand",
+        version: "8",
+      },
+      {
+        brand: "Chromium",
+        version,
+      },
+      {
+        brand: "Google Chrome",
+        version,
+      },
+    ];
+
+    const userAgentData = {
+      brands,
+      mobile: false,
+      platform: "Windows",
+      getHighEntropyValues() {
+        return Promise.resolve({
+          brands,
+          mobile: false,
+          platform: "Windows",
+        });
+      },
+    };
+
+    Object.defineProperty(nav, "userAgentData", {
+      get: () => userAgentData,
+      set: () => {},
+    });
+  }
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`;
+
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1739489-draftjs-beforeinput.js b/browser/extensions/webcompat/injections/js/bug1739489-draftjs-beforeinput.js
index 2b489dc29d5b3..7d8869574afc4 100644
--- a/browser/extensions/webcompat/injections/js/bug1739489-draftjs-beforeinput.js
+++ b/browser/extensions/webcompat/injections/js/bug1739489-draftjs-beforeinput.js
@@ -8,33 +8,33 @@
  * Bug 1739489 - Entering an emoji using the MacOS IME "crashes" Draft.js editors.
  */
 
-/* globals exportFunction */
+if (!window.TextEvent) {
+  console.info(
+    "textInput event has been remapped to beforeinput for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1739489 for details."
+  );
 
-console.info(
-  "textInput event has been remapped to beforeinput for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1739489 for details."
-);
+  window.TextEvent = window.InputEvent;
 
-window.wrappedJSObject.TextEvent = window.wrappedJSObject.InputEvent;
+  const { CustomEvent, Event, EventTarget } = window;
+  var Remapped = [
+    [CustomEvent, "constructor"],
+    [Event, "constructor"],
+    [Event, "initEvent"],
+    [EventTarget, "addEventListener"],
+    [EventTarget, "removeEventListener"],
+  ];
 
-const { CustomEvent, Event, EventTarget } = window.wrappedJSObject;
-var Remapped = [
-  [CustomEvent, "constructor"],
-  [Event, "constructor"],
-  [Event, "initEvent"],
-  [EventTarget, "addEventListener"],
-  [EventTarget, "removeEventListener"],
-];
-
-for (const [obj, name] of Remapped) {
-  const { prototype } = obj;
-  const orig = prototype[name];
-  Object.defineProperty(prototype, name, {
-    configurable: true,
-    value: exportFunction(function (type, b, c, d) {
-      if (type?.toLowerCase() === "textinput") {
-        type = "beforeinput";
-      }
-      return orig.call(this, type, b, c, d);
-    }, window),
-  });
+  for (const [obj, name] of Remapped) {
+    const { prototype } = obj;
+    const orig = prototype[name];
+    Object.defineProperty(prototype, name, {
+      configurable: true,
+      value(type, b, c, d) {
+        if (type?.toLowerCase() === "textinput") {
+          type = "beforeinput";
+        }
+        return orig.call(this, type, b, c, d);
+      },
+    });
+  }
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js b/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js
index a28bd9bbb8c7c..0fc408f4bc8dc 100644
--- a/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1769762-tiktok.com-plugins-shim.js
@@ -18,15 +18,15 @@
  * (note that the first 2 are still broken if you open devtools even with this intervention)
  */
 
-/* globals exportFunction */
+if (navigator.plugins.length) {
+  console.info(
+    "The PluginArray has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1753874 for details."
+  );
 
-console.info(
-  "The PluginArray has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1753874 for details."
-);
-
-const pluginsArray = new window.wrappedJSObject.Array();
-Object.setPrototypeOf(pluginsArray, PluginArray.prototype);
-const navProto = Object.getPrototypeOf(navigator.wrappedJSObject);
-const pluginsDesc = Object.getOwnPropertyDescriptor(navProto, "plugins");
-pluginsDesc.get = exportFunction(() => pluginsArray, window);
-Object.defineProperty(navProto, "plugins", pluginsDesc);
+  const pluginsArray = [];
+  Object.setPrototypeOf(pluginsArray, PluginArray.prototype);
+  const navProto = Object.getPrototypeOf(navigator);
+  const pluginsDesc = Object.getOwnPropertyDescriptor(navProto, "plugins");
+  pluginsDesc.get = () => pluginsArray;
+  Object.defineProperty(navProto, "plugins", pluginsDesc);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1774005-installtrigger-shim.js b/browser/extensions/webcompat/injections/js/bug1774005-installtrigger-shim.js
index 8f4bd07305dd7..aa40b613752aa 100644
--- a/browser/extensions/webcompat/injections/js/bug1774005-installtrigger-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1774005-installtrigger-shim.js
@@ -12,11 +12,11 @@
  * be applied to multiple domains, see bug 1774005 for more information.
  */
 
-/* globals exportFunction */
+if (!window.InstallTrigger) {
+  console.info(
+    "window.InstallTrigger has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1774005 for details."
+  );
 
-console.info(
-  "The InstallTrigger has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1774005 for details."
-);
-
-window.wrappedJSObject.InstallTrigger =
-  "This property has been shimmed for Web Compatibility reasons.";
+  window.InstallTrigger =
+    "This property has been shimmed for Web Compatibility reasons.";
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1799968-www.samsung.com-appVersion-linux-fix.js b/browser/extensions/webcompat/injections/js/bug1799968-www.samsung.com-appVersion-linux-fix.js
index eddad3a6a0a87..8e5615c61855f 100644
--- a/browser/extensions/webcompat/injections/js/bug1799968-www.samsung.com-appVersion-linux-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1799968-www.samsung.com-appVersion-linux-fix.js
@@ -17,13 +17,13 @@
  * only meant to be applied on Linux or Android.
  */
 
-/* globals exportFunction */
+if (!navigator.appVersion.includes("Linux")) {
+  console.info(
+    "navigator.appVersion has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1799968 for details."
+  );
 
-console.info(
-  "navigator.appVersion has been shimmed for compatibility reasons. See https://webcompat.com/issues/108993 for details."
-);
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
-appVersion.get = exportFunction(() => "5.0 (Linux)", window);
-Object.defineProperty(nav, "appVersion", appVersion);
+  const nav = Object.getPrototypeOf(navigator);
+  const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
+  appVersion.get = () => "5.0 (Linux)";
+  Object.defineProperty(nav, "appVersion", appVersion);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1799980-healow.com-infinite-loop-fix.js b/browser/extensions/webcompat/injections/js/bug1799980-healow.com-infinite-loop-fix.js
index 191e97dec1132..111070553a902 100644
--- a/browser/extensions/webcompat/injections/js/bug1799980-healow.com-infinite-loop-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1799980-healow.com-infinite-loop-fix.js
@@ -26,12 +26,16 @@
  * See https://bugzilla.mozilla.org/show_bug.cgi?id=1799980 for details.
  */
 
-/* globals exportFunction */
+if (!window.ajaxRequestProcessing) {
+  console.info(
+    "window.ajaxRequetProcessing has been modified for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1799980 for details."
+  );
 
-Object.defineProperty(window.wrappedJSObject, "ajaxRequestProcessing", {
-  get: exportFunction(function () {
-    return false;
-  }, window),
+  Object.defineProperty(window, "ajaxRequestProcessing", {
+    get() {
+      return false;
+    },
 
-  set: exportFunction(function () {}, window),
-});
+    set() {},
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1815733-outlook365-clipboard-read-noop.js b/browser/extensions/webcompat/injections/js/bug1815733-outlook365-clipboard-read-noop.js
index 393b438682620..9929127990442 100644
--- a/browser/extensions/webcompat/injections/js/bug1815733-outlook365-clipboard-read-noop.js
+++ b/browser/extensions/webcompat/injections/js/bug1815733-outlook365-clipboard-read-noop.js
@@ -13,17 +13,20 @@
  * annoying.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1815733) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1815733", {
+    configurable: false,
+    value: true,
+  });
 
-Object.defineProperty(navigator.clipboard.wrappedJSObject, "read", {
-  configurable: true,
-  value: exportFunction(function () {
-    return new Promise((resolve, _) => {
-      console.log(
-        "clipboard.read() has been overwriten with a no-op. See https://bugzilla.mozilla.org/show_bug.cgi?id=1815733#c13 for details."
-      );
+  console.info(
+    "navigator.clipboard.read() has been overridden with a no-op. See https://bugzilla.mozilla.org/show_bug.cgi?id=1815733#c13 for details."
+  );
 
-      resolve();
-    });
-  }, navigator.clipboard),
-});
+  Object.defineProperty(navigator.clipboard, "read", {
+    configurable: true,
+    value() {
+      return Promise.resolve();
+    },
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1818818-fastclick-legacy-shim.js b/browser/extensions/webcompat/injections/js/bug1818818-fastclick-legacy-shim.js
index e8756261b7c94..b331bf5fec496 100644
--- a/browser/extensions/webcompat/injections/js/bug1818818-fastclick-legacy-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1818818-fastclick-legacy-shim.js
@@ -12,9 +12,14 @@
  * by the library.
  */
 
-/* globals exportFunction */
+if (
+  !(window.CSSStyleProperties ?? window.CSS2Properties).prototype.msTouchAction
+) {
+  const bug = location.origin.includes("wellcare") ? "1818818" : "1944004";
+  console.info(
+    `FastClick is being disabled for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=${bug} for details.`
+  );
 
-(
-  window.CSSStyleProperties ?? window.CSS2Properties
-).prototype.wrappedJSObject.msTouchAction =
-  window.wrappedJSObject.String("none");
+  (window.CSSStyleProperties ?? window.CSS2Properties).prototype.msTouchAction =
+    "none";
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1819450-cmbchina.com-ua-change.js b/browser/extensions/webcompat/injections/js/bug1819450-cmbchina.com-ua-change.js
index 12293ca990bdd..90dddbab7e281 100644
--- a/browser/extensions/webcompat/injections/js/bug1819450-cmbchina.com-ua-change.js
+++ b/browser/extensions/webcompat/injections/js/bug1819450-cmbchina.com-ua-change.js
@@ -12,16 +12,16 @@
  * to bypass the detection of mobile browser.
  */
 
-/* globals exportFunction */
+if (!navigator.userAgent.includes("SAMSUNG")) {
+  console.info(
+    "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1081239 for details."
+  );
 
-console.info(
-  "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1081239 for details."
-);
+  const MODIFIED_UA = navigator.userAgent + " SAMSUNG";
 
-const MODIFIED_UA = navigator.userAgent + " SAMSUNG";
+  const nav = Object.getPrototypeOf(navigator);
 
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => MODIFIED_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => MODIFIED_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1819678-free4talk.com-window-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1819678-free4talk.com-window-chrome-shim.js
index eb922f7f42580..07ef78fad1d66 100644
--- a/browser/extensions/webcompat/injections/js/bug1819678-free4talk.com-window-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1819678-free4talk.com-window-chrome-shim.js
@@ -10,10 +10,10 @@
  * This site is checking for window.chrome, so let's spoof that.
  */
 
-/* globals exportFunction */
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been shimmed for compatibility reasons. See https://github.com/webcompat/web-bugs/issues/77727 for details."
+  );
 
-console.info(
-  "window.chrome has been shimmed for compatibility reasons. See https://github.com/webcompat/web-bugs/issues/77727 for details."
-);
-
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1831007-nintendo-window-OnetrustActiveGroups.js b/browser/extensions/webcompat/injections/js/bug1831007-nintendo-window-OnetrustActiveGroups.js
index f733575390187..f740618ce8a74 100644
--- a/browser/extensions/webcompat/injections/js/bug1831007-nintendo-window-OnetrustActiveGroups.js
+++ b/browser/extensions/webcompat/injections/js/bug1831007-nintendo-window-OnetrustActiveGroups.js
@@ -15,10 +15,10 @@
  * the value to be overwritten at any time.
  */
 
-/* globals exportFunction */
+if (typeof OnetrustActiveGroups === "undefined") {
+  console.info(
+    "The window.OnetrustActiveGroups property has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1831007 for details."
+  );
 
-console.info(
-  "The window.OnetrustActiveGroups property has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1831007 for details."
-);
-
-window.wrappedJSObject.OnetrustActiveGroups = "";
+  window.OnetrustActiveGroups = "";
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1841730-www.korg.com-fix-broken-page-loads.js b/browser/extensions/webcompat/injections/js/bug1841730-www.korg.com-fix-broken-page-loads.js
index 838a2e627f88b..8bb0653d72103 100644
--- a/browser/extensions/webcompat/injections/js/bug1841730-www.korg.com-fix-broken-page-loads.js
+++ b/browser/extensions/webcompat/injections/js/bug1841730-www.korg.com-fix-broken-page-loads.js
@@ -12,6 +12,10 @@
  * This is the fix suggested at https://github.com/CodeByZach/pace/issues/510
  */
 
-/* globals cloneInto */
+if (!window.paceOptions) {
+  console.info(
+    "PACE options are being modified for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1841730 for details."
+  );
 
-window.wrappedJSObject.paceOptions = cloneInto({ eventLag: false }, window);
+  window.paceOptions = { eventLag: false };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1842437-www.youtube.com-performance-now-precision.js b/browser/extensions/webcompat/injections/js/bug1842437-www.youtube.com-performance-now-precision.js
index 797b53c7bbb4b..be68ff252eb71 100644
--- a/browser/extensions/webcompat/injections/js/bug1842437-www.youtube.com-performance-now-precision.js
+++ b/browser/extensions/webcompat/injections/js/bug1842437-www.youtube.com-performance-now-precision.js
@@ -13,24 +13,29 @@
  * get the same result helped with resolving the issue.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1756970) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1756970", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "performance.now precision has been modified for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1756970 for details."
-);
+  console.info(
+    "performance.now precision has been modified for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1756970 for details."
+  );
 
-let counter = 0;
-let previousVal = 0;
+  let counter = 0;
+  let previousVal = 0;
 
-const perf = Object.getPrototypeOf(performance.wrappedJSObject);
-const now = perf.now;
-perf.now = exportFunction(function () {
-  let originalVal = now.call(this);
-  if (originalVal === previousVal) {
-    originalVal += 0.00000003 * ++counter;
-  } else {
-    previousVal = originalVal;
-    counter = 0;
-  }
-  return originalVal;
-}, window);
+  const perf = Object.getPrototypeOf(performance);
+  const now = perf.now;
+  perf.now = function () {
+    let originalVal = now.call(this);
+    if (originalVal === previousVal) {
+      originalVal += 0.00000003 * ++counter;
+    } else {
+      previousVal = originalVal;
+      counter = 0;
+    }
+    return originalVal;
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1846742-microsoft.com-search-key-fix.js b/browser/extensions/webcompat/injections/js/bug1846742-microsoft.com-search-key-fix.js
index 807e32d39d928..458d3dc3f0500 100644
--- a/browser/extensions/webcompat/injections/js/bug1846742-microsoft.com-search-key-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1846742-microsoft.com-search-key-fix.js
@@ -12,12 +12,19 @@
  * click the element as a work-around.
  */
 
-console.info(
-  "A simulated click is issued on search suggestions when enter is pressed on them for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1846742 for details."
-);
+if (!window.__firefoxWebCompatFixBug1846742) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1846742", {
+    configurable: false,
+    value: true,
+  });
 
-document.addEventListener("keydown", ({ target, key }) => {
-  if (key == "Enter" && target.matches(".m-auto-suggest a.f-product")) {
-    target.click();
-  }
-});
+  console.info(
+    "A simulated click is issued on search suggestions when enter is pressed on them for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1846742 for details."
+  );
+
+  document.addEventListener("keydown", ({ target, key }) => {
+    if (key == "Enter" && target.matches(".m-auto-suggest a.f-product")) {
+      target.click();
+    }
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1847971-ebay.com-barcode-scanner.js b/browser/extensions/webcompat/injections/js/bug1847971-ebay.com-barcode-scanner.js
index b43aa132570f7..97f5c189e46c1 100644
--- a/browser/extensions/webcompat/injections/js/bug1847971-ebay.com-barcode-scanner.js
+++ b/browser/extensions/webcompat/injections/js/bug1847971-ebay.com-barcode-scanner.js
@@ -13,52 +13,52 @@
  * entirely, we carefully change `barcodeEnabled` from `false` to `true`.
  */
 
-/* globals exportFunction */
+if (!window.$feprelist_C) {
+  const ENABLED_MESSAGE =
+    "The barcode scanner feature has been force-enabled. See https://bugzilla.mozilla.org/show_bug.cgi?id=1847971 for details.";
 
-const ENABLED_MESSAGE =
-  "The barcode scanner feature has been force-enabled. See https://bugzilla.mozilla.org/show_bug.cgi?id=1847971 for details.";
+  let value = undefined;
 
-let value = undefined;
-
-function check(obj) {
-  if (obj === null) {
-    return false;
-  }
-  if (Array.isArray(obj)) {
-    for (const v of obj) {
-      if (check(v)) {
-        return true;
-      }
+  function check(obj) {
+    if (obj === null) {
+      return false;
     }
-    return false;
-  }
-  if (typeof obj === "object") {
-    if ("barcodeEnabled" in obj) {
-      obj.barcodeEnabled = true;
-      return true;
+    if (Array.isArray(obj)) {
+      for (const v of obj) {
+        if (check(v)) {
+          return true;
+        }
+      }
+      return false;
     }
-    for (const v of Object.values(obj)) {
-      if (check(v)) {
+    if (typeof obj === "object") {
+      if ("barcodeEnabled" in obj) {
+        obj.barcodeEnabled = true;
         return true;
       }
+      for (const v of Object.values(obj)) {
+        if (check(v)) {
+          return true;
+        }
+      }
     }
+    return false;
   }
-  return false;
-}
 
-Object.defineProperty(window.wrappedJSObject, "$feprelist_C", {
-  configurable: true,
+  Object.defineProperty(window, "$feprelist_C", {
+    configurable: true,
 
-  get: exportFunction(function () {
-    return value;
-  }, window),
+    get() {
+      return value;
+    },
 
-  set: exportFunction(function (v) {
-    try {
-      if (check(v)) {
-        console.info(ENABLED_MESSAGE);
-      }
-    } catch (_) {}
-    value = v;
-  }, window),
-});
+    set(v) {
+      try {
+        if (check(v)) {
+          console.info(ENABLED_MESSAGE);
+        }
+      } catch (_) {}
+      value = v;
+    },
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1850998-chaturbate.com.js b/browser/extensions/webcompat/injections/js/bug1850998-chaturbate.com.js
index 03bf9708b1328..18f78f0b09fe6 100644
--- a/browser/extensions/webcompat/injections/js/bug1850998-chaturbate.com.js
+++ b/browser/extensions/webcompat/injections/js/bug1850998-chaturbate.com.js
@@ -11,17 +11,22 @@
  * this by pretending to not be Firefox for that specific check.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1850998) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1850998", {
+    configurable: false,
+    value: true,
+  });
 
-const proto = window.wrappedJSObject.RegExp.prototype;
-const descriptor = Object.getOwnPropertyDescriptor(proto, "test");
-const { value } = descriptor;
+  const proto = window.RegExp.prototype;
+  const descriptor = Object.getOwnPropertyDescriptor(proto, "test");
+  const { value } = descriptor;
 
-descriptor.value = exportFunction(function (test) {
-  if (this.source === "UCBrowser|Firefox|SamsungBrowser") {
-    return false;
-  }
-  return value.call(this, test);
-}, window);
+  descriptor.value = function (test) {
+    if (this.source === "UCBrowser|Firefox|SamsungBrowser") {
+      return false;
+    }
+    return value.call(this, test);
+  };
 
-Object.defineProperty(proto, "test", descriptor);
+  Object.defineProperty(proto, "test", descriptor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js b/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js
index 0f856895e6bfb..9bdd4f48e4ff5 100644
--- a/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js
+++ b/browser/extensions/webcompat/injections/js/bug1855014-eksiseyler.com.js
@@ -12,10 +12,10 @@
  * window.loggingEnabled = false
  */
 
-/* globals exportFunction */
+if (typeof loggingEnabled == "undefined") {
+  console.info(
+    "loggingEnabled been set to true for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1855014 for details."
+  );
 
-console.info(
-  "loggingEnabled been set to true for compatibility reasons. See https://webcompat.com/issues/77221 for details."
-);
-
-window.wrappedJSObject.loggingEnabled = false;
+  window.loggingEnabled = false;
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1859617-installtrigger-removal-shim.js b/browser/extensions/webcompat/injections/js/bug1859617-installtrigger-removal-shim.js
index 0505df1d3c2a0..d2cda5757105e 100644
--- a/browser/extensions/webcompat/injections/js/bug1859617-installtrigger-removal-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1859617-installtrigger-removal-shim.js
@@ -10,12 +10,10 @@
  * This interventions shims window.InstallTrigger to undefine it.
  */
 
-/* globals exportFunction */
-
 if (typeof window.InstallTrigger !== "undefined") {
   console.info(
     "window.InstallTrigger has been undefined for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1859617 for details."
   );
 
-  delete window.wrappedJSObject.InstallTrigger;
+  delete window.InstallTrigger;
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1878024-g1.globo.com-fix-account-icon.js b/browser/extensions/webcompat/injections/js/bug1878024-g1.globo.com-fix-account-icon.js
index a814e778fad7d..8253443c8cb3f 100644
--- a/browser/extensions/webcompat/injections/js/bug1878024-g1.globo.com-fix-account-icon.js
+++ b/browser/extensions/webcompat/injections/js/bug1878024-g1.globo.com-fix-account-icon.js
@@ -11,23 +11,26 @@
  * This works around the issue by adding CSS to the relevant web component.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1878024) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1878024", {
+    configurable: false,
+    value: true,
+  });
 
-const ENABLED_MESSAGE =
-  "Extra CSS to fix account icons is being applied to the nova-barra-globocom web component. See https://bugzilla.mozilla.org/show_bug.cgi?id=1878024 for details.";
+  const ENABLED_MESSAGE =
+    "Extra CSS to fix account icons is being applied to the nova-barra-globocom web component. See https://bugzilla.mozilla.org/show_bug.cgi?id=1878024 for details.";
 
-const { appendChild } = DocumentFragment.prototype.wrappedJSObject;
+  const { appendChild } = DocumentFragment.prototype;
 
-ShadowRoot.wrappedJSObject.prototype.appendChild = exportFunction(function (
-  child
-) {
-  if (this.host?.localName === "nova-barra-globocom") {
-    const style = child.querySelector("style");
-    if (style) {
-      console.info(ENABLED_MESSAGE);
-      style.textContent = `${style.textContent} .base-container .button-login-icon img { flex-shrink: 0; }`;
+  ShadowRoot.prototype.appendChild = function (child) {
+    if (this.host?.localName === "nova-barra-globocom") {
+      const style = child.querySelector("style");
+      if (style) {
+        console.info(ENABLED_MESSAGE);
+        style.textContent = `${style.textContent} .base-container .button-login-icon img { flex-shrink: 0; }`;
+      }
+      delete ShadowRoot.prototype.appendChild;
     }
-    delete ShadowRoot.wrappedJSObject.prototype.appendChild;
-  }
-  return appendChild.call(this, child);
-}, window);
+    return appendChild.call(this, child);
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1889326-office365-email-handling-prompt-autohide.js b/browser/extensions/webcompat/injections/js/bug1889326-office365-email-handling-prompt-autohide.js
index 4f840c291e0b3..11ebed105dabb 100644
--- a/browser/extensions/webcompat/injections/js/bug1889326-office365-email-handling-prompt-autohide.js
+++ b/browser/extensions/webcompat/injections/js/bug1889326-office365-email-handling-prompt-autohide.js
@@ -5,30 +5,35 @@
 "use strict";
 
 /**
- * Bug 1889326 - Office 365 email handling prompt autohide
+ * Bug 1709653 - Office 365 email handling prompt autohide
  *
  * This site patch prevents the notification bar on Office 365
  * apps from popping up on each page-load, offering to handle
  * email with Outlook.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1709653) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1709653", {
+    configurable: false,
+    value: true,
+  });
 
-const warning =
-  "Office 365 Outlook email handling prompt has been hidden. See https://bugzilla.mozilla.org/show_bug.cgi?id=1889326 for details.";
+  const warning =
+    "Office 365 Outlook email handling prompt has been hidden. See https://bugzilla.mozilla.org/show_bug.cgi?id=1709653 for details.";
 
-const localStorageKey = "mailProtocolHandlerAlreadyOffered";
+  const localStorageKey = "mailProtocolHandlerAlreadyOffered";
 
-const proto = Object.getPrototypeOf(navigator).wrappedJSObject;
-const { registerProtocolHandler } = proto;
-const { localStorage } = window.wrappedJSObject;
+  const proto = Object.getPrototypeOf(navigator);
+  const { registerProtocolHandler } = proto;
+  const { localStorage } = window;
 
-proto.registerProtocolHandler = exportFunction(function (scheme, url, title) {
-  if (localStorage.getItem(localStorageKey)) {
-    console.info(warning);
+  proto.registerProtocolHandler = function (scheme, url, title) {
+    if (localStorage.getItem(localStorageKey)) {
+      console.info(warning);
+      return undefined;
+    }
+    registerProtocolHandler.call(this, scheme, url, title);
+    localStorage.setItem(localStorageKey, true);
     return undefined;
-  }
-  registerProtocolHandler.call(this, scheme, url, title);
-  localStorage.setItem(localStorageKey, true);
-  return undefined;
-}, window);
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1889505-bankmandiri.co.id-window.chrome.js b/browser/extensions/webcompat/injections/js/bug1889505-bankmandiri.co.id-window.chrome.js
index c8601af76f253..a3dee2773e781 100644
--- a/browser/extensions/webcompat/injections/js/bug1889505-bankmandiri.co.id-window.chrome.js
+++ b/browser/extensions/webcompat/injections/js/bug1889505-bankmandiri.co.id-window.chrome.js
@@ -10,8 +10,10 @@
  * WebCompat issue #67924 - https://webcompat.com/issues/67924
  */
 
-console.info(
-  "window.chrome has been set to an empty object for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1889505 for details."
-);
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been set to an empty object for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1889505 for details."
+  );
 
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1898929-app.sessionlinkpro.com-spoof-user-agent.js b/browser/extensions/webcompat/injections/js/bug1898929-app.sessionlinkpro.com-spoof-user-agent.js
index a3c560c6100dc..c3153b9d45187 100644
--- a/browser/extensions/webcompat/injections/js/bug1898929-app.sessionlinkpro.com-spoof-user-agent.js
+++ b/browser/extensions/webcompat/injections/js/bug1898929-app.sessionlinkpro.com-spoof-user-agent.js
@@ -10,16 +10,30 @@
  * This site is checking for Chrome in navigator.userAgent and for window.chrome, so let's spoof those.
  */
 
-/* globals exportFunction, UAHelpers */
+if (!window.chrome) {
+  console.info(
+    "navigator.userAgent and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1898929 for details."
+  );
 
-console.info(
-  "navigator.userAgent and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1898929 for details."
-);
+  window.chrome = {};
 
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
+  const userAgent = navigator.userAgent;
+  let osSegment = "Windows NT 11.0; Win64; x64";
+  if (userAgent.includes("Android")) {
+    const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+    const device = userAgent.includes("Mobile")
+      ? "Nexus 5 Build/MRA58N"
+      : "Nexus 7 Build/JSS15Q";
+    osSegment = `Linux; ${androidVer}; ${device}`;
+  } else if (userAgent.includes("Macintosh")) {
+    osSegment = "Macintosh; Intel Mac OS X 10_15_7";
+  } else if (userAgent.includes("Linux")) {
+    osSegment = "X11; Ubuntu; Linux x86_64";
+  }
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
 
-const CHROME_UA = UAHelpers.addChrome();
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => CHROME_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
+  const nav = Object.getPrototypeOf(navigator);
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1898946-transcrib.io-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1898946-transcrib.io-chrome-shim.js
index 18e42ce00ec45..3707106d4af15 100644
--- a/browser/extensions/webcompat/injections/js/bug1898946-transcrib.io-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1898946-transcrib.io-chrome-shim.js
@@ -11,26 +11,20 @@
  * so let's set appropriate values to also look like Chrome.
  */
 
-/* globals exportFunction */
+if (!navigator.userAgent.includes("Chrome")) {
+  console.info(
+    "The user agent and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898946 for details."
+  );
 
-console.info(
-  "The user agent and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898946 for details."
-);
+  const CHROME_UA = navigator.userAgent + " Chrome for WebCompat";
 
-const CHROME_UA = navigator.userAgent + " Chrome for WebCompat";
+  const nav = Object.getPrototypeOf(navigator);
 
-Object.defineProperty(window.navigator.wrappedJSObject, "userAgent", {
-  get: exportFunction(function () {
-    return CHROME_UA;
-  }, window),
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
 
-  set: exportFunction(function () {}, window),
-});
-
-Object.defineProperty(window.navigator.wrappedJSObject, "vendor", {
-  get: exportFunction(function () {
-    return "Google Inc.";
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1898951-hexagame.io-prevent-unsupported-alert.js b/browser/extensions/webcompat/injections/js/bug1898951-hexagame.io-prevent-unsupported-alert.js
index b6d35e3a880fa..5d87775d2a3d7 100644
--- a/browser/extensions/webcompat/injections/js/bug1898951-hexagame.io-prevent-unsupported-alert.js
+++ b/browser/extensions/webcompat/injections/js/bug1898951-hexagame.io-prevent-unsupported-alert.js
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* globals exportFunction */
-
 "use strict";
 
 /**
@@ -12,13 +10,20 @@
  * WebCompat issue #120035 - https://webcompat.com/issues/120035
  */
 
-console.info(
-  "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898951 for details."
-);
+if (!window.__firefoxWebCompatFixBug1898951) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1898951", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898951 for details."
+  );
 
-const originalAlert = window.wrappedJSObject.alert;
-window.wrappedJSObject.alert = exportFunction(function (msg) {
-  if (!msg?.toLowerCase?.().includes("chrome")) {
-    originalAlert(msg);
-  }
-}, window);
+  const { alert } = window;
+  window.alert = function (msg) {
+    if (!msg?.toLowerCase?.().includes("chrome")) {
+      alert(msg);
+    }
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1898952-digits.t-mobile.com.js b/browser/extensions/webcompat/injections/js/bug1898952-digits.t-mobile.com.js
index bbb84a37abc6a..018a6fca86cfb 100644
--- a/browser/extensions/webcompat/injections/js/bug1898952-digits.t-mobile.com.js
+++ b/browser/extensions/webcompat/injections/js/bug1898952-digits.t-mobile.com.js
@@ -11,11 +11,9 @@
  * The site blocks Firefox and Safari, reading info from userAgentData.
  */
 
-/* globals exportFunction, cloneInto */
-
 if (!navigator.userAgentData) {
   console.info(
-    "navigator.userAgentData has been overridden for compatibility reasons. See https://webcompat.com/issues/119767 for details."
+    "navigator.userAgentData has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898952 for details."
   );
 
   const ua = navigator.userAgent;
@@ -49,20 +47,9 @@ if (!navigator.userAgentData) {
     },
   ];
 
-  const userAgentData = cloneInto(
-    {
-      brands,
-      mobile,
-      platform,
-    },
-    window
-  );
-
-  Object.defineProperty(window.navigator.wrappedJSObject, "userAgentData", {
-    get: exportFunction(function () {
-      return userAgentData;
-    }, window),
-
-    set: exportFunction(function () {}, window),
-  });
+  navigator.userAgentData = {
+    brands,
+    mobile,
+    platform,
+  };
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1898983-elibrary.ferc.gov-window-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1898983-elibrary.ferc.gov-window-chrome-shim.js
index 5dc09f9dcfa1f..58b7a1a4eb22c 100644
--- a/browser/extensions/webcompat/injections/js/bug1898983-elibrary.ferc.gov-window-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1898983-elibrary.ferc.gov-window-chrome-shim.js
@@ -10,10 +10,10 @@
  * The site is checking for window.chrome, so let's spoof that.
  */
 
-/* globals exportFunction */
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1898983 for details."
+  );
 
-console.info(
-  "window.chrome has been shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1898983 for details."
-);
-
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1898996-oculus.com-chrome-shims.js b/browser/extensions/webcompat/injections/js/bug1898996-oculus.com-chrome-shims.js
index e99de77772e5e..2d73a7ed92e88 100644
--- a/browser/extensions/webcompat/injections/js/bug1898996-oculus.com-chrome-shims.js
+++ b/browser/extensions/webcompat/injections/js/bug1898996-oculus.com-chrome-shims.js
@@ -10,24 +10,15 @@
  * This site is checking for window.chrome and navigator.vendor, so let's spoof those.
  */
 
-/* globals exportFunction */
-
-console.info(
-  "window.chrome and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898996 for details."
-);
-
-Object.defineProperty(window.wrappedJSObject, "chrome", {
-  get: exportFunction(function () {
-    return true;
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
-
-Object.defineProperty(window.navigator.wrappedJSObject, "vendor", {
-  get: exportFunction(function () {
-    return "Google Inc.";
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
+if (!window.chrome) {
+  console.info(
+    "window.chrome and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1898996 for details."
+  );
+
+  window.chrome = {};
+
+  const nav = Object.getPrototypeOf(navigator);
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1901780-disable-legacy-mutation-events.js b/browser/extensions/webcompat/injections/js/bug1901780-disable-legacy-mutation-events.js
index 7eafa15b53319..cdb8caeaf4281 100644
--- a/browser/extensions/webcompat/injections/js/bug1901780-disable-legacy-mutation-events.js
+++ b/browser/extensions/webcompat/injections/js/bug1901780-disable-legacy-mutation-events.js
@@ -8,13 +8,16 @@
  * Bugs 1901780 - Disable legacy DOM Mutation Events to prevent performance issues.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1901780) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1901780", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "DOM Mutation Events have been disabled to prevent performance issues. See https://bugzilla.mozilla.org/show_bug.cgi?id=1901780 for details."
-);
+  console.info(
+    "DOM Mutation Events have been disabled to prevent performance issues. See https://bugzilla.mozilla.org/show_bug.cgi?id=1901780 for details."
+  );
 
-(function disableMutationEvents() {
   const whichEvents = [
     "domattrmodified",
     "domcharacterdatamodified",
@@ -25,15 +28,15 @@ console.info(
     "domsubtreemodified",
   ];
 
-  const { prototype } = window.wrappedJSObject.EventTarget;
+  const { prototype } = window.EventTarget;
   const { addEventListener } = prototype;
   Object.defineProperty(prototype, "addEventListener", {
-    value: exportFunction(function (_type, b, c, d) {
+    value(_type, b, c, d) {
       const type = _type?.toLowerCase();
       if (whichEvents.includes(type)) {
         return undefined;
       }
       return addEventListener.call(this, type, b, c, d);
-    }, window),
+    },
   });
-})();
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1902379-adl.edu.tw-hide-unsupported-popup.js b/browser/extensions/webcompat/injections/js/bug1902379-adl.edu.tw-hide-unsupported-popup.js
index f36d6233fb1eb..848a8a0e6de6a 100644
--- a/browser/extensions/webcompat/injections/js/bug1902379-adl.edu.tw-hide-unsupported-popup.js
+++ b/browser/extensions/webcompat/injections/js/bug1902379-adl.edu.tw-hide-unsupported-popup.js
@@ -10,20 +10,32 @@
  * This site is checking for Chrome in navigator.userAgent and vendor, so let's spoof those.
  */
 
-/* globals exportFunction, UAHelpers */
-
-console.info(
-  "navigator.userAgent and navigator.platform are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1902379 for details."
-);
-
-const CHROME_UA = UAHelpers.addChrome();
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => CHROME_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
-
-const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
-vendor.get = exportFunction(() => "Google Inc.", window);
-Object.defineProperty(nav, "vendor", vendor);
+if (!navigator.userAgent.includes("Chrome")) {
+  console.info(
+    "navigator.userAgent and navigator.platform are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1902379 for details."
+  );
+
+  const nav = Object.getPrototypeOf(navigator);
+  const userAgent = navigator.userAgent;
+  let osSegment = "Windows NT 11.0; Win64; x64";
+  if (userAgent.includes("Android")) {
+    const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+    const device = userAgent.includes("Mobile")
+      ? "Nexus 5 Build/MRA58N"
+      : "Nexus 7 Build/JSS15Q";
+    osSegment = `Linux; ${androidVer}; ${device}`;
+  } else if (userAgent.includes("Macintosh")) {
+    osSegment = "Macintosh; Intel Mac OS X 10_15_7";
+  } else if (userAgent.includes("Linux")) {
+    osSegment = "X11; Ubuntu; Linux x86_64";
+  }
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
+
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1902406-sp.hi.co.kr-window-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1902406-sp.hi.co.kr-window-chrome-shim.js
index 184337ed425bf..6fd433151f893 100644
--- a/browser/extensions/webcompat/injections/js/bug1902406-sp.hi.co.kr-window-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1902406-sp.hi.co.kr-window-chrome-shim.js
@@ -10,16 +10,10 @@
  * This site is checking for window.chrome, so let's spoof that.
  */
 
-/* globals exportFunction */
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902406 for details."
+  );
 
-console.info(
-  "window.chrome has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902406 for details."
-);
-
-Object.defineProperty(window.wrappedJSObject, "chrome", {
-  get: exportFunction(function () {
-    return true;
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js b/browser/extensions/webcompat/injections/js/bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js
index 1b7f37087509d..6129805f59aea 100644
--- a/browser/extensions/webcompat/injections/js/bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js
+++ b/browser/extensions/webcompat/injections/js/bug1902407-www.sigadoc.mt.gov.br-user-agent-spoof.js
@@ -10,18 +10,30 @@
  * This site is checking for Chrome in navigator.userAgent and window.chrome, so let's spoof those.
  */
 
-/* globals exportFunction, UAHelpers */
-
-console.info(
-  "navigator.userAgent and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1902407 for details."
-);
-
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
-
-const CHROME_UA = UAHelpers.addChrome();
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => CHROME_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
+if (!window.chrome) {
+  console.info(
+    "navigator.userAgent and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1902407 for details."
+  );
+
+  window.chrome = {};
+
+  const userAgent = navigator.userAgent;
+  let osSegment = "Windows NT 11.0; Win64; x64";
+  if (userAgent.includes("Android")) {
+    const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+    const device = userAgent.includes("Mobile")
+      ? "Nexus 5 Build/MRA58N"
+      : "Nexus 7 Build/JSS15Q";
+    osSegment = `Linux; ${androidVer}; ${device}`;
+  } else if (userAgent.includes("Macintosh")) {
+    osSegment = "Macintosh; Intel Mac OS X 10_15_7";
+  } else if (userAgent.includes("Linux")) {
+    osSegment = "X11; Ubuntu; Linux x86_64";
+  }
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
+
+  const nav = Object.getPrototypeOf(navigator);
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1902416-www.acionafacil.com.br-prevent-unsupported-alert.js b/browser/extensions/webcompat/injections/js/bug1902416-www.acionafacil.com.br-prevent-unsupported-alert.js
index f01107a9b3080..6c233c0136b17 100644
--- a/browser/extensions/webcompat/injections/js/bug1902416-www.acionafacil.com.br-prevent-unsupported-alert.js
+++ b/browser/extensions/webcompat/injections/js/bug1902416-www.acionafacil.com.br-prevent-unsupported-alert.js
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* globals exportFunction */
-
 "use strict";
 
 /**
@@ -13,13 +11,20 @@
  * We can intercept the call to alert and hide it.
  */
 
-console.info(
-  "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902416 for details."
-);
+if (!window.__firefoxWebCompatFixBug1902416) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1902416", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902416 for details."
+  );
 
-const originalAlert = window.wrappedJSObject.alert;
-window.wrappedJSObject.alert = exportFunction(function (msg) {
-  if (!msg?.toLowerCase?.().includes("google chrome")) {
-    originalAlert(msg);
-  }
-}, window);
+  const originalAlert = window.alert;
+  window.alert = function (msg) {
+    if (!msg?.toLowerCase?.().includes("google chrome")) {
+      originalAlert(msg);
+    }
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1902419-www.jamsune.com-prevent-unsupported-alert.js b/browser/extensions/webcompat/injections/js/bug1902419-www.jamsune.com-prevent-unsupported-alert.js
index 69c9ee0809e92..755875159b8d8 100644
--- a/browser/extensions/webcompat/injections/js/bug1902419-www.jamsune.com-prevent-unsupported-alert.js
+++ b/browser/extensions/webcompat/injections/js/bug1902419-www.jamsune.com-prevent-unsupported-alert.js
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* globals exportFunction */
-
 "use strict";
 
 /**
@@ -11,13 +9,20 @@
  * Bug #1902419 - https://bugzilla.mozilla.org/show_bug.cgi?id=1902419
  */
 
-console.info(
-  "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902419 for details."
-);
+if (!window.__firefoxWebCompatFixBug1902419) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1902419", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1902419 for details."
+  );
 
-const originalAlert = window.wrappedJSObject.alert;
-window.wrappedJSObject.alert = exportFunction(function (msg) {
-  if (!msg?.toLowerCase?.().includes("크롬")) {
-    originalAlert(msg);
-  }
-}, window);
+  const originalAlert = window.alert;
+  window.alert = function (msg) {
+    if (!msg?.toLowerCase?.().includes("크롬")) {
+      originalAlert(msg);
+    }
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1903480-ace7.acecombat.jp-slow-down-scrolling.js b/browser/extensions/webcompat/injections/js/bug1903480-ace7.acecombat.jp-slow-down-scrolling.js
index ea862d66068a3..ae161fa706b1e 100644
--- a/browser/extensions/webcompat/injections/js/bug1903480-ace7.acecombat.jp-slow-down-scrolling.js
+++ b/browser/extensions/webcompat/injections/js/bug1903480-ace7.acecombat.jp-slow-down-scrolling.js
@@ -11,19 +11,24 @@
  * on Firefox. We can undo that here.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1903480) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1903480", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "wheel events are being scaled down for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1903480 for details."
-);
+  console.info(
+    "wheel events are being scaled down for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1903480 for details."
+  );
 
-const proto = window.wrappedJSObject.WheelEvent.prototype;
-const descriptor = Object.getOwnPropertyDescriptor(proto, "deltaY");
-const { get } = descriptor;
+  const proto = WheelEvent.prototype;
+  const descriptor = Object.getOwnPropertyDescriptor(proto, "deltaY");
+  const { get } = descriptor;
 
-descriptor.get = exportFunction(function () {
-  const value = get.call(this);
-  return value / 30;
-}, window);
+  descriptor.get = function () {
+    const value = get.call(this);
+    return value / 30;
+  };
 
-Object.defineProperty(proto, "deltaY", descriptor);
+  Object.defineProperty(proto, "deltaY", descriptor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1904952-idserver.servizicie.interno.gov.it-spoof-as-chrome.js b/browser/extensions/webcompat/injections/js/bug1904952-idserver.servizicie.interno.gov.it-spoof-as-chrome.js
index 6d767569def32..8e4153b8e5547 100644
--- a/browser/extensions/webcompat/injections/js/bug1904952-idserver.servizicie.interno.gov.it-spoof-as-chrome.js
+++ b/browser/extensions/webcompat/injections/js/bug1904952-idserver.servizicie.interno.gov.it-spoof-as-chrome.js
@@ -10,22 +10,28 @@
  * This site is checking for Chrome in navigator.userAgent, navigatorvendor and window.chrome, so let's spoof those.
  */
 
-/* globals exportFunction, UAHelpers */
-
-console.info(
-  "navigator.userAgent, navigator.platform and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1904952 for details."
-);
-
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
-
-const CHROME_UA = UAHelpers.addChrome();
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-
-const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
-ua.get = exportFunction(() => CHROME_UA, window);
-Object.defineProperty(nav, "userAgent", ua);
-
-const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
-vendor.get = exportFunction(() => "Google Inc.", window);
-Object.defineProperty(nav, "vendor", vendor);
+if (!window.chrome) {
+  console.info(
+    "navigator.userAgent, navigator.platform and window.chrome are being shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1904952 for details."
+  );
+
+  window.chrome = {};
+
+  const userAgent = navigator.userAgent;
+  const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+  const device = userAgent.includes("Mobile")
+    ? "Nexus 5 Build/MRA58N"
+    : "Nexus 7 Build/JSS15Q";
+  const osSegment = `Linux; ${androidVer}; ${device}`;
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
+
+  const nav = Object.getPrototypeOf(navigator);
+
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1905069-one.geekie.com.br-chrome-shims.js b/browser/extensions/webcompat/injections/js/bug1905069-one.geekie.com.br-chrome-shims.js
index 9e36e89507594..73a0f59e3c241 100644
--- a/browser/extensions/webcompat/injections/js/bug1905069-one.geekie.com.br-chrome-shims.js
+++ b/browser/extensions/webcompat/injections/js/bug1905069-one.geekie.com.br-chrome-shims.js
@@ -10,24 +10,15 @@
  * This site is checking for window.chrome and navigator.vendor, so let's spoof those.
  */
 
-/* globals exportFunction */
-
-console.info(
-  "window.chrome and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1905069 for details."
-);
-
-Object.defineProperty(window.wrappedJSObject, "chrome", {
-  get: exportFunction(function () {
-    return true;
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
-
-Object.defineProperty(window.navigator.wrappedJSObject, "vendor", {
-  get: exportFunction(function () {
-    return "Google Inc.";
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
+if (!window.chrome) {
+  console.info(
+    "window.chrome and navigator.vendor have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1905069 for details."
+  );
+
+  window.chrome = {};
+
+  const nav = Object.getPrototypeOf(navigator);
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1911423-app.powerbi.com-emulate-mousewheel-events.js b/browser/extensions/webcompat/injections/js/bug1911423-app.powerbi.com-emulate-mousewheel-events.js
index 47c42f3f4e2cc..673ab5a9ac6ed 100644
--- a/browser/extensions/webcompat/injections/js/bug1911423-app.powerbi.com-emulate-mousewheel-events.js
+++ b/browser/extensions/webcompat/injections/js/bug1911423-app.powerbi.com-emulate-mousewheel-events.js
@@ -4,8 +4,6 @@
 
 "use strict";
 
-/* globals exportFunction */
-
 /**
  * Bug 1911423 - app.powerbi.com - zooming is broken on maps
  *
@@ -13,26 +11,28 @@
  * which breaks zooming. This emulates mousewheel events for them.
  */
 
-console.info(
-  "Emulating mousewheel events for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1911423 for details."
-);
+if (!window.__firefoxWebCompatFixBug1911423) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1911423", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "Emulating mousewheel events for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1911423 for details."
+  );
 
-(function () {
-  const { prototype } = window.wrappedJSObject.WheelEvent;
-  Object.defineProperty(prototype, "type", {
+  Object.defineProperty(window.WheelEvent.prototype, "type", {
     configurable: true,
-    get: exportFunction(() => "mousewheel", window),
-    set: exportFunction(() => {}, window),
+    get: () => "mousewheel",
+    set: () => {},
   });
-})();
 
-(function () {
-  const { prototype } = window.wrappedJSObject.EventTarget;
+  const { prototype } = window.EventTarget;
   const { addEventListener } = prototype;
-  prototype.addEventListener = exportFunction(function (type, fn, c, d) {
+  prototype.addEventListener = function (type, fn, c, d) {
     if (type === "mousewheel") {
       type = "wheel";
     }
     return addEventListener.call(this, type, fn, c, d);
-  }, window);
-})();
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1913599-shim-createencodedstreams.js b/browser/extensions/webcompat/injections/js/bug1913599-shim-createencodedstreams.js
index c5b6b941fd42c..f86a0f7d9a724 100644
--- a/browser/extensions/webcompat/injections/js/bug1913599-shim-createencodedstreams.js
+++ b/browser/extensions/webcompat/injections/js/bug1913599-shim-createencodedstreams.js
@@ -21,16 +21,13 @@
  * worker-based API directly for optimal performance in Firefox.
  */
 
-/* globals exportFunction, cloneInto */
+if (!window.RTCRtpSender.prototype.createEncodedStreams) {
+  console.info(
+    "createEncodedStreams() is being shimmed for compatibility reasons. Please consider updating to the RTCRtpScriptTransform API for optimal performance! See https://bugzil.la/1913599 for details."
+  );
 
-console.info(
-  "createEncodedStreams() is being shimmed for compatibility reasons. Please consider updating to the RTCRtpScriptTransform API for optimal performance! See https://bugzil.la/1913599 for details."
-);
-
-const win = window.wrappedJSObject;
-if (!win.RTCRtpSender.prototype.createEncodedStreams) {
-  win.RTCRtpSender.prototype.createEncodedStreams =
-    win.RTCRtpReceiver.prototype.createEncodedStreams = exportFunction(
+  window.RTCRtpSender.prototype.createEncodedStreams =
+    window.RTCRtpReceiver.prototype.createEncodedStreams =
       function createEncodedStreams() {
         let onrtctransform; // appease linter
         function work() {
@@ -77,16 +74,9 @@ if (!win.RTCRtpSender.prototype.createEncodedStreams) {
         haveData
           .then(({ writable }) => writableNow.readable.pipeTo(writable))
           .catch(e => writableNow.readable.cancel(e));
-
-        const result = new win.Object();
-        result.readable = cloneInto(readableNow.readable, window, {
-          wrapReflectors: true,
-        });
-        result.writable = cloneInto(writableNow.writable, window, {
-          wrapReflectors: true,
-        });
-        return result;
-      },
-      window
-    );
+        return {
+          readable: readableNow.readable,
+          writable: writableNow.writable,
+        };
+      };
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1919263-nbcsports.com-getCurrentUser-script-error-fix.js b/browser/extensions/webcompat/injections/js/bug1919263-nbcsports.com-getCurrentUser-script-error-fix.js
index b901fc9266156..642de2641d4f8 100644
--- a/browser/extensions/webcompat/injections/js/bug1919263-nbcsports.com-getCurrentUser-script-error-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1919263-nbcsports.com-getCurrentUser-script-error-fix.js
@@ -12,19 +12,24 @@
  * can prevent this by changing async to false when they try to load mparticle.js.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1919263) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1919263", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "mparticle.js is being kept from loading async. See https://bugzilla.mozilla.org/show_bug.cgi?id=1919263 for details."
-);
+  console.info(
+    "mparticle.js is being kept from loading async. See https://bugzilla.mozilla.org/show_bug.cgi?id=1919263 for details."
+  );
 
-const { prototype } = HTMLScriptElement.wrappedJSObject;
-const desc = Object.getOwnPropertyDescriptor(prototype, "src");
-const origSet = desc.set;
-desc.set = exportFunction(function (url) {
-  if (url?.includes("mparticle.js")) {
-    this.async = false;
-  }
-  return origSet.call(this, url);
-}, window);
-Object.defineProperty(prototype, "src", desc);
+  const { prototype } = HTMLScriptElement;
+  const desc = Object.getOwnPropertyDescriptor(prototype, "src");
+  const origSet = desc.set;
+  desc.set = function (url) {
+    if (url?.includes("mparticle.js")) {
+      this.async = false;
+    }
+    return origSet.call(this, url);
+  };
+  Object.defineProperty(prototype, "src", desc);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1922498-www.ilgeniodellapizza.com-fix-broken-scrolling.js b/browser/extensions/webcompat/injections/js/bug1922498-www.ilgeniodellapizza.com-fix-broken-scrolling.js
index 924549fffd1e8..2131c6c930a6c 100644
--- a/browser/extensions/webcompat/injections/js/bug1922498-www.ilgeniodellapizza.com-fix-broken-scrolling.js
+++ b/browser/extensions/webcompat/injections/js/bug1922498-www.ilgeniodellapizza.com-fix-broken-scrolling.js
@@ -11,19 +11,24 @@
  * We can override the value to flip the sign and scale down the value.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1922498) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1922498", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "wheelDeltaY is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1922498 for details."
-);
+  console.info(
+    "wheelDeltaY is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1922498 for details."
+  );
 
-const proto = window.wrappedJSObject.WheelEvent.prototype;
-const descriptor = Object.getOwnPropertyDescriptor(proto, "wheelDeltaY");
-const { get } = descriptor;
+  const proto = window.WheelEvent.prototype;
+  const descriptor = Object.getOwnPropertyDescriptor(proto, "wheelDeltaY");
+  const { get } = descriptor;
 
-descriptor.get = exportFunction(function () {
-  const value = get.call(this);
-  return -value / 40;
-}, window);
+  descriptor.get = function () {
+    const value = get.call(this);
+    return -value / 40;
+  };
 
-Object.defineProperty(proto, "wheelDeltaY", descriptor);
+  Object.defineProperty(proto, "wheelDeltaY", descriptor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1927121-southerndevilhd.com-shim-WebkitMutationObserver.js b/browser/extensions/webcompat/injections/js/bug1927121-southerndevilhd.com-shim-WebkitMutationObserver.js
index f0876c50cd25d..5cc0eab23336d 100644
--- a/browser/extensions/webcompat/injections/js/bug1927121-southerndevilhd.com-shim-WebkitMutationObserver.js
+++ b/browser/extensions/webcompat/injections/js/bug1927121-southerndevilhd.com-shim-WebkitMutationObserver.js
@@ -11,11 +11,10 @@
  * which we can simply alias to MutationObserver.
  */
 
-/* globals exportFunction */
+if (!window.WebKitMutationObserver) {
+  console.info(
+    "WebKitMutationObserver has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1927121 for details."
+  );
 
-console.info(
-  "WebKitMutationObserver has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1927121 for details."
-);
-
-window.wrappedJSObject.WebKitMutationObserver =
-  window.wrappedJSObject.MutationObserver;
+  window.WebKitMutationObserver = window.MutationObserver;
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1927984-modules.sms-timing.com-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1927984-modules.sms-timing.com-chrome-shim.js
index 24317d812cc41..560aa55d58f2b 100644
--- a/browser/extensions/webcompat/injections/js/bug1927984-modules.sms-timing.com-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1927984-modules.sms-timing.com-chrome-shim.js
@@ -10,16 +10,10 @@
  * This site is checking for window.chrome, so let's spoof that.
  */
 
-/* globals exportFunction */
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1927984 for details."
+  );
 
-console.info(
-  "window.chrome has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1927984 for details."
-);
-
-Object.defineProperty(window.wrappedJSObject, "chrome", {
-  get: exportFunction(function () {
-    return true;
-  }, window),
-
-  set: exportFunction(function () {}, window),
-});
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1928941-oasis.decart.ai-window-chrome-shim.js b/browser/extensions/webcompat/injections/js/bug1928941-oasis.decart.ai-window-chrome-shim.js
index 61f8b4d34eae7..c40e3dfbd4401 100644
--- a/browser/extensions/webcompat/injections/js/bug1928941-oasis.decart.ai-window-chrome-shim.js
+++ b/browser/extensions/webcompat/injections/js/bug1928941-oasis.decart.ai-window-chrome-shim.js
@@ -10,10 +10,10 @@
  * This sites is checking for window.chrome, so let's spoof that.
  */
 
-/* globals exportFunction */
+if (!window.chrome) {
+  console.info(
+    "window.chrome has been shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1928941 for details."
+  );
 
-console.info(
-  "window.chrome has been shimmed for compatibility reasons. https://bugzilla.mozilla.org/show_bug.cgi?id=1928941 for details."
-);
-
-window.wrappedJSObject.chrome = new window.wrappedJSObject.Object();
+  window.chrome = {};
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1930440-online.singaporepools.com-prevent-unsupported-alert.js b/browser/extensions/webcompat/injections/js/bug1930440-online.singaporepools.com-prevent-unsupported-alert.js
index 6879d0d696c90..50c14799d7c22 100644
--- a/browser/extensions/webcompat/injections/js/bug1930440-online.singaporepools.com-prevent-unsupported-alert.js
+++ b/browser/extensions/webcompat/injections/js/bug1930440-online.singaporepools.com-prevent-unsupported-alert.js
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* globals exportFunction */
-
 "use strict";
 
 /**
@@ -15,31 +13,38 @@
  * additional in-page support message that they show to all browsers.
  */
 
-console.info(
-  "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1923286 for details."
-);
+if (!window.__firefoxWebCompatFixBug1923286) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1923286", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "window.alert is being overriden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1923286 for details."
+  );
 
-new MutationObserver(mutations => {
-  for (let { addedNodes } of mutations) {
-    for (const node of addedNodes) {
-      try {
-        if (
-          node.matches(".alert.views-row") &&
-          node.innerText.includes("Chrome")
-        ) {
-          node.remove();
-        }
-      } catch (_) {}
+  new MutationObserver(mutations => {
+    for (let { addedNodes } of mutations) {
+      for (const node of addedNodes) {
+        try {
+          if (
+            node.matches(".alert.views-row") &&
+            node.innerText.includes("Chrome")
+          ) {
+            node.remove();
+          }
+        } catch (_) {}
+      }
     }
-  }
-}).observe(document.documentElement, {
-  childList: true,
-  subtree: true,
-});
+  }).observe(document.documentElement, {
+    childList: true,
+    subtree: true,
+  });
 
-const originalAlert = window.wrappedJSObject.alert;
-window.wrappedJSObject.alert = exportFunction(function (msg) {
-  if (!msg?.toLowerCase?.().includes("unsupported browser")) {
-    originalAlert(msg);
-  }
-}, window);
+  const originalAlert = window.alert;
+  window.alert = function (msg) {
+    if (!msg?.toLowerCase?.().includes("unsupported browser")) {
+      originalAlert(msg);
+    }
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1934908-www.cbsnews.com-ua-override.js b/browser/extensions/webcompat/injections/js/bug1934908-www.cbsnews.com-ua-override.js
index a99d4a21cc3c3..0befb1d8c3e50 100644
--- a/browser/extensions/webcompat/injections/js/bug1934908-www.cbsnews.com-ua-override.js
+++ b/browser/extensions/webcompat/injections/js/bug1934908-www.cbsnews.com-ua-override.js
@@ -13,13 +13,26 @@
  * how media.hls.enabled is configured.
  */
 
-/* globals exportFunction, UAHelpers */
-console.info(
-  "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1934908 for details."
-);
+if (!navigator.userAgent.includes("Chrome")) {
+  console.info(
+    "The user agent has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1934908 for details."
+  );
 
-UAHelpers.overrideWithDeviceAppropriateChromeUA();
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const vendorDesc = Object.getOwnPropertyDescriptor(nav, "vendor");
-vendorDesc.get = exportFunction(() => "Google Inc.", window);
-Object.defineProperty(nav, "vendor", vendorDesc);
+  const userAgent = navigator.userAgent;
+  const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+  const device = userAgent.includes("Mobile")
+    ? "Nexus 5 Build/MRA58N"
+    : "Nexus 7 Build/JSS15Q";
+  const osSegment = `Linux; ${androidVer}; ${device}`;
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
+
+  const nav = Object.getPrototypeOf(navigator);
+
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1939248-rosasthai.com-load-event-helper.js b/browser/extensions/webcompat/injections/js/bug1939248-rosasthai.com-load-event-helper.js
index e1d52aead4ea9..54d7cb8d81049 100644
--- a/browser/extensions/webcompat/injections/js/bug1939248-rosasthai.com-load-event-helper.js
+++ b/browser/extensions/webcompat/injections/js/bug1939248-rosasthai.com-load-event-helper.js
@@ -14,16 +14,19 @@
  * readyState is already "complete", which fixes this bug.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1756970) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1756970", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "running late window load listeners for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1939248 for details."
-);
+  console.info(
+    "running late window load listeners for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1939248 for details."
+  );
 
-(function runLateWindowLoadEventListenersImmediately() {
-  const { prototype } = window.wrappedJSObject.EventTarget;
+  const { prototype } = window.EventTarget;
   const { addEventListener } = prototype;
-  prototype.addEventListener = exportFunction(function (type, b, c, d) {
+  prototype.addEventListener = function (type, b, c, d) {
     if (
       this !== window ||
       document?.readyState !== "complete" ||
@@ -38,5 +41,5 @@ console.info(
       console.error(e);
     }
     return undefined;
-  }, window);
-})();
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1943898-www.capital.gr-suppress-constant-reloading.js b/browser/extensions/webcompat/injections/js/bug1943898-www.capital.gr-suppress-constant-reloading.js
index c00b66aed808a..f854fd90aefe8 100644
--- a/browser/extensions/webcompat/injections/js/bug1943898-www.capital.gr-suppress-constant-reloading.js
+++ b/browser/extensions/webcompat/injections/js/bug1943898-www.capital.gr-suppress-constant-reloading.js
@@ -14,19 +14,24 @@
  * We fix this by clearing the form element as they check it the first time.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1943898) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1943898", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "setTimeout has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1943898 for details."
-);
+  console.info(
+    "setTimeout has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1943898 for details."
+  );
 
-window.wrappedJSObject.setTimeout = exportFunction(function (fn, time) {
-  const text = "" + fn;
-  if (
-    text.includes("var el = document.getElementById('alwaysFetch');") &&
-    text.includes("el.value = el.value ? location.reload() : true;")
-  ) {
-    document.getElementById("alwaysFetch").value = "";
-  }
-  return window.setTimeout(fn, time);
-}, window);
+  window.setTimeout = function (fn, time) {
+    const text = "" + fn;
+    if (
+      text.includes("var el = document.getElementById('alwaysFetch');") &&
+      text.includes("el.value = el.value ? location.reload() : true;")
+    ) {
+      document.getElementById("alwaysFetch").value = "";
+    }
+    return window.setTimeout(fn, time);
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1945019-order.mealkeyway.com-prevent-unsupported-message.js b/browser/extensions/webcompat/injections/js/bug1945019-order.mealkeyway.com-prevent-unsupported-message.js
index a12c85fa4c56a..acc717b6f2d5d 100644
--- a/browser/extensions/webcompat/injections/js/bug1945019-order.mealkeyway.com-prevent-unsupported-message.js
+++ b/browser/extensions/webcompat/injections/js/bug1945019-order.mealkeyway.com-prevent-unsupported-message.js
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* globals exportFunction */
-
 "use strict";
 
 /**
@@ -13,19 +11,26 @@
  * We can automatically hide the message for users.
  */
 
-console.info(
-  "Web compatibility fixes are in effect. See https://bugzilla.mozilla.org/show_bug.cgi?id=1923286 for details."
-);
+if (!window.__firefoxWebCompatFixBug1923286) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1923286", {
+    configurable: false,
+    value: true,
+  });
+
+  console.info(
+    "Web compatibility fixes are in effect. See https://bugzilla.mozilla.org/show_bug.cgi?id=1923286 for details."
+  );
 
-const timer = setInterval(() => {
-  for (const node of document.querySelectorAll(
-    "[class*=customMiniPrompt_customPromptContent]"
-  )) {
-    if (node.innerText.includes("Chrome")) {
-      node.parentElement
-        .querySelector("[class*=customMiniPrompt_iconAdd]")
-        ?.click();
-      clearInterval(timer);
+  const timer = setInterval(() => {
+    for (const node of document.querySelectorAll(
+      "[class*=customMiniPrompt_customPromptContent]"
+    )) {
+      if (node.innerText.includes("Chrome")) {
+        node.parentElement
+          .querySelector("[class*=customMiniPrompt_iconAdd]")
+          ?.click();
+        clearInterval(timer);
+      }
     }
-  }
-}, 100);
+  }, 100);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js b/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
index 08103f9080890..dc9ef00808486 100644
--- a/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
+++ b/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
@@ -10,62 +10,56 @@
  * This site is deliberately blocking Firefox, possibly due to bug 1992579.
  */
 
-/* globals cloneInto, exportFunction */
+if (!window.chrome) {
+  console.info(
+    "The window environment is being altered for compatibility reasons. If you're a web developer working on this site, please get in touch with developer-outreach@mozilla.com. See https://bugzilla.mozilla.org/show_bug.cgi?id=1950282 for details."
+  );
 
-console.info(
-  "The window environment is being altered for compatibility reasons. If you're a web developer working on this site, please get in touch with developer-outreach@mozilla.com. See https://bugzilla.mozilla.org/show_bug.cgi?id=1950282 for details."
-);
+  delete window.InstallTrigger;
+  delete window.mozInnerScreenX;
+  delete window.mozInnerScreenY;
+  delete window.MozConsentBanner;
 
-delete window.wrappedJSObject.InstallTrigger;
-delete window.wrappedJSObject.mozInnerScreenX;
-delete window.wrappedJSObject.mozInnerScreenY;
-delete window.wrappedJSObject.MozConsentBanner;
+  const nav = Object.getPrototypeOf(navigator);
+  const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
+  vendor.get = () => "Google Inc.";
+  Object.defineProperty(nav, "vendor", vendor);
 
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const vendor = Object.getOwnPropertyDescriptor(nav, "vendor");
-vendor.get = exportFunction(() => "Google Inc.", window);
-Object.defineProperty(nav, "vendor", vendor);
+  const supports = Object.getOwnPropertyDescriptor(CSS, "supports");
+  const oldSupports = supports.value;
+  supports.value = function (query) {
+    if (query.includes("moz-")) {
+      return false;
+    }
+    return oldSupports.call(this, query);
+  };
+  Object.defineProperty(CSS, "supports", supports);
 
-const css = CSS.wrappedJSObject;
-const supports = Object.getOwnPropertyDescriptor(css, "supports");
-const oldSupports = supports.value;
-supports.value = exportFunction(function (query) {
-  if (query.includes("moz-")) {
-    return false;
+  function generateTimeStamp(base, factor = 10) {
+    if (base) {
+      // increase another timestamp by a little
+      return (base + Math.random() * factor).toString().substr(0, 14);
+    }
+    const r = Math.random().toString();
+    const d10 = `1${r.substr(5, 9)}`;
+    const d3 = r.substr(2, 3);
+    return parseFloat(`${d10}.${d3}`);
   }
-  return oldSupports.call(this, query);
-}, window);
-Object.defineProperty(css, "supports", supports);
 
-function generateTimeStamp(base, factor = 10) {
-  if (base) {
-    // increase another timestamp by a little
-    return (base + Math.random() * factor).toString().substr(0, 14);
-  }
-  const r = Math.random().toString();
-  const d10 = `1${r.substr(5, 9)}`;
-  const d3 = r.substr(2, 3);
-  return parseFloat(`${d10}.${d3}`);
-}
+  const startLoadTime = generateTimeStamp();
+  const commitLoadTime = generateTimeStamp(startLoadTime);
+  const firstPaintTime = generateTimeStamp(commitLoadTime);
+  const finishDocumentLoadTime = generateTimeStamp(firstPaintTime);
+  const finishLoadTime = generateTimeStamp(finishDocumentLoadTime);
 
-const startLoadTime = generateTimeStamp();
-const commitLoadTime = generateTimeStamp(startLoadTime);
-const firstPaintTime = generateTimeStamp(commitLoadTime);
-const finishDocumentLoadTime = generateTimeStamp(firstPaintTime);
-const finishLoadTime = generateTimeStamp(finishDocumentLoadTime);
-
-const csi = cloneInto(
-  {
+  const csi = {
     onloadT: parseInt(finishDocumentLoadTime * 100),
     pageT: generateTimeStamp().toString().substr(-11),
     startE: parseInt(parseFloat(startLoadTime * 100)),
     tran: 10 + parseInt(4 + Math.random() * 4),
-  },
-  window
-);
+  };
 
-const loadTimes = cloneInto(
-  {
+  const loadTimes = {
     commitLoadTime,
     connectionInfo: "h3",
     finishDocumentLoadTime,
@@ -79,12 +73,9 @@ const loadTimes = cloneInto(
     wasAlternateProtocolAvailable: false,
     wasFetchedViaSpdy: true,
     wasNpnNegotiated: true,
-  },
-  window
-);
+  };
 
-window.wrappedJSObject.chrome = cloneInto(
-  {
+  window.chrome = {
     app: {
       InstallState: {
         DISABLED: "disabled",
@@ -116,7 +107,5 @@ window.wrappedJSObject.chrome = cloneInto(
     loadTimes() {
       return loadTimes;
     },
-  },
-  window,
-  { cloneFunctions: true }
-);
+  };
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1950282-formula1.com-platform-linux-fix.js b/browser/extensions/webcompat/injections/js/bug1950282-formula1.com-platform-linux-fix.js
index b41aa64f0935d..cca078997f283 100644
--- a/browser/extensions/webcompat/injections/js/bug1950282-formula1.com-platform-linux-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1950282-formula1.com-platform-linux-fix.js
@@ -12,13 +12,13 @@
  * Overriding navigator.platform to Win64 on Linux works around this issue.
  */
 
-/* globals exportFunction */
+if (!navigator.platform.includes("Win64")) {
+  console.info(
+    "navigator.platform has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1950282 for details."
+  );
 
-console.info(
-  "navigator.platform has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1950282 for details."
-);
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const platform = Object.getOwnPropertyDescriptor(nav, "platform");
-platform.get = exportFunction(() => "Win64", window);
-Object.defineProperty(nav, "platform", platform);
+  const nav = Object.getPrototypeOf(navigator);
+  const platform = Object.getOwnPropertyDescriptor(nav, "platform");
+  platform.get = () => "Win64";
+  Object.defineProperty(nav, "platform", platform);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1956165-www.youtube.com-picture-in-picture-fix.js b/browser/extensions/webcompat/injections/js/bug1956165-www.youtube.com-picture-in-picture-fix.js
index a0dea19d31ce2..34571e96a74a5 100644
--- a/browser/extensions/webcompat/injections/js/bug1956165-www.youtube.com-picture-in-picture-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1956165-www.youtube.com-picture-in-picture-fix.js
@@ -11,73 +11,78 @@
  * effectively cancels it. We can work around this conflict with this site patch.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxPiPFix) {
+  Object.defineProperty(window, "__firefoxPiPFix", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "exitFullscreen and window.outerWidth|Height have been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1956165 for details."
-);
+  console.info(
+    "exitFullscreen and window.outerWidth|Height have been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1956165 for details."
+  );
 
-const win = window.wrappedJSObject;
-const outerWidthDesc = Object.getOwnPropertyDescriptor(win, "outerWidth");
-const outerHeightDesc = Object.getOwnPropertyDescriptor(win, "outerHeight");
-const originalOuterWidth = outerWidthDesc.get;
-const originalOuterHeight = outerHeightDesc.get;
+  const outerWidthDesc = Object.getOwnPropertyDescriptor(window, "outerWidth");
+  const outerHeightDesc = Object.getOwnPropertyDescriptor(
+    window,
+    "outerHeight"
+  );
+  const originalOuterWidth = outerWidthDesc.get;
+  const originalOuterHeight = outerHeightDesc.get;
 
-// This is the logic YouTube uses to detect the app backgrounding to enter picture in picture mode mode (as of May 28 2025).
+  // This is the logic YouTube uses to detect the app backgrounding to enter picture in picture mode mode (as of May 28 2025).
 
-const getRatio = (() => {
-  let cachedRatio;
-  return function () {
-    if (cachedRatio === undefined) {
-      const cfg = window.wrappedJSObject.ytcfg.get(
-        "WEB_PLAYER_CONTEXT_CONFIGS"
-      );
-      const experiment =
-        cfg?.WEB_PLAYER_CONTEXT_CONFIG_ID_MWEB_WATCH?.serializedExperimentFlags?.match(
-          /html5_picture_in_picture_logging_onresize_ratio=(\d+(\.\d+)?)/
-        )?.[1];
-      cachedRatio = parseFloat(experiment) || 0.33;
+  const getRatio = (() => {
+    let cachedRatio;
+    return function () {
+      if (cachedRatio === undefined) {
+        const cfg = window.ytcfg.get("WEB_PLAYER_CONTEXT_CONFIGS");
+        const experiment =
+          cfg?.WEB_PLAYER_CONTEXT_CONFIG_ID_MWEB_WATCH?.serializedExperimentFlags?.match(
+            /html5_picture_in_picture_logging_onresize_ratio=(\d+(\.\d+)?)/
+          )?.[1];
+        cachedRatio = parseFloat(experiment) || 0.33;
+      }
+      return cachedRatio;
+    };
+  })();
+
+  const inPipMode = (() => {
+    let o_ = 0;
+    return function () {
+      const l = window.screen.width * window.screen.height;
+      const M = originalOuterWidth() * originalOuterHeight();
+      o_ = Math.max(o_, l, M);
+      return M / o_ < getRatio();
+    };
+  })();
+
+  outerWidthDesc.get = function () {
+    if (inPipMode()) {
+      return screen.width;
     }
-    return cachedRatio;
+    return originalOuterWidth();
   };
-})();
-
-const inPipMode = (() => {
-  let o_ = 0;
-  return function () {
-    const l = window.screen.width * window.screen.height;
-    const M = originalOuterWidth() * originalOuterHeight();
-    o_ = Math.max(o_, l, M);
-    return M / o_ < getRatio();
+  outerHeightDesc.get = () => {
+    if (inPipMode()) {
+      return screen.height;
+    }
+    return originalOuterHeight();
   };
-})();
+  Object.defineProperty(window, "outerWidth", outerWidthDesc);
+  Object.defineProperty(window, "outerHeight", outerHeightDesc);
 
-outerWidthDesc.get = exportFunction(function () {
-  if (inPipMode()) {
-    return screen.width;
-  }
-  return originalOuterWidth();
-}, window);
-outerHeightDesc.get = exportFunction(() => {
-  if (inPipMode()) {
-    return screen.height;
-  }
-  return originalOuterHeight();
-}, window);
-Object.defineProperty(win, "outerWidth", outerWidthDesc);
-Object.defineProperty(win, "outerHeight", outerHeightDesc);
+  const originalExitFullscreen = window.Document.prototype.exitFullscreen;
 
-const originalExitFullscreen = win.Document.prototype.exitFullscreen;
-
-const newExitFullscreen = exportFunction(function () {
-  if (inPipMode()) {
-    return undefined;
-  }
-  return originalExitFullscreen.apply(this);
-}, window);
+  const newExitFullscreen = function () {
+    if (inPipMode()) {
+      return undefined;
+    }
+    return originalExitFullscreen.apply(this);
+  };
 
-Object.defineProperty(win.Document.prototype, "exitFullscreen", {
-  value: newExitFullscreen,
-  writable: true,
-  configurable: true,
-});
+  Object.defineProperty(window.Document.prototype, "exitFullscreen", {
+    value: newExitFullscreen,
+    writable: true,
+    configurable: true,
+  });
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1959598-www.signal-tech.com-round-pageYOffset.js b/browser/extensions/webcompat/injections/js/bug1959598-www.signal-tech.com-round-pageYOffset.js
index 4c1dfcfe2dd04..cdb0d1eb97859 100644
--- a/browser/extensions/webcompat/injections/js/bug1959598-www.signal-tech.com-round-pageYOffset.js
+++ b/browser/extensions/webcompat/injections/js/bug1959598-www.signal-tech.com-round-pageYOffset.js
@@ -10,12 +10,16 @@
  * The page's logic seems to rely on integer values being returned by window.pageYOffset.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1959598) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1959598", {
+    configurable: false,
+    value: true,
+  });
 
-const win = window.wrappedJSObject;
-const pyo = Object.getOwnPropertyDescriptor(win, "pageYOffset");
-const pyoGet = pyo.get;
-pyo.get = exportFunction(function () {
-  return Math.round(pyoGet.call(this));
-}, window);
-Object.defineProperty(win, "pageYOffset", pyo);
+  const pyo = Object.getOwnPropertyDescriptor(window, "pageYOffset");
+  const pyoGet = pyo.get;
+  pyo.get = function () {
+    return Math.round(pyoGet.call(this));
+  };
+  Object.defineProperty(window, "pageYOffset", pyo);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1963270-app.kosmi.io-unprefix-mozCaptureStream.js b/browser/extensions/webcompat/injections/js/bug1963270-app.kosmi.io-unprefix-mozCaptureStream.js
index d9cc6a873b280..f544d97853d8f 100644
--- a/browser/extensions/webcompat/injections/js/bug1963270-app.kosmi.io-unprefix-mozCaptureStream.js
+++ b/browser/extensions/webcompat/injections/js/bug1963270-app.kosmi.io-unprefix-mozCaptureStream.js
@@ -12,5 +12,11 @@
  * prefixed version (which it seems to work with, so we unprefix it here).
  */
 
-const { prototype } = HTMLMediaElement.wrappedJSObject;
-prototype.captureStream = prototype.mozCaptureStream;
+if (!HTMLMediaElement.captureStream) {
+  console.info(
+    "HTMLMediaElement.captureStream has been set to HTMLMediaElement.mozCaptureStream for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1963270 for details."
+  );
+
+  const { prototype } = HTMLMediaElement;
+  prototype.captureStream = prototype.mozCaptureStream;
+}
diff --git a/browser/extensions/webcompat/injections/js/bug196916-mpi.mb.ca-polyfill-getWeekInfo.js b/browser/extensions/webcompat/injections/js/bug196916-mpi.mb.ca-polyfill-getWeekInfo.js
index 9a839b84b4761..d024b0144dff2 100644
--- a/browser/extensions/webcompat/injections/js/bug196916-mpi.mb.ca-polyfill-getWeekInfo.js
+++ b/browser/extensions/webcompat/injections/js/bug196916-mpi.mb.ca-polyfill-getWeekInfo.js
@@ -8,15 +8,11 @@
  * Bug 1969165 - Polyfill getWeekInfo for mpi.mb.ca
  */
 
-/* globals exportFunction, cloneInto */
+if (!window.Intl.Locale.prototype.getWeekInfo) {
+  console.info(
+    "Intl.Locale.getWeekInfo is being polyfilled for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1969165 for details."
+  );
 
-console.info(
-  "Intl.Locale.getWeekInfo is being polyfilled for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1969165 for details."
-);
-
-const { prototype } = window.wrappedJSObject.Intl.Locale;
-
-if (!prototype.getWeekInfo) {
   const weekInfoData = {
     aa: { firstDay: 7, weekend: [6, 7], minimalDays: 1 },
     "aa-DJ": { firstDay: 6, weekend: [6, 7], minimalDays: 1 },
@@ -730,7 +726,7 @@ if (!prototype.getWeekInfo) {
     zu: { firstDay: 7, weekend: [6, 7], minimalDays: 1 },
   };
 
-  prototype.getWeekInfo = exportFunction(function () {
-    return cloneInto(weekInfoData[this.language] ?? {}, window);
-  }, window);
+  window.Intl.Locale.prototype.getWeekInfo = function () {
+    return weekInfoData[this.language] ?? {};
+  };
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1970810-www.camper-van-week-end.fr-appVersion-linux-fix.js b/browser/extensions/webcompat/injections/js/bug1970810-www.camper-van-week-end.fr-appVersion-linux-fix.js
index 1a33643d33489..0c817ec84f3d9 100644
--- a/browser/extensions/webcompat/injections/js/bug1970810-www.camper-van-week-end.fr-appVersion-linux-fix.js
+++ b/browser/extensions/webcompat/injections/js/bug1970810-www.camper-van-week-end.fr-appVersion-linux-fix.js
@@ -15,13 +15,13 @@
  * only meant to be applied on Linux.
  */
 
-/* globals exportFunction */
+if (!navigator.appVersion.includes("Linux")) {
+  console.info(
+    "navigator.appVersion has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1970810 for details."
+  );
 
-console.info(
-  "navigator.appVersion has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1970810 for details."
-);
-
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
-appVersion.get = exportFunction(() => "5.0 (Linux)", window);
-Object.defineProperty(nav, "appVersion", appVersion);
+  const nav = Object.getPrototypeOf(navigator);
+  const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
+  appVersion.get = () => "5.0 (Linux)";
+  Object.defineProperty(nav, "appVersion", appVersion);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1975651-comic.k-manga.jp-ua-override.js b/browser/extensions/webcompat/injections/js/bug1975651-comic.k-manga.jp-ua-override.js
index 92ceb39c2a5fb..5f4cb2d6a6762 100644
--- a/browser/extensions/webcompat/injections/js/bug1975651-comic.k-manga.jp-ua-override.js
+++ b/browser/extensions/webcompat/injections/js/bug1975651-comic.k-manga.jp-ua-override.js
@@ -8,16 +8,26 @@
  * Bug 1975651 - User agent override for comic.k-manga.jp
  */
 
-/* globals exportFunction, UAHelpers */
+if (!navigator.userAgent.includes("Chrome")) {
+  console.info(
+    "The user agent and navigator.appVersion have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1975651 for details."
+  );
 
-console.info(
-  "The user agent and navigator.appVersion have been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1975651 for details."
-);
+  const userAgent = navigator.userAgent;
+  const androidVer = userAgent.match(/Android [0-9.]+/) || "Android 6.0";
+  const device = userAgent.includes("Mobile")
+    ? "Nexus 5 Build/MRA58N"
+    : "Nexus 7 Build/JSS15Q";
+  const osSegment = `Linux; ${androidVer}; ${device}`;
+  const CHROME_UA = `Mozilla/5.0 (${osSegment}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36`;
 
-UAHelpers.overrideWithDeviceAppropriateChromeUA();
+  const nav = Object.getPrototypeOf(navigator);
 
-const appVer = navigator.wrappedJSObject.userAgent.replace("Mozilla/", "");
-const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
-appVersion.get = exportFunction(() => appVer, window);
-Object.defineProperty(nav, "appVersion", appVersion);
+  const ua = Object.getOwnPropertyDescriptor(nav, "userAgent");
+  ua.get = () => CHROME_UA;
+  Object.defineProperty(nav, "userAgent", ua);
+
+  const appVersion = Object.getOwnPropertyDescriptor(nav, "appVersion");
+  appVersion.get = () => CHROME_UA.replace("Mozilla/", "");
+  Object.defineProperty(nav, "appVersion", appVersion);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1983538-incontrol.landrover.com-alias-WebKitMutationObserver.js b/browser/extensions/webcompat/injections/js/bug1983538-incontrol.landrover.com-alias-WebKitMutationObserver.js
index a5a84756d2fdd..dba257a3be529 100644
--- a/browser/extensions/webcompat/injections/js/bug1983538-incontrol.landrover.com-alias-WebKitMutationObserver.js
+++ b/browser/extensions/webcompat/injections/js/bug1983538-incontrol.landrover.com-alias-WebKitMutationObserver.js
@@ -11,11 +11,10 @@
  * which we can simply alias to MutationObserver.
  */
 
-/* globals exportFunction */
+if (!window.WebKitMutationObserver) {
+  console.info(
+    "WebKitMutationObserver has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1989241 for details."
+  );
 
-console.info(
-  "WebKitMutationObserver has been shimmed for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1989241 for details."
-);
-
-window.wrappedJSObject.WebKitMutationObserver =
-  window.wrappedJSObject.MutationObserver;
+  window.WebKitMutationObserver = window.MutationObserver;
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1993517-onlinebank.resursbank.se-autoclose-bankid-tabs.js b/browser/extensions/webcompat/injections/js/bug1993517-onlinebank.resursbank.se-autoclose-bankid-tabs.js
index ae0beef511306..86ad40e1b002c 100644
--- a/browser/extensions/webcompat/injections/js/bug1993517-onlinebank.resursbank.se-autoclose-bankid-tabs.js
+++ b/browser/extensions/webcompat/injections/js/bug1993517-onlinebank.resursbank.se-autoclose-bankid-tabs.js
@@ -4,8 +4,6 @@
 
 "use strict";
 
-/* globals exportFunction */
-
 /**
  * Bug 1993517 - onlinebank.resursbank.se - extra browser tabs for bankid logins remain open
  *
@@ -13,19 +11,26 @@
  * Chrome and Safari seem to autoclose such tabs incorrectly.
  */
 
-console.info(
-  'Dropping target="_blank" attribute for bankid logins for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1993517 for details.'
-);
+if (!window.__firefoxWebCompatFixBug1993517) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1993517", {
+    configurable: false,
+    value: true,
+  });
 
-if (/Win32|Win64|Windows|WinCE/i.test(navigator.platform)) {
-  const nav = Object.getPrototypeOf(navigator.wrappedJSObject);
-  const platform = Object.getOwnPropertyDescriptor(nav, "platform");
-  platform.get = exportFunction(() => "MacIntel", window);
-  Object.defineProperty(nav, "platform", platform);
-}
+  console.info(
+    'Dropping target="_blank" attribute for bankid logins for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1993517 for details.'
+  );
 
-document.addEventListener(
-  "click",
-  e => e.target?.closest("a[href^='bankid://']")?.removeAttribute("target"),
-  true
-);
+  if (/Win32|Win64|Windows|WinCE/i.test(navigator.platform)) {
+    const nav = Object.getPrototypeOf(navigator);
+    const platform = Object.getOwnPropertyDescriptor(nav, "platform");
+    platform.get = () => "MacIntel";
+    Object.defineProperty(nav, "platform", platform);
+  }
+
+  document.addEventListener(
+    "click",
+    e => e.target?.closest("a[href^='bankid://']")?.removeAttribute("target"),
+    true
+  );
+}
diff --git a/browser/extensions/webcompat/injections/js/bug1994562-shim-mstp-mstg-on-window.js b/browser/extensions/webcompat/injections/js/bug1994562-shim-mstp-mstg-on-window.js
index 281601b1df9f6..adb5d406bb10a 100644
--- a/browser/extensions/webcompat/injections/js/bug1994562-shim-mstp-mstg-on-window.js
+++ b/browser/extensions/webcompat/injections/js/bug1994562-shim-mstp-mstg-on-window.js
@@ -24,300 +24,246 @@
  * worker-based APIs directly for optimal performance in Firefox.
  */
 
-/* globals exportFunction, cloneInto */
-
-console.info(
-  "Nonstandard MediaStreamTrackProcessor and MediaStreamTrackGenerator are being shimmed for compatibility reasons. Please consider updating to the standard equivalents available in workers for optimal performance! See https://bugzil.la/1994562 for details."
-);
-
 if (!window.MediaStreamTrackProcessor) {
-  const win = window.wrappedJSObject;
-  const f = func => exportFunction(func, window);
-  const o = obj => Object.assign(new win.Object(), obj);
+  console.info(
+    "Nonstandard MediaStreamTrackProcessor and MediaStreamTrackGenerator are being shimmed for compatibility reasons. Please consider updating to the standard equivalents available in workers for optimal performance! See https://bugzil.la/1994562 for details."
+  );
 
   function MediaStreamTrackProcessor(options) {
-    if (!(options?.track instanceof win.MediaStreamTrack)) {
+    if (!(options?.track instanceof MediaStreamTrack)) {
       throw new TypeError("Missing track");
     }
     const { track } = options;
     if (track.kind == "video") {
-      const src = o({
-        start: f(function start(controller) {
-          return win.Promise.resolve()
-            .then(
-              f(() => {
-                track.addEventListener(
-                  "ended",
-                  f(() => controller.close()),
-                  o({ once: true })
-                );
-                src.video = win.document.createElement("video");
-                const tracks = new win.Array();
-                tracks.push(track);
-                src.video.srcObject = new win.MediaStream(tracks);
-                src.video.play();
-                return new win.Promise(
-                  f(r => (src.video.onloadedmetadata = r))
-                );
-              })
-            )
-            .then(
-              f(() => {
-                src.track = track;
-                src.canvas = new win.OffscreenCanvas(
-                  src.video.videoWidth,
-                  src.video.videoHeight
-                );
-                src.ctx = src.canvas.getContext(
-                  "2d",
-                  o({ desynchronized: true })
-                );
-                src.t1 = performance.now();
-              })
-            );
-        }),
-        pull: f(function pull(controller) {
+      const src = {
+        start: function start(controller) {
+          return Promise.resolve()
+            .then(() => {
+              track.addEventListener("ended", () => controller.close(), {
+                once: true,
+              });
+              src.video = document.createElement("video");
+              const tracks = [];
+              tracks.push(track);
+              src.video.srcObject = new MediaStream(tracks);
+              src.video.play();
+              return new Promise(r => (src.video.onloadedmetadata = r));
+            })
+            .then(() => {
+              src.track = track;
+              src.canvas = new OffscreenCanvas(
+                src.video.videoWidth,
+                src.video.videoHeight
+              );
+              src.ctx = src.canvas.getContext("2d", { desynchronized: true });
+              src.t1 = performance.now();
+            });
+        },
+        pull: function pull(controller) {
           if (track.readyState == "ended") {
             controller.close();
             return Promise.resolve();
           }
           const fps = track.getSettings().frameRate || 30;
-          return new win.Promise(
-            f(r => {
-              const waitUntil = () => {
-                if (
-                  track.readyState == "ended" ||
-                  performance.now() - src.t1 >= 1000 / fps
-                ) {
-                  r();
-                  return;
-                }
-                requestAnimationFrame(waitUntil);
-              };
+          return new Promise(r => {
+            const waitUntil = () => {
+              if (
+                track.readyState == "ended" ||
+                performance.now() - src.t1 >= 1000 / fps
+              ) {
+                r();
+                return;
+              }
               requestAnimationFrame(waitUntil);
+            };
+            requestAnimationFrame(waitUntil);
+          }).then(() => {
+            if (track.readyState == "ended") {
+              controller.close();
+              return;
+            }
+            src.t1 = performance.now();
+            src.ctx.drawImage(src.video, 0, 0);
+            const frame = new VideoFrame(src.canvas, { timestamp: src.t1 });
+            controller.enqueue(frame);
+          });
+        },
+      };
+      return { readable: new ReadableStream(src) };
+    } else if (track.kind == "audio") {
+      const src = {
+        start: function start(controller) {
+          return Promise.resolve()
+            .then(() => {
+              track.addEventListener("ended", () => controller.close(), {
+                once: true,
+              });
+              src.ac = new AudioContext();
+              src.arrays = [];
+              function worklet() {
+                registerProcessor(
+                  "mstp-shim",
+                  class Processor extends AudioWorkletProcessor {
+                    process(input) {
+                      this.port.postMessage(input);
+                      return true;
+                    }
+                  }
+                );
+              }
+              return src.ac.audioWorklet.addModule(
+                `data:text/javascript,(${worklet.toString()})()`
+              );
             })
-          ).then(
-            f(() => {
+            .then(() => {
+              src.node = new AudioWorkletNode(src.ac, "mstp-shim");
+              const tracks = [];
+              tracks.push(track);
+              src.ac
+                .createMediaStreamSource(new MediaStream(tracks))
+                .connect(src.node);
+              src.node.port.addEventListener(
+                "message",
+                ({ data }) => data[0][0] && src.arrays.push(data)
+              );
+            });
+        },
+        pull: function pull(controller) {
+          return Promise.resolve()
+            .then(() => {
               if (track.readyState == "ended") {
                 controller.close();
-                return;
+                return Promise.resolve();
               }
-              src.t1 = performance.now();
-              src.ctx.drawImage(src.video, 0, 0);
-              const frame = new win.VideoFrame(
-                src.canvas,
-                o({ timestamp: src.t1 })
-              );
-              controller.enqueue(frame);
-            })
-          );
-        }),
-      });
-      return o({ readable: new win.ReadableStream(src) });
-    } else if (track.kind == "audio") {
-      const src = o({
-        start: f(function start(controller) {
-          return win.Promise.resolve()
-            .then(
-              f(() => {
-                track.addEventListener(
-                  "ended",
-                  f(() => controller.close()),
-                  o({ once: true })
-                );
-                src.ac = new win.AudioContext();
-                src.arrays = new win.Array();
-                function worklet() {
-                  registerProcessor(
-                    "mstp-shim",
-                    class Processor extends AudioWorkletProcessor {
-                      process(input) {
-                        this.port.postMessage(input);
-                        return true;
+              return src.arrays.length
+                ? Promise.resolve()
+                : new Promise(r =>
+                    (src.node.port.onmessage = r).then(function loop() {
+                      if (track.readyState == "ended") {
+                        return Promise.resolve();
                       }
-                    }
+                      if (!src.arrays.length) {
+                        return new Promise(
+                          _r => (src.node.port.onmessage = _r)
+                        ).then(loop);
+                      }
+                      return Promise.resolve();
+                    })
                   );
-                }
-                return src.ac.audioWorklet.addModule(
-                  `data:text/javascript,(${worklet.toString()})()`
-                );
-              })
-            )
-            .then(
-              f(() => {
-                src.node = new win.AudioWorkletNode(src.ac, "mstp-shim");
-                const tracks = new win.Array();
-                tracks.push(track);
-                src.ac
-                  .createMediaStreamSource(new win.MediaStream(tracks))
-                  .connect(src.node);
-                src.node.port.addEventListener(
-                  "message",
-                  f(({ data }) => data[0][0] && src.arrays.push(data))
-                );
-              })
-            );
-        }),
-        pull: f(function pull(controller) {
-          return win.Promise.resolve()
-            .then(
-              f(() => {
-                if (track.readyState == "ended") {
-                  controller.close();
-                  return Promise.resolve();
-                }
-                return src.arrays.length
-                  ? win.Promise.resolve()
-                  : new win.Promise(f(r => (src.node.port.onmessage = r))).then(
-                      f(function loop() {
-                        if (track.readyState == "ended") {
-                          return Promise.resolve();
-                        }
-                        if (!src.arrays.length) {
-                          return new win.Promise(
-                            f(r => (src.node.port.onmessage = r))
-                          ).then(f(loop));
-                        }
-                        return win.Promise.resolve();
-                      })
-                    );
-              })
-            )
-            .then(
-              f(() => {
-                if (track.readyState == "ended") {
-                  return;
-                }
-                const [channels] = src.arrays.shift();
-                const joined = new win.Float32Array(
-                  channels.reduce(f((a, b) => a + b.length, 0))
-                );
-                channels.reduce(
-                  f((offset, a) => {
-                    joined.set(a, offset);
-                    return offset + a.length;
-                  }, 0)
-                );
-                const transfer = new win.Array();
-                transfer.push(joined.buffer);
-                const data = new win.AudioData(
-                  o({
-                    format: "f32-planar",
-                    sampleRate: src.ac.sampleRate,
-                    numberOfFrames: channels[0].length,
-                    numberOfChannels: channels.length,
-                    timestamp: (src.ac.currentTime * 1e6) | 0,
-                    data: joined,
-                    transfer,
-                  })
-                );
-                controller.enqueue(data);
-              })
-            );
-        }),
-      });
-      return o({ readable: new win.ReadableStream(src) });
+            })
+            .then(() => {
+              if (track.readyState == "ended") {
+                return;
+              }
+              const [channels] = src.arrays.shift();
+              const joined = new Float32Array(
+                channels.reduce((a, b) => a + b.length, 0)
+              );
+              channels.reduce((offset, a) => {
+                joined.set(a, offset);
+                return offset + a.length;
+              }, 0);
+              const transfer = [];
+              transfer.push(joined.buffer);
+              const data = new AudioData({
+                format: "f32-planar",
+                sampleRate: src.ac.sampleRate,
+                numberOfFrames: channels[0].length,
+                numberOfChannels: channels.length,
+                timestamp: (src.ac.currentTime * 1e6) | 0,
+                data: joined,
+                transfer,
+              });
+              controller.enqueue(data);
+            });
+        },
+      };
+      return { readable: new ReadableStream(src) };
     }
   }
-  win.MediaStreamTrackProcessor = exportFunction(
-    MediaStreamTrackProcessor,
-    window,
-    { allowCrossOriginArguments: true }
-  );
+  window.MediaStreamTrackProcessor = MediaStreamTrackProcessor;
 }
 
 if (!window.MediaStreamTrackGenerator) {
-  const win = window.wrappedJSObject;
-  const f = func => exportFunction(func, window);
-  const o = obj => Object.assign(new win.Object(), obj);
-
   function MediaStreamTrackGenerator(options) {
     if (options?.kind != "video" && options?.kind != "audio") {
       throw new TypeError("Invalid kind");
     }
     if (options.kind == "video") {
-      const canvas = win.document.createElement("canvas");
-      const ctx = canvas.getContext("2d", o({ desynchronized: true }));
+      const canvas = document.createElement("canvas");
+      const ctx = canvas.getContext("2d", { desynchronized: true });
       const [track] = canvas.captureStream().getVideoTracks();
-      const sink = o({
-        write: f(function write(frame) {
+      const sink = {
+        write: function write(frame) {
           canvas.width = frame.displayWidth;
           canvas.height = frame.displayHeight;
           ctx.drawImage(frame, 0, 0, canvas.width, canvas.height);
           frame.close();
-        }),
-      });
-      track.writable = new win.WritableStream(sink);
+        },
+      };
+      track.writable = new WritableStream(sink);
       return track;
     } else if (options.kind == "audio") {
-      const ac = new win.AudioContext();
+      const ac = new AudioContext();
       const dest = ac.createMediaStreamDestination();
       const [track] = dest.stream.getAudioTracks();
-      const sink = o({
-        start: f(function start() {
-          return win.Promise.resolve()
-            .then(
-              f(() => {
-                sink.arrays = new win.Array();
-                function worklet() {
-                  registerProcessor(
-                    "mstg-shim",
-                    class Processor extends AudioWorkletProcessor {
-                      constructor() {
-                        super();
-                        this.arrays = [];
-                        this.arrayOffset = 0;
-                        this.port.onmessage = ({ data }) =>
-                          this.arrays.push(data);
-                        this.emptyArray = new Float32Array(0);
-                      }
-                      process(inputs, [[output]]) {
-                        for (let i = 0; i < output.length; i++) {
-                          if (
-                            !this.array ||
-                            this.arrayOffset >= this.array.length
-                          ) {
-                            this.array = this.arrays.shift() || this.emptyArray;
-                            this.arrayOffset = 0;
-                          }
-                          output[i] = this.array[this.arrayOffset++] || 0;
+      const sink = {
+        start: function start() {
+          return Promise.resolve()
+            .then(() => {
+              sink.arrays = [];
+              function worklet() {
+                registerProcessor(
+                  "mstg-shim",
+                  class Processor extends AudioWorkletProcessor {
+                    constructor() {
+                      super();
+                      this.arrays = [];
+                      this.arrayOffset = 0;
+                      this.port.onmessage = ({ data }) =>
+                        this.arrays.push(data);
+                      this.emptyArray = new Float32Array(0);
+                    }
+                    process(inputs, [[output]]) {
+                      for (let i = 0; i < output.length; i++) {
+                        if (
+                          !this.array ||
+                          this.arrayOffset >= this.array.length
+                        ) {
+                          this.array = this.arrays.shift() || this.emptyArray;
+                          this.arrayOffset = 0;
                         }
-                        return true;
+                        output[i] = this.array[this.arrayOffset++] || 0;
                       }
+                      return true;
                     }
-                  );
-                }
-                return ac.audioWorklet.addModule(
-                  `data:text/javascript,(${worklet.toString()})()`
+                  }
                 );
-              })
-            )
-            .then(
-              f(() => {
-                sink.node = new win.AudioWorkletNode(ac, "mstg-shim");
-                sink.node.connect(dest);
-                return track;
-              })
-            );
-        }),
-        write: f(function write(audioData) {
-          const array = new win.Float32Array(
+              }
+              return ac.audioWorklet.addModule(
+                `data:text/javascript,(${worklet.toString()})()`
+              );
+            })
+            .then(() => {
+              sink.node = new AudioWorkletNode(ac, "mstg-shim");
+              sink.node.connect(dest);
+              return track;
+            });
+        },
+        write: function write(audioData) {
+          const array = new Float32Array(
             audioData.numberOfFrames * audioData.numberOfChannels
           );
-          audioData.copyTo(array, o({ planeIndex: 0 }));
-          const transfer = new win.Array();
+          audioData.copyTo(array, { planeIndex: 0 });
+          const transfer = [];
           transfer.push(array.buffer);
-          sink.node.port.postMessage(array, o({ transfer }));
+          sink.node.port.postMessage(array, { transfer });
           audioData.close();
-        }),
-      });
-      track.writable = new win.WritableStream(sink);
+        },
+      };
+      track.writable = new WritableStream(sink);
       return track;
     }
   }
-  win.MediaStreamTrackGenerator = exportFunction(
-    MediaStreamTrackGenerator,
-    window,
-    { allowCrossOriginArguments: true }
-  );
+  window.MediaStreamTrackGenerator = MediaStreamTrackGenerator;
 }
diff --git a/browser/extensions/webcompat/injections/js/bug1999198-anime-bit.ru-fix-broken-scrolling.js b/browser/extensions/webcompat/injections/js/bug1999198-anime-bit.ru-fix-broken-scrolling.js
index 2837fa8d6953c..16ed7aabd98ef 100644
--- a/browser/extensions/webcompat/injections/js/bug1999198-anime-bit.ru-fix-broken-scrolling.js
+++ b/browser/extensions/webcompat/injections/js/bug1999198-anime-bit.ru-fix-broken-scrolling.js
@@ -11,19 +11,27 @@
  * will not load more content as the page is scrolled down. This fixes it.
  */
 
-/* globals exportFunction */
+if (!window.__firefoxWebCompatFixBug1756970) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug1756970", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  "documentElement.clientHeight has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1999198 for details."
-);
+  console.info(
+    "documentElement.clientHeight has been overridden for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1999198 for details."
+  );
 
-const proto = Element.prototype.wrappedJSObject;
-const clientHeightDesc = Object.getOwnPropertyDescriptor(proto, "clientHeight");
-const origHeight = clientHeightDesc.get;
-clientHeightDesc.get = exportFunction(function () {
-  if (this === document.documentElement) {
-    return this.scrollHeight;
-  }
-  return origHeight.call(this);
-}, window);
-Object.defineProperty(proto, "clientHeight", clientHeightDesc);
+  const { prototype } = Element;
+  const clientHeightDesc = Object.getOwnPropertyDescriptor(
+    prototype,
+    "clientHeight"
+  );
+  const origHeight = clientHeightDesc.get;
+  clientHeightDesc.get = function () {
+    if (this === document.documentElement) {
+      return this.scrollHeight;
+    }
+    return origHeight.call(this);
+  };
+  Object.defineProperty(prototype, "clientHeight", clientHeightDesc);
+}
diff --git a/browser/extensions/webcompat/injections/js/bug2000906-teams.microsoft.com-disable-resizeMode-in-gDM.js b/browser/extensions/webcompat/injections/js/bug2000906-teams.microsoft.com-disable-resizeMode-in-gDM.js
index 4be558b75a1a9..99f0560189df4 100644
--- a/browser/extensions/webcompat/injections/js/bug2000906-teams.microsoft.com-disable-resizeMode-in-gDM.js
+++ b/browser/extensions/webcompat/injections/js/bug2000906-teams.microsoft.com-disable-resizeMode-in-gDM.js
@@ -11,40 +11,42 @@
  * Chrome seems to incorrectly ignore the resizeMode constraint for getDisplayMedia.
  */
 
-/* globals exportFunction */
+if (
+  navigator.mediaDevices?.getDisplayMedia &&
+  !window.__firefoxWebCompatFixBug2000906
+) {
+  Object.defineProperty(window, "__firefoxWebCompatFixBug2000906", {
+    configurable: false,
+    value: true,
+  });
 
-console.info(
-  'getDisplayMedia has been modified to drop resizeMode: "none" for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=2000906 for details.'
-);
+  console.info(
+    'getDisplayMedia has been modified to drop resizeMode: "none" for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=2000906 for details.'
+  );
 
-function maybeDeleteResizeMode(video) {
-  const { resizeMode, width, height, frameRate } = video;
-  if (resizeMode == "none" && (width || height || frameRate)) {
-    delete video.resizeMode;
+  function maybeDeleteResizeMode(video) {
+    const { resizeMode, width, height, frameRate } = video;
+    if (resizeMode == "none" && (width || height || frameRate)) {
+      delete video.resizeMode;
+    }
   }
-}
 
-if (navigator.mediaDevices?.getDisplayMedia) {
   {
-    const { prototype } = MediaDevices.wrappedJSObject;
+    const { prototype } = MediaDevices;
     const { getDisplayMedia: gDM } = prototype;
-    prototype.getDisplayMedia = exportFunction(function getDisplayMedia(
-      options
-    ) {
+    prototype.getDisplayMedia = function getDisplayMedia(options) {
       const { video } = options || {};
       if (video) {
         maybeDeleteResizeMode(video);
       }
       return gDM.call(this, options);
-    }, window);
+    };
   }
 
   {
-    const { prototype } = MediaStreamTrack.wrappedJSObject;
+    const { prototype } = MediaStreamTrack;
     const { applyConstraints: aC } = prototype;
-    prototype.applyConstraints = exportFunction(function applyConstraints(
-      constraints
-    ) {
+    prototype.applyConstraints = function applyConstraints(constraints) {
       // Don't allow adding resizeMode if it wasn't there from the start.
       // Ideally we'd check for a gDM-sourced track instead but there's no
       // spec-compliant way to do that.
@@ -52,6 +54,6 @@ if (navigator.mediaDevices?.getDisplayMedia) {
         maybeDeleteResizeMode(constraints || {});
       }
       return aC.call(this, constraints);
-    }, window);
+    };
   }
 }
diff --git a/browser/extensions/webcompat/lib/interventions.js b/browser/extensions/webcompat/lib/interventions.js
index 342cabe9fe324..c2f3b674fad84 100644
--- a/browser/extensions/webcompat/lib/interventions.js
+++ b/browser/extensions/webcompat/lib/interventions.js
@@ -309,7 +309,7 @@ class Interventions {
     });
   }
 
-  #getBlocksAndMatchesFor(config) {
+  getBlocksAndMatchesFor(config) {
     const { bugs } = config;
     return {
       blocks: Object.values(bugs)
@@ -336,7 +336,7 @@ class Interventions {
         continue;
       }
 
-      const { blocks, matches } = this.#getBlocksAndMatchesFor(config);
+      const { blocks, matches } = this.getBlocksAndMatchesFor(config);
 
       for (const intervention of interventions) {
         if (!intervention.enabled) {
@@ -550,7 +550,7 @@ class Interventions {
             `force-disabled by pref extensions.webcompat.${disablingPref}`,
           ]);
         } else {
-          const { blocks, matches } = this.#getBlocksAndMatchesFor(config);
+          const { blocks, matches } = this.getBlocksAndMatchesFor(config);
 
           let uaOverridesEnabled = false;
           let requestBlocksEnabled = false;
@@ -594,7 +594,7 @@ class Interventions {
 
             if (intervention.content_scripts) {
               const contentScriptsForIntervention =
-                this.#buildContentScriptRegistrations(
+                this.buildContentScriptRegistrations(
                   config.label,
                   intervention,
                   matches
@@ -813,18 +813,24 @@ class Interventions {
     }
   }
 
-  #buildContentScriptRegistrations(label, intervention, matches) {
+  buildContentScriptRegistrations(label, intervention, matches) {
     const registration = {
-      id: `webcompat intervention for ${label}: ${JSON.stringify(intervention.content_scripts)}`,
       matches,
-      persistAcrossSessions: true,
     };
 
-    let { all_frames, css, js, run_at } = intervention.content_scripts;
+    let { all_frames, css, isolated, js, run_at } =
+      intervention.content_scripts;
     if (!css && !js) {
       console.error(`Missing js or css for content_script in ${label}`);
       return [];
     }
+    if (js) {
+      if (isolated) {
+        registration.world = "ISOLATED";
+      } else {
+        registration.world = "MAIN";
+      }
+    }
     if (all_frames) {
       registration.allFrames = true;
     }
@@ -850,6 +856,10 @@ class Interventions {
       registration.runAt = "document_start";
     }
 
+    registration.id = `webcompat intervention for ${label}: ${JSON.stringify(registration)}`;
+
+    registration.persistAcrossSessions = true;
+
     return [registration];
   }
 }
diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json
index ccdf06fa50845..131f8110b1d7b 100644
--- a/browser/extensions/webcompat/manifest.json
+++ b/browser/extensions/webcompat/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "149.5.0",
+  "version": "149.6.0",
   "browser_specific_settings": {
     "gecko": {
       "id": "webcompat@mozilla.org",
diff --git a/browser/extensions/webcompat/tests/browser/browser_aboutcompat.js b/browser/extensions/webcompat/tests/browser/browser_aboutcompat.js
index 32c375559751e..6354d11443501 100644
--- a/browser/extensions/webcompat/tests/browser/browser_aboutcompat.js
+++ b/browser/extensions/webcompat/tests/browser/browser_aboutcompat.js
@@ -77,7 +77,15 @@ add_task(async function test_about_compat_loads_properly() {
     }
 
     // both should have their content scripts registered at startup
-    const interventionRCSId = `webcompat intervention for ${interventionWithContentScripts.label}: ${JSON.stringify(interventionWithContentScripts.interventions[0].content_scripts)}`;
+
+    const interventionRCSId =
+      bgWin.interventions.buildContentScriptRegistrations(
+        interventionWithContentScripts.label,
+        interventionWithContentScripts.interventions[0],
+        bgWin.interventions.getBlocksAndMatchesFor(
+          interventionWithContentScripts
+        ).matches
+      )[0].id;
     const shimRCSId = `SmartBlock shim for ${shimWithContentScripts.id}: ${JSON.stringify(shimWithContentScripts.contentScripts[0])}`;
     ok(
       await findRegisteredScript(interventionRCSId),
diff --git a/browser/extensions/webcompat/tests/browser/browser_interventions.js b/browser/extensions/webcompat/tests/browser/browser_interventions.js
index e9dc7b3853480..0c934d100dc28 100644
--- a/browser/extensions/webcompat/tests/browser/browser_interventions.js
+++ b/browser/extensions/webcompat/tests/browser/browser_interventions.js
@@ -321,6 +321,13 @@ add_task(async function test_json_data() {
             `all_frames key is true or false for content_scripts for id ${id}`
           );
         }
+        if ("isolated" in content_scripts) {
+          const isolated = content_scripts.isolated;
+          ok(
+            isolated === false || isolated === true,
+            `isolated key is true or false for content_scripts for id ${id}`
+          );
+        }
         for (const type of ["css", "js"]) {
           if (!(type in content_scripts)) {
             continue;
diff --git a/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py b/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py
index dac7f99ceeea3..328694194cb8a 100644
--- a/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py
+++ b/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py
@@ -88,11 +88,24 @@ def testContentScriptsAreCorrectlyPersisted(self):
         bug3 = self.buildInterventionConfig("bug3", interventionContentScriptPath)
 
         def getInterventionScriptId(bug):
-            return f"""webcompat intervention for {bug}: {{"js":["{interventionContentScriptPath}"]}}"""
+            return self.marionette.execute_script(
+                """
+                    const config = arguments[0];
+                    const bgWin = window.wrappedJSObject.browser.extension.getBackgroundPage();
+                    const { id } =
+                      bgWin.interventions.buildContentScriptRegistrations(
+                        config.label,
+                        config.interventions[0],
+                        bgWin.interventions.getBlocksAndMatchesFor(config).matches
+                      )[0];
+                      return id;
+              """,
+                [bug],
+            )
 
-        expectedBug1ScriptId = getInterventionScriptId("bug1")
-        expectedBug2ScriptId = getInterventionScriptId("bug2")
-        expectedBug3ScriptId = getInterventionScriptId("bug3")
+        expectedBug1ScriptId = getInterventionScriptId(bug1)
+        expectedBug2ScriptId = getInterventionScriptId(bug2)
+        expectedBug3ScriptId = getInterventionScriptId(bug3)
 
         shim1 = self.buildShimConfig("bug1", shimContentScriptPath)
         shim2 = self.buildShimConfig("bug2", shimContentScriptPath)
diff --git a/testing/webcompat/interventions/tests/test_1799968_samsung_com.py b/testing/webcompat/interventions/tests/test_1799968_samsung_com.py
index 4b4fc408aa590..a59aa1e6dc646 100644
--- a/testing/webcompat/interventions/tests/test_1799968_samsung_com.py
+++ b/testing/webcompat/interventions/tests/test_1799968_samsung_com.py
@@ -1,6 +1,6 @@
 import pytest
 
-URL = "https://www.samsung.com/in/watches/galaxy-watch/galaxy-watch5-44mm-graphite-bluetooth-sm-r910nzaainu/"
+URL = "https://www.samsung.com/in/watches/galaxy-watch/galaxy-watch8-40mm-silver-bluetooth-sm-l320nzsains/"
 GOOD_CSS = "html.linux.firefox"
 ERROR_MSG = "DOMTokenList.add: The empty string is not a valid token."
 

From 6a1e134a7f358db47daaff147ba497124519a16c Mon Sep 17 00:00:00 2001
From: Thomas Wisniewski <twisniewski@mozilla.com>
Date: Fri, 6 Feb 2026 17:09:21 +0000
Subject: [PATCH 26/93] Bug 1950282 - update our webcompat intervention for
 f1tv.formula1.com; r=webcompat-reviewers,ksenia

Differential Revision: https://phabricator.services.mozilla.com/D281874
---
 ...50282-f1tv.formula1.com-unblock-firefox.js | 51 +++++++++++++++++++
 .../tests/test_1950282_f1tv_formula1_com.py   | 14 +++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js b/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
index dc9ef00808486..57ec79ff9278a 100644
--- a/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
+++ b/browser/extensions/webcompat/injections/js/bug1950282-f1tv.formula1.com-unblock-firefox.js
@@ -108,4 +108,55 @@ if (!window.chrome) {
       return loadTimes;
     },
   };
+
+  const ua = navigator.userAgent;
+  const mobile = ua.includes("Android");
+
+  // Very roughly matches Chromium's GetPlatformForUAMetadata()
+  let platform = "Linux";
+  if (mobile) {
+    platform = "Android";
+  } else if (navigator.platform.startsWith("Win")) {
+    platform = "Windows";
+  } else if (navigator.platform.startsWith("Mac")) {
+    platform = "macOS";
+  }
+
+  const version = ua.match(/Chrome\/([0-9]+)/)[1];
+
+  // These match Chrome's output as of version 126.
+  const brands = [
+    {
+      brand: "Not/A)Brand",
+      version: "8",
+    },
+    {
+      brand: "Chromium",
+      version,
+    },
+    {
+      brand: "Google Chrome",
+      version,
+    },
+  ];
+
+  // Site checks the high-entropy platformVersion on Windows.
+  const userAgentData = {
+    brands,
+    mobile,
+    platform,
+    getHighEntropyValues() {
+      return Promise.resolve({
+        brands,
+        mobile,
+        platform,
+        platformVersion: "19.0.0",
+      });
+    },
+  };
+
+  Object.defineProperty(nav, "userAgentData", {
+    get: () => userAgentData,
+    set: () => {},
+  });
 }
diff --git a/testing/webcompat/interventions/tests/test_1950282_f1tv_formula1_com.py b/testing/webcompat/interventions/tests/test_1950282_f1tv_formula1_com.py
index a1f10ac2467b3..3e29a9d89a8ba 100644
--- a/testing/webcompat/interventions/tests/test_1950282_f1tv_formula1_com.py
+++ b/testing/webcompat/interventions/tests/test_1950282_f1tv_formula1_com.py
@@ -2,8 +2,9 @@
 
 URL = "https://f1tv.formula1.com/"
 
-SUPPORTED_TEXT = "Watch"
-UNSUPPORTED_TEXT = "Unsupported Browser"
+SUPPORTED_TEXT = "Watch now"
+UNSUPPORTED_TEXT = "browser is not supported"
+USE_APP_TEXT = "Use F1 TV App"
 
 
 @pytest.mark.asyncio
@@ -18,5 +19,12 @@ async def test_enabled(client):
 @pytest.mark.without_interventions
 async def test_disabled(client):
     await client.navigate(URL, wait="none")
-    assert client.await_text(UNSUPPORTED_TEXT, is_displayed=True)
+    use_app, unsupported = client.await_first_element_of(
+        [
+            client.text(USE_APP_TEXT),
+            client.text(UNSUPPORTED_TEXT),
+        ],
+        is_displayed=True,
+    )
+    assert use_app or unsupported
     assert not client.find_text(SUPPORTED_TEXT, is_displayed=True)

From 04acfe29cfcf3cd4a1e474a207d17691a582536a Mon Sep 17 00:00:00 2001
From: Thomas Wisniewski <twisniewski@mozilla.com>
Date: Fri, 6 Feb 2026 17:09:21 +0000
Subject: [PATCH 27/93] Bug 2013705 - actually await SmartBlock shims
 RemoteSettings updates properly for tests to not intermittently fail;
 r=webcompat-reviewers,ksenia

Differential Revision: https://phabricator.services.mozilla.com/D281799
---
 browser/extensions/webcompat/lib/shims.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/extensions/webcompat/lib/shims.js b/browser/extensions/webcompat/lib/shims.js
index f1abdb928276f..e2942296e76bc 100644
--- a/browser/extensions/webcompat/lib/shims.js
+++ b/browser/extensions/webcompat/lib/shims.js
@@ -613,7 +613,7 @@ class Shims {
     const oldReadyPromise = this._readyPromise;
     this._readyPromise = new Promise(done => (this._resolveReady = done));
     await oldReadyPromise;
-    this._updateShims(updatedShims);
+    await this._updateShims(updatedShims);
   }
 
   async _updateShims(updatedShims) {

From f1372fd2d6c25159a90c6a2101ce59fe6513ed6b Mon Sep 17 00:00:00 2001
From: Heitor Neiva <hneiva@mozilla.com>
Date: Fri, 6 Feb 2026 17:11:18 +0000
Subject: [PATCH 28/93] Bug 2000262 - Add dedicated Docker image for
 partials-zucchini generator r=releng-reviewers,bhearsum

Create deb13-partials-zuc Docker image with dependencies for MAR signature verification:

- Python mar library for reading and verifying MAR files
- Adds public key certificates (nightly, release, dep) during docker image creation
- Certificates added to /builds/worker/workspace/keys/

Differential Revision: https://phabricator.services.mozilla.com/D279009
---
 .../docker/partials-zucchini/Dockerfile       |  23 +++
 .../docker/partials-zucchini/requirements.in  |   1 +
 .../docker/partials-zucchini/requirements.txt | 168 ++++++++++++++++++
 taskcluster/kinds/docker-image/kind.yml       |   4 +
 4 files changed, 196 insertions(+)
 create mode 100644 taskcluster/docker/partials-zucchini/Dockerfile
 create mode 100644 taskcluster/docker/partials-zucchini/requirements.in
 create mode 100644 taskcluster/docker/partials-zucchini/requirements.txt

diff --git a/taskcluster/docker/partials-zucchini/Dockerfile b/taskcluster/docker/partials-zucchini/Dockerfile
new file mode 100644
index 0000000000000..c8ec83468c9a4
--- /dev/null
+++ b/taskcluster/docker/partials-zucchini/Dockerfile
@@ -0,0 +1,23 @@
+FROM $DOCKER_IMAGE_PARENT
+
+# Install deps
+RUN apt-get install python3-pip
+COPY requirements.txt /tmp/requirements.txt
+RUN python3 -m pip install --break-system-packages --no-cache-dir -r /tmp/requirements.txt && rm /tmp/requirements.txt
+
+# Copy DER certificates and convert to public keys
+# %include toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
+COPY topsrcdir/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der /tmp/
+# %include toolkit/mozapps/update/updater/dep1.der
+COPY topsrcdir/toolkit/mozapps/update/updater/dep1.der /tmp/
+# %include toolkit/mozapps/update/updater/release_primary.der
+COPY topsrcdir/toolkit/mozapps/update/updater/release_primary.der /tmp/
+RUN mkdir -p /builds/worker/workspace/keys && \
+    openssl x509 -inform DER -pubkey -noout -in /tmp/nightly_aurora_level3_primary.der > /builds/worker/workspace/keys/nightly.pubkey && \
+    openssl x509 -inform DER -pubkey -noout -in /tmp/dep1.der > /builds/worker/workspace/keys/dep.pubkey && \
+    openssl x509 -inform DER -pubkey -noout -in /tmp/release_primary.der > /builds/worker/workspace/keys/release.pubkey && \
+    rm /tmp/*.der && \
+    chmod -R a+r,a-w /builds/worker/workspace/keys
+
+# Copy files
+COPY make_incremental_zucchini.py /builds/worker/bin/make_incremental_zucchini.py
diff --git a/taskcluster/docker/partials-zucchini/requirements.in b/taskcluster/docker/partials-zucchini/requirements.in
new file mode 100644
index 0000000000000..bfde3788656d7
--- /dev/null
+++ b/taskcluster/docker/partials-zucchini/requirements.in
@@ -0,0 +1 @@
+mar
diff --git a/taskcluster/docker/partials-zucchini/requirements.txt b/taskcluster/docker/partials-zucchini/requirements.txt
new file mode 100644
index 0000000000000..e97793d5acd6c
--- /dev/null
+++ b/taskcluster/docker/partials-zucchini/requirements.txt
@@ -0,0 +1,168 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --python-version 3.14 --generate-hashes --output-file requirements.txt requirements.in
+asn1crypto==1.5.1 \
+    --hash=sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c \
+    --hash=sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67
+    # via mar
+cffi==2.0.0 \
+    --hash=sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb \
+    --hash=sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b \
+    --hash=sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f \
+    --hash=sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9 \
+    --hash=sha256:0cf2d91ecc3fcc0625c2c530fe004f82c110405f101548512cce44322fa8ac44 \
+    --hash=sha256:0f6084a0ea23d05d20c3edcda20c3d006f9b6f3fefeac38f59262e10cef47ee2 \
+    --hash=sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c \
+    --hash=sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75 \
+    --hash=sha256:1cd13c99ce269b3ed80b417dcd591415d3372bcac067009b6e0f59c7d4015e65 \
+    --hash=sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e \
+    --hash=sha256:1f72fb8906754ac8a2cc3f9f5aaa298070652a0ffae577e0ea9bd480dc3c931a \
+    --hash=sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e \
+    --hash=sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25 \
+    --hash=sha256:2081580ebb843f759b9f617314a24ed5738c51d2aee65d31e02f6f7a2b97707a \
+    --hash=sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe \
+    --hash=sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b \
+    --hash=sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91 \
+    --hash=sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592 \
+    --hash=sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187 \
+    --hash=sha256:2de9a304e27f7596cd03d16f1b7c72219bd944e99cc52b84d0145aefb07cbd3c \
+    --hash=sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1 \
+    --hash=sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94 \
+    --hash=sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba \
+    --hash=sha256:3e837e369566884707ddaf85fc1744b47575005c0a229de3327f8f9a20f4efeb \
+    --hash=sha256:3f4d46d8b35698056ec29bca21546e1551a205058ae1a181d871e278b0b28165 \
+    --hash=sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529 \
+    --hash=sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca \
+    --hash=sha256:4647afc2f90d1ddd33441e5b0e85b16b12ddec4fca55f0d9671fef036ecca27c \
+    --hash=sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6 \
+    --hash=sha256:53f77cbe57044e88bbd5ed26ac1d0514d2acf0591dd6bb02a3ae37f76811b80c \
+    --hash=sha256:5eda85d6d1879e692d546a078b44251cdd08dd1cfb98dfb77b670c97cee49ea0 \
+    --hash=sha256:5fed36fccc0612a53f1d4d9a816b50a36702c28a2aa880cb8a122b3466638743 \
+    --hash=sha256:61d028e90346df14fedc3d1e5441df818d095f3b87d286825dfcbd6459b7ef63 \
+    --hash=sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5 \
+    --hash=sha256:6824f87845e3396029f3820c206e459ccc91760e8fa24422f8b0c3d1731cbec5 \
+    --hash=sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4 \
+    --hash=sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d \
+    --hash=sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b \
+    --hash=sha256:730cacb21e1bdff3ce90babf007d0a0917cc3e6492f336c2f0134101e0944f93 \
+    --hash=sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205 \
+    --hash=sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27 \
+    --hash=sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512 \
+    --hash=sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d \
+    --hash=sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c \
+    --hash=sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037 \
+    --hash=sha256:8941aaadaf67246224cee8c3803777eed332a19d909b47e29c9842ef1e79ac26 \
+    --hash=sha256:89472c9762729b5ae1ad974b777416bfda4ac5642423fa93bd57a09204712322 \
+    --hash=sha256:8ea985900c5c95ce9db1745f7933eeef5d314f0565b27625d9a10ec9881e1bfb \
+    --hash=sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c \
+    --hash=sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8 \
+    --hash=sha256:9332088d75dc3241c702d852d4671613136d90fa6881da7d770a483fd05248b4 \
+    --hash=sha256:94698a9c5f91f9d138526b48fe26a199609544591f859c870d477351dc7b2414 \
+    --hash=sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9 \
+    --hash=sha256:9de40a7b0323d889cf8d23d1ef214f565ab154443c42737dfe52ff82cf857664 \
+    --hash=sha256:a05d0c237b3349096d3981b727493e22147f934b20f6f125a3eba8f994bec4a9 \
+    --hash=sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775 \
+    --hash=sha256:b18a3ed7d5b3bd8d9ef7a8cb226502c6bf8308df1525e1cc676c3680e7176739 \
+    --hash=sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc \
+    --hash=sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062 \
+    --hash=sha256:b4c854ef3adc177950a8dfc81a86f5115d2abd545751a304c5bcf2c2c7283cfe \
+    --hash=sha256:b882b3df248017dba09d6b16defe9b5c407fe32fc7c65a9c69798e6175601be9 \
+    --hash=sha256:baf5215e0ab74c16e2dd324e8ec067ef59e41125d3eade2b863d294fd5035c92 \
+    --hash=sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5 \
+    --hash=sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13 \
+    --hash=sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d \
+    --hash=sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26 \
+    --hash=sha256:cb527a79772e5ef98fb1d700678fe031e353e765d1ca2d409c92263c6d43e09f \
+    --hash=sha256:cf364028c016c03078a23b503f02058f1814320a56ad535686f90565636a9495 \
+    --hash=sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b \
+    --hash=sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6 \
+    --hash=sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c \
+    --hash=sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef \
+    --hash=sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5 \
+    --hash=sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18 \
+    --hash=sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad \
+    --hash=sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3 \
+    --hash=sha256:de8dad4425a6ca6e4e5e297b27b5c824ecc7581910bf9aee86cb6835e6812aa7 \
+    --hash=sha256:e11e82b744887154b182fd3e7e8512418446501191994dbf9c9fc1f32cc8efd5 \
+    --hash=sha256:e6e73b9e02893c764e7e8d5bb5ce277f1a009cd5243f8228f75f842bf937c534 \
+    --hash=sha256:f73b96c41e3b2adedc34a7356e64c8eb96e03a3782b535e043a986276ce12a49 \
+    --hash=sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2 \
+    --hash=sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5 \
+    --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
+    --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
+    # via cryptography
+click==8.3.1 \
+    --hash=sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a \
+    --hash=sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6
+    # via mar
+construct==2.10.70 \
+    --hash=sha256:4d2472f9684731e58cc9c56c463be63baa1447d674e0d66aeb5627b22f512c29 \
+    --hash=sha256:c80be81ef595a1a821ec69dc16099550ed22197615f4320b57cc9ce2a672cb30
+    # via mar
+cryptography==46.0.3 \
+    --hash=sha256:00a5e7e87938e5ff9ff5447ab086a5706a957137e6e433841e9d24f38a065217 \
+    --hash=sha256:01ca9ff2885f3acc98c29f1860552e37f6d7c7d013d7334ff2a9de43a449315d \
+    --hash=sha256:09859af8466b69bc3c27bdf4f5d84a665e0f7ab5088412e9e2ec49758eca5cbc \
+    --hash=sha256:0abf1ffd6e57c67e92af68330d05760b7b7efb243aab8377e583284dbab72c71 \
+    --hash=sha256:1000713389b75c449a6e979ffc7dcc8ac90b437048766cef052d4d30b8220971 \
+    --hash=sha256:109d4ddfadf17e8e7779c39f9b18111a09efb969a301a31e987416a0191ed93a \
+    --hash=sha256:10b01676fc208c3e6feeb25a8b83d81767e8059e1fe86e1dc62d10a3018fa926 \
+    --hash=sha256:10ca84c4668d066a9878890047f03546f3ae0a6b8b39b697457b7757aaf18dbc \
+    --hash=sha256:15ab9b093e8f09daab0f2159bb7e47532596075139dd74365da52ecc9cb46c5d \
+    --hash=sha256:191bb60a7be5e6f54e30ba16fdfae78ad3a342a0599eb4193ba88e3f3d6e185b \
+    --hash=sha256:22d7e97932f511d6b0b04f2bfd818d73dcd5928db509460aaf48384778eb6d20 \
+    --hash=sha256:23b1a8f26e43f47ceb6d6a43115f33a5a37d57df4ea0ca295b780ae8546e8044 \
+    --hash=sha256:36e627112085bb3b81b19fed209c05ce2a52ee8b15d161b7c643a7d5a88491f3 \
+    --hash=sha256:39b6755623145ad5eff1dab323f4eae2a32a77a7abef2c5089a04a3d04366715 \
+    --hash=sha256:3b51b8ca4f1c6453d8829e1eb7299499ca7f313900dd4d89a24b8b87c0a780d4 \
+    --hash=sha256:402b58fc32614f00980b66d6e56a5b4118e6cb362ae8f3fda141ba4689bd4506 \
+    --hash=sha256:416260257577718c05135c55958b674000baef9a1c7d9e8f306ec60d71db850f \
+    --hash=sha256:46acf53b40ea38f9c6c229599a4a13f0d46a6c3fa9ef19fc1a124d62e338dfa0 \
+    --hash=sha256:4b7387121ac7d15e550f5cb4a43aef2559ed759c35df7336c402bb8275ac9683 \
+    --hash=sha256:50fc3343ac490c6b08c0cf0d704e881d0d660be923fd3076db3e932007e726e3 \
+    --hash=sha256:516ea134e703e9fe26bcd1277a4b59ad30586ea90c365a87781d7887a646fe21 \
+    --hash=sha256:549e234ff32571b1f4076ac269fcce7a808d3bf98b76c8dd560e42dbc66d7d91 \
+    --hash=sha256:5d7f93296ee28f68447397bf5198428c9aeeab45705a55d53a6343455dcb2c3c \
+    --hash=sha256:5ecfccd2329e37e9b7112a888e76d9feca2347f12f37918facbb893d7bb88ee8 \
+    --hash=sha256:6276eb85ef938dc035d59b87c8a7dc559a232f954962520137529d77b18ff1df \
+    --hash=sha256:6b5063083824e5509fdba180721d55909ffacccc8adbec85268b48439423d78c \
+    --hash=sha256:6eae65d4c3d33da080cff9c4ab1f711b15c1d9760809dad6ea763f3812d254cb \
+    --hash=sha256:6f61efb26e76c45c4a227835ddeae96d83624fb0d29eb5df5b96e14ed1a0afb7 \
+    --hash=sha256:71e842ec9bc7abf543b47cf86b9a743baa95f4677d22baa4c7d5c69e49e9bc04 \
+    --hash=sha256:760f83faa07f8b64e9c33fc963d790a2edb24efb479e3520c14a45741cd9b2db \
+    --hash=sha256:78a97cf6a8839a48c49271cdcbd5cf37ca2c1d6b7fdd86cc864f302b5e9bf459 \
+    --hash=sha256:7ce938a99998ed3c8aa7e7272dca1a610401ede816d36d0693907d863b10d9ea \
+    --hash=sha256:8a6e050cb6164d3f830453754094c086ff2d0b2f3a897a1d9820f6139a1f0914 \
+    --hash=sha256:9394673a9f4de09e28b5356e7fff97d778f8abad85c9d5ac4a4b7e25a0de7717 \
+    --hash=sha256:94cd0549accc38d1494e1f8de71eca837d0509d0d44bf11d158524b0e12cebf9 \
+    --hash=sha256:a04bee9ab6a4da801eb9b51f1b708a1b5b5c9eb48c03f74198464c66f0d344ac \
+    --hash=sha256:a23582810fedb8c0bc47524558fb6c56aac3fc252cb306072fd2815da2a47c32 \
+    --hash=sha256:a2c0cd47381a3229c403062f764160d57d4d175e022c1df84e168c6251a22eec \
+    --hash=sha256:a8b17438104fed022ce745b362294d9ce35b4c2e45c1d958ad4a4b019285f4a1 \
+    --hash=sha256:a9a3008438615669153eb86b26b61e09993921ebdd75385ddd748702c5adfddb \
+    --hash=sha256:b02cf04496f6576afffef5ddd04a0cb7d49cf6be16a9059d793a30b035f6b6ac \
+    --hash=sha256:b419ae593c86b87014b9be7396b385491ad7f320bde96826d0dd174459e54665 \
+    --hash=sha256:c0a7bb1a68a5d3471880e264621346c48665b3bf1c3759d682fc0864c540bd9e \
+    --hash=sha256:c70cc23f12726be8f8bc72e41d5065d77e4515efae3690326764ea1b07845cfb \
+    --hash=sha256:c8daeb2d2174beb4575b77482320303f3d39b8e81153da4f0fb08eb5fe86a6c5 \
+    --hash=sha256:cb3d760a6117f621261d662bccc8ef5bc32ca673e037c83fbe565324f5c46936 \
+    --hash=sha256:d55f3dffadd674514ad19451161118fd010988540cee43d8bc20675e775925de \
+    --hash=sha256:d89c3468de4cdc4f08a57e214384d0471911a3830fcdaf7a8cc587e42a866372 \
+    --hash=sha256:db391fa7c66df6762ee3f00c95a89e6d428f4d60e7abc8328f4fe155b5ac6e54 \
+    --hash=sha256:dfb781ff7eaa91a6f7fd41776ec37c5853c795d3b358d4896fdbb5df168af422 \
+    --hash=sha256:e5bf0ed4490068a2e72ac03d786693adeb909981cc596425d09032d372bcc849 \
+    --hash=sha256:e7aec276d68421f9574040c26e2a7c3771060bc0cff408bae1dcb19d3ab1e63c \
+    --hash=sha256:ef639cb3372f69ec44915fafcd6698b6cc78fbe0c2ea41be867f6ed612811963 \
+    --hash=sha256:f260d0d41e9b4da1ed1e0f1ce571f97fe370b152ab18778e9e8f67d6af432018
+    # via mar
+mar==3.2.0 \
+    --hash=sha256:602f64a99fb2db578a3d76c9f1ac3efd29bd5f8f0ae8568759fb205162b017d0 \
+    --hash=sha256:dd032cf72b65c62fb4e58e04a347076fda41f84265b41dd248098cc11e396c6e
+    # via -r requirements.in
+pycparser==2.23 \
+    --hash=sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2 \
+    --hash=sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934
+    # via cffi
+six==1.17.0 \
+    --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
+    --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
+    # via mar
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
index a89a0b15a4cc7..e8498268a8e17 100644
--- a/taskcluster/kinds/docker-image/kind.yml
+++ b/taskcluster/kinds/docker-image/kind.yml
@@ -342,6 +342,10 @@ tasks:
         symbol: I(idx)
     funsize-update-generator:
         symbol: I(pg)
+    partials-zuc:
+        symbol: I(pz)
+        parent: debian13-base
+        definition: partials-zucchini
     update-verify:
         symbol: I(uv)
         parent: debian12-base

From d416d4ceed03d9fe156dda827d3637b7485cdc44 Mon Sep 17 00:00:00 2001
From: Heitor Neiva <hneiva@mozilla.com>
Date: Fri, 6 Feb 2026 17:11:18 +0000
Subject: [PATCH 29/93] Bug 2000262 - Major refactor zucchini partials
 generator r=releng-reviewers,taskgraph-reviewers,bhearsum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move and refactor the zucchini partial MAR generator to support
certificate-based signature verification and URL validation.

Changes to make_incremental_zucchini.py:
- Move from tools/update-packaging/ to taskcluster/docker/partials-zucchini/
- Add URL validation with allowlist for download sources
- Add MAR signature verification using public key certificates
- Add MAR channel ID validation
- Refactor CLI: --from_url → --from-mars-json (JSON with version info)
- Add args: --branch, --cert-path, --mar-channel-id, --allow-staging-urls
- Standardize arg names (underscores to hyphens)
- Fix manifest version field: use application.ini instead of platform.ini

Changes to partials_zucchini.py transform:
- Add identify_desired_signing_keys() to determine cert type per branch
- Build --from-mars-json with previousVersion data
- Pass certificate path based on signing type
- Pass mar-channel-id and branch parameters
- Remove MAR_CHANNEL_ID environment variable

Changes to kind.yml:
- Use new partials-zuc docker image
- Update script path to /builds/worker/bin/make_incremental_zucchini.py
- Remove run-on-projects: [] restriction (still gated by shipping-phase)
- Remove obsolete environment variables

Differential Revision: https://phabricator.services.mozilla.com/D279010
---
 .../make_incremental_zucchini.py              | 192 ++++++++++++++----
 .../transforms/partials_zucchini.py           |  92 +++++----
 taskcluster/kinds/partials-zucchini/kind.yml  |  29 ++-
 3 files changed, 225 insertions(+), 88 deletions(-)
 rename {tools/update-packaging => taskcluster/docker/partials-zucchini}/make_incremental_zucchini.py (75%)

diff --git a/tools/update-packaging/make_incremental_zucchini.py b/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
similarity index 75%
rename from tools/update-packaging/make_incremental_zucchini.py
rename to taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
index e73c787416a8a..2b539f3d92e06 100644
--- a/tools/update-packaging/make_incremental_zucchini.py
+++ b/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
@@ -11,14 +11,8 @@
 #      partial to have unnecessary updates.
 # - Only decompress the target complete mar once
 # - Separate this script into a python module with multiple files (ie: download, validation, diffing)
-# - Implement caching of diffs. (Keeping in mind SCCACHE needs to
-#      move away from AWS)
-#      https://bugzilla.mozilla.org/show_bug.cgi?id=1842209
-# - Writing of the manifest file could be done at the very end
-#      instead of multiple writes
-# - Check file signature
-# - Check ALLOWED_URL_PREFIXES
-# - Check mar channel ids
+# - Implement caching of diffs. https://bugzilla.mozilla.org/show_bug.cgi?id=1842209
+# - Writing of the manifest file could be done at the very end instead of multiple writes
 
 import argparse
 import configparser
@@ -38,7 +32,8 @@
 from concurrent.futures import ProcessPoolExecutor
 from tempfile import NamedTemporaryFile
 
-# import multiprocessing
+from mardor.reader import MarReader
+from mardor.signing import get_keysize
 
 # Additional flags for XZ compression
 BCJ_OPTIONS = {
@@ -47,6 +42,24 @@
     "aarch64": [],
     "macos-x86_64-aarch64": [],
 }
+ROOT_URL = os.environ.get(
+    "TASKCLUSTER_ROOT_URL", "https://firefox-ci-tc.services.mozilla.com"
+)
+QUEUE_PREFIX = f"{ROOT_URL}/api/queue/"
+ALLOWED_URL_PREFIXES = (
+    "http://download.cdn.mozilla.net/pub/mozilla.org/firefox/nightly/",
+    "http://download.cdn.mozilla.net/pub/firefox/nightly/",
+    "http://ftp.mozilla.org/",
+    "http://download.mozilla.org/",
+    "https://archive.mozilla.org/",
+    "http://archive.mozilla.org/",
+    QUEUE_PREFIX,
+)
+STAGING_URL_PREFIXES = (
+    # TODO: Update release_history to force stage urls as https. https://bugzilla.mozilla.org/show_bug.cgi?id=2010915
+    "http://ftp.stage.mozaws.net/",
+    "https://ftp.stage.mozaws.net/",
+)
 
 logging.basicConfig(level=logging.INFO)
 
@@ -189,6 +202,24 @@ def append_remove_instructions(newdir, manifest):
                 manifest_file.write(f'remove "{file.strip()}"\n')
 
 
+def validate_mar_channel_id(mar_path, mar_channel_id):
+    """Validate MAR has correct channel id"""
+    channel_ids = set(mar_channel_id.split(","))
+
+    product_info = MarReader(open(mar_path, "rb")).productinfo
+    if not isinstance(product_info, tuple):
+        raise Exception(f"Malformed product info in mar: {mar_path}")
+
+    found_channel_ids = set(product_info[1].split(","))
+    if not found_channel_ids.issubset(channel_ids):
+        raise Exception(
+            f"MAR_CHANNEL_ID mismatch, {product_info[1]} not in {channel_ids}"
+        )
+
+    log(f"Validated {mar_path}: channel {product_info[1]} in {mar_channel_id}")
+    return True
+
+
 def mar_extract(source_mar, destination):
     os.makedirs(destination, exist_ok=True)
     cmd = ("mar", "-C", os.path.abspath(destination), "-x", os.path.abspath(source_mar))
@@ -224,7 +255,6 @@ def create_patch(from_file, to_file, destination_patch):
         # TODO: Potentially don't decompress to_mar files once per thread?
         xz_cmd(("--decompress",), to_file, to_fd.name)
 
-        # args = f"zucchini -gen '{from_fd.name}' '{to_fd.name}' '{patch_fd.name}'"
         args = ["zucchini", "-gen", from_fd.name, to_fd.name, patch_fd.name]
         try:
             subprocess.run(args, check=True)
@@ -235,10 +265,20 @@ def create_patch(from_file, to_file, destination_patch):
         xz_cmd(("--compress", "-9", "-e", "-c"), patch_fd.name, destination_patch)
 
 
-def make_partial(from_mar_url, to_mar_dir, target_mar, workdir, arch="", force=None):
+def make_partial(
+    from_mar_url,
+    to_mar_dir,
+    target_mar,
+    mar_channel_id,
+    workdir,
+    signing_cert,
+    arch="",
+    force=None,
+    staging=False,
+):
     # Download from_mar
     from_mar = os.path.join(workdir, "from.mar")
-    download_file(from_mar_url, from_mar)
+    download_file(from_mar_url, from_mar, staging, signing_cert)
 
     requested_forced_updates = force or []
     # MacOS firefox binary is always forced update
@@ -262,7 +302,7 @@ def make_partial(from_mar_url, to_mar_dir, target_mar, workdir, arch="", force=N
     os.makedirs(partials_dir, exist_ok=True)
 
     # List files and directories
-    oldfiles, olddirs = list_files_and_dirs(from_mar_dir)
+    oldfiles, _ = list_files_and_dirs(from_mar_dir)
     newfiles, newdirs = list_files_and_dirs(to_mar_dir)
 
     for newdir in newdirs:
@@ -345,12 +385,9 @@ def make_partial(from_mar_url, to_mar_dir, target_mar, workdir, arch="", force=N
     xz_cmd(xz_compression_options(arch), manifest_file, compressed_manifest)
     archivefiles.append("updatev3.manifest")
 
-    # Use
-    mar_channel_id = os.environ.get("MAR_CHANNEL_ID", "unknown")
     version = get_option_from_compressed(
         to_mar_dir, "application.ini", "App", "Version"
     )
-    # from_version = get_option_from_compressed(from_mar_dir, "application.ini", "App", "Version")
 
     log(f"Archive files: {' '.join(archivefiles)}", "make_partial")
 
@@ -387,14 +424,32 @@ def make_partial(from_mar_url, to_mar_dir, target_mar, workdir, arch="", force=N
     }
 
 
-def download_file(url, save_path):
+def validate_url(url, allow_staging):
+    allowed_url_prefixes = ALLOWED_URL_PREFIXES
+    if allow_staging:
+        allowed_url_prefixes += STAGING_URL_PREFIXES
+    if not url.startswith(allowed_url_prefixes):
+        raise Exception(f"URL not allowed: {url}")
+
+
+def verify_signature(path, signing_cert):
+    with open(path, "rb") as fd:
+        m = MarReader(fd)
+        if not m.verify(verify_key=signing_cert):
+            raise Exception(f"MAR Signature invalid: {path}")
+
+
+def download_file(url, save_path, allow_staging, signing_cert=None):
     """
     Downloads a file from a given URL and saves it to disk.
+    Validates URL before proceeding with download.
 
     Args:
     url (str): The URL to download the file from.
     save_path (str): The path (including filename) where the file should be saved.
+    allow_staging (bool): Allows staging URLs
     """
+    validate_url(url, allow_staging)
     try:
         # Download the file and save it to the specified path
         urllib.request.urlretrieve(url, save_path)
@@ -406,22 +461,44 @@ def download_file(url, save_path):
         log(f"An unexpected error occurred: {url} -> {e}", "download_file")
         raise Exception("Failed to download file.")
 
+    if signing_cert:
+        verify_signature(save_path, signing_cert)
+
 
 def process_single(
     update_number,
     from_mar_url,
     to_mar_dir,
     target_mar,
+    mar_channel_id,
     workdir,
+    signing_cert,
     arch,
     force,
+    staging,
+    previousVersion=None,
 ):
     try:
         mar_manifest = make_partial(
-            from_mar_url, to_mar_dir, target_mar, workdir, arch, force
+            from_mar_url=from_mar_url,
+            to_mar_dir=to_mar_dir,
+            target_mar=target_mar,
+            mar_channel_id=mar_channel_id,
+            workdir=workdir,
+            signing_cert=signing_cert,
+            arch=arch,
+            force=force,
+            staging=staging,
         )
         mar_manifest["update_number"] = update_number
-        return None, mar_manifest
+        if previousVersion:
+            mar_manifest["previousVersion"] = previousVersion
+        # Validate the created mar has valid channel id
+        if validate_mar_channel_id(target_mar, mar_channel_id):
+            return None, mar_manifest
+        else:
+            # Since we still want to capture the manifest, we return the exception without raising it
+            return Exception("Invalid partial MAR id!"), mar_manifest
     except Exception as e:
         log(traceback.format_exc(), "process_single")
         return e, None
@@ -432,20 +509,40 @@ def main():
         description="Generate incremental update packages with zucchini."
     )
     parser.add_argument(
-        "--from_url", help="Complete mar URLs", action="append", required=True
+        "--from-mars-json",
+        help="JSON data of complete mar URLs",
+        action="store",
+        required=True,
+    )
+    parser.add_argument(
+        "--branch", help="Project branch", action="store", required=True
     )
-    parser.add_argument("--to_mar", help="To complete mar", required=True)
+    parser.add_argument("--to-mar", help="To complete mar", required=True)
     parser.add_argument(
-        "--to_mar_url",
+        "--to-mar-url",
         help="To mar URL. Only used for filling the manifest.json file.",
         action="store",
         required=False,
         default="",
     )
     parser.add_argument("--target", help="Target partial mar location", required=True)
+    parser.add_argument(
+        "--cert-path",
+        help="Certificate path",
+        type=argparse.FileType("rb"),
+        required=True,
+    )
+    parser.add_argument(
+        "--allow-staging-urls",
+        help="Allows downloading from staging URLs",
+        action="store_true",
+    )
     parser.add_argument(
         "--workdir", help="Work directory", action="store", required=True
     )
+    parser.add_argument(
+        "--mar-channel-id", help="MAR channel ID", action="store", default="unknown"
+    )
     parser.add_argument("--locale", help="Build locale", action="store", required=True)
     parser.add_argument(
         "--arch",
@@ -464,6 +561,9 @@ def main():
 
     base_workdir = os.path.abspath(args.workdir)
 
+    signing_cert = args.cert_path.read()
+    assert get_keysize(signing_cert) == 4096
+
     # Multithread one partial per CPU
     cpus = os.cpu_count()  # This isn't optimal, but will do for now
     log(f"CPUs available for parallel computing: {cpus}", "main")
@@ -476,6 +576,12 @@ def main():
     to_mar_dir = os.path.join(base_workdir, "to_mar")
     mar_extract(args.to_mar, to_mar_dir)
 
+    # Note: we can't validate "from mar" channels. See bug 1543662 for details.
+    # Validate to_mar channel id
+    if not validate_mar_channel_id(args.to_mar, args.mar_channel_id):
+        log("Invalid MAR channel id in to-mar!", "main")
+        raise Exception("Invalid MAR channel id in to-mar!")
+
     futures = []
     futures_result = []
 
@@ -486,20 +592,32 @@ def future_cb(f):
             futures_result.append(("Cancelled", None))
 
     with ProcessPoolExecutor(cpus) as executor:
-        # TODO: should the update_number come from the task payload?
-        for update_number, from_url in enumerate(args.from_url):
-            process_workdir = os.path.join(base_workdir, str(update_number))
+        from_data = json.loads(args.from_mars_json)
+        assert isinstance(from_data, list), (
+            "Param --from-mars-json should be a JSON list."
+        )
+
+        for from_data_index in range(len(from_data)):
+            source_data = from_data[from_data_index]
+            update_number = source_data["update_number"]
+            process_workdir = os.path.join(base_workdir, str(from_data_index))
             os.makedirs(process_workdir, exist_ok=True)
-            target_mar = os.path.join(target, f"target.partial-{update_number}.mar")
+
+            target_mar = os.path.join(target, source_data["dest_mar"])
+
             future = executor.submit(
                 process_single,
-                update_number,
-                from_url,
-                to_mar_dir,
-                target_mar,
-                process_workdir,
-                args.arch,
-                args.force,
+                update_number=update_number,
+                from_mar_url=source_data["url"],
+                to_mar_dir=to_mar_dir,
+                target_mar=target_mar,
+                mar_channel_id=args.mar_channel_id,
+                workdir=process_workdir,
+                signing_cert=signing_cert,
+                arch=args.arch,
+                force=args.force,
+                staging=args.allow_staging_urls,
+                previousVersion=source_data.get("previousVersion"),
             )
             future.add_done_callback(future_cb)
             futures.append(future)
@@ -515,11 +633,12 @@ def future_cb(f):
             section="Build",
             option="SourceRepository",
         ),
+        "branch": args.branch,
         "revision": get_option_from_compressed(
             to_mar_dir, filename="platform.ini", section="Build", option="SourceStamp"
         ),
         "version": get_option_from_compressed(
-            to_mar_dir, filename="platform.ini", section="Build", option="SourceStamp"
+            to_mar_dir, filename="application.ini", section="App", option="Version"
         ),
         "to_buildid": get_option_from_compressed(
             to_mar_dir, filename="application.ini", section="App", option="BuildID"
@@ -539,8 +658,6 @@ def future_cb(f):
             errd = True
             log("Process raised an exception!", "main")
             print(error)
-    if errd:
-        sys.exit(1)
 
     # Write final task manifest
     with open(os.path.join(target, "manifest.json"), "w") as fd:
@@ -548,6 +665,9 @@ def future_cb(f):
 
     log("Finished writing final manifest.", "main")
 
+    if errd:
+        sys.exit(1)
+
 
 if __name__ == "__main__":
     main()
diff --git a/taskcluster/gecko_taskgraph/transforms/partials_zucchini.py b/taskcluster/gecko_taskgraph/transforms/partials_zucchini.py
index 4444fe1181e7a..aa2a37d224625 100644
--- a/taskcluster/gecko_taskgraph/transforms/partials_zucchini.py
+++ b/taskcluster/gecko_taskgraph/transforms/partials_zucchini.py
@@ -5,31 +5,37 @@
 Transform the partials task into an actual task description.
 """
 
+import json
+
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.dependencies import get_primary_dependency
 from taskgraph.util.treeherder import inherit_treeherder_from_dep
 
+from gecko_taskgraph.util.attributes import release_level
 from gecko_taskgraph.util.partials import get_builds
 from gecko_taskgraph.util.platforms import architecture
+from gecko_taskgraph.util.scriptworker import (
+    get_devedition_signing_type,
+    get_signing_type,
+)
 
 transforms = TransformSequence()
 
 
-# TODO: Add cert verify
-# def identify_desired_signing_keys(project, product):
-#     if project in ["mozilla-central", "comm-central", "larch", "pine", "maple"]:
-#         return "nightly"
-#     if project == "mozilla-beta":
-#         if product == "devedition":
-#             return "nightly"
-#         return "release"
-#     if (
-#         project in ["mozilla-release", "comm-release", "comm-beta"]
-#         or project.startswith("mozilla-esr")
-#         or project.startswith("comm-esr")
-#     ):
-#         return "release"
-#     return "dep1"
+def identify_desired_signing_keys(config):
+    """
+    Determine the signing certificate type to use for MAR validation.
+    It identifies the appropriate signing type based on the release product
+    and configuration parameters, handling special logic for devedition releases.
+
+    Args:
+        config: The task graph configuration object containing:
+    Returns:
+        str: The signing type (defined in util/scriptworker.py)
+    """
+    if config.params["release_product"] == "devedition":
+        return get_devedition_signing_type(config=config)
+    return get_signing_type(config=config)
 
 
 @transforms.add
@@ -41,9 +47,7 @@ def make_task_description(config, tasks):
         dep_task = get_primary_dependency(config, task)
         assert dep_task
 
-        # attributes = copy_attributes_from_dependent_job(dep_job)
         locale = task["attributes"].get("locale")
-
         build_locale = locale or "en-US"
 
         build_platform = task["attributes"]["build_platform"]
@@ -56,6 +60,8 @@ def make_task_description(config, tasks):
         if not builds:
             continue
 
+        mar_channel_id = task["attributes"]["mar-channel-id"]
+
         locale_suffix = ""
         if locale:
             locale_suffix = f"{locale}/"
@@ -64,37 +70,53 @@ def make_task_description(config, tasks):
         # Fetches from upstream repackage task
         task["fetches"][dep_task.kind] = [artifact_path]
 
-        extra_params = [f"--target=/builds/worker/artifacts/{locale_suffix}"]
+        cert_type = identify_desired_signing_keys(config).replace("-signing", "")
 
+        from_data = []
+        update_number = 1
         for build in sorted(builds):
-            url = builds[build]["mar_url"]
-            extra_params.append(f"--from_url={url}")
+            partial_info = {
+                "url": builds[build]["mar_url"],
+                "update_number": update_number,
+                "dest_mar": build,
+            }
+            if "previousVersion" in builds[build]:
+                partial_info["previousVersion"] = builds[build]["previousVersion"]
+            from_data.append(partial_info)
+        from_mars_json = json.dumps(from_data, separators=(",", ":"))
+
+        extra_params = [
+            f"--arch={architecture(build_platform)}",
+            f"--locale={build_locale}",
+            f"--target=/builds/worker/artifacts/{locale_suffix}",
+            f"--from-mars-json='{from_mars_json}'",
+            f"--mar-channel-id='{mar_channel_id}'",
+            f"--branch={config.params['project']}",
+            f"--cert-path=/builds/worker/workspace/keys/{cert_type}.pubkey",
+        ]
+
+        if release_level(config.params) == "staging":
+            extra_params.append("--allow-staging-urls")
 
-        to_mar_path = None
         for artifact in dep_task.attributes["release_artifacts"]:
             if artifact.endswith(".complete.mar"):
-                to_mar_path = artifact
+                extra_params.append(f"--to-mar-url=<{dep_task.kind}/{artifact}>")
                 break
 
-        task["worker"]["env"]["TO_MAR_TASK_ID"] = {
-            "task-reference": f"<{dep_task.kind}>"
-        }
-        extra_params.extend([
-            f"--arch={architecture(build_platform)}",
-            f"--locale={build_locale}",
-            # This isn't a great approach to resolving the source URL of to_mar, but it's the same as
-            # It's only being used to fill manifest.json information, the actual file is downloaded via run-task
-            f"--to_mar_url=https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/$TO_MAR_TASK_ID/artifacts/{to_mar_path}",
-        ])
-        # Add a space from the last command + list of extra_params
-        task["run"]["command"] += " " + " ".join(extra_params)
+        full_cmd = (
+            task["run"]["command"]["artifact-reference"] + "\n" + " ".join(extra_params)
+        )
+        # remove all whitespace from the command
+        full_cmd = " ".join([line.strip() for line in full_cmd.splitlines()])
+        task["run"]["command"]["artifact-reference"] = full_cmd
 
         task["description"] = (
             f"Partials task for locale '{build_locale}' for build '{build_platform}'"
         )
 
         task["treeherder"] = inherit_treeherder_from_dep(task, dep_task)
+        # TODO: Reset this to tier 1 once D272679 is landed
+        task["treeherder"]["tier"] = 3
         task["treeherder"]["symbol"] = f"pz({locale or 'N'})"
 
-        task["worker"]["env"]["MAR_CHANNEL_ID"] = task["attributes"]["mar-channel-id"]
         yield task
diff --git a/taskcluster/kinds/partials-zucchini/kind.yml b/taskcluster/kinds/partials-zucchini/kind.yml
index 3a40b0714dd91..38b1c52ae44fd 100644
--- a/taskcluster/kinds/partials-zucchini/kind.yml
+++ b/taskcluster/kinds/partials-zucchini/kind.yml
@@ -43,8 +43,7 @@ tasks:
             copy-attributes: true
             group-by: single-with-filters
         shipping-phase: promote
-        # Don't run on CI until we switch to zucchini partials
-        run-on-projects: []
+        run-on-projects: ["mozilla-central"]
         fetches:
             toolchain:
                 - linux64-zucchini-bin
@@ -57,22 +56,18 @@ tasks:
                   type: directory
                   path: /builds/worker/artifacts
             docker-image:
-                in-tree: "debian12-base"
+                in-tree: "partials-zuc"
             chain-of-trust: true
             max-run-time: 5400
-            env:
-                # Defined in transform
-                MAR_CHANNEL_ID: TBD
-                FROM_MAR_TASK_ID: {"task-reference": "TBD"}
         run:
             using: run-task
-            cwd: "{checkout}"
-            # --from_url, --locale, --target and --arch parameters to be added in transform
-            command: >-
-                mkdir -p /builds/worker/artifacts/public/build &&
-                export PATH=$PATH:$MOZ_FETCHES_DIR &&
-                export PATH=$PATH:$MOZ_FETCHES_DIR/mar-tools &&
-                python3
-                tools/update-packaging/make_incremental_zucchini.py
-                --workdir=/builds/worker/workspace
-                --to_mar=$MOZ_FETCHES_DIR/target.complete.mar
+            checkout: false
+            # More parameters to be added in transform
+            # artifact-reference used for to-mar-url parameter
+            command:
+                artifact-reference: >-
+                    export PATH=$PATH:$MOZ_FETCHES_DIR &&
+                    export PATH=$PATH:$MOZ_FETCHES_DIR/mar-tools &&
+                    python3 /builds/worker/bin/make_incremental_zucchini.py
+                    --workdir=/builds/worker/workspace
+                    --to-mar=$MOZ_FETCHES_DIR/target.complete.mar

From 8061d4fb0c57aa03b7de80bcca38a4d0e45965c5 Mon Sep 17 00:00:00 2001
From: Heitor Neiva <hneiva@mozilla.com>
Date: Fri, 6 Feb 2026 17:11:18 +0000
Subject: [PATCH 30/93] Bug 2012546 - Fix zucchini partials patch manifest
 entries r=yjuglaret,releng-reviewers,taskgraph-reviewers,bhearsum

- Remove unnecessary variable
- Update make_patch_instruction to use relative path instead of absolute

Differential Revision: https://phabricator.services.mozilla.com/D280459
---
 .../partials-zucchini/make_incremental_zucchini.py     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py b/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
index 2b539f3d92e06..7b97db9966037 100644
--- a/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
+++ b/taskcluster/docker/partials-zucchini/make_incremental_zucchini.py
@@ -177,7 +177,7 @@ def check_for_add_if_not_update(filename):
 
 def make_patch_instruction(filename, manifest):
     with open(manifest, "a") as manifest_file:
-        manifest_file.write(f'patch "{filename}"\n')
+        manifest_file.write(f'patch "{filename}.patch" "{filename}"\n')
 
 
 def add_remove_instructions(remove_array, manifest):
@@ -326,6 +326,9 @@ def make_partial(
     # Process files for patching
     # Note: these files are already XZ compressed
     for rel_path in oldfiles:
+        # updatev3.manifest is the partial manifest, not a patch[able] file
+        if rel_path == "updatev3.manifest":
+            continue
         new_file_abs = os.path.join(to_mar_dir, rel_path)
         old_file_abs = os.path.join(from_mar_dir, rel_path)
 
@@ -358,9 +361,8 @@ def make_partial(
                     shutil.copy2(new_file_abs, patch_file)
                     archivefiles.append(rel_path)
                 else:
-                    make_patch_instruction(patch_file, manifest_file)
-                    path_relpath = os.path.relpath(patch_file, partials_dir)
-                    archivefiles.append(f"{path_relpath}.patch")
+                    make_patch_instruction(rel_path, manifest_file)
+                    archivefiles.append(f"{rel_path}.patch")
 
         else:
             remove_array.append(rel_path)

From 30c991cc2a3abedd0db52133caaf784d13a87fe5 Mon Sep 17 00:00:00 2001
From: Jon Oliver <jooliver@mozilla.com>
Date: Fri, 6 Feb 2026 17:16:20 +0000
Subject: [PATCH 31/93] Bug 2003084 - update toolbar tokens to use underlying
 design tokens r=desktop-theme-reviewers,jules

Differential Revision: https://phabricator.services.mozilla.com/D280464
---
 .../shared/design-system/src/toolbar.css      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/toolkit/themes/shared/design-system/src/toolbar.css b/toolkit/themes/shared/design-system/src/toolbar.css
index 243565699cbd9..fe31afd103fe8 100644
--- a/toolkit/themes/shared/design-system/src/toolbar.css
+++ b/toolkit/themes/shared/design-system/src/toolbar.css
@@ -38,7 +38,7 @@
   --toolbar-field-focus-color: FieldText;
   --toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent);
 
-  --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 85%, white);
+  --toolbar-bgcolor: color-mix(in srgb, -moz-dialog 85%, var(--color-white));
   --toolbar-color: -moz-dialogtext;
   --toolbarseparator-color: color-mix(in srgb, currentColor 60%, transparent);
 
@@ -49,12 +49,12 @@
    * the toolbar background applies some white unconditionally.
    */
   @media not (prefers-contrast) {
-    --toolbar-field-border-color: transparent;
-    --toolbar-field-background-color: light-dark(rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.3));
+    --toolbar-field-border-color: var(--border-color-transparent);
+    --toolbar-field-background-color: light-dark(rgba(0, 0, 0, 0.05), var(--color-black-alpha-30));
     --toolbar-field-color: inherit;
 
     @media (prefers-color-scheme: light) {
-      --toolbar-bgcolor: white;
+      --toolbar-bgcolor: var(--color-white);
     }
   }
 
@@ -79,12 +79,12 @@
   }
 
   &[lwtheme] {
-    --toolbar-bgcolor: rgba(255, 255, 255, 0.4);
+    --toolbar-bgcolor: var(--color-white-alpha-40);
     --toolbar-color: var(--lwt-text-color, inherit);
 
-    --toolbarbutton-icon-fill-attention: light-dark(rgb(0, 97, 224), rgb(0, 221, 255));
-    --toolbarbutton-icon-fill-attention-text-light: rgb(240, 240, 244);
-    --toolbarbutton-icon-fill-attention-text-dark: rgb(28, 27, 34);
+    --toolbarbutton-icon-fill-attention: light-dark(var(--color-blue-60), var(--color-cyan-30));
+    --toolbarbutton-icon-fill-attention-text-light: var(--color-gray-20);
+    --toolbarbutton-icon-fill-attention-text-dark: var(--color-gray-90);
     --toolbarbutton-icon-fill-attention-text: light-dark(
       var(--toolbarbutton-icon-fill-attention-text-light),
       var(--toolbarbutton-icon-fill-attention-text-dark)
@@ -99,17 +99,17 @@
  */
 @media not ((forced-colors) or (-moz-native-theme)) {
   :root:not([lwtheme]) {
-    --toolbar-color: light-dark(rgb(21, 20, 26), rgb(251, 251, 254));
+    --toolbar-color: light-dark(var(--color-gray-100), var(--color-gray-05));
     --toolbar-bgcolor: light-dark(#f9f9fb, rgb(43, 42, 51));
 
-    --toolbar-field-border-color: transparent;
-    --toolbar-field-background-color: light-dark(rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.3));
-    --toolbar-field-color: light-dark(rgb(21, 20, 26), rgb(251, 251, 254));
-    --toolbar-field-focus-background-color: light-dark(white, rgb(66, 65, 77));
-    --toolbar-field-focus-color: light-dark(black, rgb(251, 251, 254));
+    --toolbar-field-border-color: var(--border-color-transparent);
+    --toolbar-field-background-color: light-dark(rgba(0, 0, 0, 0.05), var(--color-black-alpha-30));
+    --toolbar-field-color: light-dark(var(--color-gray-100), var(--color-gray-05));
+    --toolbar-field-focus-background-color: light-dark(var(--color-white), rgb(66, 65, 77));
+    --toolbar-field-focus-color: light-dark(var(--color-black), var(--color-gray-05));
 
-    --toolbarbutton-icon-fill: light-dark(rgb(91, 91, 102), rgb(251, 251, 254));
-    --toolbarbutton-icon-fill-attention: light-dark(rgb(0, 97, 224), rgb(0, 221, 255));
-    --toolbarbutton-icon-fill-attention-text: light-dark(rgb(240, 240, 244), rgb(28, 27, 34));
+    --toolbarbutton-icon-fill: light-dark(var(--color-gray-70), var(--color-gray-05));
+    --toolbarbutton-icon-fill-attention: light-dark(var(--color-blue-60), var(--color-cyan-30));
+    --toolbarbutton-icon-fill-attention-text: light-dark(var(--color-gray-20), var(--color-gray-90));
   }
 }

From 8473191ea2afef752f2a897e556cf3952cc4a2ee Mon Sep 17 00:00:00 2001
From: hannajones <hjones@mozilla.com>
Date: Fri, 6 Feb 2026 17:16:23 +0000
Subject: [PATCH 32/93] Bug 1995062 - Part 1: render backup-settings via config
 r=fluent-reviewers,desktop-theme-reviewers,cdupuis,bolsson,akulyk,tgiles

Differential Revision: https://phabricator.services.mozilla.com/D279015
---
 .../backup/content/backup-settings.css        |  2 +-
 browser/components/preferences/main.js        | 11 ++++++
 browser/components/preferences/preferences.js |  8 -----
 browser/components/preferences/sync.inc.xhtml | 17 +--------
 browser/components/preferences/sync.js        | 36 +++++++++----------
 .../locales/en-US/browser/backupSettings.ftl  |  4 ++-
 6 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/browser/components/backup/content/backup-settings.css b/browser/components/backup/content/backup-settings.css
index 8ad6c6ccd1ada..a6c22f79f9dab 100644
--- a/browser/components/backup/content/backup-settings.css
+++ b/browser/components/backup/content/backup-settings.css
@@ -64,7 +64,7 @@
   }
 }
 
-section {
+section:not(:first-of-type) {
   margin-block-start: 24px;
 }
 
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 1bfdc4b6bda7d..908c1b4d24878 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -4885,6 +4885,17 @@ SettingGroupManager.registerGroups({
       },
     ],
   },
+  backup: {
+    l10nId: "settings-data-backup-header2",
+    headingLevel: 2,
+    supportPage: "firefox-backup",
+    items: [
+      {
+        id: "backupSettings",
+        control: "backup-settings",
+      },
+    ],
+  },
   translationsAutomaticTranslation: {
     inProgress: true,
     headingLevel: 2,
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 3c60cc9f199ba..f0574900b1d88 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -571,14 +571,6 @@ async function gotoPref(
     spotlight(subcategory, category);
   }
 
-  // Handle any visibility changes that are controlled by pref logic.
-  //
-  // Take caution when trying to flip the hidden state to true since the
-  // element might show up unexpectedly on different pages in about:preferences.
-  //
-  // See Bug 1999032 to remove this in favor of config-based prefs.
-  categoryModule.handlePrefControlledSection?.();
-
   // Record which category is shown
   let gleanId = /** @type {"showClick" | "showHash" | "showInitial"} */ (
     "show" + aShowReason
diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
index d473643ccf12b..b889d42301de3 100644
--- a/browser/components/preferences/sync.inc.xhtml
+++ b/browser/components/preferences/sync.inc.xhtml
@@ -256,20 +256,5 @@
 <html:setting-group groupid="sync" hidden="true" data-category="paneSync"/>
 
 <!-- Firefox Backup -->
-<hbox id="backupCategory"
-    class="subcategory"
-    hidden="true"
-    data-category="paneSync"
-    >
-  <html:h1 data-l10n-id="settings-data-backup-header"/>
-</hbox>
-<groupbox id="dataBackupGroup"
-          data-category="paneSync"
-          data-subcategory="backup"
-          hidden="true">
-  <label class="search-header" hidden="true"><html:h2 data-l10n-id="settings-data-backup-header"/></label>
-  <hbox flex="1">
-    <html:backup-settings />
-  </hbox>
-</groupbox>
+<html:setting-group groupid="backup" hidden="true" data-category="paneSync" data-subcategory="backup"/>
 </html:template>
diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index 48314589f189b..068cec6ad28cb 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -605,6 +605,21 @@ Preferences.addSetting({
   },
 });
 
+// Backup section
+
+Preferences.addSetting({
+  id: "backupSettings",
+  setup(emitChange) {
+    Services.obs.addObserver(emitChange, "backup-service-status-updated");
+    return () =>
+      Services.obs.removeObserver(emitChange, "backup-service-status-updated");
+  },
+  visible: () => {
+    let bs = lazy.BackupService.init();
+    return bs.archiveEnabledStatus.enabled || bs.restoreEnabledStatus.enabled;
+  },
+});
+
 var gSyncPane = {
   get page() {
     return document.getElementById("weavePrefsDeck").selectedIndex;
@@ -656,26 +671,6 @@ var gSyncPane = {
     xps.ensureLoaded();
   },
 
-  /**
-   * This method allows us to override any hidden states that were set
-   * during preferences.js init(). Currently, this is used to hide the
-   * backup section if backup is disabled.
-   *
-   * Take caution when trying to flip the hidden state to true since the
-   * element might show up unexpectedly on different pages in about:preferences
-   * since this function will run at the end of preferences.js init().
-   *
-   * See Bug 1999032 to remove this in favor of config-based prefs.
-   */
-  handlePrefControlledSection() {
-    let bs = lazy.BackupService.init();
-
-    if (!bs.archiveEnabledStatus.enabled && !bs.restoreEnabledStatus.enabled) {
-      document.getElementById("backupCategory").hidden = true;
-      document.getElementById("dataBackupGroup").hidden = true;
-    }
-  },
-
   _showLoadPage() {
     let maybeAcct = false;
     let username = Services.prefs.getCharPref("services.sync.username", "");
@@ -699,6 +694,7 @@ var gSyncPane = {
     initSettingGroup("defaultBrowserSync");
     initSettingGroup("sync");
     initSettingGroup("account");
+    initSettingGroup("backup");
 
     Weave.Svc.Obs.add(UIState.ON_UPDATE, this.updateWeavePrefs, this);
 
diff --git a/browser/locales/en-US/browser/backupSettings.ftl b/browser/locales/en-US/browser/backupSettings.ftl
index 378a1ca3dfbf4..43934d799eaf4 100644
--- a/browser/locales/en-US/browser/backupSettings.ftl
+++ b/browser/locales/en-US/browser/backupSettings.ftl
@@ -21,7 +21,9 @@ backup-folder-name = Restore { -brand-product-name }
 # FirefoxBackup_default_20240606-1830.html
 backup-file-name = { -brand-product-name }Backup
 
-settings-data-backup-header = Backup
+settings-data-backup-header2 =
+    .label = Backup
+    .description = Automatically protect your bookmarks, history, and other data.
 settings-data-backup-toggle = Manage backup
 settings-data-backup-toggle-on = Turn on backup
 settings-data-backup-toggle-off = Turn off backup

From 92f1deb41e6a5de3e8150f0fd576befe7c9ab771 Mon Sep 17 00:00:00 2001
From: hannajones <hjones@mozilla.com>
Date: Fri, 6 Feb 2026 17:16:23 +0000
Subject: [PATCH 33/93] Bug 1995062 - Part 2: convert backup-settings to match
 new settings UI
 r=fluent-reviewers,desktop-theme-reviewers,cdupuis,bolsson,akulyk,tgiles

Differential Revision: https://phabricator.services.mozilla.com/D279016
---
 .../components/backup/BackupService.sys.mjs   |  37 +--
 .../backup/actors/BackupUIChild.sys.mjs       |   2 +-
 .../backup/actors/BackupUIParent.sys.mjs      |   4 +-
 .../backup/content/backup-settings.css        |  65 ++---
 .../backup/content/backup-settings.mjs        | 250 +++++++-----------
 .../locales/en-US/browser/backupSettings.ftl  |  36 ++-
 .../bug_1995062_backup_settings_conversion.py |  36 +++
 toolkit/content/widgets/moz-box-common.css    |   2 +-
 .../widgets/moz-box-item/moz-box-item.css     |   9 +
 .../widgets/moz-box-item/moz-box-item.mjs     |  41 ++-
 .../moz-input-folder/moz-input-folder.css     |   1 +
 .../moz-input-folder/moz-input-folder.mjs     |   1 +
 12 files changed, 235 insertions(+), 249 deletions(-)
 create mode 100644 python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py

diff --git a/browser/components/backup/BackupService.sys.mjs b/browser/components/backup/BackupService.sys.mjs
index c66327adf40d1..1516f4b1e3da5 100644
--- a/browser/components/backup/BackupService.sys.mjs
+++ b/browser/components/backup/BackupService.sys.mjs
@@ -4873,42 +4873,13 @@ export class BackupService extends EventTarget {
   }
 
   /**
-   * Shows a native folder picker to set the location to write the single-file
-   * archive files.
+   * Sets the location to write the single-file archive files.
    *
-   * @param {ChromeWindow} window
-   *   The top-level browsing window to associate the file picker with.
+   * @param {string} path
+   *   The parent directory path where backups should be stored.
    * @returns {Promise<undefined>}
    */
-  async editBackupLocation(window) {
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    let mode = Ci.nsIFilePicker.modeGetFolder;
-    fp.init(window.browsingContext, "", mode);
-
-    let currentBackupDirPathParent = PathUtils.parent(
-      this.#_state.backupDirPath
-    );
-    if (await IOUtils.exists(currentBackupDirPathParent)) {
-      fp.displayDirectory = await IOUtils.getDirectory(
-        currentBackupDirPathParent
-      );
-    }
-
-    let result = await new Promise(resolve => fp.open(resolve));
-
-    if (result === Ci.nsIFilePicker.returnCancel) {
-      return;
-    }
-
-    let path = fp.file.path;
-
-    // If the same parent directory was chosen, this is a no-op.
-    if (
-      PathUtils.join(path, BackupService.BACKUP_DIR_NAME) == lazy.backupDirPref
-    ) {
-      return;
-    }
-
+  async editBackupLocation(path) {
     // If the location changed, delete the last backup there if one exists.
     try {
       await this.deleteLastBackup();
diff --git a/browser/components/backup/actors/BackupUIChild.sys.mjs b/browser/components/backup/actors/BackupUIChild.sys.mjs
index 0cf8b31708c8a..59ccb98379d6a 100644
--- a/browser/components/backup/actors/BackupUIChild.sys.mjs
+++ b/browser/components/backup/actors/BackupUIChild.sys.mjs
@@ -128,7 +128,7 @@ export class BackupUIChild extends JSWindowActorChild {
     } else if (event.type == "BackupUI:ShowBackupLocation") {
       this.sendAsyncMessage("ShowBackupLocation");
     } else if (event.type == "BackupUI:EditBackupLocation") {
-      this.sendAsyncMessage("EditBackupLocation");
+      this.sendAsyncMessage("EditBackupLocation", event.detail);
     } else if (event.type == "BackupUI:SetEmbeddedComponentPersistentData") {
       this.sendAsyncMessage("SetEmbeddedComponentPersistentData", event.detail);
     } else if (event.type == "BackupUI:FlushEmbeddedComponentPersistentData") {
diff --git a/browser/components/backup/actors/BackupUIParent.sys.mjs b/browser/components/backup/actors/BackupUIParent.sys.mjs
index f4dc87570d292..a91c6f337f516 100644
--- a/browser/components/backup/actors/BackupUIParent.sys.mjs
+++ b/browser/components/backup/actors/BackupUIParent.sys.mjs
@@ -265,8 +265,8 @@ export class BackupUIParent extends JSWindowActorParent {
     } else if (message.name == "ShowBackupLocation") {
       this.#bs.showBackupLocation();
     } else if (message.name == "EditBackupLocation") {
-      const window = this.browsingContext.topChromeWindow;
-      this.#bs.editBackupLocation(window);
+      const path = message.data?.path;
+      this.#bs.editBackupLocation(path);
     } else if (message.name == "QuitCurrentProfile") {
       // Notify windows that a quit has been requested.
       let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(
diff --git a/browser/components/backup/content/backup-settings.css b/browser/components/backup/content/backup-settings.css
index a6c22f79f9dab..46e279536d9d0 100644
--- a/browser/components/backup/content/backup-settings.css
+++ b/browser/components/backup/content/backup-settings.css
@@ -7,7 +7,9 @@
 
 :host {
   --margin-inline-start-checkbox-content: calc(var(--checkbox-margin-inline) + var(--checkbox-size));
-  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-large);
 }
 
 .backup-dialog {
@@ -28,63 +30,28 @@
   width: 29.27rem;
 }
 
-#backup-sensitive-data-checkbox {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-  row-gap: var(--space-xsmall);
-}
-
-#backup-sensitive-data-checkbox-label {
-  display: flex;
-  align-items: center;
-}
-
-#backup-sensitive-data-checkbox-description {
-  margin-inline-start: var(--margin-inline-start-checkbox-content);
+.scheduled-backups-enabled {
+  --box-icon-start-fill: var(--icon-color-success);
 }
 
-.backups-control {
-  display: grid;
-  grid-template-columns: 1fr auto auto;
-  column-gap: var(--space-large);
-  row-gap: var(--space-xsmall);
-  align-items: center;
-
-  moz-button {
-    justify-self: end;
-  }
-
-  moz-button:last-of-type {
-    grid-column: 3;
-  }
-
-  [id$="description"] {
-    grid-column: 1 / -1;
-  }
+.scheduled-backups-disabled {
+  --box-icon-start-fill: var(--icon-color-warning);
 }
 
-section:not(:first-of-type) {
-  margin-block-start: 24px;
+moz-input-folder {
+  --input-folder-wrap: wrap;
 }
 
 #last-backup-info {
-  color: var(--text-color-deemphasized);
-}
-
-#last-backup-location-control,
-#last-backup-info > div {
-  margin-block: 14px;
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-xsmall);
 }
 
-#last-backup-location-control {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  text-overflow: ellipsis ellipsis;
+#sensitive-data {
+  margin-block-start: var(--space-small);
 }
 
-#backup-password-controls {
-  display: flex;
-  margin-block: var(--space-large);
+moz-button {
+  white-space: nowrap;
 }
diff --git a/browser/components/backup/content/backup-settings.mjs b/browser/components/backup/content/backup-settings.mjs
index d5831510e0efc..da2c449b0686d 100644
--- a/browser/components/backup/content/backup-settings.mjs
+++ b/browser/components/backup/content/backup-settings.mjs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { html } from "chrome://global/content/vendor/lit.all.mjs";
+import { html, classMap } from "chrome://global/content/vendor/lit.all.mjs";
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 import { getErrorL10nId } from "chrome://browser/content/backup/backup-errors.mjs";
 import { ERRORS } from "chrome://browser/content/backup/backup-constants.mjs";
@@ -23,7 +23,6 @@ import "chrome://browser/content/backup/disable-backup-encryption.mjs";
  * document of about:settings / about:preferences.
  */
 export default class BackupSettings extends MozLitElement {
-  #placeholderIconURL = "chrome://global/skin/icons/page-portrait.svg";
   inProgressTimeout = null;
   showInProgress = false;
 
@@ -52,16 +51,12 @@ export default class BackupSettings extends MozLitElement {
       turnOffScheduledBackupsDialogEl: "#turn-off-scheduled-backups-dialog",
       restoreFromBackupEl: "restore-from-backup",
       restoreFromBackupButtonEl: "#backup-toggle-restore-button",
-      restoreFromBackupDescriptionEl: "#backup-restore-description",
       restoreFromBackupDialogEl: "#restore-from-backup-dialog",
       sensitiveDataCheckboxInputEl: "#backup-sensitive-data-checkbox-input",
-      passwordControlsEl: "#backup-password-controls",
-      lastBackupLocationInputEl: "#last-backup-location",
+      passwordControlsEl: "#sensitive-data",
       lastBackupFileNameEl: "#last-backup-filename",
       lastBackupDateEl: "#last-backup-date",
       backupLocationShowButtonEl: "#backup-location-show",
-      backupLocationEditButtonEl: "#backup-location-edit",
-      scheduledBackupsDescriptionEl: "#scheduled-backups-description",
       backupErrorBarEl: "#create-backup-error",
       backupInProgressMessageBarEl: "#backup-in-progress-message",
     };
@@ -182,11 +177,17 @@ export default class BackupSettings extends MozLitElement {
   }
 
   async handleToggleBackupEncryption(event) {
+    if (event.target.slot) {
+      return;
+    }
+
+    event.stopPropagation();
     event.preventDefault();
 
-    // Checkbox was unchecked, meaning encryption is already enabled and should be disabled.
+    // User is trying to uncheck the checkbox, meaning encryption is already
+    // enabled and should be disabled.
     let toggledToDisable =
-      !event.target.checked && this.backupServiceState.encryptionEnabled;
+      event.target.checked && this.backupServiceState.encryptionEnabled;
 
     if (toggledToDisable && this.disableBackupEncryptionDialogEl) {
       this.disableBackupEncryptionDialogEl.showModal();
@@ -205,22 +206,6 @@ export default class BackupSettings extends MozLitElement {
     }
   }
 
-  scheduledBackupsDescriptionTemplate() {
-    return html`
-      <div
-        id="scheduled-backups-description"
-        data-l10n-id="settings-data-backup-scheduled-backups-description"
-      >
-        <a
-          is="moz-support-link"
-          support-page="firefox-backup"
-          data-l10n-name="support-link"
-          utm-content="backup-off"
-        ></a>
-      </div>
-    `;
-  }
-
   turnOnScheduledBackupsDialogTemplate() {
     let { fileName, path, iconURL } = this.backupServiceState.defaultParent;
     return html`<dialog
@@ -250,33 +235,26 @@ export default class BackupSettings extends MozLitElement {
   }
 
   restoreFromBackupTemplate() {
-    let descriptionL10nID = this.backupServiceState.scheduledBackupsEnabled
-      ? "settings-data-backup-scheduled-backups-on-restore-description"
-      : "settings-data-backup-scheduled-backups-off-restore-description";
+    let restoreItemL10nID = this.backupServiceState.scheduledBackupsEnabled
+      ? "settings-data-backup-restore-scheduled-on"
+      : "settings-data-backup-restore-scheduled-off";
 
     let restoreButtonL10nID = this.backupServiceState.scheduledBackupsEnabled
       ? "settings-data-backup-scheduled-backups-on-restore-choose"
       : "settings-data-backup-scheduled-backups-off-restore-choose";
 
-    return html`<section id="restore-from-backup">
-      ${this.restoreFromBackupDialogTemplate()}
-      <div class="backups-control">
-        <span
-          id="restore-header"
-          data-l10n-id="settings-data-backup-restore-header"
-          class="heading-medium"
-        ></span>
+    return html`<moz-box-item
+        id="restore-from-backup"
+        data-l10n-id=${restoreItemL10nID}
+      >
         <moz-button
           id="backup-toggle-restore-button"
           @click=${this.handleShowRestoreDialog}
           data-l10n-id=${restoreButtonL10nID}
+          slot="actions"
         ></moz-button>
-        <div
-          id="backup-restore-description"
-          data-l10n-id=${descriptionL10nID}
-        ></div>
-      </div>
-    </section>`;
+      </moz-box-item>
+      ${this.restoreFromBackupDialogTemplate()}`;
   }
 
   handleShowRestoreDialog() {
@@ -294,10 +272,19 @@ export default class BackupSettings extends MozLitElement {
     );
   }
 
-  handleEditBackupLocation() {
+  handleEditBackupLocation(event) {
+    let newPath = event.target.value;
+    let currentPath = this.backupServiceState.backupDirPath;
+
+    // If the same directory was chosen, this is a no-op
+    if (newPath === PathUtils.parent(currentPath)) {
+      return;
+    }
+
     this.dispatchEvent(
       new CustomEvent("BackupUI:EditBackupLocation", {
         bubbles: true,
+        detail: { path: newPath },
       })
     );
   }
@@ -342,7 +329,7 @@ export default class BackupSettings extends MozLitElement {
     };
 
     return html`
-      <div id="last-backup-info">
+      <div id="last-backup-info" slot="description">
         <div
           id="last-backup-date"
           data-l10n-id="settings-data-backup-last-backup-date"
@@ -358,78 +345,53 @@ export default class BackupSettings extends MozLitElement {
   }
 
   backupLocationTemplate() {
-    let iconURL =
-      this.backupServiceState.defaultParent.iconURL || this.#placeholderIconURL;
     let { backupDirPath } = this.backupServiceState;
 
     return html`
-      <div id="last-backup-location-control">
-        <span data-l10n-id="settings-data-backup-last-backup-location"></span>
-        <input
-          id="last-backup-location"
-          class="backup-location-filepicker-input"
-          type="text"
-          readonly
-          .value=${backupDirPath}
-          style=${`background-image: url(${iconURL})`}></input>
+      <moz-input-folder
+        id="last-backup-location"
+        data-l10n-id="settings-data-backup-last-backup-location2"
+        .value=${backupDirPath}
+        @change=${this.handleEditBackupLocation}
+      >
         <moz-button
           id="backup-location-show"
           @click=${this.handleShowBackupLocation}
           data-l10n-id="settings-data-backup-last-backup-location-show-in-folder"
+          slot="actions"
         ></moz-button>
-        <moz-button
-          id="backup-location-edit"
-          @click=${this.handleEditBackupLocation}
-          data-l10n-id="settings-data-backup-last-backup-location-edit"
-        ></moz-button>
-      </div>
+      </moz-input-folder>
     `;
   }
 
   sensitiveDataTemplate() {
-    return html`<section id="backup-password-controls">
-      <!-- TODO: we can use the moz-checkbox reusable component once it is ready (bug 1901635)-->
-      <div id="backup-sensitive-data-checkbox">
-        <label
-          id="backup-sensitive-data-checkbox-label"
-          for="backup-sensitive-data-checkbox-input"
-        >
-          <input
-            id="backup-sensitive-data-checkbox-input"
-            @click=${this.handleToggleBackupEncryption}
-            type="checkbox"
-            .checked=${this.backupServiceState.encryptionEnabled}
-          />
-          <span
-            id="backup-sensitive-data-checkbox-span"
-            data-l10n-id="settings-data-toggle-encryption-label"
-          ></span>
-        </label>
-        <div
-          id="backup-sensitive-data-checkbox-description"
-          class="text-deemphasized"
+    return html`
+      <moz-fieldset data-l10n-id="settings-sensitive-data" id="sensitive-data">
+        <moz-checkbox
+          id="backup-sensitive-data-checkbox-input"
+          data-l10n-id="settings-data-toggle-encryption-label2"
+          @click=${{
+            handleEvent: e => this.handleToggleBackupEncryption(e),
+            capture: true,
+          }}
+          .checked=${this.backupServiceState.encryptionEnabled}
         >
-          <span
-            id="backup-sensitive-data-checkbox-description-span"
-            data-l10n-id="settings-sensitive-data-encryption-description"
-          ></span>
           <a
-            id="settings-data-toggle-encryption-learn-more-link"
+            slot="support-link"
             is="moz-support-link"
             support-page="firefox-backup"
-            utm-content="encryption"
             data-l10n-id="settings-data-toggle-encryption-support-link"
+            utm-content="encryption"
           ></a>
-        </div>
-      </div>
-      ${this.backupServiceState.encryptionEnabled
-        ? html`<moz-button
+          <moz-box-button
             id="backup-change-password-button"
             @click=${this.handleChangePassword}
-            data-l10n-id="settings-data-change-password"
-          ></moz-button>`
-        : null}
-    </section>`;
+            data-l10n-id="settings-data-change-password2"
+            slot="nested"
+          ></moz-box-button>
+        </moz-checkbox>
+      </moz-fieldset>
+    `;
   }
 
   inProgressMessageBarTemplate() {
@@ -464,24 +426,21 @@ export default class BackupSettings extends MozLitElement {
     `;
   }
 
-  updated() {
-    if (this.backupServiceState.scheduledBackupsEnabled) {
-      let input = this.lastBackupLocationInputEl;
-      input.setSelectionRange(input.value.length, input.value.length);
-    }
-  }
-
   render() {
     let scheduledBackupsEnabledState =
       this.backupServiceState.scheduledBackupsEnabled;
 
     let scheduledBackupsEnabledL10nID = scheduledBackupsEnabledState
-      ? "settings-data-backup-scheduled-backups-on"
-      : "settings-data-backup-scheduled-backups-off";
+      ? "settings-data-backup-scheduled-backups-on2"
+      : "settings-data-backup-scheduled-backups-off2";
 
     let backupToggleL10nID = scheduledBackupsEnabledState
-      ? "settings-data-backup-toggle-off"
-      : "settings-data-backup-toggle-on";
+      ? "settings-data-backup-toggle-off2"
+      : "settings-data-backup-toggle-on2";
+
+    let scheduledBackupsIcon = scheduledBackupsEnabledState
+      ? "chrome://global/skin/icons/check-filled.svg"
+      : "chrome://global/skin/icons/warning.svg";
 
     if (this.backupServiceState.backupInProgress) {
       if (!this.showInProgress) {
@@ -511,51 +470,46 @@ export default class BackupSettings extends MozLitElement {
       ${this.turnOffScheduledBackupsDialogTemplate()}
       ${this.enableBackupEncryptionDialogTemplate()}
       ${this.disableBackupEncryptionDialogTemplate()}
-      ${this.backupServiceState.archiveEnabledStatus
-        ? html` <section id="scheduled-backups">
-            <div class="backups-control">
-              <span
-                id="scheduled-backups-enabled"
+      <moz-box-group>
+        ${this.backupServiceState.archiveEnabledStatus
+          ? html`<moz-box-item
+                id="scheduled-backups"
+                class=${classMap({
+                  "scheduled-backups-enabled": scheduledBackupsEnabledState,
+                  "scheduled-backups-disabled": !scheduledBackupsEnabledState,
+                })}
                 data-l10n-id=${scheduledBackupsEnabledL10nID}
-                class="heading-medium"
-              ></span>
-
-              ${scheduledBackupsEnabledState
-                ? html`
-                    <moz-button
-                      id="backup-trigger-button"
-                      @click=${this.handleBackupTrigger}
-                      data-l10n-id="settings-data-backup-trigger-button"
-                      ?disabled=${this.showInProgress}
-                    ></moz-button>
-                  `
-                : null}
-
-              <moz-button
+                iconsrc=${scheduledBackupsIcon}
+              >
+                ${this.backupServiceState.lastBackupDate
+                  ? this.lastBackupInfoTemplate()
+                  : null}
+                ${scheduledBackupsEnabledState
+                  ? html`
+                      <moz-button
+                        id="backup-trigger-button"
+                        @click=${this.handleBackupTrigger}
+                        data-l10n-id="settings-data-backup-trigger-button"
+                        ?disabled=${this.showInProgress}
+                        slot="actions"
+                      ></moz-button>
+                    `
+                  : null}
+              </moz-box-item>
+              <moz-box-button
                 id="backup-toggle-scheduled-button"
                 @click=${this.handleShowScheduledBackups}
                 data-l10n-id=${backupToggleL10nID}
-              ></moz-button>
-
-              ${this.backupServiceState.scheduledBackupsEnabled
-                ? null
-                : this.scheduledBackupsDescriptionTemplate()}
-            </div>
-
-            ${this.backupServiceState.lastBackupDate
-              ? this.lastBackupInfoTemplate()
-              : null}
-            ${this.backupServiceState.scheduledBackupsEnabled
-              ? this.backupLocationTemplate()
-              : null}
-            ${this.backupServiceState.scheduledBackupsEnabled
-              ? this.sensitiveDataTemplate()
-              : null}
-          </section>`
-        : null}
-      ${this.backupServiceState.restoreEnabledStatus
-        ? this.restoreFromBackupTemplate()
-        : null} `;
+              ></moz-box-button>`
+          : null}
+        ${this.backupServiceState.restoreEnabledStatus
+          ? this.restoreFromBackupTemplate()
+          : null}
+      </moz-box-group>
+      ${this.backupServiceState.archiveEnabledStatus &&
+      this.backupServiceState.scheduledBackupsEnabled
+        ? html`${this.backupLocationTemplate()}${this.sensitiveDataTemplate()}`
+        : null}`;
   }
 }
 
diff --git a/browser/locales/en-US/browser/backupSettings.ftl b/browser/locales/en-US/browser/backupSettings.ftl
index 43934d799eaf4..10df0d0645067 100644
--- a/browser/locales/en-US/browser/backupSettings.ftl
+++ b/browser/locales/en-US/browser/backupSettings.ftl
@@ -25,29 +25,37 @@ settings-data-backup-header2 =
     .label = Backup
     .description = Automatically protect your bookmarks, history, and other data.
 settings-data-backup-toggle = Manage backup
-settings-data-backup-toggle-on = Turn on backup
-settings-data-backup-toggle-off = Turn off backup
+settings-data-backup-toggle-on2 =
+    .label = Turn on backup
+settings-data-backup-toggle-off2 =
+    .label = Turn off backup
 settings-data-backup-trigger-button = Backup now
 settings-data-backup-in-progress-button = Backup in progress…
 settings-data-backup-in-progress-message =
     .message = Backup in progress…
-settings-data-backup-scheduled-backups-on = Backup: ON
-settings-data-backup-scheduled-backups-off = Backup: OFF
-settings-data-backup-scheduled-backups-description = Automatically protect your bookmarks, history, and other data. <a data-l10n-name="support-link">Learn more</a>
 settings-data-backup-last-backup-date = Last backup: { DATETIME($date, timeStyle: "short") }, { DATETIME($date, dateStyle: "short") }
+settings-data-backup-scheduled-backups-on2 =
+    .label = Backup is ON
+settings-data-backup-scheduled-backups-off2 =
+    .label = Backup is OFF
 # "Location" refers to the folder where backups are being written to.
-settings-data-backup-last-backup-location = Location
+settings-data-backup-last-backup-location2 =
+    .label = Backup location
 settings-data-backup-last-backup-location-show-in-folder = Show in folder
 settings-data-backup-last-backup-location-edit = Edit…
 settings-data-create-backup-error = There was an error creating your backup on { DATETIME($date, timeStyle: "short") }, { DATETIME($date, dateStyle: "short") }
 
-settings-sensitive-data-encryption-description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
-
 # Variables:
 #   $fileName (String) - The file name of the last backup that was created.
 settings-data-backup-last-backup-filename = Filename: { $fileName }
 
-settings-data-backup-restore-header = Restore your data
+settings-data-backup-restore-scheduled-on =
+    .label = Restore your data
+    .description = Recover your { -brand-product-name } data back from the last time it was backed up.
+
+settings-data-backup-restore-scheduled-off =
+    .label = Restore your data
+    .description = Use a { -brand-product-name } backup from another device to restore your data.
 
 ## These strings are shown under the header if scheduled backups are disabled.
 
@@ -59,10 +67,16 @@ settings-data-backup-scheduled-backups-off-restore-choose = Choose backup file
 settings-data-backup-scheduled-backups-on-restore-description = Recover your { -brand-product-name } data back from the last time it was backed up.
 settings-data-backup-scheduled-backups-on-restore-choose = Restore…
 
-settings-data-toggle-encryption-label = Back up your sensitive data
+settings-sensitive-data =
+    .label = Sensitive data
+settings-sensitive-data-encryption-description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
+settings-data-toggle-encryption-label2 =
+    .label = Back up your sensitive data
+    .description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
 settings-data-toggle-encryption-support-link = Learn more
 
-settings-data-change-password = Change password…
+settings-data-change-password2 =
+    .label = Change password
 
 ## These strings are displayed in a modal when users want to turn on scheduled backups.
 
diff --git a/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py b/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py
new file mode 100644
index 0000000000000..dfa31bd042ebb
--- /dev/null
+++ b/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py
@@ -0,0 +1,36 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from fluent.migrate.transforms import COPY_PATTERN
+import fluent.syntax.ast as FTL
+
+
+def migrate(ctx):
+    """Bug 1995062 - Convert Backup settings to config-based prefs, part {index}"""
+
+    path = "browser/browser/backupSettings.ftl"
+
+    ctx.add_transforms(
+        path,
+        path,
+        [
+            FTL.Message(
+                id=FTL.Identifier("settings-data-backup-toggle-on2"),
+                attributes=[
+                    FTL.Attribute(
+                        id=FTL.Identifier("label"),
+                        value=COPY_PATTERN(path, "settings-data-backup-toggle-on"),
+                    ),
+                ],
+            ),
+            FTL.Message(
+                id=FTL.Identifier("settings-data-backup-toggle-off2"),
+                attributes=[
+                    FTL.Attribute(
+                        id=FTL.Identifier("label"),
+                        value=COPY_PATTERN(path, "settings-data-backup-toggle-off"),
+                    ),
+                ],
+            ),
+        ],
+    )
diff --git a/toolkit/content/widgets/moz-box-common.css b/toolkit/content/widgets/moz-box-common.css
index 2a80fc6fc3a9d..daeea21ae4061 100644
--- a/toolkit/content/widgets/moz-box-common.css
+++ b/toolkit/content/widgets/moz-box-common.css
@@ -96,7 +96,7 @@
   .description {
     grid-area: description;
     display: flex;
-    justify-content: center;
+    justify-content: start;
     gap: var(--space-small);
     align-self: var(--box-description-alignment);
   }
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.css b/toolkit/content/widgets/moz-box-item/moz-box-item.css
index ab6d82cea0c20..874cfaa5f13b4 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.css
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.css
@@ -36,6 +36,11 @@
     }
   }
 
+  .description-wrapper {
+    display: flex;
+    gap: var(--space-xsmall);
+  }
+
   .description,
   .support-page {
     display: inline;
@@ -46,6 +51,10 @@
   font-size: var(--font-size-small);
 }
 
+.text-content:not(.has-description) slot[name="description"] {
+  display: none;
+}
+
 .box-container {
   padding: var(--box-padding);
   font-size: inherit;
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
index 1bd6f2b1d00f4..3c0befe131add 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
@@ -30,6 +30,7 @@ const NAVIGATION_DIRECTIONS = {
  * @property {string} iconSrc - The src for an optional icon shown next to the label.
  * @property {"default"|"medium-icon"|"large-icon"} layout - Layout style for the box content.
  * @slot default - Slot for the box item's content, which overrides label and description.
+ * @slot description - Slot for custom description content.
  * @slot actions - Slot for the actions positioned at the end of the component container.
  * @slot actions-start - Slot for the actions positioned at the start of the component container.
  */
@@ -39,6 +40,7 @@ export default class MozBoxItem extends MozBoxBase {
   static properties = {
     layout: { type: String, reflect: true },
     supportPage: { type: String, attribute: "support-page" },
+    _hasSlottedDescription: { type: Boolean, state: true },
   };
 
   static queries = {
@@ -51,9 +53,18 @@ export default class MozBoxItem extends MozBoxBase {
   constructor() {
     super();
     this.layout = "default";
+    this._hasSlottedDescription = false;
     this.addEventListener("keydown", e => this.handleKeydown(e));
   }
 
+  get hasDescription() {
+    return this.description || this._hasSlottedDescription;
+  }
+
+  checkSlottedDescription(e) {
+    this._hasSlottedDescription = !!e.target?.assignedNodes()?.length;
+  }
+
   firstUpdated() {
     this.getActionEls();
   }
@@ -159,11 +170,33 @@ export default class MozBoxItem extends MozBoxBase {
     `;
   }
 
+  descriptionTemplate() {
+    if (!this.description) {
+      return html`<slot
+        class="description text-deemphasized"
+        id="description"
+        name="description"
+        @slotchange=${this.checkSlottedDescription}
+      ></slot>`;
+    }
+    return html`<span class="description text-deemphasized" id="description">
+      ${this.description}
+    </span>`;
+  }
+
   textTemplate() {
     if (this.supportPage) {
       return this.supportTextTemplate();
     }
-    return super.textTemplate();
+    return html`<div
+      class=${classMap({
+        "text-content": true,
+        "has-icon": this.iconSrc,
+        "has-description": this.hasDescription,
+      })}
+    >
+      ${this.iconTemplate()}${this.labelTemplate()}${this.descriptionTemplate()}
+    </div>`;
   }
 
   supportTextTemplate() {
@@ -171,19 +204,19 @@ export default class MozBoxItem extends MozBoxBase {
       class=${classMap({
         "text-content": true,
         "has-icon": this.iconSrc,
-        "has-description": this.description,
+        "has-description": this.hasDescription,
         "has-support-page": this.supportPage,
       })}
     >
       <span class="label-wrapper">
         ${this.iconTemplate()}<span>
-          ${this.labelTemplate()}${!this.description
+          ${this.labelTemplate()}${!this.hasDescription
             ? this.supportPageTemplate()
             : ""}
         </span>
       </span>
       <span class="description-wrapper">
-        ${this.descriptionTemplate()}${this.description
+        ${this.descriptionTemplate()}${this.hasDescription
           ? this.supportPageTemplate()
           : ""}
       </span>
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
index 03390ac1b6217..f2ec31265377c 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
@@ -19,6 +19,7 @@
   display: flex;
   align-items: flex-end;
   gap: var(--input-folder-space-inline);
+  flex-wrap: var(--input-folder-wrap);
 }
 
 #choose-folder-button {
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs b/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
index 80179e6b697c7..b2011b6e887cc 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
@@ -169,6 +169,7 @@ export default class MozInputFolder extends MozInputText {
           ?disabled=${this.disabled || this.parentDisabled}
           @click=${this.openFolderPicker}
         ></moz-button>
+        <slot name="actions"></slot>
       </div>
     `;
   }

From a8fdc42f1ae23e698f4c33b7584533f6161c9ba9 Mon Sep 17 00:00:00 2001
From: hannajones <hjones@mozilla.com>
Date: Fri, 6 Feb 2026 17:16:24 +0000
Subject: [PATCH 34/93] Bug 1995062 - Part 3: fix backup-settings tests
 r=cdupuis,akulyk

Differential Revision: https://phabricator.services.mozilla.com/D279017
---
 .../browser_password_validation_inputs.js     |  8 ++-
 .../backup/tests/browser/browser_settings.js  | 58 ++++++++++++++++---
 .../components/backup/tests/browser/head.js   | 24 ++++++++
 .../tests/chrome/test_backup_settings.html    | 50 ++++++++--------
 .../tests/xpcshell/test_BackupService.js      | 18 +-----
 .../tests/browser_backup_visibility.js        | 24 +++-----
 6 files changed, 119 insertions(+), 63 deletions(-)

diff --git a/browser/components/backup/tests/browser/browser_password_validation_inputs.js b/browser/components/backup/tests/browser/browser_password_validation_inputs.js
index 4171693d13801..f1596f2244401 100644
--- a/browser/components/backup/tests/browser/browser_password_validation_inputs.js
+++ b/browser/components/backup/tests/browser/browser_password_validation_inputs.js
@@ -15,14 +15,20 @@ add_task(async function password_validation() {
       set: [[SCHEDULED_BACKUPS_ENABLED_PREF, true]],
     });
     let sandbox = sinon.createSandbox();
-    let settings = browser.contentDocument.querySelector("backup-settings");
+    let settings = await waitForBackupSettings(browser);
 
+    settings.backupServiceState.archiveEnabledStatus = true;
+    settings.backupServiceState.scheduledBackupsEnabled = true;
     settings.backupServiceState.encryptionEnabled = true;
     await settings.requestUpdate();
     await settings.updateComplete;
 
     let changePasswordButton = settings.changePasswordButtonEl;
     Assert.ok(changePasswordButton, "Change password button should be found");
+    Assert.ok(
+      !changePasswordButton.disabled,
+      "Change password button should be enabled"
+    );
 
     changePasswordButton.click();
     await settings.updateComplete;
diff --git a/browser/components/backup/tests/browser/browser_settings.js b/browser/components/backup/tests/browser/browser_settings.js
index 3899b139556b0..ab6f52ef38927 100644
--- a/browser/components/backup/tests/browser/browser_settings.js
+++ b/browser/components/backup/tests/browser/browser_settings.js
@@ -25,13 +25,25 @@ add_setup(async () => {
  */
 add_task(async function test_preferences_visibility() {
   await BrowserTestUtils.withNewTab("about:preferences#sync", async browser => {
-    let settings = browser.contentDocument.querySelector("backup-settings");
+    let settings = await waitForBackupSettings(browser);
+
+    // Wait for the sections to be rendered (they're conditionally rendered based on state)
+    await BrowserTestUtils.waitForMutationCondition(
+      settings.shadowRoot,
+      { childList: true, subtree: true },
+      () => {
+        return (
+          settings.shadowRoot.getElementById("restore-from-backup") &&
+          settings.shadowRoot.getElementById("scheduled-backups")
+        );
+      }
+    );
 
-    // Our mochitest-browser tests are configured to have the section visible
-    // by default.
+    let restoreSection = settings.restoreSectionEl;
+    let archiveSection = settings.archiveSectionEl;
     Assert.ok(
-      BrowserTestUtils.isVisible(settings.restoreSectionEl) &&
-        BrowserTestUtils.isVisible(settings.archiveSectionEl),
+      BrowserTestUtils.isVisible(restoreSection) &&
+        BrowserTestUtils.isVisible(archiveSection),
       "Backup section is visible"
     );
   });
@@ -96,7 +108,7 @@ add_task(async function test_disable_backup_encryption_confirm() {
       set: [[SCHEDULED_BACKUPS_ENABLED_PREF, true]],
     });
 
-    let settings = browser.contentDocument.querySelector("backup-settings");
+    let settings = await waitForBackupSettings(browser);
 
     /**
      * For this test, we can pretend that browser-settings receives a backupServiceState
@@ -111,6 +123,14 @@ add_task(async function test_disable_backup_encryption_confirm() {
     await settings.requestUpdate();
     await settings.updateComplete;
 
+    // Wait for the sensitive data section to render (requires archiveEnabledStatus
+    // and scheduledBackupsEnabled to be set by BackupService state updates)
+    await BrowserTestUtils.waitForMutationCondition(
+      settings.shadowRoot,
+      { childList: true, subtree: true },
+      () => settings.shadowRoot.querySelector("moz-checkbox")
+    );
+
     let sensitiveDataCheckbox = settings.sensitiveDataCheckboxInputEl;
 
     Assert.ok(sensitiveDataCheckbox, "Sensitive data checkbox should be found");
@@ -414,7 +434,7 @@ add_task(async function test_last_backup_info_and_location() {
       "BackupService:StateUpdate",
       false,
       () => {
-        return bs.state.backupDirPath.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
+        return bs.state.backupDirPath?.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
       }
     );
     let filePickerShownPromise = new Promise(resolve => {
@@ -426,7 +446,29 @@ add_task(async function test_last_backup_info_and_location() {
     });
     MockFilePicker.returnValue = MockFilePicker.returnOK;
 
-    settings.backupLocationEditButtonEl.click();
+    // Wait for the location input to be rendered
+    await BrowserTestUtils.waitForMutationCondition(
+      settings.shadowRoot,
+      { childList: true, subtree: true },
+      () => settings.shadowRoot.getElementById("last-backup-location")
+    );
+
+    let locationInput = settings.shadowRoot.getElementById(
+      "last-backup-location"
+    );
+    await locationInput.updateComplete;
+
+    stateUpdated = BrowserTestUtils.waitForEvent(
+      bs,
+      "BackupService:StateUpdate",
+      false,
+      () => {
+        return bs.state.backupDirPath?.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
+      }
+    );
+
+    let editButton = locationInput.chooseFolderButtonEl;
+    editButton.click();
     await filePickerShownPromise;
     await stateUpdated;
 
diff --git a/browser/components/backup/tests/browser/head.js b/browser/components/backup/tests/browser/head.js
index 6f5b371c9a038..2c724bc2a56ea 100644
--- a/browser/components/backup/tests/browser/head.js
+++ b/browser/components/backup/tests/browser/head.js
@@ -90,3 +90,27 @@ function createMockPassInputEventPromise(inputEl, mockPassword) {
   inputEl.dispatchEvent(new Event("input"));
   return promise;
 }
+
+/**
+ * Waits for the backup-settings element to be rendered in the DOM and returns it.
+ *
+ * @param {Browser} browser
+ *  the browser instance containing the about:preferences page
+ * @returns {Promise<Element>}
+ *  resolves to the backup-settings element once it's rendered
+ */
+async function waitForBackupSettings(browser) {
+  let settingsGroup = browser.contentDocument.querySelector(
+    "setting-group[groupid='backup']"
+  );
+
+  await BrowserTestUtils.waitForMutationCondition(
+    settingsGroup,
+    { childList: true, subtree: true },
+    () => browser.contentDocument.querySelector("backup-settings")
+  );
+
+  let settings = browser.contentDocument.querySelector("backup-settings");
+  await settings.updateComplete;
+  return settings;
+}
diff --git a/browser/components/backup/tests/chrome/test_backup_settings.html b/browser/components/backup/tests/chrome/test_backup_settings.html
index 66bdeee03ea45..86a491f55a83f 100644
--- a/browser/components/backup/tests/chrome/test_backup_settings.html
+++ b/browser/components/backup/tests/chrome/test_backup_settings.html
@@ -120,9 +120,10 @@
       let dialog = settings.disableBackupEncryptionDialogEl;
 
       ok(sensitiveDataCheckboxInput, "Checkbox for toggling encryption should be found");
+      ok(sensitiveDataCheckboxInput.checked, "Checkbox for toggling encryption should be checked");
       ok(!dialog.open, "Dialog should not be open");
 
-      sensitiveDataCheckboxInput.click();
+      synthesizeMouseAtCenter(sensitiveDataCheckboxInput, {});
       await settings.updateComplete;
 
       ok(dialog?.open, "Dialog should be open");
@@ -202,7 +203,7 @@
       });
       await settings.updateComplete;
 
-      backupLocationControl = settings.shadowRoot.querySelector("#last-backup-location-control");
+      backupLocationControl = settings.shadowRoot.querySelector("#last-backup-location");
       ok(backupLocationControl, "Last backup location control was rendered.");
 
       let backupLocation = settings.shadowRoot.querySelector("#last-backup-location");
@@ -237,18 +238,27 @@
       let settings = document.getElementById("test-backup-settings");
       let content = document.getElementById("content");
 
-      const backupDirPath = "Some/Expected/Path";
+      const backupDirPath = PathUtils.join(PathUtils.tempDir, "BackupTest", "Restore Firefox");
       settings.backupServiceState = createBackupServiceState({
         scheduledBackupsEnabled: true,
         backupDirPath,
       });
 
-      let locationEditButton = settings.shadowRoot.querySelector("#backup-location-edit");
+      await settings.updateComplete;
+
+      let locationInput = settings.shadowRoot.getElementById("last-backup-location");
+      let locationEditButton = locationInput.chooseFolderButtonEl;
       ok(locationEditButton, "Backup location edit button exists.");
 
       let sawEditEvent = BrowserTestUtils.waitForEvent(content, "BackupUI:EditBackupLocation");
-      locationEditButton.click();
-      await sawEditEvent;
+
+      // Simulate what happens after user selects a new folder in the file picker
+      const newPath = PathUtils.join(PathUtils.tempDir, "NewBackupLocation");
+      locationInput.value = newPath;
+      locationInput.dispatchEvent(new Event("change", { bubbles: true }));
+
+      let event = await sawEditEvent;
+      is(event.detail.path, newPath, "Event should contain the new path");
     });
 
     /**
@@ -284,8 +294,8 @@
         "Sensitive data checkbox should not be checked"
       );
       ok(
-        !settings.changePasswordButtonEl,
-        "Change password button should not be found"
+        settings.changePasswordButtonEl,
+        "Change password button should be found"
       );
 
       // Now pretend encryption is enabled
@@ -315,8 +325,9 @@
       });
       await settings.updateComplete;
 
-      ok(
-        settings.scheduledBackupsDescriptionEl,
+      is(
+        settings.archiveSectionEl.getAttribute("data-l10n-id"),
+        "settings-data-backup-scheduled-backups-off2",
         "Scheduled backups description should be in the DOM"
       );
 
@@ -324,11 +335,6 @@
         settings.restoreFromBackupButtonEl.getAttribute("data-l10n-id"),
         "settings-data-backup-scheduled-backups-off-restore-choose"
       );
-
-      is(
-        settings.restoreFromBackupDescriptionEl.getAttribute("data-l10n-id"),
-        "settings-data-backup-scheduled-backups-off-restore-description"
-      );
     });
 
     /**
@@ -343,26 +349,22 @@
       });
       await settings.updateComplete;
 
-      ok(
-        !settings.scheduledBackupsDescriptionEl,
-        "Scheduled backups description should not be in the DOM"
+      is(
+        settings.archiveSectionEl.getAttribute("data-l10n-id"),
+        "settings-data-backup-scheduled-backups-on2",
+        "Scheduled backups description should be in the DOM"
       );
 
       is(
         settings.restoreFromBackupButtonEl.getAttribute("data-l10n-id"),
         "settings-data-backup-scheduled-backups-on-restore-choose"
       );
-
-      is(
-        settings.restoreFromBackupDescriptionEl.getAttribute("data-l10n-id"),
-        "settings-data-backup-scheduled-backups-on-restore-description"
-      );
     });
   </script>
 </head>
 <body>
 <p id="display"></p>
-<div id="content" style="display: none">
+<div id="content">
   <backup-settings id="test-backup-settings"></backup-settings>
 </div>
 <pre id="test"></pre>
diff --git a/browser/components/backup/tests/xpcshell/test_BackupService.js b/browser/components/backup/tests/xpcshell/test_BackupService.js
index 189452e027e72..c4cc164910dbf 100644
--- a/browser/components/backup/tests/xpcshell/test_BackupService.js
+++ b/browser/components/backup/tests/xpcshell/test_BackupService.js
@@ -880,17 +880,6 @@ add_task(
       "newBackupLocation"
     );
 
-    let pickerDir = await IOUtils.getDirectory(newBackupLocation);
-    const reg = MockRegistrar.register("@mozilla.org/filepicker;1", {
-      init() {},
-      open(cb) {
-        cb.done(Ci.nsIFilePicker.returnOK);
-      },
-      displayDirectory: null,
-      file: pickerDir,
-      QueryInterface: ChromeUtils.generateQI(["nsIFilePicker"]),
-    });
-
     const backupService = new BackupService({});
 
     const sandbox = sinon.createSandbox();
@@ -898,18 +887,17 @@ add_task(
       .stub(backupService, "deleteLastBackup")
       .rejects(new Error("Exception while deleting backup"));
 
-    await backupService.editBackupLocation({ browsingContext: null });
+    await backupService.editBackupLocation(newBackupLocation);
 
-    pickerDir.append("Restore Firefox");
+    let expectedPath = PathUtils.join(newBackupLocation, "Restore Firefox");
     Assert.equal(
       Services.prefs.getStringPref(backupLocationPref),
-      pickerDir.path,
+      expectedPath,
       "Backup location pref should have updated to the new directory."
     );
 
     Services.prefs.setStringPref(backupLocationPref, resetLocation);
     sinon.restore();
-    MockRegistrar.unregister(reg);
     await Promise.all([
       IOUtils.remove(exceptionBackupLocation, { recursive: true }),
       IOUtils.remove(newBackupLocation, { recursive: true }),
diff --git a/browser/components/preferences/tests/browser_backup_visibility.js b/browser/components/preferences/tests/browser_backup_visibility.js
index 47072d3da807a..7b04a0edd14da 100644
--- a/browser/components/preferences/tests/browser_backup_visibility.js
+++ b/browser/components/preferences/tests/browser_backup_visibility.js
@@ -15,14 +15,13 @@ add_task(async function () {
     set: [["browser.backup.archive.enabled", false]],
   });
 
-  ok(
-    gBrowser.contentDocument.getElementById("backupCategory").hidden,
-    "backup category hidden"
+  let settings = gBrowser.contentDocument.querySelector(
+    "setting-group[groupid='backup']"
   );
-
+  console.log("show me", settings);
   ok(
-    gBrowser.contentDocument.getElementById("dataBackupGroup").hidden,
-    "backup section is hidden"
+    BrowserTestUtils.isHidden(settings),
+    "backup setting-group is not visible"
   );
 
   // Check that we don't get any results in sync when searching:
@@ -43,18 +42,13 @@ add_task(async function () {
     leaveOpen: true,
   });
 
-  ok(
-    !gBrowser.contentDocument.getElementById("backupCategory").hidden,
-    "backup category shown"
-  );
-
-  ok(
-    !gBrowser.contentDocument.getElementById("dataBackupGroup").hidden,
-    "backup section is shown"
+  let settings = gBrowser.contentDocument.querySelector(
+    "setting-group[groupid='backup']"
   );
+  ok(BrowserTestUtils.isVisible(settings), "backup setting-group is visible");
 
   // Check that we don't get any results in sync when searching:
-  await evaluateSearchResults("backup", "dataBackupGroup");
+  await evaluateSearchResults("backup", "backup");
 
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });

From 27b3c494362ace89d37b5697f83ebbfdaec48265 Mon Sep 17 00:00:00 2001
From: hannajones <hjones@mozilla.com>
Date: Fri, 6 Feb 2026 17:16:24 +0000
Subject: [PATCH 35/93] Bug 1995062 - Part 4: add tests and stories for new
 component functionality r=desktop-theme-reviewers,akulyk,tgiles

Differential Revision: https://phabricator.services.mozilla.com/D279962
---
 .../tests/widgets/test_moz_box_item.html      | 36 +++++++++++++++++++
 .../tests/widgets/test_moz_input_folder.html  | 27 ++++++++++++++
 .../moz-box-item/moz-box-item.stories.mjs     | 14 ++++++++
 .../moz-input-folder/README.stories.md        | 18 ++++++++++
 .../moz-input-folder/moz-input-folder.css     |  4 +++
 .../moz-input-folder.stories.mjs              | 18 ++++++++--
 6 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/tests/widgets/test_moz_box_item.html b/toolkit/content/tests/widgets/test_moz_box_item.html
index ddd83c4e14add..55b5464b18074 100644
--- a/toolkit/content/tests/widgets/test_moz_box_item.html
+++ b/toolkit/content/tests/widgets/test_moz_box_item.html
@@ -207,6 +207,42 @@
           "support link is placed next to the description when provided."
         );
       });
+
+      add_task(async function testMozBoxItemSlottedDescription() {
+        let slottedTemplate = testHelpers.templateFn({
+          label: "Testing slotted description",
+        });
+        let renderTarget = await testHelpers.renderTemplate(slottedTemplate);
+        let item = renderTarget.firstElementChild;
+
+        ok(!item.hasDescription, "Item initially has no description.");
+
+        const SLOTTED_DESCRIPTION = "This is a slotted description";
+        let slottedDesc = document.createElement("span");
+        slottedDesc.textContent = SLOTTED_DESCRIPTION;
+        slottedDesc.slot = "description";
+
+        item.append(slottedDesc);
+        await item.updateComplete;
+
+        let descriptionSlot = item.shadowRoot.querySelector(
+          "slot[name='description']"
+        );
+        ok(descriptionSlot, "Description slot exists in shadow DOM");
+
+        let slottedElements = descriptionSlot.assignedElements();
+        is(
+          slottedElements.length,
+          1,
+          "Description slot has one assigned element"
+        );
+        is(
+          slottedElements[0],
+          slottedDesc,
+          "Slotted description is assigned to description slot"
+        );
+        ok(item.hasDescription, "Item has description after slotting content");
+      });
     </script>
   </head>
   <body>
diff --git a/toolkit/content/tests/widgets/test_moz_input_folder.html b/toolkit/content/tests/widgets/test_moz_input_folder.html
index 98d64b4f1cbe7..567d767290d6f 100644
--- a/toolkit/content/tests/widgets/test_moz_input_folder.html
+++ b/toolkit/content/tests/widgets/test_moz_input_folder.html
@@ -237,6 +237,33 @@
 
         MockFilePicker.cleanup();
       });
+
+      add_task(async function testActionsSlot() {
+        let slottedActionTemplate = html`<moz-input-folder label="More actions">
+          <moz-button id="test-action-button" slot="actions"
+            >Additional Action</moz-button
+          >
+        </moz-input-folder>`;
+        let target = await testHelpers.renderTemplate(slottedActionTemplate);
+        let inputFolder = target.querySelector("moz-input-folder");
+        await inputFolder.updateComplete;
+
+        let actionButton = inputFolder.querySelector("#test-action-button");
+        ok(actionButton, "Button in actions slot is present");
+
+        let actionsSlot = inputFolder.shadowRoot.querySelector(
+          "slot[name='actions']"
+        );
+        ok(actionsSlot, "Actions slot exists in shadow DOM");
+
+        let slottedElements = actionsSlot.assignedElements();
+        is(slottedElements.length, 1, "Actions slot has one assigned element");
+        is(
+          slottedElements[0],
+          actionButton,
+          "Button is assigned to actions slot"
+        );
+      });
     </script>
   </head>
   <body>
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs b/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
index 000e3efe6b6b4..d724beded7174 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
@@ -63,6 +63,7 @@ const Template = ({
   slottedActions,
   slottedActionsStart,
   supportPage,
+  slottedDescription,
 }) => html`
   <style>
     .container {
@@ -128,6 +129,12 @@ const Template = ({
             ></moz-button>
           `
         : ""}
+      ${slottedDescription
+        ? html`<span slot="description"
+            >This is a slotted description
+            <a href="https://www.example.com" target="_blank">click me</a></span
+          >`
+        : ""}
     </moz-box-item>
   </div>
 `;
@@ -141,6 +148,7 @@ Default.args = {
   slottedActions: false,
   slottedActionsStart: false,
   supportPage: "",
+  slottedDescription: false,
 };
 
 export const WithDescription = Template.bind({});
@@ -186,6 +194,12 @@ WithSlottedActionAtTheStart.args = {
   slottedActionsStart: true,
 };
 
+export const WithSlottedDescription = Template.bind({});
+WithSlottedDescription.args = {
+  ...Default.args,
+  slottedDescription: true,
+};
+
 export const WithSupportPage = Template.bind({});
 WithSupportPage.args = {
   ...Default.args,
diff --git a/toolkit/content/widgets/moz-input-folder/README.stories.md b/toolkit/content/widgets/moz-input-folder/README.stories.md
index 75c706fcff437..c55151cbfed43 100644
--- a/toolkit/content/widgets/moz-input-folder/README.stories.md
+++ b/toolkit/content/widgets/moz-input-folder/README.stories.md
@@ -151,6 +151,24 @@ In order to disable the `moz-input-folder`, add `disabled=""` or `disabled` to t
 </div>
 ```
 
+### Adding additional actions
+
+The `actions` slot can be used in cases where we need to support additional buttons beyond the built-in folder picker button, or other interactive content.
+
+```html
+<moz-input-folder label="Label">
+  <moz-button slot="actions">More actions</moz-button>
+</moz-input-folder>
+```
+
+```html story
+<div style={{width: '500px'}} onClickCapture={e => e.stopPropagation()}>
+  <moz-input-folder label="Label">
+    <moz-button slot="actions">More actions</moz-button>
+  </moz-input-folder>
+</div>
+```
+
 ### Fluent usage
 
 The `label`, `description`, `placeholder` and `accesskey` attributes of `moz-input-folder` will generally be provided via [Fluent attributes](https://mozilla-l10n.github.io/localizer-documentation/tools/fluent/basic_syntax.html#attributes).
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
index f2ec31265377c..48b1a9d21c75d 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
@@ -25,3 +25,7 @@
 #choose-folder-button {
   white-space: nowrap;
 }
+
+slot[name="actions"]::slotted(moz-button) {
+  white-space: nowrap;
+}
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs b/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
index 071cd5e0f11da..5e001bd38dde7 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
@@ -49,8 +49,9 @@ const Template = ({
   hasSlottedDescription,
   hasSlottedSupportLink,
   ellipsized,
+  hasAdditionalAction,
 }) => html`
-  <div style="width: 400px;">
+  <div style="width: 450px;">
     <moz-input-folder
       name=${name}
       value=${ifDefined(value || null)}
@@ -60,7 +61,7 @@ const Template = ({
       support-page=${ifDefined(supportPage || null)}
       @click=${{
         handleEvent: e => {
-          if (e.composedPath().some(el => el.localName == "moz-button")) {
+          if (e.composedPath().some(el => el.id == "choose-folder-button")) {
             e.stopPropagation();
             alert("This would open the file picker");
           }
@@ -75,6 +76,13 @@ const Template = ({
       ${hasSlottedSupportLink
         ? html`<a slot="support-link" href="www.example.com">Click me!</a>`
         : ""}
+      ${hasAdditionalAction
+        ? html`<moz-button
+            slot="actions"
+            @click=${() => alert("Use the 'actions' slot for more actions.")}
+            >Click me!</moz-button
+          >`
+        : ""}
     </moz-input-folder>
   </div>
 `;
@@ -149,3 +157,9 @@ WithEllipsizedLabel.args = {
   ellipsized: true,
   l10nId: "moz-input-folder-long-label",
 };
+
+export const WithAdditionalActions = Template.bind({});
+WithAdditionalActions.args = {
+  ...Default.args,
+  hasAdditionalAction: true,
+};

From b0204f44424b901b5f71888f5fa785648ef3ca02 Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Fri, 6 Feb 2026 20:14:02 +0200
Subject: [PATCH 36/93] Revert "Bug 1986639 - Invalidate elements with styles
 that reference custom attributes and update wpt expectations.
 r=emilio,firefox-style-system-reviewers" for causing failures at
 attr-null-namespace.xhtml.

This reverts commit c77441ec61a03fc1b77e4c1044b8eda6f95101bb.
---
 layout/style/RestyleManager.cpp                  |  3 ---
 servo/ports/geckolib/glue.rs                     | 16 ----------------
 .../css/css-values/attr-invalidation.html.ini    |  3 +++
 .../attr-pseudo-elem-invalidation.html.ini       | 12 ++++++++++++
 4 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
 create mode 100644 testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini

diff --git a/layout/style/RestyleManager.cpp b/layout/style/RestyleManager.cpp
index fb31c7268fb56..3c74b95b176cc 100644
--- a/layout/style/RestyleManager.cpp
+++ b/layout/style/RestyleManager.cpp
@@ -3489,9 +3489,6 @@ void RestyleManager::AttributeWillChange(Element* aElement,
                                          int32_t aNameSpaceID,
                                          nsAtom* aAttribute,
                                          AttrModType aModType) {
-  if (Servo_Element_ReferencesAttribute(aElement, aAttribute)) {
-    PostRestyleEvent(aElement, RestyleHint::RECASCADE_SELF, nsChangeHint(0));
-  }
   TakeSnapshotForAttributeChange(*aElement, aNameSpaceID, aAttribute);
 }
 
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index 23479b822cb8c..2142bc34ed095 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -1586,22 +1586,6 @@ pub extern "C" fn Servo_Element_MayHaveStartingStyle(element: &RawGeckoElement)
         .contains(data::ElementDataFlags::MAY_HAVE_STARTING_STYLE)
 }
 
-#[no_mangle]
-pub extern "C" fn Servo_Element_ReferencesAttribute(
-    element: &RawGeckoElement,
-    attr: *const nsAtom,
-) -> bool {
-    let element = GeckoElement(element);
-    let Some(data) = element.borrow_data() else {
-        return false;
-    };
-    let Some(ref attrs) = data.styles.primary().attribute_references else {
-        return false;
-    };
-
-    unsafe { Atom::with(attr, |attr| attrs.contains(AtomIdent::cast(attr))) }
-}
-
 fn mode_to_origin(mode: SheetParsingMode) -> Origin {
     match mode {
         SheetParsingMode::eAuthorSheetFeatures => Origin::Author,
diff --git a/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
new file mode 100644
index 0000000000000..111ec1b397568
--- /dev/null
+++ b/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
@@ -0,0 +1,3 @@
+[attr-invalidation.html]
+  [CSS Values and Units Test: attr() invalidation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
new file mode 100644
index 0000000000000..167cc146d9a2d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
@@ -0,0 +1,12 @@
+[attr-pseudo-elem-invalidation.html]
+  [CSS Values and Units Test: attr() invalidation of pseudo elements 1]
+    expected: FAIL
+
+  [CSS Values and Units Test: attr() invalidation of pseudo elements 3]
+    expected: FAIL
+
+  [CSS Values and Units Test: attr() invalidation of pseudo elements 4]
+    expected: FAIL
+
+  [CSS Values and Units Test: attr() invalidation of pseudo elements 5]
+    expected: FAIL

From 922e545845e3ac4bf1733b498b26864852f9d9ef Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Fri, 6 Feb 2026 20:29:54 +0200
Subject: [PATCH 37/93] Revert "Bug 2014279 - Add new tool to return all saved
 memories to the assistant r=cgopal,ai-models-reviewers" for causing failures
 at browser_conversation_stream.js.

This reverts commit 98c974ba80ae88a5340806defcd85066924847aa.
---
 .../components/aiwindow/models/Chat.sys.mjs   |  2 -
 .../components/aiwindow/models/Tools.sys.mjs  | 22 -----
 .../browser/browser_conversation_stream.js    | 90 -------------------
 .../models/tests/xpcshell/test_Chat.js        |  5 --
 4 files changed, 119 deletions(-)

diff --git a/browser/components/aiwindow/models/Chat.sys.mjs b/browser/components/aiwindow/models/Chat.sys.mjs
index be1a82626a656..bdf04fee9c3ed 100644
--- a/browser/components/aiwindow/models/Chat.sys.mjs
+++ b/browser/components/aiwindow/models/Chat.sys.mjs
@@ -17,7 +17,6 @@ import {
   searchBrowsingHistory,
   GetPageContent,
   RunSearch,
-  getUserMemories,
 } from "moz-src:///browser/components/aiwindow/models/Tools.sys.mjs";
 
 const lazy = {};
@@ -45,7 +44,6 @@ Object.assign(Chat, {
     search_browsing_history: searchBrowsingHistory,
     get_page_content: GetPageContent.getPageContent,
     run_search: RunSearch.runSearch.bind(RunSearch),
-    get_user_memories: getUserMemories,
   },
 
   /**
diff --git a/browser/components/aiwindow/models/Tools.sys.mjs b/browser/components/aiwindow/models/Tools.sys.mjs
index 2dbe2adbd61e8..1943ffb16eb7c 100644
--- a/browser/components/aiwindow/models/Tools.sys.mjs
+++ b/browser/components/aiwindow/models/Tools.sys.mjs
@@ -18,8 +18,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
-  MemoriesManager:
-    "moz-src:///browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs",
   // @todo Bug 2009194
   // PageDataService:
   //   "moz-src:///browser/components/pagedata/PageDataService.sys.mjs",
@@ -29,14 +27,12 @@ const GET_OPEN_TABS = "get_open_tabs";
 const SEARCH_BROWSING_HISTORY = "search_browsing_history";
 const GET_PAGE_CONTENT = "get_page_content";
 const RUN_SEARCH = "run_search";
-const GET_USER_MEMORIES = "get_user_memories";
 
 export const TOOLS = [
   GET_OPEN_TABS,
   SEARCH_BROWSING_HISTORY,
   GET_PAGE_CONTENT,
   RUN_SEARCH,
-  GET_USER_MEMORIES,
 ];
 
 export const toolsConfig = [
@@ -133,18 +129,6 @@ export const toolsConfig = [
       },
     },
   },
-  {
-    type: "function",
-    function: {
-      name: GET_USER_MEMORIES,
-      description:
-        'Retrieves all memories saved about the user to answer questions like "What do you know about me?", "What memories have you saved?", "What do you remember about me?", etc. Respond to the user that these are memories.',
-      parameters: {
-        type: "object",
-        properties: {},
-      },
-    },
-  },
 ];
 
 /**
@@ -681,9 +665,3 @@ export class GetPageContent {
     return `Content (${modeLabel}) from ${label}:\n\n${cleanContent}`;
   }
 }
-
-export async function getUserMemories() {
-  const memories = await lazy.MemoriesManager.getAllMemories();
-
-  return memories.map(memory => memory.memory_summary);
-}
diff --git a/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js b/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
index 7d69a37e05afa..e6220324ce3d3 100644
--- a/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
+++ b/browser/components/aiwindow/models/tests/browser/browser_conversation_stream.js
@@ -12,9 +12,6 @@ const { MESSAGE_ROLE } = ChromeUtils.importESModule(
 const { Chat } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
 );
-const { MemoryStore } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/services/MemoryStore.sys.mjs"
-);
 
 const { PlacesTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/PlacesTestUtils.sys.mjs"
@@ -252,90 +249,3 @@ add_task(async function test_chat_tool_call_get_page_content() {
     await new Promise(resolve => pageServer.stop(resolve));
   }
 });
-
-add_task(async function test_chat_tool_call_get_user_memories() {
-  // Clear existing memories
-  const preTestMemories = await MemoryStore.getMemories({
-    includeSoftDeleted: true,
-  });
-  for (const memory of preTestMemories) {
-    await MemoryStore.hardDeleteMemory(memory.id);
-  }
-
-  // Add temp test memories
-  const testMemories = [
-    {
-      memory_summary: "Loves drinking coffee",
-      category: "Food & Drink",
-      intent: "Plan / Organize",
-      score: 3,
-    },
-    {
-      memory_summary: "Buys dog food online",
-      category: "Pets & Animals",
-      intent: "Buy / Acquire",
-      score: 4,
-    },
-  ];
-  for (const memory of testMemories) {
-    await MemoryStore.addMemory(memory);
-  }
-
-  try {
-    await withServer(
-      {
-        toolCall: {
-          name: "get_user_memories",
-          args: "{}",
-        },
-        followupChunks: ["Memories ready."],
-      },
-      async () => {
-        const conversation = new ChatConversation({
-          title: "chat title",
-          description: "chat desc",
-          pageUrl: new URL("https://example.com"),
-          pageMeta: {},
-        });
-        conversation.addUserMessage(
-          "Tell me everything you know about me",
-          "https://example.com",
-          0
-        );
-
-        let responseText = "";
-        for await (const chunk of Chat.fetchWithHistory(conversation)) {
-          if (typeof chunk === "string") {
-            responseText += chunk;
-          }
-        }
-
-        Assert.equal(
-          responseText,
-          "Memories ready.",
-          "Assistant should stream follow-up text"
-        );
-
-        const toolMessages = conversation.messages.filter(
-          message => message.role === MESSAGE_ROLE.TOOL
-        );
-        Assert.equal(toolMessages.length, 1, "Tool result recorded");
-        const returnedMemories = toolMessages[0].content.body;
-        info("got memories: " + returnedMemories);
-        Assert.deepEqual(
-          returnedMemories,
-          ["Loves drinking coffee", "Buys dog food online"],
-          "Memories tool returns should match the expected set"
-        );
-      }
-    );
-  } finally {
-    // Clear temp memories
-    const postTestMemories = await MemoryStore.getMemories({
-      includeSoftDeleted: true,
-    });
-    for (const memory of postTestMemories) {
-      await MemoryStore.hardDeleteMemory(memory.id);
-    }
-  }
-});
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
index 08742d389fb4a..f8ca82a4af83b 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
@@ -50,11 +50,6 @@ add_task(async function test_Chat_real_tools_are_registered() {
     "function",
     "get_page_content should be registered in toolMap"
   );
-  Assert.strictEqual(
-    typeof Chat.toolMap.get_user_memories,
-    "function",
-    "get_user_memories should be registered in the toolMap"
-  );
 });
 
 add_task(

From 2a69e071adbf1a732dfeefb343d65ef43f248204 Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Fri, 6 Feb 2026 18:47:56 +0000
Subject: [PATCH 38/93] No Bug - Bumping Firefox l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
af -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
an -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ar -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ast -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
az -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
be -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bg -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
br -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
brx -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ca -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ca-valencia -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cak -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ckb -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cy -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
da -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
de -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
dsb -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
el -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
en-CA -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
en-GB -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
eo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-AR -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-CL -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-ES -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-MX -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
et -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
eu -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fa -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ff -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fi -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fur -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fy-NL -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ga-IE -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gd -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gu-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
he -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hi-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hsb -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hu -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hy-AM -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hye -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ia -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
id -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
is -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
it -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ja -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ja-JP-mac -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ka -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kab -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
km -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ko -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lij -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lt -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ltg -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lv -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
meh -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
mk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ml -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
mr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ms -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
my -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nb-NO -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ne-NP -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nn-NO -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
oc -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pa-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pt-BR -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pt-PT -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
rm -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ro -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ru -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sat -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sc -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
scn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sco -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
si -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
skr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
son -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sq -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sv-SE -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
szl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ta -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
te -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
tg -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
th -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
tl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
tr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
trs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
uk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ur -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
uz -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
vi -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
wo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
xh -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
zh-CN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
zh-TW -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
---
 browser/locales/l10n-changesets.json | 226 +++++++++++++--------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json
index 2fadd6e4ed8e3..6595f9b89111e 100644
--- a/browser/locales/l10n-changesets.json
+++ b/browser/locales/l10n-changesets.json
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bo": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "br": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "brx": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bs": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ca": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ca-valencia": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cak": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ckb": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cs": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cy": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "da": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "de": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "dsb": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "el": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "en-CA": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "en-GB": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "eo": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-AR": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-CL": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-ES": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-MX": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "et": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "eu": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fa": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ff": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fi": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fr": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fur": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fy-NL": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ga-IE": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gd": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gl": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gn": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gu-IN": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "he": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hi-IN": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hr": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hsb": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hu": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hy-AM": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hye": {
         "pin": false,
@@ -897,7 +897,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ia": {
         "pin": false,
@@ -915,7 +915,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "id": {
         "pin": false,
@@ -933,7 +933,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "is": {
         "pin": false,
@@ -951,7 +951,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "it": {
         "pin": false,
@@ -969,7 +969,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ja": {
         "pin": false,
@@ -985,7 +985,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -993,7 +993,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ka": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kab": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kk": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "km": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kn": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ko": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lij": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lo": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lt": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ltg": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lv": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "meh": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "mk": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ml": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "mr": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ms": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "my": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nb-NO": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ne-NP": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nl": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nn-NO": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "oc": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pa-IN": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pl": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pt-BR": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pt-PT": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "rm": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ro": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ru": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sat": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sc": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "scn": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sco": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "si": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sk": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "skr": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sl": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "son": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sq": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sr": {
         "pin": false,
@@ -1713,7 +1713,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sv-SE": {
         "pin": false,
@@ -1731,7 +1731,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "szl": {
         "pin": false,
@@ -1749,7 +1749,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ta": {
         "pin": false,
@@ -1767,7 +1767,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "te": {
         "pin": false,
@@ -1785,7 +1785,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "tg": {
         "pin": false,
@@ -1803,7 +1803,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "th": {
         "pin": false,
@@ -1821,7 +1821,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "tl": {
         "pin": false,
@@ -1839,7 +1839,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "tr": {
         "pin": false,
@@ -1857,7 +1857,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "trs": {
         "pin": false,
@@ -1875,7 +1875,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "uk": {
         "pin": false,
@@ -1893,7 +1893,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ur": {
         "pin": false,
@@ -1911,7 +1911,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "uz": {
         "pin": false,
@@ -1929,7 +1929,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "vi": {
         "pin": false,
@@ -1947,7 +1947,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "wo": {
         "pin": false,
@@ -1965,7 +1965,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "xh": {
         "pin": false,
@@ -1983,7 +1983,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "zh-CN": {
         "pin": false,
@@ -2001,7 +2001,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "zh-TW": {
         "pin": false,
@@ -2019,6 +2019,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     }
 }
\ No newline at end of file

From 7403c5aa1fe040d7066784c43191217aa5fe5feb Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Fri, 6 Feb 2026 18:47:57 +0000
Subject: [PATCH 39/93] No Bug - Bumping Mobile l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
an -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ar -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ast -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
az -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
be -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bg -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
br -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
bs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ca -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cak -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
cy -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
da -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
de -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
dsb -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
el -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
en-CA -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
en-GB -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
eo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-AR -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-CL -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-ES -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
es-MX -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
et -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
eu -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fa -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ff -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fi -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
fy-NL -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ga-IE -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gd -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
gu-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
he -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hi-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hsb -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hu -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
hy-AM -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ia -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
id -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
is -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
it -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ja -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ka -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kab -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
km -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
kn -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ko -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lij -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lt -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ltg -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
lv -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
meh -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
mix -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ml -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
mr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ms -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
my -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nb-NO -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ne-NP -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
nn-NO -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
oc -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pa-IN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pt-BR -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
pt-PT -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
rm -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ro -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ru -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
son -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sq -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
sv-SE -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ta -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
te -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
th -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
tl -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
tr -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
trs -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
uk -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
ur -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
uz -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
vi -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
wo -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
xh -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
zam -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
zh-CN -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
zh-TW -> 1fa6d947ff843230525d6f0f8143e23f2b26a844
---
 mobile/locales/l10n-changesets.json | 196 ++++++++++++++--------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/mobile/locales/l10n-changesets.json b/mobile/locales/l10n-changesets.json
index a467ec0bf149f..2b08091c44ab2 100644
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -6,7 +6,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "an": {
         "pin": false,
@@ -15,7 +15,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ar": {
         "pin": false,
@@ -24,7 +24,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ast": {
         "pin": false,
@@ -33,7 +33,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "az": {
         "pin": false,
@@ -42,7 +42,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "be": {
         "pin": false,
@@ -51,7 +51,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bg": {
         "pin": false,
@@ -60,7 +60,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bn": {
         "pin": false,
@@ -69,7 +69,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "br": {
         "pin": false,
@@ -78,7 +78,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "bs": {
         "pin": false,
@@ -87,7 +87,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ca": {
         "pin": false,
@@ -96,7 +96,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cak": {
         "pin": false,
@@ -105,7 +105,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cs": {
         "pin": false,
@@ -114,7 +114,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "cy": {
         "pin": false,
@@ -123,7 +123,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "da": {
         "pin": false,
@@ -132,7 +132,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "de": {
         "pin": false,
@@ -141,7 +141,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "dsb": {
         "pin": false,
@@ -150,7 +150,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "el": {
         "pin": false,
@@ -159,7 +159,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "en-CA": {
         "pin": false,
@@ -168,7 +168,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "en-GB": {
         "pin": false,
@@ -177,7 +177,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "eo": {
         "pin": false,
@@ -186,7 +186,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-AR": {
         "pin": false,
@@ -195,7 +195,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-CL": {
         "pin": false,
@@ -204,7 +204,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-ES": {
         "pin": false,
@@ -213,7 +213,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "es-MX": {
         "pin": false,
@@ -222,7 +222,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "et": {
         "pin": false,
@@ -231,7 +231,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "eu": {
         "pin": false,
@@ -240,7 +240,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fa": {
         "pin": false,
@@ -249,7 +249,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ff": {
         "pin": false,
@@ -258,7 +258,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fi": {
         "pin": false,
@@ -267,7 +267,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fr": {
         "pin": false,
@@ -276,7 +276,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "fy-NL": {
         "pin": false,
@@ -285,7 +285,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ga-IE": {
         "pin": false,
@@ -294,7 +294,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gd": {
         "pin": false,
@@ -303,7 +303,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gl": {
         "pin": false,
@@ -312,7 +312,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gn": {
         "pin": false,
@@ -321,7 +321,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "gu-IN": {
         "pin": false,
@@ -330,7 +330,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "he": {
         "pin": false,
@@ -339,7 +339,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hi-IN": {
         "pin": false,
@@ -348,7 +348,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hr": {
         "pin": false,
@@ -357,7 +357,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hsb": {
         "pin": false,
@@ -366,7 +366,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hu": {
         "pin": false,
@@ -375,7 +375,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "hy-AM": {
         "pin": false,
@@ -384,7 +384,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ia": {
         "pin": false,
@@ -393,7 +393,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "id": {
         "pin": false,
@@ -402,7 +402,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "is": {
         "pin": false,
@@ -411,7 +411,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "it": {
         "pin": false,
@@ -420,7 +420,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ja": {
         "pin": false,
@@ -429,7 +429,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ka": {
         "pin": false,
@@ -438,7 +438,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kab": {
         "pin": false,
@@ -447,7 +447,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kk": {
         "pin": false,
@@ -456,7 +456,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "km": {
         "pin": false,
@@ -465,7 +465,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "kn": {
         "pin": false,
@@ -474,7 +474,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ko": {
         "pin": false,
@@ -483,7 +483,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lij": {
         "pin": false,
@@ -492,7 +492,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lo": {
         "pin": false,
@@ -501,7 +501,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lt": {
         "pin": false,
@@ -510,7 +510,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ltg": {
         "pin": false,
@@ -519,7 +519,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "lv": {
         "pin": false,
@@ -528,7 +528,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "meh": {
         "pin": false,
@@ -537,7 +537,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "mix": {
         "pin": false,
@@ -546,7 +546,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ml": {
         "pin": false,
@@ -555,7 +555,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "mr": {
         "pin": false,
@@ -564,7 +564,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ms": {
         "pin": false,
@@ -573,7 +573,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "my": {
         "pin": false,
@@ -582,7 +582,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nb-NO": {
         "pin": false,
@@ -591,7 +591,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ne-NP": {
         "pin": false,
@@ -600,7 +600,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nl": {
         "pin": false,
@@ -609,7 +609,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "nn-NO": {
         "pin": false,
@@ -618,7 +618,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "oc": {
         "pin": false,
@@ -627,7 +627,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pa-IN": {
         "pin": false,
@@ -636,7 +636,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pl": {
         "pin": false,
@@ -645,7 +645,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pt-BR": {
         "pin": false,
@@ -654,7 +654,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "pt-PT": {
         "pin": false,
@@ -663,7 +663,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "rm": {
         "pin": false,
@@ -672,7 +672,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ro": {
         "pin": false,
@@ -681,7 +681,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ru": {
         "pin": false,
@@ -690,7 +690,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sk": {
         "pin": false,
@@ -699,7 +699,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sl": {
         "pin": false,
@@ -708,7 +708,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "son": {
         "pin": false,
@@ -717,7 +717,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sq": {
         "pin": false,
@@ -726,7 +726,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sr": {
         "pin": false,
@@ -735,7 +735,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "sv-SE": {
         "pin": false,
@@ -744,7 +744,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ta": {
         "pin": false,
@@ -753,7 +753,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "te": {
         "pin": false,
@@ -762,7 +762,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "th": {
         "pin": false,
@@ -771,7 +771,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "tl": {
         "pin": false,
@@ -780,7 +780,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "tr": {
         "pin": false,
@@ -789,7 +789,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "trs": {
         "pin": false,
@@ -798,7 +798,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "uk": {
         "pin": false,
@@ -807,7 +807,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "ur": {
         "pin": false,
@@ -816,7 +816,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "uz": {
         "pin": false,
@@ -825,7 +825,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "vi": {
         "pin": false,
@@ -834,7 +834,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "wo": {
         "pin": false,
@@ -843,7 +843,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "xh": {
         "pin": false,
@@ -852,7 +852,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "zam": {
         "pin": false,
@@ -861,7 +861,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "zh-CN": {
         "pin": false,
@@ -870,7 +870,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     },
     "zh-TW": {
         "pin": false,
@@ -879,6 +879,6 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "9ad14998f04fd730a0eb04090acc462cc811b2cf"
+        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
     }
 }
\ No newline at end of file

From c949f90e8ba2a982dd0dff33f62bf751c2e7de39 Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Fri, 6 Feb 2026 21:21:26 +0200
Subject: [PATCH 40/93] Revert "Bug 2011162 - Bump required `tox` version to
 `3.28.0` r=ahal" as requested by dev. DONTBUILD

This reverts commit e6289356f976e40f0cceef01a91d804ede195a6d.

Revert "Bug 2011162 - Strip inline comments when parsing `requirements.txt` for lockfiles r=firefox-build-system-reviewers,sergesanspaille"

This reverts commit 738a09ac7c39fc8775e8700cfe74cc2631955026.

Revert "Bug 2011162 - Add `-r` include support to lockfile `requirements.txt` parsing r=firefox-build-system-reviewers,sergesanspaille"

This reverts commit 592072308d0320cae69859b619c5a7667f54e3b7.

Revert "Bug 2011162 - Remove vendored `filelock` dependency r=ahal,mach-reviewers"

This reverts commit ba4111b9132b8f08004390d698a319b616199bd7.

Revert "Bug 2011162 - Fail on site lock timeout instead of continuing r=firefox-build-system-reviewers,sergesanspaille"

This reverts commit 07e9dc124eba81d046498b91142fc60e7e1f0ad5.

Revert "Bug 2011162 - Replace vendored `filelock` with `mach.filelock` r=firefox-build-system-reviewers,sergesanspaille,mozperftest-reviewers,sparky"

This reverts commit 9641d7f7357610b9e13de9c57d9434fd7b7f252a.
---
 build/mach_initialize.py                      |   2 +
 config/MozZipFile.py                          |   2 +-
 configure.py                                  |   1 +
 mobile/android/gradle.py                      |   2 +-
 python/mach/mach/filelock.py                  | 142 ------
 python/mach/mach/logging.py                   |   4 +-
 python/mach/mach/site.py                      |  29 +-
 python/mach/mach/test/test_site_activation.py |   1 +
 python/mozbuild/mozbuild/action/buildlist.py  |   2 +-
 .../lockfiles/site_dependency_extractor.py    |  16 +-
 .../test/test_site_dependency_extractor.py    |  13 +-
 python/mozperftest/mozperftest/runner.py      |   2 +
 python/sites/lint.txt                         |   2 +-
 python/sites/mach.txt                         |   1 +
 python/sites/wpt.txt                          |   2 +-
 .../filelock-3.18.0.dist-info/METADATA        |  58 +++
 .../filelock/filelock-3.18.0.dist-info/RECORD |  14 +
 .../filelock/filelock-3.18.0.dist-info/WHEEL  |   4 +
 .../licenses/LICENSE                          |  24 ++
 .../python/filelock/filelock/__init__.py      |  70 +++
 third_party/python/filelock/filelock/_api.py  | 403 ++++++++++++++++++
 .../python/filelock/filelock/_error.py        |  30 ++
 third_party/python/filelock/filelock/_soft.py |  47 ++
 third_party/python/filelock/filelock/_unix.py |  70 +++
 third_party/python/filelock/filelock/_util.py |  52 +++
 .../python/filelock/filelock/_windows.py      |  65 +++
 .../python/filelock/filelock/asyncio.py       | 342 +++++++++++++++
 third_party/python/filelock/filelock/py.typed |   0
 .../python/filelock/filelock/version.py       |  21 +
 third_party/python/pyproject.toml             |   1 +
 third_party/python/requirements.txt           |   4 +
 third_party/python/uv.lock                    |  11 +
 third_party/python/uv.lock.hash               |   2 +-
 tools/lint/python/l10n_lint.py                |   6 +-
 34 files changed, 1251 insertions(+), 194 deletions(-)
 delete mode 100644 python/mach/mach/filelock.py
 create mode 100644 third_party/python/filelock/filelock-3.18.0.dist-info/METADATA
 create mode 100644 third_party/python/filelock/filelock-3.18.0.dist-info/RECORD
 create mode 100644 third_party/python/filelock/filelock-3.18.0.dist-info/WHEEL
 create mode 100644 third_party/python/filelock/filelock-3.18.0.dist-info/licenses/LICENSE
 create mode 100644 third_party/python/filelock/filelock/__init__.py
 create mode 100644 third_party/python/filelock/filelock/_api.py
 create mode 100644 third_party/python/filelock/filelock/_error.py
 create mode 100644 third_party/python/filelock/filelock/_soft.py
 create mode 100644 third_party/python/filelock/filelock/_unix.py
 create mode 100644 third_party/python/filelock/filelock/_util.py
 create mode 100644 third_party/python/filelock/filelock/_windows.py
 create mode 100644 third_party/python/filelock/filelock/asyncio.py
 create mode 100644 third_party/python/filelock/filelock/py.typed
 create mode 100644 third_party/python/filelock/filelock/version.py

diff --git a/build/mach_initialize.py b/build/mach_initialize.py
index 21e2e460db849..1a00b00689f6d 100644
--- a/build/mach_initialize.py
+++ b/build/mach_initialize.py
@@ -135,12 +135,14 @@ def initialize(topsrcdir, args=()):
 
     # We need the "mach" module to access the logic to parse virtualenv
     # requirements. Since that depends on "packaging", we add it to the path too.
+    # We need filelock for solving a virtualenv race condition
     sys.path[0:0] = [
         os.path.join(topsrcdir, module)
         for module in (
             os.path.join("python", "mach"),
             os.path.join("testing", "mozbase", "mozfile"),
             os.path.join("third_party", "python", "packaging"),
+            os.path.join("third_party", "python", "filelock"),
         )
     ]
 
diff --git a/config/MozZipFile.py b/config/MozZipFile.py
index ec4f36e5c94a5..033a050e52835 100644
--- a/config/MozZipFile.py
+++ b/config/MozZipFile.py
@@ -6,7 +6,7 @@
 import time
 import zipfile
 
-from mach.filelock import SoftFileLock
+from filelock import SoftFileLock
 
 
 class ZipFile(zipfile.ZipFile):
diff --git a/configure.py b/configure.py
index 2e76b81c08061..bb36ac156c2fa 100644
--- a/configure.py
+++ b/configure.py
@@ -19,6 +19,7 @@
 sys.path.insert(0, os.path.join(base_dir, "testing", "mozbase", "mozshellutil"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "six"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
+sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "filelock"))
 import mozpack.path as mozpath
 from mach.requirements import MachEnvRequirements
 from mach.site import (
diff --git a/mobile/android/gradle.py b/mobile/android/gradle.py
index 4548784b88239..5f31cf13a1129 100644
--- a/mobile/android/gradle.py
+++ b/mobile/android/gradle.py
@@ -9,7 +9,7 @@
 from contextlib import contextmanager
 
 import mozpack.path as mozpath
-from mach.filelock import SoftFileLock
+from filelock import SoftFileLock
 from mozbuild.dirutils import ensureParentDir
 
 
diff --git a/python/mach/mach/filelock.py b/python/mach/mach/filelock.py
deleted file mode 100644
index 97ddd46639937..0000000000000
--- a/python/mach/mach/filelock.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import errno
-import os
-import sys
-import time
-from pathlib import Path
-
-
-class LockTimeout(Exception):
-    """Raised when a lock cannot be acquired within the timeout period."""
-
-    def __init__(self, lock_file):
-        self.lock_file = lock_file
-        super().__init__(f"Timeout waiting for lock file: {lock_file}")
-
-
-def _is_pid_alive(pid):
-    """Check if a process with the given PID is still running."""
-    try:
-        if sys.platform == "win32":
-            # os.kill(pid, 0) is unreliable on Windows
-            import ctypes
-
-            PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
-            handle = ctypes.windll.kernel32.OpenProcess(
-                PROCESS_QUERY_LIMITED_INFORMATION, False, pid
-            )
-            if handle:
-                ctypes.windll.kernel32.CloseHandle(handle)
-                return True
-            return False
-        else:
-            os.kill(pid, 0)
-            return True
-    except OSError as e:
-        if e.errno == errno.ESRCH:  # No such process
-            return False
-        if e.errno == errno.EPERM:  # Permission denied, but the process exists
-            return True
-        raise
-
-
-class SoftFileLock:
-    """A simple cross-platform file lock using exclusive file creation."""
-
-    def __init__(self, lock_file, timeout=-1):
-        self.lock_file = Path(lock_file)
-        self.timeout = timeout
-        self._lock_held = False
-
-    def _is_lock_stale(self):
-        """Check if the existing lock file is stale (owning process no longer exists)."""
-        try:
-            content = self.lock_file.read_text().strip()
-            if not content:
-                # Empty file is invalid/stale
-                return True
-            pid = int(content)
-            return not _is_pid_alive(pid)
-        except ValueError:
-            # Can't parse PID, treat as stale
-            return True
-        except OSError:
-            # Can't read the file, may be a race condition, assume it's not stale to be safe
-            return False
-
-    def _try_remove_stale_lock(self):
-        """Attempt to remove a stale lock file. Returns True if removed."""
-        if not self._is_lock_stale():
-            return False
-        try:
-            self.lock_file.unlink()
-            return True
-        except OSError:
-            # Race condition, another process did what we're trying to do. We failed, so we wait.
-            return False
-
-    def acquire(self, timeout=None):
-        """Acquire the lock, blocking until available or timeout is reached."""
-        assert not self._lock_held, "acquire() is not reentrant"
-
-        if timeout is None:
-            timeout = self.timeout
-
-        start_time = time.monotonic()
-        poll_interval = 0.1
-
-        self.lock_file.parent.mkdir(parents=True, exist_ok=True)
-        while True:
-            try:
-                with self.lock_file.open("x") as f:
-                    # Write PID for stale lock detection
-                    f.write(f"{os.getpid()}\n")
-                self._lock_held = True
-                return self
-            except OSError as e:
-                # FileExistsError (EEXIST) or Windows EACCES means lock is held
-                if e.errno not in (errno.EEXIST, errno.EACCES):
-                    raise
-                if e.errno == errno.EACCES and sys.platform != "win32":
-                    raise
-                # Check if the lock is stale before waiting
-                if self._try_remove_stale_lock():
-                    continue
-                if timeout >= 0 and time.monotonic() - start_time >= timeout:
-                    raise LockTimeout(self.lock_file)
-                time.sleep(poll_interval)
-                poll_interval = min(poll_interval * 1.5, 1.0)
-
-    def release(self):
-        """Release the lock by deleting the lock file."""
-        if not self._lock_held:
-            return
-        while True:
-            try:
-                self.lock_file.unlink()
-                self._lock_held = False
-                break
-            except OSError as e:
-                if e.errno == errno.EACCES:
-                    # On Windows, another process may have the file open we'll retry.
-                    # Just a short sleep since we want to drop the lock ASAP
-                    # (but we need to let some other process close the file
-                    # first).
-                    time.sleep(0.1)
-                elif e.errno == errno.ENOENT:
-                    # Already deleted
-                    self._lock_held = False
-                    break
-                else:
-                    raise
-
-    def __enter__(self):
-        self.acquire()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.release()
-        return False
diff --git a/python/mach/mach/logging.py b/python/mach/mach/logging.py
index d3a895da27232..f209370e4efc7 100644
--- a/python/mach/mach/logging.py
+++ b/python/mach/mach/logging.py
@@ -440,8 +440,10 @@ def enable_all_structured_loggers(self, terminal=True, file=True):
         on. By default, all known handlers are operated on.
         """
 
-        # Glean makes logs that we're not interested in, so we squelch them.
+        # Glean and filelock make logs that we're not interested in, so we
+        # squelch them.
         logging.getLogger("glean").setLevel(logging.CRITICAL)
+        logging.getLogger("filelock").setLevel(logging.CRITICAL)
 
         # Remove current handlers from all loggers so we don't double
         # register handlers.
diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
index 23500b9300de6..32c0c0d0e9bf1 100644
--- a/python/mach/mach/site.py
+++ b/python/mach/mach/site.py
@@ -21,24 +21,15 @@
 from pathlib import Path
 from typing import Callable, Optional
 
+from filelock import FileLock, Timeout
 from mozfile import json
 from packaging.specifiers import SpecifierSet
 
-from mach.filelock import LockTimeout, SoftFileLock
 from mach.requirements import (
     MachEnvRequirements,
     UnexpectedFlexibleRequirementException,
 )
 
-
-class SiteLockTimeout(Exception):
-    def __init__(self, lock_file, site_name, timeout):
-        self.lock_file = lock_file
-        super().__init__(
-            f"Could not acquire the lock at {lock_file} for the {site_name} site after {timeout} seconds"
-        )
-
-
 PTH_FILENAME = "mach.pth"
 METADATA_FILENAME = "moz_virtualenv_metadata.json"
 # The following virtualenvs *may* be used in a context where they aren't allowed to
@@ -409,7 +400,7 @@ def ensure(self, *, force=False):
                 root = os.path.join(workspace, "mach_virtualenv")
 
         # Although `root` should never be `None` here, let's guard against
-        # that edge case by skipping the SoftFileLock step if it is.
+        # that edge case by skipping the FileLock step if it is.
         if root:
             lock_file = Path(root).with_suffix(".lock")
             timeout = 60
@@ -420,10 +411,12 @@ def ensure(self, *, force=False):
             # to date, while the other(s) wait(s). Once the first releases the lock, the others will
             # continue one-by-one and determine it's up-to-date.
             try:
-                with SoftFileLock(lock_file, timeout=timeout):
+                with FileLock(lock_file, timeout=timeout):
                     self._ensure(force=force)
-            except LockTimeout:
-                raise SiteLockTimeout(lock_file, "mach", timeout)
+            except Timeout:
+                self._log(
+                    f"Could not acquire the lock at {lock_file} for the mach site after {timeout} seconds."
+                )
         else:
             self._ensure(force=force)
 
@@ -668,7 +661,7 @@ def ensure(self):
         # to date, while the other(s) wait(s). Once the first releases the lock, the others
         # will continue one-by-one and determine it's up-to-date.
         try:
-            with SoftFileLock(lock_file, timeout=timeout):
+            with FileLock(lock_file, timeout=timeout):
                 result = self._up_to_date()
                 if not result.is_up_to_date:
                     active_site = MozSiteMetadata.from_runtime()
@@ -689,8 +682,10 @@ def ensure(self):
                         self._requirements,
                         self._metadata,
                     )
-        except LockTimeout:
-            raise SiteLockTimeout(lock_file, self._site_name, timeout)
+        except Timeout:
+            self._log(
+                f"Could not acquire the lock at {lock_file} for the {self._site_name} site after {timeout} seconds."
+            )
 
     def activate(self):
         """Activate this site in the current Python context.
diff --git a/python/mach/mach/test/test_site_activation.py b/python/mach/mach/test/test_site_activation.py
index abe87acb30098..8e82436ed9759 100644
--- a/python/mach/mach/test/test_site_activation.py
+++ b/python/mach/mach/test/test_site_activation.py
@@ -313,6 +313,7 @@ def _activation_context():
     required_mach_sys_paths = [
         topsrcdir / "python" / "mach",
         topsrcdir / "testing" / "mozbase" / "mozfile",
+        topsrcdir / "third_party" / "python" / "filelock",
         topsrcdir / "third_party" / "python" / "packaging",
         topsrcdir / "third_party" / "python" / "pip",
     ]
diff --git a/python/mozbuild/mozbuild/action/buildlist.py b/python/mozbuild/mozbuild/action/buildlist.py
index ee3b9f4d7d1c6..805e0be5ed6ff 100644
--- a/python/mozbuild/mozbuild/action/buildlist.py
+++ b/python/mozbuild/mozbuild/action/buildlist.py
@@ -11,7 +11,7 @@
 import os.path
 import sys
 
-from mach.filelock import SoftFileLock
+from filelock import SoftFileLock
 
 from mozbuild.dirutils import ensureParentDir
 
diff --git a/python/mozbuild/mozbuild/lockfiles/site_dependency_extractor.py b/python/mozbuild/mozbuild/lockfiles/site_dependency_extractor.py
index 6b5a132b3c16f..126b6f2c6207e 100644
--- a/python/mozbuild/mozbuild/lockfiles/site_dependency_extractor.py
+++ b/python/mozbuild/mozbuild/lockfiles/site_dependency_extractor.py
@@ -132,22 +132,10 @@ def _handle_requirements_txt(self, rest: str) -> None:
             for raw_line in f:
                 line = raw_line.strip()
 
-                if not line or line.startswith("#"):
+                if not line or line.startswith("#") or line.startswith("-"):
                     continue
 
-                if line.startswith("-r "):
-                    included = (
-                        requirements_txt_path.parent / line[3:].strip()
-                    ).resolve()
-                    self._handle_requirements_txt(
-                        str(included.relative_to(self.topsrcdir))
-                    )
-                    continue
-
-                if line.startswith("-"):
-                    continue
-
-                pypi_requirement_spec = line.split("#")[0].split("\\")[0].strip()
+                pypi_requirement_spec = line.split("\\")[0].strip().rstrip()
                 if pypi_requirement_spec:
                     self._handle_pypi(pypi_requirement_spec)
 
diff --git a/python/mozbuild/mozbuild/test/test_site_dependency_extractor.py b/python/mozbuild/mozbuild/test/test_site_dependency_extractor.py
index 719b6276a9d43..96e57fe7debb1 100644
--- a/python/mozbuild/mozbuild/test/test_site_dependency_extractor.py
+++ b/python/mozbuild/mozbuild/test/test_site_dependency_extractor.py
@@ -15,13 +15,6 @@ def test_requirements_txt_parsing(tmp_path):
     sites_dir = tmp_path / "sites"
     sites_dir.mkdir()
 
-    other_requirements_txt = tmp_path / "other-requirements.txt"
-    other_requirements_txt.write_text(
-        """# Included requirements
-chardet==4.0.0 --hash=sha256:jkl012
-"""
-    )
-
     requirements_txt = tmp_path / "requirements.txt"
     requirements_txt.write_text(
         """# Comment line
@@ -29,7 +22,7 @@ def test_requirements_txt_parsing(tmp_path):
 
 # Another comment
 urllib3==1.26.5 --hash=sha256:def456
-requests==2.26.0 --hash=sha256:ghi789  # inline comment
+requests==2.26.0 --hash=sha256:ghi789
 
 # Empty line follows
 
@@ -49,19 +42,17 @@ def test_requirements_txt_parsing(tmp_path):
     requires_python, dependencies = extractor.parse()
 
     assert requires_python == ">=3.8"
-    assert len(dependencies) == 4
+    assert len(dependencies) == 3
 
     dep_names = {dep.name for dep in dependencies}
     assert "certifi" in dep_names
     assert "urllib3" in dep_names
     assert "requests" in dep_names
-    assert "chardet" in dep_names
 
     dep_dict = {dep.name: dep.version for dep in dependencies}
     assert dep_dict["certifi"] == "==2021.5.30 --hash=sha256"
     assert dep_dict["urllib3"] == "==1.26.5 --hash=sha256"
     assert dep_dict["requests"] == "==2.26.0 --hash=sha256"
-    assert dep_dict["chardet"] == "==4.0.0 --hash=sha256"
 
 
 def test_requirements_txt_missing_file(tmp_path):
diff --git a/python/mozperftest/mozperftest/runner.py b/python/mozperftest/mozperftest/runner.py
index d48ea82ad6f1d..b4f4070d4bc15 100644
--- a/python/mozperftest/mozperftest/runner.py
+++ b/python/mozperftest/mozperftest/runner.py
@@ -42,12 +42,14 @@ def _activate_virtualenvs(flavor):
 
     # We need the "mach" module to access the logic to parse virtualenv
     # requirements. Since that depends on "packaging", we add that to the path too.
+    # We need filelock for solving a virtualenv race condition
     sys.path[0:0] = [
         os.path.join(SRC_ROOT, module)
         for module in (
             os.path.join("python", "mach"),
             os.path.join("testing", "mozbase", "mozfile"),
             os.path.join("third_party", "python", "packaging"),
+            os.path.join("third_party", "python", "filelock"),
         )
     ]
 
diff --git a/python/sites/lint.txt b/python/sites/lint.txt
index c78d58384d1d9..e764b4b246f1e 100644
--- a/python/sites/lint.txt
+++ b/python/sites/lint.txt
@@ -19,7 +19,7 @@ pypi:snowballstemmer==2.2.0
 pypi:sphinxcontrib-applehelp==1.0.4
 pypi:sphinxcontrib-htmlhelp==2.0.1
 pypi:sphinxcontrib-mermaid==1.0.0
-pypi:tox==3.28.0
+pypi:tox==2.7.0
 pypi:virtualenv==20.24.7
 requirements-txt:taskcluster/requirements.txt
 vendored:third_party/python/aiohappyeyeballs
diff --git a/python/sites/mach.txt b/python/sites/mach.txt
index 86a9106c4cdf4..c2bec8a47f748 100644
--- a/python/sites/mach.txt
+++ b/python/sites/mach.txt
@@ -80,6 +80,7 @@ vendored:third_party/python/click
 vendored:third_party/python/colorama
 vendored:third_party/python/diskcache
 vendored:third_party/python/distro
+vendored:third_party/python/filelock
 vendored:third_party/python/glean_parser
 vendored:third_party/python/idna
 vendored:third_party/python/importlib_metadata
diff --git a/python/sites/wpt.txt b/python/sites/wpt.txt
index fe41235deb6b6..384dbe81943c7 100644
--- a/python/sites/wpt.txt
+++ b/python/sites/wpt.txt
@@ -4,7 +4,7 @@ pypi:pillow==11.3.0
 # Bug 1823701 - tomli is a pytest dependency that isn't pulled into WPT's
 # vendor dir for some reason
 pypi:tomli==2.2.1
-pypi:tox==3.28.0
+pypi:tox==3.12.1
 pypi:ujson==5.10.0
 vendored:testing/web-platform/tests/tools/third_party/h2/src
 vendored:testing/web-platform/tests/tools/third_party/hpack/src
diff --git a/third_party/python/filelock/filelock-3.18.0.dist-info/METADATA b/third_party/python/filelock/filelock-3.18.0.dist-info/METADATA
new file mode 100644
index 0000000000000..b640fa40f1c60
--- /dev/null
+++ b/third_party/python/filelock/filelock-3.18.0.dist-info/METADATA
@@ -0,0 +1,58 @@
+Metadata-Version: 2.4
+Name: filelock
+Version: 3.18.0
+Summary: A platform independent file lock.
+Project-URL: Documentation, https://py-filelock.readthedocs.io
+Project-URL: Homepage, https://github.com/tox-dev/py-filelock
+Project-URL: Source, https://github.com/tox-dev/py-filelock
+Project-URL: Tracker, https://github.com/tox-dev/py-filelock/issues
+Maintainer-email: Bernát Gábor <gaborjbernat@gmail.com>
+License-Expression: Unlicense
+License-File: LICENSE
+Keywords: application,cache,directory,log,user
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: The Unlicense (Unlicense)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Internet
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: System
+Requires-Python: >=3.9
+Provides-Extra: docs
+Requires-Dist: furo>=2024.8.6; extra == 'docs'
+Requires-Dist: sphinx-autodoc-typehints>=3; extra == 'docs'
+Requires-Dist: sphinx>=8.1.3; extra == 'docs'
+Provides-Extra: testing
+Requires-Dist: covdefaults>=2.3; extra == 'testing'
+Requires-Dist: coverage>=7.6.10; extra == 'testing'
+Requires-Dist: diff-cover>=9.2.1; extra == 'testing'
+Requires-Dist: pytest-asyncio>=0.25.2; extra == 'testing'
+Requires-Dist: pytest-cov>=6; extra == 'testing'
+Requires-Dist: pytest-mock>=3.14; extra == 'testing'
+Requires-Dist: pytest-timeout>=2.3.1; extra == 'testing'
+Requires-Dist: pytest>=8.3.4; extra == 'testing'
+Requires-Dist: virtualenv>=20.28.1; extra == 'testing'
+Provides-Extra: typing
+Requires-Dist: typing-extensions>=4.12.2; (python_version < '3.11') and extra == 'typing'
+Description-Content-Type: text/markdown
+
+# filelock
+
+[![PyPI](https://img.shields.io/pypi/v/filelock)](https://pypi.org/project/filelock/)
+[![Supported Python
+versions](https://img.shields.io/pypi/pyversions/filelock.svg)](https://pypi.org/project/filelock/)
+[![Documentation
+status](https://readthedocs.org/projects/py-filelock/badge/?version=latest)](https://py-filelock.readthedocs.io/en/latest/?badge=latest)
+[![Code style:
+black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Downloads](https://static.pepy.tech/badge/filelock/month)](https://pepy.tech/project/filelock)
+[![check](https://github.com/tox-dev/py-filelock/actions/workflows/check.yaml/badge.svg)](https://github.com/tox-dev/py-filelock/actions/workflows/check.yaml)
+
+For more information checkout the [official documentation](https://py-filelock.readthedocs.io/en/latest/index.html).
diff --git a/third_party/python/filelock/filelock-3.18.0.dist-info/RECORD b/third_party/python/filelock/filelock-3.18.0.dist-info/RECORD
new file mode 100644
index 0000000000000..954dad1e7a103
--- /dev/null
+++ b/third_party/python/filelock/filelock-3.18.0.dist-info/RECORD
@@ -0,0 +1,14 @@
+filelock/__init__.py,sha256=_t_-OAGXo_qyPa9lNQ1YnzVYEvSW3I0onPqzpomsVVg,1769
+filelock/_api.py,sha256=2aATBeJ3-jtMj5OSm7EE539iNaTBsf13KXtcBMoi8oM,14545
+filelock/_error.py,sha256=-5jMcjTu60YAvAO1UbqDD1GIEjVkwr8xCFwDBtMeYDg,787
+filelock/_soft.py,sha256=haqtc_TB_KJbYv2a8iuEAclKuM4fMG1vTcp28sK919c,1711
+filelock/_unix.py,sha256=eGOs4gDgZ-5fGnJUz-OkJDeZkAMzgvYcD8hVD6XH7e4,2351
+filelock/_util.py,sha256=QHBoNFIYfbAThhotH3Q8E2acFc84wpG49-T-uu017ZE,1715
+filelock/_windows.py,sha256=8k4XIBl_zZVfGC2gz0kEr8DZBvpNa8wdU9qeM1YrBb8,2179
+filelock/asyncio.py,sha256=EZdJVkbMnZMuQwzuPN5IvXD0Ugzt__vOtrMP4-siVeU,12451
+filelock/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+filelock/version.py,sha256=D9gAiF9PGH4dQFjbe6VcXhU8kyCLpU7-c7_vfZP--Hc,513
+filelock-3.18.0.dist-info/METADATA,sha256=bMzrZMIFytIbgg_WaLomH79i_7KEx8ahX0IJBxbx1_I,2897
+filelock-3.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+filelock-3.18.0.dist-info/licenses/LICENSE,sha256=iNm062BXnBkew5HKBMFhMFctfu3EqG2qWL8oxuFMm80,1210
+filelock-3.18.0.dist-info/RECORD,,
diff --git a/third_party/python/filelock/filelock-3.18.0.dist-info/WHEEL b/third_party/python/filelock/filelock-3.18.0.dist-info/WHEEL
new file mode 100644
index 0000000000000..12228d414b6cf
--- /dev/null
+++ b/third_party/python/filelock/filelock-3.18.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.27.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/third_party/python/filelock/filelock-3.18.0.dist-info/licenses/LICENSE b/third_party/python/filelock/filelock-3.18.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000000..cf1ab25da0349
--- /dev/null
+++ b/third_party/python/filelock/filelock-3.18.0.dist-info/licenses/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
diff --git a/third_party/python/filelock/filelock/__init__.py b/third_party/python/filelock/filelock/__init__.py
new file mode 100644
index 0000000000000..c9d8c5b8ebe56
--- /dev/null
+++ b/third_party/python/filelock/filelock/__init__.py
@@ -0,0 +1,70 @@
+"""
+A platform independent file lock that supports the with-statement.
+
+.. autodata:: filelock.__version__
+   :no-value:
+
+"""
+
+from __future__ import annotations
+
+import sys
+import warnings
+from typing import TYPE_CHECKING
+
+from ._api import AcquireReturnProxy, BaseFileLock
+from ._error import Timeout
+from ._soft import SoftFileLock
+from ._unix import UnixFileLock, has_fcntl
+from ._windows import WindowsFileLock
+from .asyncio import (
+    AsyncAcquireReturnProxy,
+    AsyncSoftFileLock,
+    AsyncUnixFileLock,
+    AsyncWindowsFileLock,
+    BaseAsyncFileLock,
+)
+from .version import version
+
+#: version of the project as a string
+__version__: str = version
+
+
+if sys.platform == "win32":  # pragma: win32 cover
+    _FileLock: type[BaseFileLock] = WindowsFileLock
+    _AsyncFileLock: type[BaseAsyncFileLock] = AsyncWindowsFileLock
+else:  # pragma: win32 no cover # noqa: PLR5501
+    if has_fcntl:
+        _FileLock: type[BaseFileLock] = UnixFileLock
+        _AsyncFileLock: type[BaseAsyncFileLock] = AsyncUnixFileLock
+    else:
+        _FileLock = SoftFileLock
+        _AsyncFileLock = AsyncSoftFileLock
+        if warnings is not None:
+            warnings.warn("only soft file lock is available", stacklevel=2)
+
+if TYPE_CHECKING:
+    FileLock = SoftFileLock
+    AsyncFileLock = AsyncSoftFileLock
+else:
+    #: Alias for the lock, which should be used for the current platform.
+    FileLock = _FileLock
+    AsyncFileLock = _AsyncFileLock
+
+
+__all__ = [
+    "AcquireReturnProxy",
+    "AsyncAcquireReturnProxy",
+    "AsyncFileLock",
+    "AsyncSoftFileLock",
+    "AsyncUnixFileLock",
+    "AsyncWindowsFileLock",
+    "BaseAsyncFileLock",
+    "BaseFileLock",
+    "FileLock",
+    "SoftFileLock",
+    "Timeout",
+    "UnixFileLock",
+    "WindowsFileLock",
+    "__version__",
+]
diff --git a/third_party/python/filelock/filelock/_api.py b/third_party/python/filelock/filelock/_api.py
new file mode 100644
index 0000000000000..8fde69a0fef7b
--- /dev/null
+++ b/third_party/python/filelock/filelock/_api.py
@@ -0,0 +1,403 @@
+from __future__ import annotations
+
+import contextlib
+import inspect
+import logging
+import os
+import time
+import warnings
+from abc import ABCMeta, abstractmethod
+from dataclasses import dataclass
+from threading import local
+from typing import TYPE_CHECKING, Any, cast
+from weakref import WeakValueDictionary
+
+from ._error import Timeout
+
+if TYPE_CHECKING:
+    import sys
+    from types import TracebackType
+
+    if sys.version_info >= (3, 11):  # pragma: no cover (py311+)
+        from typing import Self
+    else:  # pragma: no cover (<py311)
+        from typing_extensions import Self
+
+
+_LOGGER = logging.getLogger("filelock")
+
+
+# This is a helper class which is returned by :meth:`BaseFileLock.acquire` and wraps the lock to make sure __enter__
+# is not called twice when entering the with statement. If we would simply return *self*, the lock would be acquired
+# again in the *__enter__* method of the BaseFileLock, but not released again automatically. issue #37 (memory leak)
+class AcquireReturnProxy:
+    """A context-aware object that will release the lock file when exiting."""
+
+    def __init__(self, lock: BaseFileLock) -> None:
+        self.lock = lock
+
+    def __enter__(self) -> BaseFileLock:
+        return self.lock
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        self.lock.release()
+
+
+@dataclass
+class FileLockContext:
+    """A dataclass which holds the context for a ``BaseFileLock`` object."""
+
+    # The context is held in a separate class to allow optional use of thread local storage via the
+    # ThreadLocalFileContext class.
+
+    #: The path to the lock file.
+    lock_file: str
+
+    #: The default timeout value.
+    timeout: float
+
+    #: The mode for the lock files
+    mode: int
+
+    #: Whether the lock should be blocking or not
+    blocking: bool
+
+    #: The file descriptor for the *_lock_file* as it is returned by the os.open() function, not None when lock held
+    lock_file_fd: int | None = None
+
+    #: The lock counter is used for implementing the nested locking mechanism.
+    lock_counter: int = 0  # When the lock is acquired is increased and the lock is only released, when this value is 0
+
+
+class ThreadLocalFileContext(FileLockContext, local):
+    """A thread local version of the ``FileLockContext`` class."""
+
+
+class FileLockMeta(ABCMeta):
+    def __call__(  # noqa: PLR0913
+        cls,
+        lock_file: str | os.PathLike[str],
+        timeout: float = -1,
+        mode: int = 0o644,
+        thread_local: bool = True,  # noqa: FBT001, FBT002
+        *,
+        blocking: bool = True,
+        is_singleton: bool = False,
+        **kwargs: Any,  # capture remaining kwargs for subclasses  # noqa: ANN401
+    ) -> BaseFileLock:
+        if is_singleton:
+            instance = cls._instances.get(str(lock_file))  # type: ignore[attr-defined]
+            if instance:
+                params_to_check = {
+                    "thread_local": (thread_local, instance.is_thread_local()),
+                    "timeout": (timeout, instance.timeout),
+                    "mode": (mode, instance.mode),
+                    "blocking": (blocking, instance.blocking),
+                }
+
+                non_matching_params = {
+                    name: (passed_param, set_param)
+                    for name, (passed_param, set_param) in params_to_check.items()
+                    if passed_param != set_param
+                }
+                if not non_matching_params:
+                    return cast("BaseFileLock", instance)
+
+                # parameters do not match; raise error
+                msg = "Singleton lock instances cannot be initialized with differing arguments"
+                msg += "\nNon-matching arguments: "
+                for param_name, (passed_param, set_param) in non_matching_params.items():
+                    msg += f"\n\t{param_name} (existing lock has {set_param} but {passed_param} was passed)"
+                raise ValueError(msg)
+
+        # Workaround to make `__init__`'s params optional in subclasses
+        # E.g. virtualenv changes the signature of the `__init__` method in the `BaseFileLock` class descendant
+        # (https://github.com/tox-dev/filelock/pull/340)
+
+        all_params = {
+            "timeout": timeout,
+            "mode": mode,
+            "thread_local": thread_local,
+            "blocking": blocking,
+            "is_singleton": is_singleton,
+            **kwargs,
+        }
+
+        present_params = inspect.signature(cls.__init__).parameters  # type: ignore[misc]
+        init_params = {key: value for key, value in all_params.items() if key in present_params}
+
+        instance = super().__call__(lock_file, **init_params)
+
+        if is_singleton:
+            cls._instances[str(lock_file)] = instance  # type: ignore[attr-defined]
+
+        return cast("BaseFileLock", instance)
+
+
+class BaseFileLock(contextlib.ContextDecorator, metaclass=FileLockMeta):
+    """Abstract base class for a file lock object."""
+
+    _instances: WeakValueDictionary[str, BaseFileLock]
+
+    def __init_subclass__(cls, **kwargs: dict[str, Any]) -> None:
+        """Setup unique state for lock subclasses."""
+        super().__init_subclass__(**kwargs)
+        cls._instances = WeakValueDictionary()
+
+    def __init__(  # noqa: PLR0913
+        self,
+        lock_file: str | os.PathLike[str],
+        timeout: float = -1,
+        mode: int = 0o644,
+        thread_local: bool = True,  # noqa: FBT001, FBT002
+        *,
+        blocking: bool = True,
+        is_singleton: bool = False,
+    ) -> None:
+        """
+        Create a new lock object.
+
+        :param lock_file: path to the file
+        :param timeout: default timeout when acquiring the lock, in seconds. It will be used as fallback value in \
+            the acquire method, if no timeout value (``None``) is given. If you want to disable the timeout, set it \
+            to a negative value. A timeout of 0 means that there is exactly one attempt to acquire the file lock.
+        :param mode: file permissions for the lockfile
+        :param thread_local: Whether this object's internal context should be thread local or not. If this is set to \
+            ``False`` then the lock will be reentrant across threads.
+        :param blocking: whether the lock should be blocking or not
+        :param is_singleton: If this is set to ``True`` then only one instance of this class will be created \
+            per lock file. This is useful if you want to use the lock object for reentrant locking without needing \
+            to pass the same object around.
+
+        """
+        self._is_thread_local = thread_local
+        self._is_singleton = is_singleton
+
+        # Create the context. Note that external code should not work with the context directly and should instead use
+        # properties of this class.
+        kwargs: dict[str, Any] = {
+            "lock_file": os.fspath(lock_file),
+            "timeout": timeout,
+            "mode": mode,
+            "blocking": blocking,
+        }
+        self._context: FileLockContext = (ThreadLocalFileContext if thread_local else FileLockContext)(**kwargs)
+
+    def is_thread_local(self) -> bool:
+        """:return: a flag indicating if this lock is thread local or not"""
+        return self._is_thread_local
+
+    @property
+    def is_singleton(self) -> bool:
+        """:return: a flag indicating if this lock is singleton or not"""
+        return self._is_singleton
+
+    @property
+    def lock_file(self) -> str:
+        """:return: path to the lock file"""
+        return self._context.lock_file
+
+    @property
+    def timeout(self) -> float:
+        """
+        :return: the default timeout value, in seconds
+
+        .. versionadded:: 2.0.0
+        """
+        return self._context.timeout
+
+    @timeout.setter
+    def timeout(self, value: float | str) -> None:
+        """
+        Change the default timeout value.
+
+        :param value: the new value, in seconds
+
+        """
+        self._context.timeout = float(value)
+
+    @property
+    def blocking(self) -> bool:
+        """:return: whether the locking is blocking or not"""
+        return self._context.blocking
+
+    @blocking.setter
+    def blocking(self, value: bool) -> None:
+        """
+        Change the default blocking value.
+
+        :param value: the new value as bool
+
+        """
+        self._context.blocking = value
+
+    @property
+    def mode(self) -> int:
+        """:return: the file permissions for the lockfile"""
+        return self._context.mode
+
+    @abstractmethod
+    def _acquire(self) -> None:
+        """If the file lock could be acquired, self._context.lock_file_fd holds the file descriptor of the lock file."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def _release(self) -> None:
+        """Releases the lock and sets self._context.lock_file_fd to None."""
+        raise NotImplementedError
+
+    @property
+    def is_locked(self) -> bool:
+        """
+
+        :return: A boolean indicating if the lock file is holding the lock currently.
+
+        .. versionchanged:: 2.0.0
+
+            This was previously a method and is now a property.
+        """
+        return self._context.lock_file_fd is not None
+
+    @property
+    def lock_counter(self) -> int:
+        """:return: The number of times this lock has been acquired (but not yet released)."""
+        return self._context.lock_counter
+
+    def acquire(
+        self,
+        timeout: float | None = None,
+        poll_interval: float = 0.05,
+        *,
+        poll_intervall: float | None = None,
+        blocking: bool | None = None,
+    ) -> AcquireReturnProxy:
+        """
+        Try to acquire the file lock.
+
+        :param timeout: maximum wait time for acquiring the lock, ``None`` means use the default :attr:`~timeout` is and
+         if ``timeout < 0``, there is no timeout and this method will block until the lock could be acquired
+        :param poll_interval: interval of trying to acquire the lock file
+        :param poll_intervall: deprecated, kept for backwards compatibility, use ``poll_interval`` instead
+        :param blocking: defaults to True. If False, function will return immediately if it cannot obtain a lock on the
+         first attempt. Otherwise, this method will block until the timeout expires or the lock is acquired.
+        :raises Timeout: if fails to acquire lock within the timeout period
+        :return: a context object that will unlock the file when the context is exited
+
+        .. code-block:: python
+
+            # You can use this method in the context manager (recommended)
+            with lock.acquire():
+                pass
+
+            # Or use an equivalent try-finally construct:
+            lock.acquire()
+            try:
+                pass
+            finally:
+                lock.release()
+
+        .. versionchanged:: 2.0.0
+
+            This method returns now a *proxy* object instead of *self*,
+            so that it can be used in a with statement without side effects.
+
+        """
+        # Use the default timeout, if no timeout is provided.
+        if timeout is None:
+            timeout = self._context.timeout
+
+        if blocking is None:
+            blocking = self._context.blocking
+
+        if poll_intervall is not None:
+            msg = "use poll_interval instead of poll_intervall"
+            warnings.warn(msg, DeprecationWarning, stacklevel=2)
+            poll_interval = poll_intervall
+
+        # Increment the number right at the beginning. We can still undo it, if something fails.
+        self._context.lock_counter += 1
+
+        lock_id = id(self)
+        lock_filename = self.lock_file
+        start_time = time.perf_counter()
+        try:
+            while True:
+                if not self.is_locked:
+                    _LOGGER.debug("Attempting to acquire lock %s on %s", lock_id, lock_filename)
+                    self._acquire()
+                if self.is_locked:
+                    _LOGGER.debug("Lock %s acquired on %s", lock_id, lock_filename)
+                    break
+                if blocking is False:
+                    _LOGGER.debug("Failed to immediately acquire lock %s on %s", lock_id, lock_filename)
+                    raise Timeout(lock_filename)  # noqa: TRY301
+                if 0 <= timeout < time.perf_counter() - start_time:
+                    _LOGGER.debug("Timeout on acquiring lock %s on %s", lock_id, lock_filename)
+                    raise Timeout(lock_filename)  # noqa: TRY301
+                msg = "Lock %s not acquired on %s, waiting %s seconds ..."
+                _LOGGER.debug(msg, lock_id, lock_filename, poll_interval)
+                time.sleep(poll_interval)
+        except BaseException:  # Something did go wrong, so decrement the counter.
+            self._context.lock_counter = max(0, self._context.lock_counter - 1)
+            raise
+        return AcquireReturnProxy(lock=self)
+
+    def release(self, force: bool = False) -> None:  # noqa: FBT001, FBT002
+        """
+        Releases the file lock. Please note, that the lock is only completely released, if the lock counter is 0.
+        Also note, that the lock file itself is not automatically deleted.
+
+        :param force: If true, the lock counter is ignored and the lock is released in every case/
+
+        """
+        if self.is_locked:
+            self._context.lock_counter -= 1
+
+            if self._context.lock_counter == 0 or force:
+                lock_id, lock_filename = id(self), self.lock_file
+
+                _LOGGER.debug("Attempting to release lock %s on %s", lock_id, lock_filename)
+                self._release()
+                self._context.lock_counter = 0
+                _LOGGER.debug("Lock %s released on %s", lock_id, lock_filename)
+
+    def __enter__(self) -> Self:
+        """
+        Acquire the lock.
+
+        :return: the lock object
+
+        """
+        self.acquire()
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        """
+        Release the lock.
+
+        :param exc_type: the exception type if raised
+        :param exc_value: the exception value if raised
+        :param traceback: the exception traceback if raised
+
+        """
+        self.release()
+
+    def __del__(self) -> None:
+        """Called when the lock object is deleted."""
+        self.release(force=True)
+
+
+__all__ = [
+    "AcquireReturnProxy",
+    "BaseFileLock",
+]
diff --git a/third_party/python/filelock/filelock/_error.py b/third_party/python/filelock/filelock/_error.py
new file mode 100644
index 0000000000000..f7ff08c0f508a
--- /dev/null
+++ b/third_party/python/filelock/filelock/_error.py
@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import Any
+
+
+class Timeout(TimeoutError):  # noqa: N818
+    """Raised when the lock could not be acquired in *timeout* seconds."""
+
+    def __init__(self, lock_file: str) -> None:
+        super().__init__()
+        self._lock_file = lock_file
+
+    def __reduce__(self) -> str | tuple[Any, ...]:
+        return self.__class__, (self._lock_file,)  # Properly pickle the exception
+
+    def __str__(self) -> str:
+        return f"The file lock '{self._lock_file}' could not be acquired."
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self.lock_file!r})"
+
+    @property
+    def lock_file(self) -> str:
+        """:return: The path of the file lock."""
+        return self._lock_file
+
+
+__all__ = [
+    "Timeout",
+]
diff --git a/third_party/python/filelock/filelock/_soft.py b/third_party/python/filelock/filelock/_soft.py
new file mode 100644
index 0000000000000..28c67f74cc82b
--- /dev/null
+++ b/third_party/python/filelock/filelock/_soft.py
@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import os
+import sys
+from contextlib import suppress
+from errno import EACCES, EEXIST
+from pathlib import Path
+
+from ._api import BaseFileLock
+from ._util import ensure_directory_exists, raise_on_not_writable_file
+
+
+class SoftFileLock(BaseFileLock):
+    """Simply watches the existence of the lock file."""
+
+    def _acquire(self) -> None:
+        raise_on_not_writable_file(self.lock_file)
+        ensure_directory_exists(self.lock_file)
+        # first check for exists and read-only mode as the open will mask this case as EEXIST
+        flags = (
+            os.O_WRONLY  # open for writing only
+            | os.O_CREAT
+            | os.O_EXCL  # together with above raise EEXIST if the file specified by filename exists
+            | os.O_TRUNC  # truncate the file to zero byte
+        )
+        try:
+            file_handler = os.open(self.lock_file, flags, self._context.mode)
+        except OSError as exception:  # re-raise unless expected exception
+            if not (
+                exception.errno == EEXIST  # lock already exist
+                or (exception.errno == EACCES and sys.platform == "win32")  # has no access to this lock
+            ):  # pragma: win32 no cover
+                raise
+        else:
+            self._context.lock_file_fd = file_handler
+
+    def _release(self) -> None:
+        assert self._context.lock_file_fd is not None  # noqa: S101
+        os.close(self._context.lock_file_fd)  # the lock file is definitely not None
+        self._context.lock_file_fd = None
+        with suppress(OSError):  # the file is already deleted and that's what we want
+            Path(self.lock_file).unlink()
+
+
+__all__ = [
+    "SoftFileLock",
+]
diff --git a/third_party/python/filelock/filelock/_unix.py b/third_party/python/filelock/filelock/_unix.py
new file mode 100644
index 0000000000000..b2fd0f33d25d2
--- /dev/null
+++ b/third_party/python/filelock/filelock/_unix.py
@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+import os
+import sys
+from contextlib import suppress
+from errno import ENOSYS
+from pathlib import Path
+from typing import cast
+
+from ._api import BaseFileLock
+from ._util import ensure_directory_exists
+
+#: a flag to indicate if the fcntl API is available
+has_fcntl = False
+if sys.platform == "win32":  # pragma: win32 cover
+
+    class UnixFileLock(BaseFileLock):
+        """Uses the :func:`fcntl.flock` to hard lock the lock file on unix systems."""
+
+        def _acquire(self) -> None:
+            raise NotImplementedError
+
+        def _release(self) -> None:
+            raise NotImplementedError
+
+else:  # pragma: win32 no cover
+    try:
+        import fcntl
+
+        _ = (fcntl.flock, fcntl.LOCK_EX, fcntl.LOCK_NB, fcntl.LOCK_UN)
+    except (ImportError, AttributeError):
+        pass
+    else:
+        has_fcntl = True
+
+    class UnixFileLock(BaseFileLock):
+        """Uses the :func:`fcntl.flock` to hard lock the lock file on unix systems."""
+
+        def _acquire(self) -> None:
+            ensure_directory_exists(self.lock_file)
+            open_flags = os.O_RDWR | os.O_TRUNC
+            if not Path(self.lock_file).exists():
+                open_flags |= os.O_CREAT
+            fd = os.open(self.lock_file, open_flags, self._context.mode)
+            with suppress(PermissionError):  # This locked is not owned by this UID
+                os.fchmod(fd, self._context.mode)
+            try:
+                fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
+            except OSError as exception:
+                os.close(fd)
+                if exception.errno == ENOSYS:  # NotImplemented error
+                    msg = "FileSystem does not appear to support flock; use SoftFileLock instead"
+                    raise NotImplementedError(msg) from exception
+            else:
+                self._context.lock_file_fd = fd
+
+        def _release(self) -> None:
+            # Do not remove the lockfile:
+            #   https://github.com/tox-dev/py-filelock/issues/31
+            #   https://stackoverflow.com/questions/17708885/flock-removing-locked-file-without-race-condition
+            fd = cast("int", self._context.lock_file_fd)
+            self._context.lock_file_fd = None
+            fcntl.flock(fd, fcntl.LOCK_UN)
+            os.close(fd)
+
+
+__all__ = [
+    "UnixFileLock",
+    "has_fcntl",
+]
diff --git a/third_party/python/filelock/filelock/_util.py b/third_party/python/filelock/filelock/_util.py
new file mode 100644
index 0000000000000..c671e85338739
--- /dev/null
+++ b/third_party/python/filelock/filelock/_util.py
@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+import os
+import stat
+import sys
+from errno import EACCES, EISDIR
+from pathlib import Path
+
+
+def raise_on_not_writable_file(filename: str) -> None:
+    """
+    Raise an exception if attempting to open the file for writing would fail.
+
+    This is done so files that will never be writable can be separated from files that are writable but currently
+    locked.
+
+    :param filename: file to check
+    :raises OSError: as if the file was opened for writing.
+
+    """
+    try:  # use stat to do exists + can write to check without race condition
+        file_stat = os.stat(filename)  # noqa: PTH116
+    except OSError:
+        return  # swallow does not exist or other errors
+
+    if file_stat.st_mtime != 0:  # if os.stat returns but modification is zero that's an invalid os.stat - ignore it
+        if not (file_stat.st_mode & stat.S_IWUSR):
+            raise PermissionError(EACCES, "Permission denied", filename)
+
+        if stat.S_ISDIR(file_stat.st_mode):
+            if sys.platform == "win32":  # pragma: win32 cover
+                # On Windows, this is PermissionError
+                raise PermissionError(EACCES, "Permission denied", filename)
+            else:  # pragma: win32 no cover # noqa: RET506
+                # On linux / macOS, this is IsADirectoryError
+                raise IsADirectoryError(EISDIR, "Is a directory", filename)
+
+
+def ensure_directory_exists(filename: Path | str) -> None:
+    """
+    Ensure the directory containing the file exists (create it if necessary).
+
+    :param filename: file.
+
+    """
+    Path(filename).parent.mkdir(parents=True, exist_ok=True)
+
+
+__all__ = [
+    "ensure_directory_exists",
+    "raise_on_not_writable_file",
+]
diff --git a/third_party/python/filelock/filelock/_windows.py b/third_party/python/filelock/filelock/_windows.py
new file mode 100644
index 0000000000000..348251d1067c2
--- /dev/null
+++ b/third_party/python/filelock/filelock/_windows.py
@@ -0,0 +1,65 @@
+from __future__ import annotations
+
+import os
+import sys
+from contextlib import suppress
+from errno import EACCES
+from pathlib import Path
+from typing import cast
+
+from ._api import BaseFileLock
+from ._util import ensure_directory_exists, raise_on_not_writable_file
+
+if sys.platform == "win32":  # pragma: win32 cover
+    import msvcrt
+
+    class WindowsFileLock(BaseFileLock):
+        """Uses the :func:`msvcrt.locking` function to hard lock the lock file on Windows systems."""
+
+        def _acquire(self) -> None:
+            raise_on_not_writable_file(self.lock_file)
+            ensure_directory_exists(self.lock_file)
+            flags = (
+                os.O_RDWR  # open for read and write
+                | os.O_CREAT  # create file if not exists
+                | os.O_TRUNC  # truncate file if not empty
+            )
+            try:
+                fd = os.open(self.lock_file, flags, self._context.mode)
+            except OSError as exception:
+                if exception.errno != EACCES:  # has no access to this lock
+                    raise
+            else:
+                try:
+                    msvcrt.locking(fd, msvcrt.LK_NBLCK, 1)
+                except OSError as exception:
+                    os.close(fd)  # close file first
+                    if exception.errno != EACCES:  # file is already locked
+                        raise
+                else:
+                    self._context.lock_file_fd = fd
+
+        def _release(self) -> None:
+            fd = cast("int", self._context.lock_file_fd)
+            self._context.lock_file_fd = None
+            msvcrt.locking(fd, msvcrt.LK_UNLCK, 1)
+            os.close(fd)
+
+            with suppress(OSError):  # Probably another instance of the application hat acquired the file lock.
+                Path(self.lock_file).unlink()
+
+else:  # pragma: win32 no cover
+
+    class WindowsFileLock(BaseFileLock):
+        """Uses the :func:`msvcrt.locking` function to hard lock the lock file on Windows systems."""
+
+        def _acquire(self) -> None:
+            raise NotImplementedError
+
+        def _release(self) -> None:
+            raise NotImplementedError
+
+
+__all__ = [
+    "WindowsFileLock",
+]
diff --git a/third_party/python/filelock/filelock/asyncio.py b/third_party/python/filelock/filelock/asyncio.py
new file mode 100644
index 0000000000000..1c9c9f05bdbc4
--- /dev/null
+++ b/third_party/python/filelock/filelock/asyncio.py
@@ -0,0 +1,342 @@
+"""An asyncio-based implementation of the file lock."""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import logging
+import os
+import time
+from dataclasses import dataclass
+from threading import local
+from typing import TYPE_CHECKING, Any, Callable, NoReturn, cast
+
+from ._api import BaseFileLock, FileLockContext, FileLockMeta
+from ._error import Timeout
+from ._soft import SoftFileLock
+from ._unix import UnixFileLock
+from ._windows import WindowsFileLock
+
+if TYPE_CHECKING:
+    import sys
+    from concurrent import futures
+    from types import TracebackType
+
+    if sys.version_info >= (3, 11):  # pragma: no cover (py311+)
+        from typing import Self
+    else:  # pragma: no cover (<py311)
+        from typing_extensions import Self
+
+
+_LOGGER = logging.getLogger("filelock")
+
+
+@dataclass
+class AsyncFileLockContext(FileLockContext):
+    """A dataclass which holds the context for a ``BaseAsyncFileLock`` object."""
+
+    #: Whether run in executor
+    run_in_executor: bool = True
+
+    #: The executor
+    executor: futures.Executor | None = None
+
+    #: The loop
+    loop: asyncio.AbstractEventLoop | None = None
+
+
+class AsyncThreadLocalFileContext(AsyncFileLockContext, local):
+    """A thread local version of the ``FileLockContext`` class."""
+
+
+class AsyncAcquireReturnProxy:
+    """A context-aware object that will release the lock file when exiting."""
+
+    def __init__(self, lock: BaseAsyncFileLock) -> None:  # noqa: D107
+        self.lock = lock
+
+    async def __aenter__(self) -> BaseAsyncFileLock:  # noqa: D105
+        return self.lock
+
+    async def __aexit__(  # noqa: D105
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        await self.lock.release()
+
+
+class AsyncFileLockMeta(FileLockMeta):
+    def __call__(  # type: ignore[override] # noqa: PLR0913
+        cls,  # noqa: N805
+        lock_file: str | os.PathLike[str],
+        timeout: float = -1,
+        mode: int = 0o644,
+        thread_local: bool = False,  # noqa: FBT001, FBT002
+        *,
+        blocking: bool = True,
+        is_singleton: bool = False,
+        loop: asyncio.AbstractEventLoop | None = None,
+        run_in_executor: bool = True,
+        executor: futures.Executor | None = None,
+    ) -> BaseAsyncFileLock:
+        if thread_local and run_in_executor:
+            msg = "run_in_executor is not supported when thread_local is True"
+            raise ValueError(msg)
+        instance = super().__call__(
+            lock_file=lock_file,
+            timeout=timeout,
+            mode=mode,
+            thread_local=thread_local,
+            blocking=blocking,
+            is_singleton=is_singleton,
+            loop=loop,
+            run_in_executor=run_in_executor,
+            executor=executor,
+        )
+        return cast("BaseAsyncFileLock", instance)
+
+
+class BaseAsyncFileLock(BaseFileLock, metaclass=AsyncFileLockMeta):
+    """Base class for asynchronous file locks."""
+
+    def __init__(  # noqa: PLR0913
+        self,
+        lock_file: str | os.PathLike[str],
+        timeout: float = -1,
+        mode: int = 0o644,
+        thread_local: bool = False,  # noqa: FBT001, FBT002
+        *,
+        blocking: bool = True,
+        is_singleton: bool = False,
+        loop: asyncio.AbstractEventLoop | None = None,
+        run_in_executor: bool = True,
+        executor: futures.Executor | None = None,
+    ) -> None:
+        """
+        Create a new lock object.
+
+        :param lock_file: path to the file
+        :param timeout: default timeout when acquiring the lock, in seconds. It will be used as fallback value in \
+            the acquire method, if no timeout value (``None``) is given. If you want to disable the timeout, set it \
+            to a negative value. A timeout of 0 means that there is exactly one attempt to acquire the file lock.
+        :param mode: file permissions for the lockfile
+        :param thread_local: Whether this object's internal context should be thread local or not. If this is set to \
+            ``False`` then the lock will be reentrant across threads.
+        :param blocking: whether the lock should be blocking or not
+        :param is_singleton: If this is set to ``True`` then only one instance of this class will be created \
+            per lock file. This is useful if you want to use the lock object for reentrant locking without needing \
+            to pass the same object around.
+        :param loop: The event loop to use. If not specified, the running event loop will be used.
+        :param run_in_executor: If this is set to ``True`` then the lock will be acquired in an executor.
+        :param executor: The executor to use. If not specified, the default executor will be used.
+
+        """
+        self._is_thread_local = thread_local
+        self._is_singleton = is_singleton
+
+        # Create the context. Note that external code should not work with the context directly and should instead use
+        # properties of this class.
+        kwargs: dict[str, Any] = {
+            "lock_file": os.fspath(lock_file),
+            "timeout": timeout,
+            "mode": mode,
+            "blocking": blocking,
+            "loop": loop,
+            "run_in_executor": run_in_executor,
+            "executor": executor,
+        }
+        self._context: AsyncFileLockContext = (AsyncThreadLocalFileContext if thread_local else AsyncFileLockContext)(
+            **kwargs
+        )
+
+    @property
+    def run_in_executor(self) -> bool:
+        """::return: whether run in executor."""
+        return self._context.run_in_executor
+
+    @property
+    def executor(self) -> futures.Executor | None:
+        """::return: the executor."""
+        return self._context.executor
+
+    @executor.setter
+    def executor(self, value: futures.Executor | None) -> None:  # pragma: no cover
+        """
+        Change the executor.
+
+        :param value: the new executor or ``None``
+        :type value: futures.Executor | None
+
+        """
+        self._context.executor = value
+
+    @property
+    def loop(self) -> asyncio.AbstractEventLoop | None:
+        """::return: the event loop."""
+        return self._context.loop
+
+    async def acquire(  # type: ignore[override]
+        self,
+        timeout: float | None = None,
+        poll_interval: float = 0.05,
+        *,
+        blocking: bool | None = None,
+    ) -> AsyncAcquireReturnProxy:
+        """
+        Try to acquire the file lock.
+
+        :param timeout: maximum wait time for acquiring the lock, ``None`` means use the default
+            :attr:`~BaseFileLock.timeout` is and if ``timeout < 0``, there is no timeout and
+            this method will block until the lock could be acquired
+        :param poll_interval: interval of trying to acquire the lock file
+        :param blocking: defaults to True. If False, function will return immediately if it cannot obtain a lock on the
+         first attempt. Otherwise, this method will block until the timeout expires or the lock is acquired.
+        :raises Timeout: if fails to acquire lock within the timeout period
+        :return: a context object that will unlock the file when the context is exited
+
+        .. code-block:: python
+
+            # You can use this method in the context manager (recommended)
+            with lock.acquire():
+                pass
+
+            # Or use an equivalent try-finally construct:
+            lock.acquire()
+            try:
+                pass
+            finally:
+                lock.release()
+
+        """
+        # Use the default timeout, if no timeout is provided.
+        if timeout is None:
+            timeout = self._context.timeout
+
+        if blocking is None:
+            blocking = self._context.blocking
+
+        # Increment the number right at the beginning. We can still undo it, if something fails.
+        self._context.lock_counter += 1
+
+        lock_id = id(self)
+        lock_filename = self.lock_file
+        start_time = time.perf_counter()
+        try:
+            while True:
+                if not self.is_locked:
+                    _LOGGER.debug("Attempting to acquire lock %s on %s", lock_id, lock_filename)
+                    await self._run_internal_method(self._acquire)
+                if self.is_locked:
+                    _LOGGER.debug("Lock %s acquired on %s", lock_id, lock_filename)
+                    break
+                if blocking is False:
+                    _LOGGER.debug("Failed to immediately acquire lock %s on %s", lock_id, lock_filename)
+                    raise Timeout(lock_filename)  # noqa: TRY301
+                if 0 <= timeout < time.perf_counter() - start_time:
+                    _LOGGER.debug("Timeout on acquiring lock %s on %s", lock_id, lock_filename)
+                    raise Timeout(lock_filename)  # noqa: TRY301
+                msg = "Lock %s not acquired on %s, waiting %s seconds ..."
+                _LOGGER.debug(msg, lock_id, lock_filename, poll_interval)
+                await asyncio.sleep(poll_interval)
+        except BaseException:  # Something did go wrong, so decrement the counter.
+            self._context.lock_counter = max(0, self._context.lock_counter - 1)
+            raise
+        return AsyncAcquireReturnProxy(lock=self)
+
+    async def release(self, force: bool = False) -> None:  # type: ignore[override]  # noqa: FBT001, FBT002
+        """
+        Releases the file lock. Please note, that the lock is only completely released, if the lock counter is 0.
+        Also note, that the lock file itself is not automatically deleted.
+
+        :param force: If true, the lock counter is ignored and the lock is released in every case/
+
+        """
+        if self.is_locked:
+            self._context.lock_counter -= 1
+
+            if self._context.lock_counter == 0 or force:
+                lock_id, lock_filename = id(self), self.lock_file
+
+                _LOGGER.debug("Attempting to release lock %s on %s", lock_id, lock_filename)
+                await self._run_internal_method(self._release)
+                self._context.lock_counter = 0
+                _LOGGER.debug("Lock %s released on %s", lock_id, lock_filename)
+
+    async def _run_internal_method(self, method: Callable[[], Any]) -> None:
+        if asyncio.iscoroutinefunction(method):
+            await method()
+        elif self.run_in_executor:
+            loop = self.loop or asyncio.get_running_loop()
+            await loop.run_in_executor(self.executor, method)
+        else:
+            method()
+
+    def __enter__(self) -> NoReturn:
+        """
+        Replace old __enter__ method to avoid using it.
+
+        NOTE: DO NOT USE `with` FOR ASYNCIO LOCKS, USE `async with` INSTEAD.
+
+        :return: none
+        :rtype: NoReturn
+        """
+        msg = "Do not use `with` for asyncio locks, use `async with` instead."
+        raise NotImplementedError(msg)
+
+    async def __aenter__(self) -> Self:
+        """
+        Acquire the lock.
+
+        :return: the lock object
+
+        """
+        await self.acquire()
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        """
+        Release the lock.
+
+        :param exc_type: the exception type if raised
+        :param exc_value: the exception value if raised
+        :param traceback: the exception traceback if raised
+
+        """
+        await self.release()
+
+    def __del__(self) -> None:
+        """Called when the lock object is deleted."""
+        with contextlib.suppress(RuntimeError):
+            loop = self.loop or asyncio.get_running_loop()
+            if not loop.is_running():  # pragma: no cover
+                loop.run_until_complete(self.release(force=True))
+            else:
+                loop.create_task(self.release(force=True))
+
+
+class AsyncSoftFileLock(SoftFileLock, BaseAsyncFileLock):
+    """Simply watches the existence of the lock file."""
+
+
+class AsyncUnixFileLock(UnixFileLock, BaseAsyncFileLock):
+    """Uses the :func:`fcntl.flock` to hard lock the lock file on unix systems."""
+
+
+class AsyncWindowsFileLock(WindowsFileLock, BaseAsyncFileLock):
+    """Uses the :func:`msvcrt.locking` to hard lock the lock file on windows systems."""
+
+
+__all__ = [
+    "AsyncAcquireReturnProxy",
+    "AsyncSoftFileLock",
+    "AsyncUnixFileLock",
+    "AsyncWindowsFileLock",
+    "BaseAsyncFileLock",
+]
diff --git a/third_party/python/filelock/filelock/py.typed b/third_party/python/filelock/filelock/py.typed
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/third_party/python/filelock/filelock/version.py b/third_party/python/filelock/filelock/version.py
new file mode 100644
index 0000000000000..68cfbf97cf730
--- /dev/null
+++ b/third_party/python/filelock/filelock/version.py
@@ -0,0 +1,21 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '3.18.0'
+__version_tuple__ = version_tuple = (3, 18, 0)
diff --git a/third_party/python/pyproject.toml b/third_party/python/pyproject.toml
index dc8a3c8dc70bd..f64b8fc846c49 100644
--- a/third_party/python/pyproject.toml
+++ b/third_party/python/pyproject.toml
@@ -19,6 +19,7 @@ dependencies = [
     "distro~=1.8",
     "ecdsa==0.19.1",
     "esprima==4.0.1",
+    "filelock~=3.6",
     "fluent-migrate~=0.13",
     "fluent-syntax==0.19.0",
     "glean-parser==18.2.0",
diff --git a/third_party/python/requirements.txt b/third_party/python/requirements.txt
index fbb22cad14e94..a9432c5019610 100644
--- a/third_party/python/requirements.txt
+++ b/third_party/python/requirements.txt
@@ -324,6 +324,10 @@ ecdsa==0.19.1 \
 esprima==4.0.1 \
     --hash=sha256:08db1a876d3c2910db9cfaeb83108193af5411fc3a3a66ebefacd390d21323ee
     # via mozilla-third-party-python-vendor-dir
+filelock==3.18.0 \
+    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
+    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
+    # via mozilla-third-party-python-vendor-dir
 fluent-migrate==0.13.3 \
     --hash=sha256:a190d5e76ea4a47061821d3688fb7eb9075916ab1439d838e2a54fe62305b80f \
     --hash=sha256:dafb8c7a4024e46aa2de359db7265f49fb4fb593fdb1d61b6b014a1a9f16ad5c
diff --git a/third_party/python/uv.lock b/third_party/python/uv.lock
index 99adf35e2f38b..9b469d9de1fa8 100644
--- a/third_party/python/uv.lock
+++ b/third_party/python/uv.lock
@@ -440,6 +440,15 @@ version = "4.0.1"
 source = { registry = "https://pypi.org/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/cc/a1/50fccd68a12bcfc27adfc9969c090286670a9109a0259f3f70943390b721/esprima-4.0.1.tar.gz", hash = "sha256:08db1a876d3c2910db9cfaeb83108193af5411fc3a3a66ebefacd390d21323ee", size = 47021, upload-time = "2018-08-24T13:59:11.374Z" }
 
+[[package]]
+name = "filelock"
+version = "3.18.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0a/10/c23352565a6544bdc5353e0b15fc1c563352101f30e24bf500207a54df9a/filelock-3.18.0.tar.gz", hash = "sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2", size = 18075, upload-time = "2025-03-14T07:11:40.47Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4d/36/2a115987e2d8c300a974597416d9de88f2444426de9571f4b59b2cca3acc/filelock-3.18.0-py3-none-any.whl", hash = "sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de", size = 16215, upload-time = "2025-03-14T07:11:39.145Z" },
+]
+
 [[package]]
 name = "fluent-migrate"
 version = "0.13.3"
@@ -837,6 +846,7 @@ dependencies = [
     { name = "distro" },
     { name = "ecdsa" },
     { name = "esprima" },
+    { name = "filelock" },
     { name = "fluent-migrate" },
     { name = "fluent-syntax" },
     { name = "glean-parser" },
@@ -896,6 +906,7 @@ requires-dist = [
     { name = "distro", specifier = "~=1.8" },
     { name = "ecdsa", specifier = "==0.19.1" },
     { name = "esprima", specifier = "==4.0.1" },
+    { name = "filelock", specifier = "~=3.6" },
     { name = "fluent-migrate", specifier = "~=0.13" },
     { name = "fluent-syntax", specifier = "==0.19.0" },
     { name = "glean-parser", specifier = "==18.2.0" },
diff --git a/third_party/python/uv.lock.hash b/third_party/python/uv.lock.hash
index 0f463f1a7b14f..813b4f173a769 100644
--- a/third_party/python/uv.lock.hash
+++ b/third_party/python/uv.lock.hash
@@ -1 +1 @@
-4bcb9bd95489b28f15a310006287ef1771d7f5df91c2fc2b36da3b027a80376e
\ No newline at end of file
+ed72bfdfe1e30244e36a4db1b651ca7780e397afea25a0cbb41498c1ea6f4ad2
diff --git a/tools/lint/python/l10n_lint.py b/tools/lint/python/l10n_lint.py
index 33e61939ec0a2..bd9edf07fd528 100644
--- a/tools/lint/python/l10n_lint.py
+++ b/tools/lint/python/l10n_lint.py
@@ -11,8 +11,8 @@
 from compare_locales.lint.linter import L10nLinter
 from compare_locales.lint.util import l10n_base_reference_and_tests
 from compare_locales.paths import ProjectFiles, TOMLParser
+from filelock import FileLock, Timeout
 from mach import util as mach_util
-from mach.filelock import LockTimeout, SoftFileLock
 from mozfile import which
 from mozlint import pathutils, result
 from mozpack import path as mozpath
@@ -98,7 +98,7 @@ def source_repo_setup(**lint_args):
     # has not yet been cloned, we need a lock to prevent them from all trying to clone
     # to the same place at the same time.
     try:
-        with SoftFileLock(lock_file, timeout=timeout):
+        with FileLock(lock_file, timeout=timeout):
             gs = mozpath.join(state_dir, L10N_SOURCE_NAME)
             marker = mozpath.join(gs, ".git", "l10n_pull_marker")
             try:
@@ -144,7 +144,7 @@ def source_repo_setup(**lint_args):
 
             with open(marker, "w") as fh:
                 fh.flush()
-    except LockTimeout:
+    except Timeout:
         print(
             f"Could not acquire the lock at {lock_file} for the {L10N_SOURCE_NAME} checkout after {timeout} seconds."
         )

From d6b3d5642bffd84a01b8942c0e344c85829a3c4f Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Fri, 6 Feb 2026 21:29:36 +0200
Subject: [PATCH 41/93] Revert "Bug 1995062 - Part 4: add tests and stories for
 new component functionality r=desktop-theme-reviewers,akulyk,tgiles" for
 causing failures complaining about PathUtils.

This reverts commit 27b3c494362ace89d37b5697f83ebbfdaec48265.

Revert "Bug 1995062 - Part 3: fix backup-settings tests r=cdupuis,akulyk"

This reverts commit a8fdc42f1ae23e698f4c33b7584533f6161c9ba9.

Revert "Bug 1995062 - Part 2: convert backup-settings to match new settings UI r=fluent-reviewers,desktop-theme-reviewers,cdupuis,bolsson,akulyk,tgiles"

This reverts commit 92f1deb41e6a5de3e8150f0fd576befe7c9ab771.

Revert "Bug 1995062 - Part 1: render backup-settings via config r=fluent-reviewers,desktop-theme-reviewers,cdupuis,bolsson,akulyk,tgiles"

This reverts commit 8473191ea2afef752f2a897e556cf3952cc4a2ee.
---
 .../components/backup/BackupService.sys.mjs   |  37 ++-
 .../backup/actors/BackupUIChild.sys.mjs       |   2 +-
 .../backup/actors/BackupUIParent.sys.mjs      |   4 +-
 .../backup/content/backup-settings.css        |  65 +++--
 .../backup/content/backup-settings.mjs        | 250 +++++++++++-------
 .../browser_password_validation_inputs.js     |   8 +-
 .../backup/tests/browser/browser_settings.js  |  58 +---
 .../components/backup/tests/browser/head.js   |  24 --
 .../tests/chrome/test_backup_settings.html    |  50 ++--
 .../tests/xpcshell/test_BackupService.js      |  18 +-
 browser/components/preferences/main.js        |  11 -
 browser/components/preferences/preferences.js |   8 +
 browser/components/preferences/sync.inc.xhtml |  17 +-
 browser/components/preferences/sync.js        |  36 +--
 .../tests/browser_backup_visibility.js        |  24 +-
 .../locales/en-US/browser/backupSettings.ftl  |  40 +--
 .../bug_1995062_backup_settings_conversion.py |  36 ---
 .../tests/widgets/test_moz_box_item.html      |  36 ---
 .../tests/widgets/test_moz_input_folder.html  |  27 --
 toolkit/content/widgets/moz-box-common.css    |   2 +-
 .../widgets/moz-box-item/moz-box-item.css     |   9 -
 .../widgets/moz-box-item/moz-box-item.mjs     |  41 +--
 .../moz-box-item/moz-box-item.stories.mjs     |  14 -
 .../moz-input-folder/README.stories.md        |  18 --
 .../moz-input-folder/moz-input-folder.css     |   5 -
 .../moz-input-folder/moz-input-folder.mjs     |   1 -
 .../moz-input-folder.stories.mjs              |  18 +-
 27 files changed, 359 insertions(+), 500 deletions(-)
 delete mode 100644 python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py

diff --git a/browser/components/backup/BackupService.sys.mjs b/browser/components/backup/BackupService.sys.mjs
index 1516f4b1e3da5..c66327adf40d1 100644
--- a/browser/components/backup/BackupService.sys.mjs
+++ b/browser/components/backup/BackupService.sys.mjs
@@ -4873,13 +4873,42 @@ export class BackupService extends EventTarget {
   }
 
   /**
-   * Sets the location to write the single-file archive files.
+   * Shows a native folder picker to set the location to write the single-file
+   * archive files.
    *
-   * @param {string} path
-   *   The parent directory path where backups should be stored.
+   * @param {ChromeWindow} window
+   *   The top-level browsing window to associate the file picker with.
    * @returns {Promise<undefined>}
    */
-  async editBackupLocation(path) {
+  async editBackupLocation(window) {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    let mode = Ci.nsIFilePicker.modeGetFolder;
+    fp.init(window.browsingContext, "", mode);
+
+    let currentBackupDirPathParent = PathUtils.parent(
+      this.#_state.backupDirPath
+    );
+    if (await IOUtils.exists(currentBackupDirPathParent)) {
+      fp.displayDirectory = await IOUtils.getDirectory(
+        currentBackupDirPathParent
+      );
+    }
+
+    let result = await new Promise(resolve => fp.open(resolve));
+
+    if (result === Ci.nsIFilePicker.returnCancel) {
+      return;
+    }
+
+    let path = fp.file.path;
+
+    // If the same parent directory was chosen, this is a no-op.
+    if (
+      PathUtils.join(path, BackupService.BACKUP_DIR_NAME) == lazy.backupDirPref
+    ) {
+      return;
+    }
+
     // If the location changed, delete the last backup there if one exists.
     try {
       await this.deleteLastBackup();
diff --git a/browser/components/backup/actors/BackupUIChild.sys.mjs b/browser/components/backup/actors/BackupUIChild.sys.mjs
index 59ccb98379d6a..0cf8b31708c8a 100644
--- a/browser/components/backup/actors/BackupUIChild.sys.mjs
+++ b/browser/components/backup/actors/BackupUIChild.sys.mjs
@@ -128,7 +128,7 @@ export class BackupUIChild extends JSWindowActorChild {
     } else if (event.type == "BackupUI:ShowBackupLocation") {
       this.sendAsyncMessage("ShowBackupLocation");
     } else if (event.type == "BackupUI:EditBackupLocation") {
-      this.sendAsyncMessage("EditBackupLocation", event.detail);
+      this.sendAsyncMessage("EditBackupLocation");
     } else if (event.type == "BackupUI:SetEmbeddedComponentPersistentData") {
       this.sendAsyncMessage("SetEmbeddedComponentPersistentData", event.detail);
     } else if (event.type == "BackupUI:FlushEmbeddedComponentPersistentData") {
diff --git a/browser/components/backup/actors/BackupUIParent.sys.mjs b/browser/components/backup/actors/BackupUIParent.sys.mjs
index a91c6f337f516..f4dc87570d292 100644
--- a/browser/components/backup/actors/BackupUIParent.sys.mjs
+++ b/browser/components/backup/actors/BackupUIParent.sys.mjs
@@ -265,8 +265,8 @@ export class BackupUIParent extends JSWindowActorParent {
     } else if (message.name == "ShowBackupLocation") {
       this.#bs.showBackupLocation();
     } else if (message.name == "EditBackupLocation") {
-      const path = message.data?.path;
-      this.#bs.editBackupLocation(path);
+      const window = this.browsingContext.topChromeWindow;
+      this.#bs.editBackupLocation(window);
     } else if (message.name == "QuitCurrentProfile") {
       // Notify windows that a quit has been requested.
       let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(
diff --git a/browser/components/backup/content/backup-settings.css b/browser/components/backup/content/backup-settings.css
index 46e279536d9d0..8ad6c6ccd1ada 100644
--- a/browser/components/backup/content/backup-settings.css
+++ b/browser/components/backup/content/backup-settings.css
@@ -7,9 +7,7 @@
 
 :host {
   --margin-inline-start-checkbox-content: calc(var(--checkbox-margin-inline) + var(--checkbox-size));
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-large);
+  flex: 1;
 }
 
 .backup-dialog {
@@ -30,28 +28,63 @@
   width: 29.27rem;
 }
 
-.scheduled-backups-enabled {
-  --box-icon-start-fill: var(--icon-color-success);
+#backup-sensitive-data-checkbox {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  row-gap: var(--space-xsmall);
+}
+
+#backup-sensitive-data-checkbox-label {
+  display: flex;
+  align-items: center;
+}
+
+#backup-sensitive-data-checkbox-description {
+  margin-inline-start: var(--margin-inline-start-checkbox-content);
 }
 
-.scheduled-backups-disabled {
-  --box-icon-start-fill: var(--icon-color-warning);
+.backups-control {
+  display: grid;
+  grid-template-columns: 1fr auto auto;
+  column-gap: var(--space-large);
+  row-gap: var(--space-xsmall);
+  align-items: center;
+
+  moz-button {
+    justify-self: end;
+  }
+
+  moz-button:last-of-type {
+    grid-column: 3;
+  }
+
+  [id$="description"] {
+    grid-column: 1 / -1;
+  }
 }
 
-moz-input-folder {
-  --input-folder-wrap: wrap;
+section {
+  margin-block-start: 24px;
 }
 
 #last-backup-info {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-xsmall);
+  color: var(--text-color-deemphasized);
 }
 
-#sensitive-data {
-  margin-block-start: var(--space-small);
+#last-backup-location-control,
+#last-backup-info > div {
+  margin-block: 14px;
 }
 
-moz-button {
-  white-space: nowrap;
+#last-backup-location-control {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  text-overflow: ellipsis ellipsis;
+}
+
+#backup-password-controls {
+  display: flex;
+  margin-block: var(--space-large);
 }
diff --git a/browser/components/backup/content/backup-settings.mjs b/browser/components/backup/content/backup-settings.mjs
index da2c449b0686d..d5831510e0efc 100644
--- a/browser/components/backup/content/backup-settings.mjs
+++ b/browser/components/backup/content/backup-settings.mjs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { html, classMap } from "chrome://global/content/vendor/lit.all.mjs";
+import { html } from "chrome://global/content/vendor/lit.all.mjs";
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 import { getErrorL10nId } from "chrome://browser/content/backup/backup-errors.mjs";
 import { ERRORS } from "chrome://browser/content/backup/backup-constants.mjs";
@@ -23,6 +23,7 @@ import "chrome://browser/content/backup/disable-backup-encryption.mjs";
  * document of about:settings / about:preferences.
  */
 export default class BackupSettings extends MozLitElement {
+  #placeholderIconURL = "chrome://global/skin/icons/page-portrait.svg";
   inProgressTimeout = null;
   showInProgress = false;
 
@@ -51,12 +52,16 @@ export default class BackupSettings extends MozLitElement {
       turnOffScheduledBackupsDialogEl: "#turn-off-scheduled-backups-dialog",
       restoreFromBackupEl: "restore-from-backup",
       restoreFromBackupButtonEl: "#backup-toggle-restore-button",
+      restoreFromBackupDescriptionEl: "#backup-restore-description",
       restoreFromBackupDialogEl: "#restore-from-backup-dialog",
       sensitiveDataCheckboxInputEl: "#backup-sensitive-data-checkbox-input",
-      passwordControlsEl: "#sensitive-data",
+      passwordControlsEl: "#backup-password-controls",
+      lastBackupLocationInputEl: "#last-backup-location",
       lastBackupFileNameEl: "#last-backup-filename",
       lastBackupDateEl: "#last-backup-date",
       backupLocationShowButtonEl: "#backup-location-show",
+      backupLocationEditButtonEl: "#backup-location-edit",
+      scheduledBackupsDescriptionEl: "#scheduled-backups-description",
       backupErrorBarEl: "#create-backup-error",
       backupInProgressMessageBarEl: "#backup-in-progress-message",
     };
@@ -177,17 +182,11 @@ export default class BackupSettings extends MozLitElement {
   }
 
   async handleToggleBackupEncryption(event) {
-    if (event.target.slot) {
-      return;
-    }
-
-    event.stopPropagation();
     event.preventDefault();
 
-    // User is trying to uncheck the checkbox, meaning encryption is already
-    // enabled and should be disabled.
+    // Checkbox was unchecked, meaning encryption is already enabled and should be disabled.
     let toggledToDisable =
-      event.target.checked && this.backupServiceState.encryptionEnabled;
+      !event.target.checked && this.backupServiceState.encryptionEnabled;
 
     if (toggledToDisable && this.disableBackupEncryptionDialogEl) {
       this.disableBackupEncryptionDialogEl.showModal();
@@ -206,6 +205,22 @@ export default class BackupSettings extends MozLitElement {
     }
   }
 
+  scheduledBackupsDescriptionTemplate() {
+    return html`
+      <div
+        id="scheduled-backups-description"
+        data-l10n-id="settings-data-backup-scheduled-backups-description"
+      >
+        <a
+          is="moz-support-link"
+          support-page="firefox-backup"
+          data-l10n-name="support-link"
+          utm-content="backup-off"
+        ></a>
+      </div>
+    `;
+  }
+
   turnOnScheduledBackupsDialogTemplate() {
     let { fileName, path, iconURL } = this.backupServiceState.defaultParent;
     return html`<dialog
@@ -235,26 +250,33 @@ export default class BackupSettings extends MozLitElement {
   }
 
   restoreFromBackupTemplate() {
-    let restoreItemL10nID = this.backupServiceState.scheduledBackupsEnabled
-      ? "settings-data-backup-restore-scheduled-on"
-      : "settings-data-backup-restore-scheduled-off";
+    let descriptionL10nID = this.backupServiceState.scheduledBackupsEnabled
+      ? "settings-data-backup-scheduled-backups-on-restore-description"
+      : "settings-data-backup-scheduled-backups-off-restore-description";
 
     let restoreButtonL10nID = this.backupServiceState.scheduledBackupsEnabled
       ? "settings-data-backup-scheduled-backups-on-restore-choose"
       : "settings-data-backup-scheduled-backups-off-restore-choose";
 
-    return html`<moz-box-item
-        id="restore-from-backup"
-        data-l10n-id=${restoreItemL10nID}
-      >
+    return html`<section id="restore-from-backup">
+      ${this.restoreFromBackupDialogTemplate()}
+      <div class="backups-control">
+        <span
+          id="restore-header"
+          data-l10n-id="settings-data-backup-restore-header"
+          class="heading-medium"
+        ></span>
         <moz-button
           id="backup-toggle-restore-button"
           @click=${this.handleShowRestoreDialog}
           data-l10n-id=${restoreButtonL10nID}
-          slot="actions"
         ></moz-button>
-      </moz-box-item>
-      ${this.restoreFromBackupDialogTemplate()}`;
+        <div
+          id="backup-restore-description"
+          data-l10n-id=${descriptionL10nID}
+        ></div>
+      </div>
+    </section>`;
   }
 
   handleShowRestoreDialog() {
@@ -272,19 +294,10 @@ export default class BackupSettings extends MozLitElement {
     );
   }
 
-  handleEditBackupLocation(event) {
-    let newPath = event.target.value;
-    let currentPath = this.backupServiceState.backupDirPath;
-
-    // If the same directory was chosen, this is a no-op
-    if (newPath === PathUtils.parent(currentPath)) {
-      return;
-    }
-
+  handleEditBackupLocation() {
     this.dispatchEvent(
       new CustomEvent("BackupUI:EditBackupLocation", {
         bubbles: true,
-        detail: { path: newPath },
       })
     );
   }
@@ -329,7 +342,7 @@ export default class BackupSettings extends MozLitElement {
     };
 
     return html`
-      <div id="last-backup-info" slot="description">
+      <div id="last-backup-info">
         <div
           id="last-backup-date"
           data-l10n-id="settings-data-backup-last-backup-date"
@@ -345,53 +358,78 @@ export default class BackupSettings extends MozLitElement {
   }
 
   backupLocationTemplate() {
+    let iconURL =
+      this.backupServiceState.defaultParent.iconURL || this.#placeholderIconURL;
     let { backupDirPath } = this.backupServiceState;
 
     return html`
-      <moz-input-folder
-        id="last-backup-location"
-        data-l10n-id="settings-data-backup-last-backup-location2"
-        .value=${backupDirPath}
-        @change=${this.handleEditBackupLocation}
-      >
+      <div id="last-backup-location-control">
+        <span data-l10n-id="settings-data-backup-last-backup-location"></span>
+        <input
+          id="last-backup-location"
+          class="backup-location-filepicker-input"
+          type="text"
+          readonly
+          .value=${backupDirPath}
+          style=${`background-image: url(${iconURL})`}></input>
         <moz-button
           id="backup-location-show"
           @click=${this.handleShowBackupLocation}
           data-l10n-id="settings-data-backup-last-backup-location-show-in-folder"
-          slot="actions"
         ></moz-button>
-      </moz-input-folder>
+        <moz-button
+          id="backup-location-edit"
+          @click=${this.handleEditBackupLocation}
+          data-l10n-id="settings-data-backup-last-backup-location-edit"
+        ></moz-button>
+      </div>
     `;
   }
 
   sensitiveDataTemplate() {
-    return html`
-      <moz-fieldset data-l10n-id="settings-sensitive-data" id="sensitive-data">
-        <moz-checkbox
-          id="backup-sensitive-data-checkbox-input"
-          data-l10n-id="settings-data-toggle-encryption-label2"
-          @click=${{
-            handleEvent: e => this.handleToggleBackupEncryption(e),
-            capture: true,
-          }}
-          .checked=${this.backupServiceState.encryptionEnabled}
+    return html`<section id="backup-password-controls">
+      <!-- TODO: we can use the moz-checkbox reusable component once it is ready (bug 1901635)-->
+      <div id="backup-sensitive-data-checkbox">
+        <label
+          id="backup-sensitive-data-checkbox-label"
+          for="backup-sensitive-data-checkbox-input"
+        >
+          <input
+            id="backup-sensitive-data-checkbox-input"
+            @click=${this.handleToggleBackupEncryption}
+            type="checkbox"
+            .checked=${this.backupServiceState.encryptionEnabled}
+          />
+          <span
+            id="backup-sensitive-data-checkbox-span"
+            data-l10n-id="settings-data-toggle-encryption-label"
+          ></span>
+        </label>
+        <div
+          id="backup-sensitive-data-checkbox-description"
+          class="text-deemphasized"
         >
+          <span
+            id="backup-sensitive-data-checkbox-description-span"
+            data-l10n-id="settings-sensitive-data-encryption-description"
+          ></span>
           <a
-            slot="support-link"
+            id="settings-data-toggle-encryption-learn-more-link"
             is="moz-support-link"
             support-page="firefox-backup"
-            data-l10n-id="settings-data-toggle-encryption-support-link"
             utm-content="encryption"
+            data-l10n-id="settings-data-toggle-encryption-support-link"
           ></a>
-          <moz-box-button
+        </div>
+      </div>
+      ${this.backupServiceState.encryptionEnabled
+        ? html`<moz-button
             id="backup-change-password-button"
             @click=${this.handleChangePassword}
-            data-l10n-id="settings-data-change-password2"
-            slot="nested"
-          ></moz-box-button>
-        </moz-checkbox>
-      </moz-fieldset>
-    `;
+            data-l10n-id="settings-data-change-password"
+          ></moz-button>`
+        : null}
+    </section>`;
   }
 
   inProgressMessageBarTemplate() {
@@ -426,21 +464,24 @@ export default class BackupSettings extends MozLitElement {
     `;
   }
 
+  updated() {
+    if (this.backupServiceState.scheduledBackupsEnabled) {
+      let input = this.lastBackupLocationInputEl;
+      input.setSelectionRange(input.value.length, input.value.length);
+    }
+  }
+
   render() {
     let scheduledBackupsEnabledState =
       this.backupServiceState.scheduledBackupsEnabled;
 
     let scheduledBackupsEnabledL10nID = scheduledBackupsEnabledState
-      ? "settings-data-backup-scheduled-backups-on2"
-      : "settings-data-backup-scheduled-backups-off2";
+      ? "settings-data-backup-scheduled-backups-on"
+      : "settings-data-backup-scheduled-backups-off";
 
     let backupToggleL10nID = scheduledBackupsEnabledState
-      ? "settings-data-backup-toggle-off2"
-      : "settings-data-backup-toggle-on2";
-
-    let scheduledBackupsIcon = scheduledBackupsEnabledState
-      ? "chrome://global/skin/icons/check-filled.svg"
-      : "chrome://global/skin/icons/warning.svg";
+      ? "settings-data-backup-toggle-off"
+      : "settings-data-backup-toggle-on";
 
     if (this.backupServiceState.backupInProgress) {
       if (!this.showInProgress) {
@@ -470,46 +511,51 @@ export default class BackupSettings extends MozLitElement {
       ${this.turnOffScheduledBackupsDialogTemplate()}
       ${this.enableBackupEncryptionDialogTemplate()}
       ${this.disableBackupEncryptionDialogTemplate()}
-      <moz-box-group>
-        ${this.backupServiceState.archiveEnabledStatus
-          ? html`<moz-box-item
-                id="scheduled-backups"
-                class=${classMap({
-                  "scheduled-backups-enabled": scheduledBackupsEnabledState,
-                  "scheduled-backups-disabled": !scheduledBackupsEnabledState,
-                })}
+      ${this.backupServiceState.archiveEnabledStatus
+        ? html` <section id="scheduled-backups">
+            <div class="backups-control">
+              <span
+                id="scheduled-backups-enabled"
                 data-l10n-id=${scheduledBackupsEnabledL10nID}
-                iconsrc=${scheduledBackupsIcon}
-              >
-                ${this.backupServiceState.lastBackupDate
-                  ? this.lastBackupInfoTemplate()
-                  : null}
-                ${scheduledBackupsEnabledState
-                  ? html`
-                      <moz-button
-                        id="backup-trigger-button"
-                        @click=${this.handleBackupTrigger}
-                        data-l10n-id="settings-data-backup-trigger-button"
-                        ?disabled=${this.showInProgress}
-                        slot="actions"
-                      ></moz-button>
-                    `
-                  : null}
-              </moz-box-item>
-              <moz-box-button
+                class="heading-medium"
+              ></span>
+
+              ${scheduledBackupsEnabledState
+                ? html`
+                    <moz-button
+                      id="backup-trigger-button"
+                      @click=${this.handleBackupTrigger}
+                      data-l10n-id="settings-data-backup-trigger-button"
+                      ?disabled=${this.showInProgress}
+                    ></moz-button>
+                  `
+                : null}
+
+              <moz-button
                 id="backup-toggle-scheduled-button"
                 @click=${this.handleShowScheduledBackups}
                 data-l10n-id=${backupToggleL10nID}
-              ></moz-box-button>`
-          : null}
-        ${this.backupServiceState.restoreEnabledStatus
-          ? this.restoreFromBackupTemplate()
-          : null}
-      </moz-box-group>
-      ${this.backupServiceState.archiveEnabledStatus &&
-      this.backupServiceState.scheduledBackupsEnabled
-        ? html`${this.backupLocationTemplate()}${this.sensitiveDataTemplate()}`
-        : null}`;
+              ></moz-button>
+
+              ${this.backupServiceState.scheduledBackupsEnabled
+                ? null
+                : this.scheduledBackupsDescriptionTemplate()}
+            </div>
+
+            ${this.backupServiceState.lastBackupDate
+              ? this.lastBackupInfoTemplate()
+              : null}
+            ${this.backupServiceState.scheduledBackupsEnabled
+              ? this.backupLocationTemplate()
+              : null}
+            ${this.backupServiceState.scheduledBackupsEnabled
+              ? this.sensitiveDataTemplate()
+              : null}
+          </section>`
+        : null}
+      ${this.backupServiceState.restoreEnabledStatus
+        ? this.restoreFromBackupTemplate()
+        : null} `;
   }
 }
 
diff --git a/browser/components/backup/tests/browser/browser_password_validation_inputs.js b/browser/components/backup/tests/browser/browser_password_validation_inputs.js
index f1596f2244401..4171693d13801 100644
--- a/browser/components/backup/tests/browser/browser_password_validation_inputs.js
+++ b/browser/components/backup/tests/browser/browser_password_validation_inputs.js
@@ -15,20 +15,14 @@ add_task(async function password_validation() {
       set: [[SCHEDULED_BACKUPS_ENABLED_PREF, true]],
     });
     let sandbox = sinon.createSandbox();
-    let settings = await waitForBackupSettings(browser);
+    let settings = browser.contentDocument.querySelector("backup-settings");
 
-    settings.backupServiceState.archiveEnabledStatus = true;
-    settings.backupServiceState.scheduledBackupsEnabled = true;
     settings.backupServiceState.encryptionEnabled = true;
     await settings.requestUpdate();
     await settings.updateComplete;
 
     let changePasswordButton = settings.changePasswordButtonEl;
     Assert.ok(changePasswordButton, "Change password button should be found");
-    Assert.ok(
-      !changePasswordButton.disabled,
-      "Change password button should be enabled"
-    );
 
     changePasswordButton.click();
     await settings.updateComplete;
diff --git a/browser/components/backup/tests/browser/browser_settings.js b/browser/components/backup/tests/browser/browser_settings.js
index ab6f52ef38927..3899b139556b0 100644
--- a/browser/components/backup/tests/browser/browser_settings.js
+++ b/browser/components/backup/tests/browser/browser_settings.js
@@ -25,25 +25,13 @@ add_setup(async () => {
  */
 add_task(async function test_preferences_visibility() {
   await BrowserTestUtils.withNewTab("about:preferences#sync", async browser => {
-    let settings = await waitForBackupSettings(browser);
-
-    // Wait for the sections to be rendered (they're conditionally rendered based on state)
-    await BrowserTestUtils.waitForMutationCondition(
-      settings.shadowRoot,
-      { childList: true, subtree: true },
-      () => {
-        return (
-          settings.shadowRoot.getElementById("restore-from-backup") &&
-          settings.shadowRoot.getElementById("scheduled-backups")
-        );
-      }
-    );
+    let settings = browser.contentDocument.querySelector("backup-settings");
 
-    let restoreSection = settings.restoreSectionEl;
-    let archiveSection = settings.archiveSectionEl;
+    // Our mochitest-browser tests are configured to have the section visible
+    // by default.
     Assert.ok(
-      BrowserTestUtils.isVisible(restoreSection) &&
-        BrowserTestUtils.isVisible(archiveSection),
+      BrowserTestUtils.isVisible(settings.restoreSectionEl) &&
+        BrowserTestUtils.isVisible(settings.archiveSectionEl),
       "Backup section is visible"
     );
   });
@@ -108,7 +96,7 @@ add_task(async function test_disable_backup_encryption_confirm() {
       set: [[SCHEDULED_BACKUPS_ENABLED_PREF, true]],
     });
 
-    let settings = await waitForBackupSettings(browser);
+    let settings = browser.contentDocument.querySelector("backup-settings");
 
     /**
      * For this test, we can pretend that browser-settings receives a backupServiceState
@@ -123,14 +111,6 @@ add_task(async function test_disable_backup_encryption_confirm() {
     await settings.requestUpdate();
     await settings.updateComplete;
 
-    // Wait for the sensitive data section to render (requires archiveEnabledStatus
-    // and scheduledBackupsEnabled to be set by BackupService state updates)
-    await BrowserTestUtils.waitForMutationCondition(
-      settings.shadowRoot,
-      { childList: true, subtree: true },
-      () => settings.shadowRoot.querySelector("moz-checkbox")
-    );
-
     let sensitiveDataCheckbox = settings.sensitiveDataCheckboxInputEl;
 
     Assert.ok(sensitiveDataCheckbox, "Sensitive data checkbox should be found");
@@ -434,7 +414,7 @@ add_task(async function test_last_backup_info_and_location() {
       "BackupService:StateUpdate",
       false,
       () => {
-        return bs.state.backupDirPath?.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
+        return bs.state.backupDirPath.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
       }
     );
     let filePickerShownPromise = new Promise(resolve => {
@@ -446,29 +426,7 @@ add_task(async function test_last_backup_info_and_location() {
     });
     MockFilePicker.returnValue = MockFilePicker.returnOK;
 
-    // Wait for the location input to be rendered
-    await BrowserTestUtils.waitForMutationCondition(
-      settings.shadowRoot,
-      { childList: true, subtree: true },
-      () => settings.shadowRoot.getElementById("last-backup-location")
-    );
-
-    let locationInput = settings.shadowRoot.getElementById(
-      "last-backup-location"
-    );
-    await locationInput.updateComplete;
-
-    stateUpdated = BrowserTestUtils.waitForEvent(
-      bs,
-      "BackupService:StateUpdate",
-      false,
-      () => {
-        return bs.state.backupDirPath?.startsWith(TEST_NEW_BACKUP_PARENT_PATH);
-      }
-    );
-
-    let editButton = locationInput.chooseFolderButtonEl;
-    editButton.click();
+    settings.backupLocationEditButtonEl.click();
     await filePickerShownPromise;
     await stateUpdated;
 
diff --git a/browser/components/backup/tests/browser/head.js b/browser/components/backup/tests/browser/head.js
index 2c724bc2a56ea..6f5b371c9a038 100644
--- a/browser/components/backup/tests/browser/head.js
+++ b/browser/components/backup/tests/browser/head.js
@@ -90,27 +90,3 @@ function createMockPassInputEventPromise(inputEl, mockPassword) {
   inputEl.dispatchEvent(new Event("input"));
   return promise;
 }
-
-/**
- * Waits for the backup-settings element to be rendered in the DOM and returns it.
- *
- * @param {Browser} browser
- *  the browser instance containing the about:preferences page
- * @returns {Promise<Element>}
- *  resolves to the backup-settings element once it's rendered
- */
-async function waitForBackupSettings(browser) {
-  let settingsGroup = browser.contentDocument.querySelector(
-    "setting-group[groupid='backup']"
-  );
-
-  await BrowserTestUtils.waitForMutationCondition(
-    settingsGroup,
-    { childList: true, subtree: true },
-    () => browser.contentDocument.querySelector("backup-settings")
-  );
-
-  let settings = browser.contentDocument.querySelector("backup-settings");
-  await settings.updateComplete;
-  return settings;
-}
diff --git a/browser/components/backup/tests/chrome/test_backup_settings.html b/browser/components/backup/tests/chrome/test_backup_settings.html
index 86a491f55a83f..66bdeee03ea45 100644
--- a/browser/components/backup/tests/chrome/test_backup_settings.html
+++ b/browser/components/backup/tests/chrome/test_backup_settings.html
@@ -120,10 +120,9 @@
       let dialog = settings.disableBackupEncryptionDialogEl;
 
       ok(sensitiveDataCheckboxInput, "Checkbox for toggling encryption should be found");
-      ok(sensitiveDataCheckboxInput.checked, "Checkbox for toggling encryption should be checked");
       ok(!dialog.open, "Dialog should not be open");
 
-      synthesizeMouseAtCenter(sensitiveDataCheckboxInput, {});
+      sensitiveDataCheckboxInput.click();
       await settings.updateComplete;
 
       ok(dialog?.open, "Dialog should be open");
@@ -203,7 +202,7 @@
       });
       await settings.updateComplete;
 
-      backupLocationControl = settings.shadowRoot.querySelector("#last-backup-location");
+      backupLocationControl = settings.shadowRoot.querySelector("#last-backup-location-control");
       ok(backupLocationControl, "Last backup location control was rendered.");
 
       let backupLocation = settings.shadowRoot.querySelector("#last-backup-location");
@@ -238,27 +237,18 @@
       let settings = document.getElementById("test-backup-settings");
       let content = document.getElementById("content");
 
-      const backupDirPath = PathUtils.join(PathUtils.tempDir, "BackupTest", "Restore Firefox");
+      const backupDirPath = "Some/Expected/Path";
       settings.backupServiceState = createBackupServiceState({
         scheduledBackupsEnabled: true,
         backupDirPath,
       });
 
-      await settings.updateComplete;
-
-      let locationInput = settings.shadowRoot.getElementById("last-backup-location");
-      let locationEditButton = locationInput.chooseFolderButtonEl;
+      let locationEditButton = settings.shadowRoot.querySelector("#backup-location-edit");
       ok(locationEditButton, "Backup location edit button exists.");
 
       let sawEditEvent = BrowserTestUtils.waitForEvent(content, "BackupUI:EditBackupLocation");
-
-      // Simulate what happens after user selects a new folder in the file picker
-      const newPath = PathUtils.join(PathUtils.tempDir, "NewBackupLocation");
-      locationInput.value = newPath;
-      locationInput.dispatchEvent(new Event("change", { bubbles: true }));
-
-      let event = await sawEditEvent;
-      is(event.detail.path, newPath, "Event should contain the new path");
+      locationEditButton.click();
+      await sawEditEvent;
     });
 
     /**
@@ -294,8 +284,8 @@
         "Sensitive data checkbox should not be checked"
       );
       ok(
-        settings.changePasswordButtonEl,
-        "Change password button should be found"
+        !settings.changePasswordButtonEl,
+        "Change password button should not be found"
       );
 
       // Now pretend encryption is enabled
@@ -325,9 +315,8 @@
       });
       await settings.updateComplete;
 
-      is(
-        settings.archiveSectionEl.getAttribute("data-l10n-id"),
-        "settings-data-backup-scheduled-backups-off2",
+      ok(
+        settings.scheduledBackupsDescriptionEl,
         "Scheduled backups description should be in the DOM"
       );
 
@@ -335,6 +324,11 @@
         settings.restoreFromBackupButtonEl.getAttribute("data-l10n-id"),
         "settings-data-backup-scheduled-backups-off-restore-choose"
       );
+
+      is(
+        settings.restoreFromBackupDescriptionEl.getAttribute("data-l10n-id"),
+        "settings-data-backup-scheduled-backups-off-restore-description"
+      );
     });
 
     /**
@@ -349,22 +343,26 @@
       });
       await settings.updateComplete;
 
-      is(
-        settings.archiveSectionEl.getAttribute("data-l10n-id"),
-        "settings-data-backup-scheduled-backups-on2",
-        "Scheduled backups description should be in the DOM"
+      ok(
+        !settings.scheduledBackupsDescriptionEl,
+        "Scheduled backups description should not be in the DOM"
       );
 
       is(
         settings.restoreFromBackupButtonEl.getAttribute("data-l10n-id"),
         "settings-data-backup-scheduled-backups-on-restore-choose"
       );
+
+      is(
+        settings.restoreFromBackupDescriptionEl.getAttribute("data-l10n-id"),
+        "settings-data-backup-scheduled-backups-on-restore-description"
+      );
     });
   </script>
 </head>
 <body>
 <p id="display"></p>
-<div id="content">
+<div id="content" style="display: none">
   <backup-settings id="test-backup-settings"></backup-settings>
 </div>
 <pre id="test"></pre>
diff --git a/browser/components/backup/tests/xpcshell/test_BackupService.js b/browser/components/backup/tests/xpcshell/test_BackupService.js
index c4cc164910dbf..189452e027e72 100644
--- a/browser/components/backup/tests/xpcshell/test_BackupService.js
+++ b/browser/components/backup/tests/xpcshell/test_BackupService.js
@@ -880,6 +880,17 @@ add_task(
       "newBackupLocation"
     );
 
+    let pickerDir = await IOUtils.getDirectory(newBackupLocation);
+    const reg = MockRegistrar.register("@mozilla.org/filepicker;1", {
+      init() {},
+      open(cb) {
+        cb.done(Ci.nsIFilePicker.returnOK);
+      },
+      displayDirectory: null,
+      file: pickerDir,
+      QueryInterface: ChromeUtils.generateQI(["nsIFilePicker"]),
+    });
+
     const backupService = new BackupService({});
 
     const sandbox = sinon.createSandbox();
@@ -887,17 +898,18 @@ add_task(
       .stub(backupService, "deleteLastBackup")
       .rejects(new Error("Exception while deleting backup"));
 
-    await backupService.editBackupLocation(newBackupLocation);
+    await backupService.editBackupLocation({ browsingContext: null });
 
-    let expectedPath = PathUtils.join(newBackupLocation, "Restore Firefox");
+    pickerDir.append("Restore Firefox");
     Assert.equal(
       Services.prefs.getStringPref(backupLocationPref),
-      expectedPath,
+      pickerDir.path,
       "Backup location pref should have updated to the new directory."
     );
 
     Services.prefs.setStringPref(backupLocationPref, resetLocation);
     sinon.restore();
+    MockRegistrar.unregister(reg);
     await Promise.all([
       IOUtils.remove(exceptionBackupLocation, { recursive: true }),
       IOUtils.remove(newBackupLocation, { recursive: true }),
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 908c1b4d24878..1bfdc4b6bda7d 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -4885,17 +4885,6 @@ SettingGroupManager.registerGroups({
       },
     ],
   },
-  backup: {
-    l10nId: "settings-data-backup-header2",
-    headingLevel: 2,
-    supportPage: "firefox-backup",
-    items: [
-      {
-        id: "backupSettings",
-        control: "backup-settings",
-      },
-    ],
-  },
   translationsAutomaticTranslation: {
     inProgress: true,
     headingLevel: 2,
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index f0574900b1d88..3c60cc9f199ba 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -571,6 +571,14 @@ async function gotoPref(
     spotlight(subcategory, category);
   }
 
+  // Handle any visibility changes that are controlled by pref logic.
+  //
+  // Take caution when trying to flip the hidden state to true since the
+  // element might show up unexpectedly on different pages in about:preferences.
+  //
+  // See Bug 1999032 to remove this in favor of config-based prefs.
+  categoryModule.handlePrefControlledSection?.();
+
   // Record which category is shown
   let gleanId = /** @type {"showClick" | "showHash" | "showInitial"} */ (
     "show" + aShowReason
diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
index b889d42301de3..d473643ccf12b 100644
--- a/browser/components/preferences/sync.inc.xhtml
+++ b/browser/components/preferences/sync.inc.xhtml
@@ -256,5 +256,20 @@
 <html:setting-group groupid="sync" hidden="true" data-category="paneSync"/>
 
 <!-- Firefox Backup -->
-<html:setting-group groupid="backup" hidden="true" data-category="paneSync" data-subcategory="backup"/>
+<hbox id="backupCategory"
+    class="subcategory"
+    hidden="true"
+    data-category="paneSync"
+    >
+  <html:h1 data-l10n-id="settings-data-backup-header"/>
+</hbox>
+<groupbox id="dataBackupGroup"
+          data-category="paneSync"
+          data-subcategory="backup"
+          hidden="true">
+  <label class="search-header" hidden="true"><html:h2 data-l10n-id="settings-data-backup-header"/></label>
+  <hbox flex="1">
+    <html:backup-settings />
+  </hbox>
+</groupbox>
 </html:template>
diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index 068cec6ad28cb..48314589f189b 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -605,21 +605,6 @@ Preferences.addSetting({
   },
 });
 
-// Backup section
-
-Preferences.addSetting({
-  id: "backupSettings",
-  setup(emitChange) {
-    Services.obs.addObserver(emitChange, "backup-service-status-updated");
-    return () =>
-      Services.obs.removeObserver(emitChange, "backup-service-status-updated");
-  },
-  visible: () => {
-    let bs = lazy.BackupService.init();
-    return bs.archiveEnabledStatus.enabled || bs.restoreEnabledStatus.enabled;
-  },
-});
-
 var gSyncPane = {
   get page() {
     return document.getElementById("weavePrefsDeck").selectedIndex;
@@ -671,6 +656,26 @@ var gSyncPane = {
     xps.ensureLoaded();
   },
 
+  /**
+   * This method allows us to override any hidden states that were set
+   * during preferences.js init(). Currently, this is used to hide the
+   * backup section if backup is disabled.
+   *
+   * Take caution when trying to flip the hidden state to true since the
+   * element might show up unexpectedly on different pages in about:preferences
+   * since this function will run at the end of preferences.js init().
+   *
+   * See Bug 1999032 to remove this in favor of config-based prefs.
+   */
+  handlePrefControlledSection() {
+    let bs = lazy.BackupService.init();
+
+    if (!bs.archiveEnabledStatus.enabled && !bs.restoreEnabledStatus.enabled) {
+      document.getElementById("backupCategory").hidden = true;
+      document.getElementById("dataBackupGroup").hidden = true;
+    }
+  },
+
   _showLoadPage() {
     let maybeAcct = false;
     let username = Services.prefs.getCharPref("services.sync.username", "");
@@ -694,7 +699,6 @@ var gSyncPane = {
     initSettingGroup("defaultBrowserSync");
     initSettingGroup("sync");
     initSettingGroup("account");
-    initSettingGroup("backup");
 
     Weave.Svc.Obs.add(UIState.ON_UPDATE, this.updateWeavePrefs, this);
 
diff --git a/browser/components/preferences/tests/browser_backup_visibility.js b/browser/components/preferences/tests/browser_backup_visibility.js
index 7b04a0edd14da..47072d3da807a 100644
--- a/browser/components/preferences/tests/browser_backup_visibility.js
+++ b/browser/components/preferences/tests/browser_backup_visibility.js
@@ -15,13 +15,14 @@ add_task(async function () {
     set: [["browser.backup.archive.enabled", false]],
   });
 
-  let settings = gBrowser.contentDocument.querySelector(
-    "setting-group[groupid='backup']"
+  ok(
+    gBrowser.contentDocument.getElementById("backupCategory").hidden,
+    "backup category hidden"
   );
-  console.log("show me", settings);
+
   ok(
-    BrowserTestUtils.isHidden(settings),
-    "backup setting-group is not visible"
+    gBrowser.contentDocument.getElementById("dataBackupGroup").hidden,
+    "backup section is hidden"
   );
 
   // Check that we don't get any results in sync when searching:
@@ -42,13 +43,18 @@ add_task(async function () {
     leaveOpen: true,
   });
 
-  let settings = gBrowser.contentDocument.querySelector(
-    "setting-group[groupid='backup']"
+  ok(
+    !gBrowser.contentDocument.getElementById("backupCategory").hidden,
+    "backup category shown"
+  );
+
+  ok(
+    !gBrowser.contentDocument.getElementById("dataBackupGroup").hidden,
+    "backup section is shown"
   );
-  ok(BrowserTestUtils.isVisible(settings), "backup setting-group is visible");
 
   // Check that we don't get any results in sync when searching:
-  await evaluateSearchResults("backup", "backup");
+  await evaluateSearchResults("backup", "dataBackupGroup");
 
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
diff --git a/browser/locales/en-US/browser/backupSettings.ftl b/browser/locales/en-US/browser/backupSettings.ftl
index 10df0d0645067..378a1ca3dfbf4 100644
--- a/browser/locales/en-US/browser/backupSettings.ftl
+++ b/browser/locales/en-US/browser/backupSettings.ftl
@@ -21,41 +21,31 @@ backup-folder-name = Restore { -brand-product-name }
 # FirefoxBackup_default_20240606-1830.html
 backup-file-name = { -brand-product-name }Backup
 
-settings-data-backup-header2 =
-    .label = Backup
-    .description = Automatically protect your bookmarks, history, and other data.
+settings-data-backup-header = Backup
 settings-data-backup-toggle = Manage backup
-settings-data-backup-toggle-on2 =
-    .label = Turn on backup
-settings-data-backup-toggle-off2 =
-    .label = Turn off backup
+settings-data-backup-toggle-on = Turn on backup
+settings-data-backup-toggle-off = Turn off backup
 settings-data-backup-trigger-button = Backup now
 settings-data-backup-in-progress-button = Backup in progress…
 settings-data-backup-in-progress-message =
     .message = Backup in progress…
+settings-data-backup-scheduled-backups-on = Backup: ON
+settings-data-backup-scheduled-backups-off = Backup: OFF
+settings-data-backup-scheduled-backups-description = Automatically protect your bookmarks, history, and other data. <a data-l10n-name="support-link">Learn more</a>
 settings-data-backup-last-backup-date = Last backup: { DATETIME($date, timeStyle: "short") }, { DATETIME($date, dateStyle: "short") }
-settings-data-backup-scheduled-backups-on2 =
-    .label = Backup is ON
-settings-data-backup-scheduled-backups-off2 =
-    .label = Backup is OFF
 # "Location" refers to the folder where backups are being written to.
-settings-data-backup-last-backup-location2 =
-    .label = Backup location
+settings-data-backup-last-backup-location = Location
 settings-data-backup-last-backup-location-show-in-folder = Show in folder
 settings-data-backup-last-backup-location-edit = Edit…
 settings-data-create-backup-error = There was an error creating your backup on { DATETIME($date, timeStyle: "short") }, { DATETIME($date, dateStyle: "short") }
 
+settings-sensitive-data-encryption-description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
+
 # Variables:
 #   $fileName (String) - The file name of the last backup that was created.
 settings-data-backup-last-backup-filename = Filename: { $fileName }
 
-settings-data-backup-restore-scheduled-on =
-    .label = Restore your data
-    .description = Recover your { -brand-product-name } data back from the last time it was backed up.
-
-settings-data-backup-restore-scheduled-off =
-    .label = Restore your data
-    .description = Use a { -brand-product-name } backup from another device to restore your data.
+settings-data-backup-restore-header = Restore your data
 
 ## These strings are shown under the header if scheduled backups are disabled.
 
@@ -67,16 +57,10 @@ settings-data-backup-scheduled-backups-off-restore-choose = Choose backup file
 settings-data-backup-scheduled-backups-on-restore-description = Recover your { -brand-product-name } data back from the last time it was backed up.
 settings-data-backup-scheduled-backups-on-restore-choose = Restore…
 
-settings-sensitive-data =
-    .label = Sensitive data
-settings-sensitive-data-encryption-description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
-settings-data-toggle-encryption-label2 =
-    .label = Back up your sensitive data
-    .description = Back up your passwords and payment methods, plus keep all your data safe with encryption.
+settings-data-toggle-encryption-label = Back up your sensitive data
 settings-data-toggle-encryption-support-link = Learn more
 
-settings-data-change-password2 =
-    .label = Change password
+settings-data-change-password = Change password…
 
 ## These strings are displayed in a modal when users want to turn on scheduled backups.
 
diff --git a/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py b/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py
deleted file mode 100644
index dfa31bd042ebb..0000000000000
--- a/python/l10n/fluent_migrations/bug_1995062_backup_settings_conversion.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from fluent.migrate.transforms import COPY_PATTERN
-import fluent.syntax.ast as FTL
-
-
-def migrate(ctx):
-    """Bug 1995062 - Convert Backup settings to config-based prefs, part {index}"""
-
-    path = "browser/browser/backupSettings.ftl"
-
-    ctx.add_transforms(
-        path,
-        path,
-        [
-            FTL.Message(
-                id=FTL.Identifier("settings-data-backup-toggle-on2"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY_PATTERN(path, "settings-data-backup-toggle-on"),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier("settings-data-backup-toggle-off2"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("label"),
-                        value=COPY_PATTERN(path, "settings-data-backup-toggle-off"),
-                    ),
-                ],
-            ),
-        ],
-    )
diff --git a/toolkit/content/tests/widgets/test_moz_box_item.html b/toolkit/content/tests/widgets/test_moz_box_item.html
index 55b5464b18074..ddd83c4e14add 100644
--- a/toolkit/content/tests/widgets/test_moz_box_item.html
+++ b/toolkit/content/tests/widgets/test_moz_box_item.html
@@ -207,42 +207,6 @@
           "support link is placed next to the description when provided."
         );
       });
-
-      add_task(async function testMozBoxItemSlottedDescription() {
-        let slottedTemplate = testHelpers.templateFn({
-          label: "Testing slotted description",
-        });
-        let renderTarget = await testHelpers.renderTemplate(slottedTemplate);
-        let item = renderTarget.firstElementChild;
-
-        ok(!item.hasDescription, "Item initially has no description.");
-
-        const SLOTTED_DESCRIPTION = "This is a slotted description";
-        let slottedDesc = document.createElement("span");
-        slottedDesc.textContent = SLOTTED_DESCRIPTION;
-        slottedDesc.slot = "description";
-
-        item.append(slottedDesc);
-        await item.updateComplete;
-
-        let descriptionSlot = item.shadowRoot.querySelector(
-          "slot[name='description']"
-        );
-        ok(descriptionSlot, "Description slot exists in shadow DOM");
-
-        let slottedElements = descriptionSlot.assignedElements();
-        is(
-          slottedElements.length,
-          1,
-          "Description slot has one assigned element"
-        );
-        is(
-          slottedElements[0],
-          slottedDesc,
-          "Slotted description is assigned to description slot"
-        );
-        ok(item.hasDescription, "Item has description after slotting content");
-      });
     </script>
   </head>
   <body>
diff --git a/toolkit/content/tests/widgets/test_moz_input_folder.html b/toolkit/content/tests/widgets/test_moz_input_folder.html
index 567d767290d6f..98d64b4f1cbe7 100644
--- a/toolkit/content/tests/widgets/test_moz_input_folder.html
+++ b/toolkit/content/tests/widgets/test_moz_input_folder.html
@@ -237,33 +237,6 @@
 
         MockFilePicker.cleanup();
       });
-
-      add_task(async function testActionsSlot() {
-        let slottedActionTemplate = html`<moz-input-folder label="More actions">
-          <moz-button id="test-action-button" slot="actions"
-            >Additional Action</moz-button
-          >
-        </moz-input-folder>`;
-        let target = await testHelpers.renderTemplate(slottedActionTemplate);
-        let inputFolder = target.querySelector("moz-input-folder");
-        await inputFolder.updateComplete;
-
-        let actionButton = inputFolder.querySelector("#test-action-button");
-        ok(actionButton, "Button in actions slot is present");
-
-        let actionsSlot = inputFolder.shadowRoot.querySelector(
-          "slot[name='actions']"
-        );
-        ok(actionsSlot, "Actions slot exists in shadow DOM");
-
-        let slottedElements = actionsSlot.assignedElements();
-        is(slottedElements.length, 1, "Actions slot has one assigned element");
-        is(
-          slottedElements[0],
-          actionButton,
-          "Button is assigned to actions slot"
-        );
-      });
     </script>
   </head>
   <body>
diff --git a/toolkit/content/widgets/moz-box-common.css b/toolkit/content/widgets/moz-box-common.css
index daeea21ae4061..2a80fc6fc3a9d 100644
--- a/toolkit/content/widgets/moz-box-common.css
+++ b/toolkit/content/widgets/moz-box-common.css
@@ -96,7 +96,7 @@
   .description {
     grid-area: description;
     display: flex;
-    justify-content: start;
+    justify-content: center;
     gap: var(--space-small);
     align-self: var(--box-description-alignment);
   }
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.css b/toolkit/content/widgets/moz-box-item/moz-box-item.css
index 874cfaa5f13b4..ab6d82cea0c20 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.css
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.css
@@ -36,11 +36,6 @@
     }
   }
 
-  .description-wrapper {
-    display: flex;
-    gap: var(--space-xsmall);
-  }
-
   .description,
   .support-page {
     display: inline;
@@ -51,10 +46,6 @@
   font-size: var(--font-size-small);
 }
 
-.text-content:not(.has-description) slot[name="description"] {
-  display: none;
-}
-
 .box-container {
   padding: var(--box-padding);
   font-size: inherit;
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
index 3c0befe131add..1bd6f2b1d00f4 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
@@ -30,7 +30,6 @@ const NAVIGATION_DIRECTIONS = {
  * @property {string} iconSrc - The src for an optional icon shown next to the label.
  * @property {"default"|"medium-icon"|"large-icon"} layout - Layout style for the box content.
  * @slot default - Slot for the box item's content, which overrides label and description.
- * @slot description - Slot for custom description content.
  * @slot actions - Slot for the actions positioned at the end of the component container.
  * @slot actions-start - Slot for the actions positioned at the start of the component container.
  */
@@ -40,7 +39,6 @@ export default class MozBoxItem extends MozBoxBase {
   static properties = {
     layout: { type: String, reflect: true },
     supportPage: { type: String, attribute: "support-page" },
-    _hasSlottedDescription: { type: Boolean, state: true },
   };
 
   static queries = {
@@ -53,18 +51,9 @@ export default class MozBoxItem extends MozBoxBase {
   constructor() {
     super();
     this.layout = "default";
-    this._hasSlottedDescription = false;
     this.addEventListener("keydown", e => this.handleKeydown(e));
   }
 
-  get hasDescription() {
-    return this.description || this._hasSlottedDescription;
-  }
-
-  checkSlottedDescription(e) {
-    this._hasSlottedDescription = !!e.target?.assignedNodes()?.length;
-  }
-
   firstUpdated() {
     this.getActionEls();
   }
@@ -170,33 +159,11 @@ export default class MozBoxItem extends MozBoxBase {
     `;
   }
 
-  descriptionTemplate() {
-    if (!this.description) {
-      return html`<slot
-        class="description text-deemphasized"
-        id="description"
-        name="description"
-        @slotchange=${this.checkSlottedDescription}
-      ></slot>`;
-    }
-    return html`<span class="description text-deemphasized" id="description">
-      ${this.description}
-    </span>`;
-  }
-
   textTemplate() {
     if (this.supportPage) {
       return this.supportTextTemplate();
     }
-    return html`<div
-      class=${classMap({
-        "text-content": true,
-        "has-icon": this.iconSrc,
-        "has-description": this.hasDescription,
-      })}
-    >
-      ${this.iconTemplate()}${this.labelTemplate()}${this.descriptionTemplate()}
-    </div>`;
+    return super.textTemplate();
   }
 
   supportTextTemplate() {
@@ -204,19 +171,19 @@ export default class MozBoxItem extends MozBoxBase {
       class=${classMap({
         "text-content": true,
         "has-icon": this.iconSrc,
-        "has-description": this.hasDescription,
+        "has-description": this.description,
         "has-support-page": this.supportPage,
       })}
     >
       <span class="label-wrapper">
         ${this.iconTemplate()}<span>
-          ${this.labelTemplate()}${!this.hasDescription
+          ${this.labelTemplate()}${!this.description
             ? this.supportPageTemplate()
             : ""}
         </span>
       </span>
       <span class="description-wrapper">
-        ${this.descriptionTemplate()}${this.hasDescription
+        ${this.descriptionTemplate()}${this.description
           ? this.supportPageTemplate()
           : ""}
       </span>
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs b/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
index d724beded7174..000e3efe6b6b4 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.stories.mjs
@@ -63,7 +63,6 @@ const Template = ({
   slottedActions,
   slottedActionsStart,
   supportPage,
-  slottedDescription,
 }) => html`
   <style>
     .container {
@@ -129,12 +128,6 @@ const Template = ({
             ></moz-button>
           `
         : ""}
-      ${slottedDescription
-        ? html`<span slot="description"
-            >This is a slotted description
-            <a href="https://www.example.com" target="_blank">click me</a></span
-          >`
-        : ""}
     </moz-box-item>
   </div>
 `;
@@ -148,7 +141,6 @@ Default.args = {
   slottedActions: false,
   slottedActionsStart: false,
   supportPage: "",
-  slottedDescription: false,
 };
 
 export const WithDescription = Template.bind({});
@@ -194,12 +186,6 @@ WithSlottedActionAtTheStart.args = {
   slottedActionsStart: true,
 };
 
-export const WithSlottedDescription = Template.bind({});
-WithSlottedDescription.args = {
-  ...Default.args,
-  slottedDescription: true,
-};
-
 export const WithSupportPage = Template.bind({});
 WithSupportPage.args = {
   ...Default.args,
diff --git a/toolkit/content/widgets/moz-input-folder/README.stories.md b/toolkit/content/widgets/moz-input-folder/README.stories.md
index c55151cbfed43..75c706fcff437 100644
--- a/toolkit/content/widgets/moz-input-folder/README.stories.md
+++ b/toolkit/content/widgets/moz-input-folder/README.stories.md
@@ -151,24 +151,6 @@ In order to disable the `moz-input-folder`, add `disabled=""` or `disabled` to t
 </div>
 ```
 
-### Adding additional actions
-
-The `actions` slot can be used in cases where we need to support additional buttons beyond the built-in folder picker button, or other interactive content.
-
-```html
-<moz-input-folder label="Label">
-  <moz-button slot="actions">More actions</moz-button>
-</moz-input-folder>
-```
-
-```html story
-<div style={{width: '500px'}} onClickCapture={e => e.stopPropagation()}>
-  <moz-input-folder label="Label">
-    <moz-button slot="actions">More actions</moz-button>
-  </moz-input-folder>
-</div>
-```
-
 ### Fluent usage
 
 The `label`, `description`, `placeholder` and `accesskey` attributes of `moz-input-folder` will generally be provided via [Fluent attributes](https://mozilla-l10n.github.io/localizer-documentation/tools/fluent/basic_syntax.html#attributes).
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
index 48b1a9d21c75d..03390ac1b6217 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.css
@@ -19,13 +19,8 @@
   display: flex;
   align-items: flex-end;
   gap: var(--input-folder-space-inline);
-  flex-wrap: var(--input-folder-wrap);
 }
 
 #choose-folder-button {
   white-space: nowrap;
 }
-
-slot[name="actions"]::slotted(moz-button) {
-  white-space: nowrap;
-}
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs b/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
index b2011b6e887cc..80179e6b697c7 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.mjs
@@ -169,7 +169,6 @@ export default class MozInputFolder extends MozInputText {
           ?disabled=${this.disabled || this.parentDisabled}
           @click=${this.openFolderPicker}
         ></moz-button>
-        <slot name="actions"></slot>
       </div>
     `;
   }
diff --git a/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs b/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
index 5e001bd38dde7..071cd5e0f11da 100644
--- a/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
+++ b/toolkit/content/widgets/moz-input-folder/moz-input-folder.stories.mjs
@@ -49,9 +49,8 @@ const Template = ({
   hasSlottedDescription,
   hasSlottedSupportLink,
   ellipsized,
-  hasAdditionalAction,
 }) => html`
-  <div style="width: 450px;">
+  <div style="width: 400px;">
     <moz-input-folder
       name=${name}
       value=${ifDefined(value || null)}
@@ -61,7 +60,7 @@ const Template = ({
       support-page=${ifDefined(supportPage || null)}
       @click=${{
         handleEvent: e => {
-          if (e.composedPath().some(el => el.id == "choose-folder-button")) {
+          if (e.composedPath().some(el => el.localName == "moz-button")) {
             e.stopPropagation();
             alert("This would open the file picker");
           }
@@ -76,13 +75,6 @@ const Template = ({
       ${hasSlottedSupportLink
         ? html`<a slot="support-link" href="www.example.com">Click me!</a>`
         : ""}
-      ${hasAdditionalAction
-        ? html`<moz-button
-            slot="actions"
-            @click=${() => alert("Use the 'actions' slot for more actions.")}
-            >Click me!</moz-button
-          >`
-        : ""}
     </moz-input-folder>
   </div>
 `;
@@ -157,9 +149,3 @@ WithEllipsizedLabel.args = {
   ellipsized: true,
   l10nId: "moz-input-folder-long-label",
 };
-
-export const WithAdditionalActions = Template.bind({});
-WithAdditionalActions.args = {
-  ...Default.args,
-  hasAdditionalAction: true,
-};

From 7016f0d0496bed4d3ab63145439a6701ba08184a Mon Sep 17 00:00:00 2001
From: Cristian Tuns <ctuns@mozilla.com>
Date: Fri, 6 Feb 2026 14:45:43 -0500
Subject: [PATCH 42/93] Revert "Bug 2010200 - Add default `distribution.ini`
 for official Linux builds
 r=firefox-build-system-reviewers,glandium,omc-reviewers,mimi" for causing bc
 failures in browser_aboutDialog_distribution.js

This reverts commit 40d36ba49cf6d720479d6ce8821d7025f4646a1b.
---
 browser/app/distribution/distribution.ini     |  4 ----
 browser/app/distribution/moz.build            | 12 ----------
 browser/app/moz.build                         |  2 --
 .../about/browser_aboutDialog_distribution.js |  1 -
 .../browser/browser_asrouter_targeting.js     | 20 +++++-----------
 .../components/uitour/test/browser_UITour.js  | 21 ++++++-----------
 browser/config/mozconfigs/linux64/common-opt  |  2 --
 browser/installer/package-manifest.in         |  4 ----
 .../test/browser/browser_ClientEnvironment.js | 23 +++++++------------
 toolkit/modules/AppConstants.sys.mjs          |  7 ------
 toolkit/moz.configure                         |  6 -----
 tools/update-packaging/common.sh              |  3 +--
 12 files changed, 22 insertions(+), 83 deletions(-)
 delete mode 100644 browser/app/distribution/distribution.ini
 delete mode 100644 browser/app/distribution/moz.build

diff --git a/browser/app/distribution/distribution.ini b/browser/app/distribution/distribution.ini
deleted file mode 100644
index 5c16c3bab161e..0000000000000
--- a/browser/app/distribution/distribution.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Global]
-id=mozilla-official
-version=1.0
-about=Mozilla Firefox Official Build
\ No newline at end of file
diff --git a/browser/app/distribution/moz.build b/browser/app/distribution/moz.build
deleted file mode 100644
index a97ea6cce4bff..0000000000000
--- a/browser/app/distribution/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIST_SUBDIR = ""
-
-if CONFIG["BUILT_BY_MOZILLA"]:
-    FINAL_TARGET_FILES.distribution += [
-        "distribution.ini",
-    ]
diff --git a/browser/app/moz.build b/browser/app/moz.build
index b5f5461fd0835..a23bb7812a03b 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -29,8 +29,6 @@ with Files("profile/channel-prefs.js"):
 with Files("profile/firefox.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
-DIRS += ["distribution"]
-
 if CONFIG["MOZ_MACBUNDLE_NAME"]:
     DIRS += ["macbuild/Contents"]
 
diff --git a/browser/base/content/test/about/browser_aboutDialog_distribution.js b/browser/base/content/test/about/browser_aboutDialog_distribution.js
index 2b9c41b2f6fd9..8f52533bbc52c 100644
--- a/browser/base/content/test/about/browser_aboutDialog_distribution.js
+++ b/browser/base/content/test/about/browser_aboutDialog_distribution.js
@@ -13,7 +13,6 @@ add_task(async function verify_distribution_info_hides() {
 
   defaultBranch.setCharPref("distribution.id", "mozilla-test-distribution-id");
   defaultBranch.setCharPref("distribution.version", "1.0");
-  defaultBranch.setCharPref("distribution.about", "");
 
   let aboutDialog = await waitForAboutDialog();
 
diff --git a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
index 5fbcd72df48d5..2fd4dfde9584b 100644
--- a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
+++ b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
@@ -1212,7 +1212,6 @@ add_task(async function checkPatternsValid() {
 
 add_task(async function check_isChinaRepack() {
   const prefDefaultBranch = Services.prefs.getDefaultBranch("distribution.");
-  const originalDistributionId = prefDefaultBranch.getCharPref("id", "");
   const messages = [
     { id: "msg_for_china_repack", targeting: "isChinaRepack == true" },
     { id: "msg_for_everyone_else", targeting: "isChinaRepack == false" },
@@ -1255,7 +1254,7 @@ add_task(async function check_isChinaRepack() {
     "should select the message for non China repack users"
   );
 
-  prefDefaultBranch.setCharPref("id", originalDistributionId);
+  prefDefaultBranch.deleteBranch("");
 });
 
 add_task(async function check_userId() {
@@ -1514,29 +1513,22 @@ add_task(async function check_userPrefersReducedMotion() {
 });
 
 add_task(async function test_distributionId() {
-  let expectedDefault = Services.prefs
-    .getDefaultBranch(null)
-    .getCharPref("distribution.id", "");
   is(
     ASRouterTargeting.Environment.distributionId,
-    expectedDefault,
-    "Should return the expected default distribution Id"
+    "",
+    "Should return an empty distribution Id"
   );
 
   Services.prefs.getDefaultBranch(null).setCharPref("distribution.id", "test");
+
   is(
     ASRouterTargeting.Environment.distributionId,
     "test",
     "Should return the correct distribution Id"
   );
 
-  if (expectedDefault) {
-    Services.prefs
-      .getDefaultBranch(null)
-      .setCharPref("distribution.id", expectedDefault);
-  } else {
-    Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
-  }
+  // clean up default branch distribution.id
+  Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
 });
 
 add_task(async function test_fxViewButtonAreaType_default() {
diff --git a/browser/components/uitour/test/browser_UITour.js b/browser/components/uitour/test/browser_UITour.js
index 4e5867b3726f0..662a58dff1503 100644
--- a/browser/components/uitour/test/browser_UITour.js
+++ b/browser/components/uitour/test/browser_UITour.js
@@ -509,22 +509,15 @@ var tests = [
         "undefined",
         "Check distribution isn't undefined."
       );
-      // distribution id defaults to "default" for most builds,
-      // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
-      // official Mozilla builds.
-      let expectedDistribution = "default";
-      if (
-        AppConstants.platform === "win" &&
-        Services.sysinfo.getProperty("hasWinPackageId")
-      ) {
-        expectedDistribution = "mozilla-MSIX";
-      } else if (AppConstants.BUILT_BY_MOZILLA) {
-        expectedDistribution = "mozilla-official";
-      }
+      // distribution id defaults to "default" for most builds, and
+      // "mozilla-MSIX" for MSIX builds.
       is(
         result.distribution,
-        expectedDistribution,
-        "Should have expected distribution value."
+        AppConstants.platform === "win" &&
+          Services.sysinfo.getProperty("hasWinPackageId")
+          ? "mozilla-MSIX"
+          : "default",
+        'Should be "default" without preference set.'
       );
 
       let defaults = Services.prefs.getDefaultBranch("distribution.");
diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
index 179a31324acc6..7181c511ba8b7 100644
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@@ -10,7 +10,5 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-ac_add_options --built-by-mozilla
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 7eb90525444dc..d3ef68f4c184a 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -449,7 +449,3 @@ bin/libfreebl_64int_3.so
 #if defined(DESKTOP_LAUNCHER_ENABLED)
 @BINPATH@/desktop-launcher/desktop-launcher@BIN_SUFFIX@
 #endif
-
-#if defined(BUILT_BY_MOZILLA)
-@RESPATH@/distribution/*
-#endif
diff --git a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
index 76ba82d9a5e27..f1322cffae248 100644
--- a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
+++ b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
@@ -62,28 +62,21 @@ add_task(async function testUserId() {
 });
 
 add_task(async function testDistribution() {
-  // distribution id defaults to "default" for most builds,
-  // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
-  // official Mozilla builds.
-  let expectedDistribution = "default";
-  if (
-    AppConstants.platform === "win" &&
-    Services.sysinfo.getProperty("hasWinPackageId")
-  ) {
-    expectedDistribution = "mozilla-MSIX";
-  } else if (AppConstants.BUILT_BY_MOZILLA) {
-    expectedDistribution = "mozilla-official";
-  }
+  // distribution id defaults to "default" for most builds, and
+  // "mozilla-MSIX" for MSIX builds.
   is(
     ClientEnvironment.distribution,
-    expectedDistribution,
+    AppConstants.platform === "win" &&
+      Services.sysinfo.getProperty("hasWinPackageId")
+      ? "mozilla-MSIX"
+      : "default",
     "distribution has a default value"
   );
 
   // distribution id is read from a preference
   Services.prefs
     .getDefaultBranch(null)
-    .setCharPref("distribution.id", "funnelcake");
+    .setStringPref("distribution.id", "funnelcake");
   is(
     ClientEnvironment.distribution,
     "funnelcake",
@@ -91,7 +84,7 @@ add_task(async function testDistribution() {
   );
   Services.prefs
     .getDefaultBranch(null)
-    .setCharPref("distribution.id", "default");
+    .setStringPref("distribution.id", "default");
 });
 
 const mockClassify = { country: "FR", request_time: new Date(2017, 1, 1) };
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
index a51aa0459c5c4..7c57a768e679a 100644
--- a/toolkit/modules/AppConstants.sys.mjs
+++ b/toolkit/modules/AppConstants.sys.mjs
@@ -31,13 +31,6 @@ export var AppConstants = Object.freeze({
 
   MOZ_OFFICIAL_BRANDING: @MOZ_OFFICIAL_BRANDING_BOOL@,
 
-  BUILT_BY_MOZILLA:
-#ifdef BUILT_BY_MOZILLA
-  true,
-#else
-  false,
-#endif
-
   MOZ_DEV_EDITION: @MOZ_DEV_EDITION_BOOL@,
 
   MOZ_SERVICES_SYNC: @MOZ_SERVICES_SYNC_BOOL@,
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index c301e8ab4e5dd..64f527d9e8053 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -94,12 +94,6 @@ option(
 )
 set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
 
-option(
-    "--built-by-mozilla",
-    help="Enable Mozilla official build designation",
-)
-set_config("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
-set_define("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
 
 @depends("MOZ_APP_VENDOR", build_project)
 def check_moz_app_vendor(moz_app_vendor, build_project):
diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh
index be2061b98cbba..e055b1c24efd5 100755
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -95,8 +95,7 @@ check_for_add_if_not_update() {
   if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
         "$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
         "$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
-        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ || \
-        "$(basename "$add_if_not_file_chk")" = "distribution.ini" ]]; then
+        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
     ## "true"
     return 0;
   fi

From bdf17c97f85100e81c3bb880b04a491da92e741d Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Fri, 6 Feb 2026 17:22:37 +0000
Subject: [PATCH 43/93] No bug - Update the Pocket Guide to reflect the end of
 the Nightly soft freeze. r=release-managers,dmeehan DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D280652
---
 .../pocket-guide-shipping-firefox.rst            | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/docs/contributing/pocket-guide-shipping-firefox.rst b/docs/contributing/pocket-guide-shipping-firefox.rst
index 76227ab08d19f..82b5daee61436 100644
--- a/docs/contributing/pocket-guide-shipping-firefox.rst
+++ b/docs/contributing/pocket-guide-shipping-firefox.rst
@@ -147,7 +147,6 @@ Feature Complete Milestone                            Nightly W2       Friday
 QA Test Plan approval due                             Nightly W2       Friday            Last day to provide QA with feature Test Plan sign-offs
 Nightly features Go/No-Go decisions                   Nightly W4       Wednesday
 Beta release notes draft                              Nightly W4       Wednesday
-Nightly soft code freeze start                        Nightly W4       Thursday          Stabilization period in preparation to merge to Beta
 QA pre-merge regression testing completed             Nightly W4       Friday
 String freeze                                         Nightly W4       Friday            Modification or deletion of strings exposed to the end-users is not allowed
 Merge Day                                             Beta W1          Monday            Day 1 of the new Beta cycle
@@ -155,9 +154,9 @@ User affecting changes identified & provided to SUMO  Beta W1          Friday
 End of Early Beta & intended pref state deadline      Beta W2          Friday            Post-B6
 Pre-release sign off                                  Beta W3          Wednesday         Final round of QA testing prior to Release
 Go/No-Go for features riding train                    Beta W3          Friday
-Firefox RC week                                       Beta W4          Monday            Validating Release Candidate builds in preparation for the next Firefox Release
 Release Notes ready                                   Beta W4          Tuesday
 What’s new page ready                                 Beta W4          Wednesday
+Firefox Release Candidate build creation              Beta W4          Wednesday         End of the current Beta cycle in preparation for the upcoming Firefox Release
 Firefox go-live @ 6am PT                              Release W1       Tuesday           Day 1 of the new Firefox Release to 25% of Release users
 Firefox Release bump to 100%                          Release W1       Thursday          Increase deployment of new Firefox Release to 100% of Release users
 Scheduled dot release approval requests due           Release W2       Friday            All requests required by EOD
@@ -355,12 +354,6 @@ and can be used to land revisions to various repositories.
 **Merge** - General term used to describe the process of integrating and
 reconciling file changes within the mozilla repositories
 
-.. _nightly soft code freeze:
-
-**Nightly Soft Code Freeze** - Last week of the nightly cycle on firefox-main
-just before the merge to beta during which landing risky or experimental code
-in the repository is discouraged.
-
 .. _nimbus:
 
 **Nimbus** - Nimbus is a collection of servers, workflows, and
@@ -384,13 +377,6 @@ when a test or a testsuite can intermittently fail.
 development collaboration tool suite. Read more about `Phabricator as a
 product <https://phacility.com/phabricator/>`__.
 
-.. _pi request:
-
-**PI Request** - Short for Product Integrity Request is a form
-submission request that’s used to engage the PI team for a variety of
-services. Most commonly used to request Feature QA it can also be used
-for Security, Fuzzing, Performance, and many other services.
-
 .. _preferences:
 
 **Preferences** - A preference is any value or defined behavior that can

From 18a22af5f778d20056ab5d9b8ed598ac04fe0cff Mon Sep 17 00:00:00 2001
From: Iain Ireland <iireland@mozilla.com>
Date: Fri, 6 Feb 2026 17:30:33 +0000
Subject: [PATCH 44/93] Bug 2012971: Increase inlining entry threshold to 95
 r=spidermonkey-reviewers,jandem

Perfherder has high confidence that bumping the threshold to 95 gives a ~0.25% improvement in SP3 on OSX, without a significant change to the JS3 score.

Differential Revision: https://phabricator.services.mozilla.com/D282077
---
 js/src/jit/JitOptions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jit/JitOptions.cpp b/js/src/jit/JitOptions.cpp
index 9c7f1f5f6565e..d6798dba6c071 100644
--- a/js/src/jit/JitOptions.cpp
+++ b/js/src/jit/JitOptions.cpp
@@ -282,7 +282,7 @@ DefaultJitOptions::DefaultJitOptions() {
   SET_DEFAULT(smallFunctionMaxBytecodeLength, 140);
 
   // The minimum entry count for an IC stub before it can be trial-inlined.
-  SET_DEFAULT(inliningEntryThreshold, 90);
+  SET_DEFAULT(inliningEntryThreshold, 95);
 
   // An artificial testing limit for the maximum supported offset of
   // pc-relative jump and call instructions.

From b31cd1b1bce92f32220a3732e8af667c2fb92184 Mon Sep 17 00:00:00 2001
From: Dre Grant <dgrant@mozilla.com>
Date: Fri, 6 Feb 2026 17:39:46 +0000
Subject: [PATCH 45/93] Bug 2012519 - Replace usage of
 newtab-toast-dismiss-button
 r=home-newtab-reviewers,reemhamz,fluent-reviewers,bolsson

Differential Revision: https://phabricator.services.mozilla.com/D281663
---
 .../PersonalizedCard/PersonalizedCard.jsx                     | 2 +-
 .../extensions/newtab/data/content/activity-stream.bundle.js  | 2 +-
 browser/locales/en-US/browser/newtab/newtab.ftl               | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/PersonalizedCard/PersonalizedCard.jsx b/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/PersonalizedCard/PersonalizedCard.jsx
index 02601ea4d1b67..eb37c9893e47f 100644
--- a/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/PersonalizedCard/PersonalizedCard.jsx
+++ b/browser/extensions/newtab/content-src/components/DiscoveryStreamComponents/PersonalizedCard/PersonalizedCard.jsx
@@ -36,7 +36,7 @@ export const PersonalizedCard = ({
           type="icon ghost"
           iconSrc="chrome://global/skin/icons/close.svg"
           onClick={onDismiss}
-          data-l10n-id="newtab-toast-dismiss-button"
+          data-l10n-id="newtab-card-dismiss-button"
         ></moz-button>
       </div>
       <div className="personalized-card-inner">
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 0ecbd0502977f..9be0d8fb15930 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -10439,7 +10439,7 @@ const PersonalizedCard = ({
     type: "icon ghost",
     iconSrc: "chrome://global/skin/icons/close.svg",
     onClick: onDismiss,
-    "data-l10n-id": "newtab-toast-dismiss-button"
+    "data-l10n-id": "newtab-card-dismiss-button"
   })), /*#__PURE__*/external_React_default().createElement("div", {
     className: "personalized-card-inner"
   }, /*#__PURE__*/external_React_default().createElement("img", {
diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl
index 96d4d20170b09..949d8ccdebdea 100644
--- a/browser/locales/en-US/browser/newtab/newtab.ftl
+++ b/browser/locales/en-US/browser/newtab/newtab.ftl
@@ -662,3 +662,7 @@ newtab-activation-window-message-values-focus-header = This space plays by your
 newtab-activation-window-message-values-focus-message = { -brand-product-name } lets you browse the way you like, with a more personal way to start your day online. Make { -brand-product-name } your own.
 
 ##
+
+newtab-card-dismiss-button =
+    .title = Dismiss
+    .aria-label = Dismiss

From 2a6118b0ca4a5516cccba62af2621c231cf8f5ac Mon Sep 17 00:00:00 2001
From: Segun Famisa <sfamisa@mozilla.com>
Date: Fri, 6 Feb 2026 17:45:43 +0000
Subject: [PATCH 46/93] Bug 2014920 - Add new GeckoView page extraction API to
 the android-components EngineSession r=android-reviewers,boek

Differential Revision: https://phabricator.services.mozilla.com/D282172
---
 .../engine/gecko/GeckoEngineSession.kt        |  26 +++
 .../PageExtractionErrorMapper.kt              |  34 ++++
 .../GeckoEngineSessionPageExtractionTest.kt   | 152 ++++++++++++++++++
 .../concept/engine/EngineSession.kt           |   5 +
 .../pageextraction/PageExtractionError.kt     |  32 ++++
 5 files changed, 249 insertions(+)
 create mode 100644 mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/pageextraction/PageExtractionErrorMapper.kt
 create mode 100644 mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionPageExtractionTest.kt
 create mode 100644 mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/pageextraction/PageExtractionError.kt

diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
index 7a01d45a025c4..79bc36aaca746 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
@@ -6,6 +6,7 @@ package mozilla.components.browser.engine.gecko
 
 import android.os.Build
 import android.view.WindowManager
+import androidx.annotation.OptIn
 import androidx.annotation.VisibleForTesting
 import androidx.core.net.toUri
 import kotlinx.coroutines.CoroutineScope
@@ -17,6 +18,7 @@ import mozilla.components.browser.engine.gecko.ext.isExcludedForTrackingProtecti
 import mozilla.components.browser.engine.gecko.fetch.toResponse
 import mozilla.components.browser.engine.gecko.media.GeckoMediaDelegate
 import mozilla.components.browser.engine.gecko.mediasession.GeckoMediaSessionDelegate
+import mozilla.components.browser.engine.gecko.pageextraction.intoPageExtractionError
 import mozilla.components.browser.engine.gecko.permission.GeckoPermissionRequest
 import mozilla.components.browser.engine.gecko.prompt.GeckoPromptDelegate
 import mozilla.components.browser.engine.gecko.translate.GeckoTranslateSessionDelegate
@@ -34,6 +36,7 @@ import mozilla.components.concept.engine.history.HistoryItem
 import mozilla.components.concept.engine.history.HistoryTrackingDelegate
 import mozilla.components.concept.engine.manifest.WebAppManifest
 import mozilla.components.concept.engine.manifest.WebAppManifestParser
+import mozilla.components.concept.engine.pageextraction.PageExtractionError
 import mozilla.components.concept.engine.request.RequestInterceptor
 import mozilla.components.concept.engine.request.RequestInterceptor.InterceptionResponse
 import mozilla.components.concept.engine.translate.TranslationError
@@ -67,6 +70,7 @@ import mozilla.components.support.utils.DownloadUtils.makePdfContentDisposition
 import org.json.JSONObject
 import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.ContentBlocking
+import org.mozilla.geckoview.ExperimentalGeckoViewApi
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoSession
@@ -850,6 +854,28 @@ class GeckoEngineSession(
         })
     }
 
+    /**
+     * See [EngineSession.getPageContent]
+     */
+    @OptIn(ExperimentalGeckoViewApi::class)
+    override fun getPageContent(onResult: (String) -> Unit, onException: (Throwable) -> Unit) {
+        geckoSession.sessionPageExtractor.pageContent
+            .then(
+                { content ->
+                    if (content == null) {
+                        onException(PageExtractionError.UnexpectedNull())
+                        return@then GeckoResult()
+                    }
+                    onResult(content)
+                    GeckoResult<Unit>()
+                },
+                { error ->
+                    onException(error.intoPageExtractionError())
+                    GeckoResult()
+                },
+            )
+    }
+
     /**
      * Purges the history for the session (back and forward history).
      */
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/pageextraction/PageExtractionErrorMapper.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/pageextraction/PageExtractionErrorMapper.kt
new file mode 100644
index 0000000000000..f97f5a0ed860c
--- /dev/null
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/pageextraction/PageExtractionErrorMapper.kt
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.browser.engine.gecko.pageextraction
+
+import androidx.annotation.OptIn
+import mozilla.components.concept.engine.pageextraction.PageExtractionError
+import org.mozilla.geckoview.ExperimentalGeckoViewApi
+import org.mozilla.geckoview.PageExtractionController
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException.ERROR_MALFORMED_RESULT
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException.ERROR_NULL_RESULT
+
+/**
+ * Bridge function to map from GeckoSession's [PageExtractionController.PageExtractionException]
+ * into [PageExtractionError]
+ */
+@OptIn(ExperimentalGeckoViewApi::class)
+fun Throwable.intoPageExtractionError(): PageExtractionError {
+    return if (this is PageExtractionController.PageExtractionException) {
+        this.toPageExtractionError()
+    } else {
+        PageExtractionError.UnknownError(cause = this)
+    }
+}
+
+@OptIn(ExperimentalGeckoViewApi::class)
+private fun PageExtractionController.PageExtractionException.toPageExtractionError(): PageExtractionError {
+    return when (this.errorType) {
+        ERROR_MALFORMED_RESULT -> PageExtractionError.MalformedResult()
+        ERROR_NULL_RESULT -> PageExtractionError.UnexpectedNull()
+        else -> PageExtractionError.UnknownError(this)
+    }
+}
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionPageExtractionTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionPageExtractionTest.kt
new file mode 100644
index 0000000000000..7813d50e0a487
--- /dev/null
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionPageExtractionTest.kt
@@ -0,0 +1,152 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.browser.engine.gecko
+
+import android.os.Looper.getMainLooper
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import mozilla.components.concept.engine.pageextraction.PageExtractionError
+import mozilla.components.support.test.mock
+import mozilla.components.support.test.whenever
+import mozilla.components.support.utils.FakeDownloadFileUtils
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.geckoview.GeckoResult
+import org.mozilla.geckoview.GeckoSession
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException.ERROR_MALFORMED_RESULT
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException.ERROR_NULL_RESULT
+import org.mozilla.geckoview.PageExtractionController.PageExtractionException.ERROR_UNKNOWN
+import org.mozilla.geckoview.PageExtractionController.SessionPageExtractor
+import org.robolectric.Shadows.shadowOf
+
+/**
+ * Test cases for the "Page Extraction" feature of [GeckoEngineSession]
+ */
+@RunWith(AndroidJUnit4::class)
+class GeckoEngineSessionPageExtractionTest {
+
+    private lateinit var mockedSessionPageExtractor: SessionPageExtractor
+    private lateinit var engineSession: GeckoEngineSession
+
+    @Before
+    fun setUp() {
+        // set up Gecko session mocks
+        mockedSessionPageExtractor = mock()
+        val mockedGeckoSession: GeckoSession = mock()
+        whenever(mockedGeckoSession.sessionPageExtractor).thenReturn(mockedSessionPageExtractor)
+
+        engineSession = GeckoEngineSession(
+            runtime = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            geckoSessionProvider = { mockedGeckoSession },
+        )
+    }
+
+    @Test
+    fun `given page extractor returns successfully but null result, then an unexpected null error is returned`() {
+        // given that page extractor returns null content
+        whenever(mockedSessionPageExtractor.pageContent)
+            .thenReturn(GeckoResult.fromValue(null))
+
+        // when we attempt to get page content
+        var resultError: Throwable? = null
+        engineSession.getPageContent(
+            onResult = { },
+            onException = { resultError = it },
+        )
+
+        // run pending tasks
+        shadowOf(getMainLooper()).idle()
+
+        // then assert that an unexpected null exception is received
+        assertTrue(resultError is PageExtractionError.UnexpectedNull)
+    }
+
+    @Test
+    fun `given page extractor returns a null content exception, then an unexpected null error is returned`() {
+        // given that page extractor returns a null result exception
+        whenever(mockedSessionPageExtractor.pageContent)
+            .thenReturn(GeckoResult.fromException(PageExtractionException(ERROR_NULL_RESULT)))
+
+        // when we attempt to get page content
+        var resultError: Throwable? = null
+        engineSession.getPageContent(
+            onResult = { },
+            onException = { resultError = it },
+        )
+
+        // run pending tasks
+        shadowOf(getMainLooper()).idle()
+
+        // then assert that an unexpected null exception is received
+        assertTrue(resultError is PageExtractionError.UnexpectedNull)
+    }
+
+    @Test
+    fun `given page extractor returns a malformed content exception, then a malformed content error is returned`() {
+        // given that page extractor returns a malformed result exception
+        whenever(mockedSessionPageExtractor.pageContent)
+            .thenReturn(GeckoResult.fromException(PageExtractionException(ERROR_MALFORMED_RESULT)))
+
+        // when we attempt to get page content
+        var resultError: Throwable? = null
+        engineSession.getPageContent(
+            onResult = { },
+            onException = { resultError = it },
+        )
+
+        // run pending tasks
+        shadowOf(getMainLooper()).idle()
+
+        // then assert that a malformed result error is received
+        assertTrue(resultError is PageExtractionError.MalformedResult)
+    }
+
+    @Test
+    fun `given page extractor returns an unknown exception, then an unknown error is returned`() {
+        // given that page extractor returns an unknown exception
+        whenever(mockedSessionPageExtractor.pageContent)
+            .thenReturn(GeckoResult.fromException(PageExtractionException(ERROR_UNKNOWN)))
+
+        // when we attempt to get page content
+        var resultError: Throwable? = null
+        engineSession.getPageContent(
+            onResult = { },
+            onException = { resultError = it },
+        )
+
+        // run pending tasks
+        shadowOf(getMainLooper()).idle()
+
+        // then assert that an unknown error is received
+        assertTrue(resultError is PageExtractionError.UnknownError)
+    }
+
+    @Test
+    fun `given page extractor returns content successfully, then a the result is returned without error`() {
+        // given that page extractor returns content
+        whenever(mockedSessionPageExtractor.pageContent)
+            .thenReturn(GeckoResult.fromValue("mozilla.org awesome blog"))
+
+        // when we attempt to get page content
+        var resultContent: String = ""
+        var resultError: Throwable? = null
+        engineSession.getPageContent(
+            onResult = { resultContent = it },
+            onException = { resultError = it },
+        )
+
+        // run pending tasks
+        shadowOf(getMainLooper()).idle()
+
+        // then assert that content is returned without error
+        assertEquals("mozilla.org awesome blog", resultContent)
+        assertNull("Expected no error to be returned. Got $resultError instead", resultError)
+    }
+}
diff --git a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
index 999f1938dcfff..f4ce5a36e0b12 100644
--- a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
+++ b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
@@ -1152,4 +1152,9 @@ abstract class EngineSession(
      * @param enabled True if the activity is in picture-in-picture mode.
      */
     open fun onPipModeChanged(enabled: Boolean) = Unit
+
+    /**
+     * Gets the page text content of this session
+     */
+    open fun getPageContent(onResult: (String) -> Unit, onException: (Throwable) -> Unit) = Unit
 }
diff --git a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/pageextraction/PageExtractionError.kt b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/pageextraction/PageExtractionError.kt
new file mode 100644
index 0000000000000..e1f738683193a
--- /dev/null
+++ b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/pageextraction/PageExtractionError.kt
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.concept.engine.pageextraction
+
+/**
+ * Errors from page content extraction.
+ *
+ * @param cause The cause of the error
+ */
+sealed class PageExtractionError(override val cause: Throwable?) : Throwable(cause = cause) {
+
+    /**
+     * An error that occurs when the result of the page extraction is null.
+     * There should not be a case where a null result is received
+     */
+    class UnexpectedNull : PageExtractionError(cause = null)
+
+    /**
+     * An unknown error. For example, an error while communicating with the toolkit layer
+     *
+     * @param cause The cause of the error
+     */
+    class UnknownError(override val cause: Throwable?) : PageExtractionError(cause)
+
+    /**
+     * An error returned when the result is not as expected. This happens when we receive a result,
+     * but the expected identifier is missing.
+     */
+    class MalformedResult : PageExtractionError(cause = null)
+}

From 67d155fb9e3106b7668a94c8f2d734f4f85b9fe6 Mon Sep 17 00:00:00 2001
From: kpatenio <kpatenio@mozilla.com>
Date: Fri, 6 Feb 2026 17:50:15 +0000
Subject: [PATCH 47/93] =?UTF-8?q?Bug=202009544=20=E2=80=94=20replace=20gen?=
 =?UTF-8?q?eric=20connection=20error=20message=20bar=20with=20status=20box?=
 =?UTF-8?q?.=20r=3Dip-protection-reviewers,fluent-reviewers,bolsson,fchase?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Differential Revision: https://phabricator.services.mozilla.com/D281318
---
 .../content/ipprotection-content.mjs          | 26 +++++++---
 .../content/ipprotection-message-bar.mjs      | 13 -----
 .../content/ipprotection-status-box.css       |  3 +-
 .../browser/browser_IPProtectionService.js    | 21 +++++---
 .../browser_ipprotection_message_bar.js       | 50 ++-----------------
 .../browser_ipprotection_status_box.js        | 36 ++++++++++++-
 .../locales/en-US/browser/ipProtection.ftl    |  5 --
 7 files changed, 71 insertions(+), 83 deletions(-)

diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index d1299dffe7780..c5aa4c32d4f57 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -231,11 +231,8 @@ export default class IPProtectionContentElement extends MozLitElement {
     let messageLinkl10nId;
     let messageLinkL10nArgs;
     let messageType = "info";
-    // If there are errors, the error message should take precedence
-    if (this.#hasErrors) {
-      messageId = "ipprotection-message-generic-error";
-      messageType = ERRORS.GENERIC;
-    } else if (this.state.bandwidthWarning) {
+
+    if (this.state.bandwidthWarning) {
       messageId = "ipprotection-message-bandwidth-warning";
       messageType = "warning";
       messageLinkL10nArgs = JSON.stringify({
@@ -322,6 +319,17 @@ export default class IPProtectionContentElement extends MozLitElement {
     </div>`;
   }
 
+  genericErrorTemplate() {
+    return html`
+      <ipprotection-status-box
+        headerL10nId="ipprotection-connection-status-generic-error-title"
+        descriptionL10nId="ipprotection-connection-status-generic-error-description"
+        type=${ERRORS.GENERIC}
+      >
+      </ipprotection-status-box>
+    `;
+  }
+
   pausedTemplate() {
     return html`
       <ipprotection-status-box
@@ -397,6 +405,10 @@ export default class IPProtectionContentElement extends MozLitElement {
       `;
     }
 
+    if (this.#hasErrors) {
+      return html` ${this.genericErrorTemplate()}${this.footerTemplate()}`;
+    }
+
     if (this.state.paused) {
       return html` ${this.pausedTemplate()} ${this.footerTemplate()}`;
     }
@@ -409,9 +421,7 @@ export default class IPProtectionContentElement extends MozLitElement {
 
   render() {
     if (
-      (this.#hasErrors ||
-        this.state.onboardingMessage ||
-        this.state.bandwidthWarning) &&
+      (this.state.onboardingMessage || this.state.bandwidthWarning) &&
       !this._messageDismissed
     ) {
       this._showMessageBar = true;
diff --git a/browser/components/ipprotection/content/ipprotection-message-bar.mjs b/browser/components/ipprotection/content/ipprotection-message-bar.mjs
index a35b52d9742b0..d7ff5fd2958f0 100644
--- a/browser/components/ipprotection/content/ipprotection-message-bar.mjs
+++ b/browser/components/ipprotection/content/ipprotection-message-bar.mjs
@@ -19,8 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
  */
 export default class IPProtectionMessageBarElement extends MozLitElement {
   #MESSAGE_TYPE_MAP = new Map([
-    ["generic-error", () => this.genericErrorTemplate()],
-
     ["info", () => this.infoMessageTemplate()],
     ["warning", () => this.warningMessageTemplate()],
   ]);
@@ -68,17 +66,6 @@ export default class IPProtectionMessageBarElement extends MozLitElement {
     );
   }
 
-  genericErrorTemplate() {
-    return html`
-      <moz-message-bar
-        type="error"
-        data-l10n-id=${ifDefined(this.messageId)}
-        dismissable
-      >
-      </moz-message-bar>
-    `;
-  }
-
   infoMessageTemplate() {
     return html`
       <moz-message-bar type="info" dismissable>
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index ff63727e2add0..85b2d550a4177 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -8,7 +8,8 @@
   --border-color: var(--border-color-card);
 }
 
-.disconnected {
+.disconnected,
+.generic-error {
   background-color: var(--background-color-box-info);
 }
 
diff --git a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
index 59fb5225512f1..db5664f61a269 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
@@ -239,7 +239,7 @@ add_task(async function test_ipprotection_ready() {
 });
 
 /**
- * Tests showing an error and dismissing it on panel close.
+ * Tests showing an error state UI and dismissing it on panel close.
  */
 add_task(async function test_IPProtectionService_pass_errors() {
   setupService({
@@ -255,10 +255,10 @@ add_task(async function test_IPProtectionService_pass_errors() {
 
   let content = await openPanel();
 
-  let messageBarLoadedPromise = BrowserTestUtils.waitForMutationCondition(
+  let statusBoxLoadedPromise = BrowserTestUtils.waitForMutationCondition(
     content.shadowRoot,
     { childList: true, subtree: true },
-    () => content.shadowRoot.querySelector("ipprotection-message-bar")
+    () => content.shadowRoot.querySelector("ipprotection-status-box")
   );
 
   let statusCard = content.statusCardEl;
@@ -267,7 +267,7 @@ add_task(async function test_IPProtectionService_pass_errors() {
 
   turnOnButton.click();
 
-  await messageBarLoadedPromise;
+  await statusBoxLoadedPromise;
 
   Assert.equal(
     IPPProxyManager.state,
@@ -275,13 +275,18 @@ add_task(async function test_IPProtectionService_pass_errors() {
     "Proxy is not active"
   );
 
-  let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
+  let statusBox = content.statusBoxEl;
 
   Assert.ok(
-    turnOnButton,
-    "Turn on button is still present because of an error"
+    !content.statusCardEl,
+    "Status card should be hidden when there's an error"
+  );
+  Assert.ok(statusBox, "Status box should be present for generic error");
+  Assert.equal(
+    statusBox.getAttribute("type"),
+    ERRORS.GENERIC,
+    "Status box type should be generic-error"
   );
-  Assert.ok(messageBar, "Message bar should be present");
   Assert.equal(
     content.state.error,
     ERRORS.GENERIC,
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
index d39802f3bf4ae..7c69613a6b75a 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_message_bar.js
@@ -4,51 +4,6 @@
 
 "use strict";
 
-const { ERRORS } = ChromeUtils.importESModule(
-  "chrome://browser/content/ipprotection/ipprotection-constants.mjs"
-);
-
-/**
- * Tests the generic error message bar.
- */
-add_task(async function test_generic_error() {
-  let content = await openPanel({
-    isSignedOut: false,
-    error: "",
-  });
-
-  let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
-
-  Assert.ok(!messageBar, "Message bar should not be present");
-
-  let messageBarLoadedPromise = BrowserTestUtils.waitForMutationCondition(
-    content.shadowRoot,
-    { childList: true, subtree: true },
-    () => content.shadowRoot.querySelector("ipprotection-message-bar")
-  );
-
-  await setPanelState({
-    isSignedOut: false,
-    error: ERRORS.GENERIC,
-  });
-  await messageBarLoadedPromise;
-
-  messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
-
-  Assert.ok(messageBar, "Message bar should be present");
-  Assert.ok(
-    messageBar.mozMessageBarEl,
-    "Wrapped moz-message-bar should be present"
-  );
-  Assert.equal(
-    messageBar.type,
-    ERRORS.GENERIC,
-    "Message bar should be generic error"
-  );
-
-  await closePanel();
-});
-
 /**
  * Tests the warning message bar triggered by bandwidth threshold preference
  */
@@ -241,10 +196,11 @@ add_task(async function test_dismiss() {
     () => content.shadowRoot.querySelector("ipprotection-message-bar")
   );
 
-  // Use generic error as a fallback
+  // Use bandwidth warning to test message bar dismiss functionality
   await setPanelState({
     isSignedOut: false,
-    error: ERRORS.GENERIC,
+    error: "",
+    bandwidthWarning: true,
   });
   await messageBarLoadedPromise;
 
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
index 552c573dc8d1f..da3cb67bebdd2 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { LINKS } = ChromeUtils.importESModule(
+const { LINKS, ERRORS } = ChromeUtils.importESModule(
   "chrome://browser/content/ipprotection/ipprotection-constants.mjs"
 );
 const lazy = {};
@@ -101,4 +101,38 @@ add_task(async function test_paused_content_upgraded() {
   Assert.ok(!content.statusCardEl, "Status card should be hidden when paused");
 
   await setPanelState();
+  await closePanel();
+});
+
+/**
+ * Tests the generic error type.
+ */
+add_task(async function test_generic_error() {
+  let content = await openPanel({
+    isSignedOut: false,
+    unauthenticated: false,
+    error: ERRORS.GENERIC,
+  });
+
+  let statusBox = content.statusBoxEl;
+  Assert.ok(statusBox, "Status box should be shown when there is an error");
+
+  let errorTitle = statusBox.titleEl;
+  let errorDescription = statusBox.descriptionEl;
+
+  Assert.ok(errorTitle, "Error title should be present");
+  Assert.ok(errorDescription, "Error description should be present");
+
+  Assert.equal(
+    statusBox.getAttribute("type"),
+    ERRORS.GENERIC,
+    "Status box type should be generic-error"
+  );
+
+  Assert.ok(!content.statusCardEl, "Status card should be hidden when error");
+
+  let footerButton = content.settingsButtonEl;
+  Assert.ok(footerButton, "Settings button should be present in footer");
+
+  await closePanel();
 });
diff --git a/browser/locales/en-US/browser/ipProtection.ftl b/browser/locales/en-US/browser/ipProtection.ftl
index 5bbd46975362e..fcf94b31fbf45 100644
--- a/browser/locales/en-US/browser/ipProtection.ftl
+++ b/browser/locales/en-US/browser/ipProtection.ftl
@@ -91,11 +91,6 @@ ipprotection-connection-status-generic-error-description = Try again in a few mi
 ipprotection-connection-status-network-error-title = Check your internet connection
 ipprotection-connection-status-network-error-description = Connect to the internet, then try turning VPN on.
 
-
-ipprotection-message-generic-error =
-  .heading = Couldn’t connect to VPN
-  .message = Try again in a few minutes.
-
 # Variables
 #   $usageLeft (number) - The amount of data a user has left in a month (in GB)
 #   $maxUsage (number) - The maximum amount of data a user can use in a month (in GB)

From 92b04d9f41847cb0ee977151b4fe31f771fe7878 Mon Sep 17 00:00:00 2001
From: kpatenio <kpatenio@mozilla.com>
Date: Fri, 6 Feb 2026 17:50:16 +0000
Subject: [PATCH 48/93] =?UTF-8?q?Bug=202009548=20=E2=80=94=20add=20interne?=
 =?UTF-8?q?t=20connection=20error=20state=20UI.=20r=3Dip-protection-review?=
 =?UTF-8?q?ers,fluent-reviewers,bolsson,fchasen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Adds IPPNetworkUtils to determine if offline, using Services.io.offline, CaptivePortalService and NetworkLinkService
- Shows the network error UI if IPPNetworkUtils.isOffline is true and an attempt to activate VPN was made

Differential Revision: https://phabricator.services.mozilla.com/D281564
---
 .../ipprotection/IPPNetworkUtils.sys.mjs      |  60 ++++++
 .../ipprotection/IPPProxyManager.sys.mjs      |  30 ++-
 .../ipprotection/IPProtectionPanel.sys.mjs    |  16 +-
 .../IPProtectionToolbarButton.sys.mjs         |  42 +++-
 .../content/ipprotection-constants.mjs        |   1 +
 .../content/ipprotection-content.mjs          |  32 ++-
 .../content/ipprotection-status-box.css       |  21 +-
 .../content/ipprotection-status-box.mjs       |   3 -
 browser/components/ipprotection/moz.build     |   1 +
 .../ipprotection/tests/browser/browser.toml   |   2 +
 .../browser/browser_IPProtectionService.js    |   2 +-
 .../browser_ipprotection_network_error.js     | 201 ++++++++++++++++++
 .../browser_ipprotection_status_box.js        |  39 +++-
 13 files changed, 424 insertions(+), 26 deletions(-)
 create mode 100644 browser/components/ipprotection/IPPNetworkUtils.sys.mjs
 create mode 100644 browser/components/ipprotection/tests/browser/browser_ipprotection_network_error.js

diff --git a/browser/components/ipprotection/IPPNetworkUtils.sys.mjs b/browser/components/ipprotection/IPPNetworkUtils.sys.mjs
new file mode 100644
index 0000000000000..233f4db2dacf9
--- /dev/null
+++ b/browser/components/ipprotection/IPPNetworkUtils.sys.mjs
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+
+const lazy = {};
+
+const LOG_PREF = "browser.ipProtection.log";
+
+ChromeUtils.defineLazyGetter(lazy, "logConsole", function () {
+  return console.createInstance({
+    prefix: "IPPNetworkUtils",
+    maxLogLevel: Services.prefs.getBoolPref(LOG_PREF, false) ? "Debug" : "Warn",
+  });
+});
+
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "CaptivePortalService",
+  "@mozilla.org/network/captive-portal-service;1",
+  Ci.nsICaptivePortalService
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "gNetworkLinkService",
+  "@mozilla.org/network/network-link-service;1",
+  Ci.nsINetworkLinkService
+);
+
+/**
+ * Provides network connectivity detection utilities for IP Protection.
+ *
+ * This class implements a comprehensive offline check using:
+ * - Services.io.offline (user-set offline mode)
+ * - CaptivePortalService (connected but captive portal blocking internet)
+ * - NetworkLinkService (physical network link status)
+ */
+export const IPPNetworkUtils = {
+  /**
+   * Checks if the browser is currently offline or unable to access the internet.
+   *
+   * @returns {boolean}
+   *   True if offline status, false otherwise.
+   */
+  get isOffline() {
+    try {
+      return (
+        Services.io.offline ||
+        lazy.CaptivePortalService.state ==
+          lazy.CaptivePortalService.LOCKED_PORTAL ||
+        !lazy.gNetworkLinkService.isLinkUp
+      );
+    } catch (e) {
+      lazy.logConsole.warn("Could not determine network status.", e);
+    }
+    return false;
+  },
+};
diff --git a/browser/components/ipprotection/IPPProxyManager.sys.mjs b/browser/components/ipprotection/IPPProxyManager.sys.mjs
index 5701e2f60e574..20ef60c077da3 100644
--- a/browser/components/ipprotection/IPPProxyManager.sys.mjs
+++ b/browser/components/ipprotection/IPPProxyManager.sys.mjs
@@ -9,6 +9,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs",
   IPPChannelFilter:
     "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs",
+  IPPNetworkUtils:
+    "moz-src:///browser/components/ipprotection/IPPNetworkUtils.sys.mjs",
   IPProtectionUsage:
     "moz-src:///browser/components/ipprotection/IPProtectionUsage.sys.mjs",
   IPPNetworkErrorObserver:
@@ -208,12 +210,23 @@ class IPPProxyManagerSingleton extends EventTarget {
       return this.#activatingPromise;
     }
 
+    // Check network status before attempting connection
+    if (lazy.IPPNetworkUtils.isOffline) {
+      this.#setErrorState(ERRORS.NETWORK, "Network is offline");
+      this.cancelChannelFilter();
+      return null;
+    }
+
     const activating = async () => {
       let started = false;
       try {
         started = await this.#startInternal();
       } catch (error) {
-        this.#setErrorState(ERRORS.GENERIC, error);
+        if (lazy.IPPNetworkUtils.isOffline) {
+          this.#setErrorState(ERRORS.NETWORK, error);
+        } else {
+          this.#setErrorState(ERRORS.GENERIC, error);
+        }
         this.cancelChannelFilter();
         return;
       }
@@ -321,16 +334,21 @@ class IPPProxyManagerSingleton extends EventTarget {
       return;
     }
 
-    if (this.#state !== IPPProxyStates.ACTIVE) {
+    if (
+      this.#state !== IPPProxyStates.ACTIVE &&
+      this.#state !== IPPProxyStates.ERROR
+    ) {
       return;
     }
 
-    this.cancelChannelFilter();
+    if (this.#connection) {
+      this.cancelChannelFilter();
 
-    lazy.clearTimeout(this.#rotationTimer);
-    this.#rotationTimer = 0;
+      lazy.clearTimeout(this.#rotationTimer);
+      this.#rotationTimer = 0;
 
-    this.networkErrorObserver.stop();
+      this.networkErrorObserver.stop();
+    }
 
     lazy.logConsole.info("Stopped");
 
diff --git a/browser/components/ipprotection/IPProtectionPanel.sys.mjs b/browser/components/ipprotection/IPProtectionPanel.sys.mjs
index c5887c3859345..f34dacf15c255 100644
--- a/browser/components/ipprotection/IPProtectionPanel.sys.mjs
+++ b/browser/components/ipprotection/IPProtectionPanel.sys.mjs
@@ -110,7 +110,7 @@ export class IPProtectionPanel {
    *  The location country name
    * @property {string} location.code
    *  The location country code
-   * @property {"generic" | ""} error
+   * @property {"generic-error" | "network-error" | ""} error
    *  The error type as a string if an error occurred, or empty string if there are no errors.
    * @property {boolean} isAlpha
    *  True if we're running the Alpha variant, else false.
@@ -326,6 +326,7 @@ export class IPProtectionPanel {
     }
 
     this.#updateSiteData();
+
     this.setState({
       isSiteExceptionsEnabled: this.isExceptionsFeatureEnabled,
     });
@@ -722,7 +723,16 @@ export class IPProtectionPanel {
     ) {
       let hasError =
         lazy.IPPProxyManager.state === lazy.IPPProxyStates.ERROR &&
-        lazy.IPPProxyManager.errors.includes(ERRORS.GENERIC);
+        (lazy.IPPProxyManager.errors.includes(ERRORS.GENERIC) ||
+          lazy.IPPProxyManager.errors.includes(ERRORS.NETWORK));
+
+      let errorType = "";
+      if (hasError) {
+        // Prioritize network error over generic error
+        errorType = lazy.IPPProxyManager.errors.includes(ERRORS.NETWORK)
+          ? ERRORS.NETWORK
+          : ERRORS.GENERIC;
+      }
 
       this.setState({
         isSignedOut: !lazy.IPPSignInWatcher.isSignedIn,
@@ -732,7 +742,7 @@ export class IPProtectionPanel {
         isProtectionEnabled:
           lazy.IPPProxyManager.state === lazy.IPPProxyStates.ACTIVE,
         hasUpgraded: lazy.IPPEnrollAndEntitleManager.hasUpgraded,
-        error: hasError ? ERRORS.GENERIC : "",
+        error: errorType,
         isActivating:
           lazy.IPPProxyManager.state === lazy.IPPProxyStates.ACTIVATING,
       });
diff --git a/browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs b/browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs
index 0e55c76fbd784..032b8a364c0cf 100644
--- a/browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs
+++ b/browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs
@@ -12,6 +12,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
   IPPExceptionsManager:
     "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs",
+  IPPNetworkUtils:
+    "moz-src:///browser/components/ipprotection/IPPNetworkUtils.sys.mjs",
   IPPProxyManager:
     "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs",
   IPProtectionService:
@@ -40,7 +42,8 @@ XPCOMUtils.defineLazyPreferenceGetter(
  *
  * Each instance:
  * - Tracks location changes via a progress listener
- * - Updates the button icon according to the proxy state, errors, and site exclusions
+ * - Updates the button icon according to the proxy state, proxy errors,
+ *  offline status, and site exclusions
  * - Handles the visual state of the toolbar button
  */
 export class IPProtectionToolbarButton {
@@ -103,6 +106,7 @@ export class IPProtectionToolbarButton {
     this.#window = Cu.getWeakReference(window);
     this.#widgetId = widgetId;
     this.handleEvent = this.#handleEvent.bind(this);
+    this.observeOfflineStatus = this.#observeOfflineStatus.bind(this);
 
     this.#addProgressListener();
     lazy.IPProtectionService.addEventListener(
@@ -114,6 +118,11 @@ export class IPProtectionToolbarButton {
       this.handleEvent
     );
 
+    Services.obs.addObserver(
+      this.observeOfflineStatus,
+      "network:offline-status-changed"
+    );
+
     if (this.gBrowser?.tabContainer) {
       this.gBrowser.tabContainer.addEventListener("TabSelect", this);
     }
@@ -179,6 +188,20 @@ export class IPProtectionToolbarButton {
     }
   }
 
+  /**
+   * Observer for network offline status changes.
+   * Updates the state for every change in case we need to show a different icon.
+   *
+   * @param {nsISupports} _subject
+   * @param {string} topic
+   * @param {string} _data
+   */
+  #observeOfflineStatus(_subject, topic, _data) {
+    if (topic === "network:offline-status-changed") {
+      this.updateState();
+    }
+  }
+
   /**
    * Updates the button to reflect the current state.
    *
@@ -189,6 +212,7 @@ export class IPProtectionToolbarButton {
    *    exclusion state for a site has changed in ipp-vpn
    * 4. After a location change / page navigation
    * 5. After tab switching
+   * 6. After offline network status changes
    *
    * @param {XULElement|null} [toolbaritem]
    *  Optional toolbaritem to update directly.
@@ -216,9 +240,14 @@ export class IPProtectionToolbarButton {
     let isExcluded = this.#isExcludedSite(principal);
 
     let isActive = lazy.IPPProxyManager.state === lazy.IPPProxyStates.ACTIVE;
-    let isError =
+
+    // Show error icon when proxy manager is in ERROR state or when offline
+    let hasProxyError =
       lazy.IPPProxyManager.state === lazy.IPPProxyStates.ERROR &&
-      lazy.IPPProxyManager.errors.includes(ERRORS.GENERIC);
+      (lazy.IPPProxyManager.errors.includes(ERRORS.GENERIC) ||
+        lazy.IPPProxyManager.errors.includes(ERRORS.NETWORK));
+    let isOffline = lazy.IPPNetworkUtils.isOffline;
+    let isError = hasProxyError || isOffline;
 
     const showConfirmationHint = options.showConfirmationHint ?? true;
     if (showConfirmationHint) {
@@ -342,7 +371,7 @@ export class IPProtectionToolbarButton {
   }
 
   /**
-   * Cleans up listeners when the button is destroyed.
+   * Cleans up listeners and observers when the button is destroyed.
    */
   uninit() {
     if (this.gBrowser && this.#progressListener) {
@@ -362,5 +391,10 @@ export class IPProtectionToolbarButton {
       "IPPProxyManager:StateChanged",
       this.handleEvent
     );
+
+    Services.obs.removeObserver(
+      this.observeOfflineStatus,
+      "network:offline-status-changed"
+    );
   }
 }
diff --git a/browser/components/ipprotection/content/ipprotection-constants.mjs b/browser/components/ipprotection/content/ipprotection-constants.mjs
index d4e0921c3ff82..d86c92edf4df7 100644
--- a/browser/components/ipprotection/content/ipprotection-constants.mjs
+++ b/browser/components/ipprotection/content/ipprotection-constants.mjs
@@ -19,6 +19,7 @@ export const LINKS = Object.freeze({
 
 export const ERRORS = Object.freeze({
   GENERIC: "generic-error",
+  NETWORK: "network-error",
 });
 
 export const SIGNIN_DATA = Object.freeze({
diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index c5aa4c32d4f57..a0fc7da061331 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -319,13 +319,35 @@ export default class IPProtectionContentElement extends MozLitElement {
     </div>`;
   }
 
-  genericErrorTemplate() {
+  errorTemplate() {
+    const isNetworkError = this.state.error === ERRORS.NETWORK;
+
+    const headerL10nId = isNetworkError
+      ? "ipprotection-connection-status-network-error-title"
+      : "ipprotection-connection-status-generic-error-title";
+
+    const descriptionL10nId = isNetworkError
+      ? "ipprotection-connection-status-network-error-description"
+      : "ipprotection-connection-status-generic-error-description";
+
+    const errorType = isNetworkError ? ERRORS.NETWORK : ERRORS.GENERIC;
+
     return html`
       <ipprotection-status-box
-        headerL10nId="ipprotection-connection-status-generic-error-title"
-        descriptionL10nId="ipprotection-connection-status-generic-error-description"
-        type=${ERRORS.GENERIC}
+        .headerL10nId=${headerL10nId}
+        .descriptionL10nId=${descriptionL10nId}
+        .type=${errorType}
       >
+        ${isNetworkError
+          ? html`
+              <img
+                slot="icon"
+                role="presentation"
+                class="icon"
+                src="chrome://browser/content/ipprotection/assets/states/ipprotection-error.svg"
+              />
+            `
+          : null}
       </ipprotection-status-box>
     `;
   }
@@ -406,7 +428,7 @@ export default class IPProtectionContentElement extends MozLitElement {
     }
 
     if (this.#hasErrors) {
-      return html` ${this.genericErrorTemplate()}${this.footerTemplate()}`;
+      return html` ${this.errorTemplate()}${this.footerTemplate()}`;
     }
 
     if (this.state.paused) {
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index 85b2d550a4177..8ae90a6452862 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -41,6 +41,15 @@
   }
 }
 
+.network-error {
+  background-color: var(--background-color-critical);
+
+  ::slotted([slot="icon"]) {
+    -moz-context-properties: fill;
+    fill: var(--icon-color-critical);
+  }
+}
+
 #content-container {
   display: flex;
   flex-direction: column;
@@ -52,15 +61,15 @@
 #header {
   display: flex;
   justify-content: space-between;
-  /* Intentionally using a larger font size for clearer visual hierarchy */
-  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
-  font-size: 1.4lh;
 }
 
 #title {
   font-weight: var(--font-weight-semibold);
   padding-bottom: var(--space-xsmall);
   margin-block: 0;
+  /* Intentionally using a larger font size for clearer visual hierarchy */
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
+  font-size: 1.4lh;
 }
 
 #description {
@@ -88,6 +97,12 @@
   margin-top: var(--space-large);
 }
 
+::slotted([slot="icon"]) {
+  /* Intentionally using a custom height to match larger font sizes. */
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
+  height: 1.8lh;
+}
+
 ::slotted([slot="location-icon"]) {
   -moz-context-properties: fill;
   fill: currentColor;
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.mjs b/browser/components/ipprotection/content/ipprotection-status-box.mjs
index 6b48e17402299..cc891de691878 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-box.mjs
@@ -5,9 +5,6 @@
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 import { html } from "chrome://global/content/vendor/lit.all.mjs";
 
-// eslint-disable-next-line import/no-unassigned-import
-import "chrome://browser/content/ipprotection/ipprotection-status-box.mjs";
-
 /**
  * Custom element that implements the state UI for the status card.
  */
diff --git a/browser/components/ipprotection/moz.build b/browser/components/ipprotection/moz.build
index f77ddd151be76..beeae13f329b6 100644
--- a/browser/components/ipprotection/moz.build
+++ b/browser/components/ipprotection/moz.build
@@ -17,6 +17,7 @@ MOZ_SRC_FILES += [
     "IPPEnrollAndEntitleManager.sys.mjs",
     "IPPExceptionsManager.sys.mjs",
     "IPPNetworkErrorObserver.sys.mjs",
+    "IPPNetworkUtils.sys.mjs",
     "IPPNimbusHelper.sys.mjs",
     "IPPOnboardingMessageHelper.sys.mjs",
     "IPPOptOutHelper.sys.mjs",
diff --git a/browser/components/ipprotection/tests/browser/browser.toml b/browser/components/ipprotection/tests/browser/browser.toml
index 66e95e2d3b7d6..635302c4e455d 100644
--- a/browser/components/ipprotection/tests/browser/browser.toml
+++ b/browser/components/ipprotection/tests/browser/browser.toml
@@ -34,6 +34,8 @@ prefs = [
 
 ["browser_ipprotection_message_bar.js"]
 
+["browser_ipprotection_network_error.js"]
+
 ["browser_ipprotection_optout.js"]
 
 ["browser_ipprotection_panel.js"]
diff --git a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
index db5664f61a269..71b8b56b9aa17 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
@@ -283,7 +283,7 @@ add_task(async function test_IPProtectionService_pass_errors() {
   );
   Assert.ok(statusBox, "Status box should be present for generic error");
   Assert.equal(
-    statusBox.getAttribute("type"),
+    statusBox.type,
     ERRORS.GENERIC,
     "Status box type should be generic-error"
   );
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_network_error.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_network_error.js
new file mode 100644
index 0000000000000..eecd1c7fc2be4
--- /dev/null
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_network_error.js
@@ -0,0 +1,201 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { ERRORS } = ChromeUtils.importESModule(
+  "chrome://browser/content/ipprotection/ipprotection-constants.mjs"
+);
+const { IPPNetworkUtils } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/ipprotection/IPPNetworkUtils.sys.mjs"
+);
+
+/**
+ * Tests that the panel does not show the network error when opened while offline.
+ * Error should only appear after attempting to activate the VPN.
+ */
+add_task(async function test_panel_no_error_when_opened_offline() {
+  setupService({
+    isSignedIn: true,
+    isEnrolledAndEntitled: true,
+    canEnroll: true,
+    proxyPass: {
+      status: 200,
+      error: undefined,
+      pass: makePass(),
+    },
+  });
+  await IPPEnrollAndEntitleManager.refetchEntitlement();
+
+  // Go offline before opening panel
+  Services.io.offline = true;
+
+  let content = await openPanel({
+    isSignedOut: false,
+    unauthenticated: false,
+  });
+
+  await content.updateComplete;
+
+  Assert.ok(
+    !content.state.error,
+    "Network error should not be present when opened while offline"
+  );
+  Assert.ok(
+    !content.statusBoxEl,
+    "Status box should not be present when opened while offline"
+  );
+
+  // Should show normal status card with Turn On button
+  let statusCard = content.statusCardEl;
+  Assert.ok(statusCard, "Status card should be present");
+
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Turn on button should be present");
+
+  // Cleanup - go back online
+  Services.io.offline = false;
+
+  await closePanel();
+  cleanupService();
+});
+
+/**
+ * Tests that the toolbar button icon updates when network goes offline,
+ * even when VPN is not active.
+ */
+add_task(async function test_toolbar_button_icon_when_offline() {
+  setupService({
+    isSignedIn: true,
+    isEnrolledAndEntitled: true,
+    canEnroll: true,
+    proxyPass: {
+      status: 200,
+      error: undefined,
+      pass: makePass(),
+    },
+  });
+  await IPPEnrollAndEntitleManager.refetchEntitlement();
+
+  let button = document.getElementById(IPProtectionWidget.WIDGET_ID);
+  Assert.ok(button, "Toolbar button should exist");
+
+  // Initially should not be in error state
+  Assert.ok(
+    !button.classList.contains("ipprotection-error"),
+    "Toolbar button should not show error initially"
+  );
+
+  let iconUpdatePromise = TestUtils.waitForCondition(
+    () => button.classList.contains("ipprotection-error"),
+    "Toolbar button should show error icon when offline"
+  );
+
+  // Go offline
+  Services.io.offline = true;
+  Services.obs.notifyObservers(null, "network:offline-status-changed");
+
+  await iconUpdatePromise;
+
+  Assert.ok(
+    button.classList.contains("ipprotection-error"),
+    "Toolbar button should show error icon even when VPN is off"
+  );
+
+  iconUpdatePromise = TestUtils.waitForCondition(
+    () => !button.classList.contains("ipprotection-error"),
+    "Toolbar button should clear error icon when back online"
+  );
+
+  // Back online
+  Services.io.offline = false;
+  Services.obs.notifyObservers(null, "network:offline-status-changed");
+
+  await iconUpdatePromise;
+
+  Assert.ok(
+    !button.classList.contains("ipprotection-error"),
+    "Toolbar button should clear error icon when back online"
+  );
+
+  cleanupService();
+});
+
+/**
+ * Tests that network errors are caught when trying to activate VPN while offline.
+ */
+add_task(async function test_network_error_when_activating_offline() {
+  setupService({
+    isSignedIn: true,
+    isEnrolledAndEntitled: true,
+    canEnroll: true,
+    proxyPass: {
+      status: 200,
+      error: undefined,
+      pass: makePass(),
+    },
+  });
+  await IPPEnrollAndEntitleManager.refetchEntitlement();
+
+  // Stub alert manager to ensure we display it when a network error occurs
+  const sandbox = sinon.createSandbox();
+  let alertStub = sandbox.stub(IPProtectionAlertManager, "showErrorPrompts");
+
+  // Go offline before opening panel
+  Services.io.offline = true;
+
+  let content = await openPanel();
+
+  await content.updateComplete;
+
+  let statusCard = content.statusCardEl;
+  Assert.ok(statusCard, "Status card should be present");
+
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Turn on button should be present");
+
+  // Wait for ERROR state when clicking Turn On while offline
+  let errorStatePromise = BrowserTestUtils.waitForEvent(
+    IPPProxyManager,
+    "IPPProxyManager:StateChanged",
+    false,
+    () => IPPProxyManager.state === IPPProxyStates.ERROR
+  );
+
+  // Try to activate the VPN while offline
+  turnOnButton.click();
+
+  await errorStatePromise;
+
+  Assert.equal(
+    IPPProxyManager.state,
+    IPPProxyStates.ERROR,
+    "IPPProxyManager should be in ERROR state when trying to start while offline"
+  );
+  Assert.ok(
+    IPPProxyManager.errors.includes(ERRORS.NETWORK),
+    "Should have network-error"
+  );
+  Assert.ok(
+    alertStub.calledOnce,
+    "Alert should be shown when activation fails due to network"
+  );
+
+  await content.updateComplete;
+
+  let statusBox = content.statusBoxEl;
+  Assert.ok(statusBox, "Status box should be shown for error");
+  Assert.equal(
+    content.state.error,
+    ERRORS.NETWORK,
+    "Panel should show network error"
+  );
+
+  // Cleanup - go back online
+  Services.io.offline = false;
+
+  await closePanel();
+  cleanupService();
+  sandbox.restore();
+});
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
index da3cb67bebdd2..d0196d9df1f82 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_box.js
@@ -124,7 +124,7 @@ add_task(async function test_generic_error() {
   Assert.ok(errorDescription, "Error description should be present");
 
   Assert.equal(
-    statusBox.getAttribute("type"),
+    statusBox.type,
     ERRORS.GENERIC,
     "Status box type should be generic-error"
   );
@@ -136,3 +136,40 @@ add_task(async function test_generic_error() {
 
   await closePanel();
 });
+
+/**
+ * Tests the network error type in the status box component.
+ */
+add_task(async function test_network_error() {
+  let content = await openPanel({
+    isSignedOut: false,
+    unauthenticated: false,
+    error: ERRORS.NETWORK,
+  });
+
+  let statusBox = content.statusBoxEl;
+  Assert.ok(statusBox, "Status box should be shown when there is an error");
+
+  let errorTitle = statusBox.titleEl;
+  let errorDescription = statusBox.descriptionEl;
+
+  Assert.ok(errorTitle, "Error title should be present");
+  Assert.ok(errorDescription, "Error description should be present");
+
+  Assert.equal(
+    statusBox.type,
+    ERRORS.NETWORK,
+    "Status box type should be network-error"
+  );
+
+  // Check for the error icon in the network error case
+  let errorIcon = statusBox.querySelector('img[slot="icon"]');
+  Assert.ok(errorIcon, "Error icon should be present for network error");
+
+  Assert.ok(!content.statusCardEl, "Status card should be hidden when error");
+
+  let footerButton = content.settingsButtonEl;
+  Assert.ok(footerButton, "Settings button should be present in footer");
+
+  await closePanel();
+});

From c8b56b717a0bbaeec44b8b4ffeb0ee4671c847ab Mon Sep 17 00:00:00 2001
From: Andy Leiserson <aleiserson@mozilla.com>
Date: Fri, 6 Feb 2026 17:52:24 +0000
Subject: [PATCH 49/93] Bug 2014043 - Additional WebGPU CTS expectation updates
 r=webgpu-reviewers,teoxoy

Differential Revision: https://phabricator.services.mozilla.com/D282062
---
 .../cts.https.html.ini                        |   2 +-
 .../copyTextureToTexture/cts.https.html.ini   | 418 ------------------
 .../cmds/setBindGroup/cts.https.html.ini      |  24 -
 .../in_render_common/cts.https.html.ini       |   3 +-
 .../builtin/subgroupAdd/cts.https.html.ini    | 333 +++++++-------
 .../builtin/textureGather/cts.https.html.ini  | 296 +------------
 .../textureGatherCompare/cts.https.html.ini   | 189 +++-----
 .../builtin/textureLoad/cts.https.html.ini    |  59 ++-
 .../builtin/textureSample/cts.https.html.ini  | 111 ++---
 .../cts.https.html.ini                        | 180 ++++----
 .../textureSampleGrad/cts.https.html.ini      |  16 +-
 .../textureSampleLevel/cts.https.html.ini     | 277 ++++--------
 .../builtin/texture_utils/cts.https.html.ini  |   8 -
 .../ImageBitmap/dedicated.https.html.ini      |  27 +-
 .../ImageBitmap/service.https.html.ini        |  75 ++--
 .../ImageBitmap/shared.https.html.ini         |  27 +-
 .../canvas/service.https.html.ini             |  14 +-
 17 files changed, 589 insertions(+), 1470 deletions(-)

diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/capability_checks/limits/maxStorageTexturesPerShaderStage/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/capability_checks/limits/maxStorageTexturesPerShaderStage/cts.https.html.ini
index 44860c7e60538..10ae1e8c78a0f 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/capability_checks/limits/maxStorageTexturesPerShaderStage/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/capability_checks/limits/maxStorageTexturesPerShaderStage/cts.https.html.ini
@@ -430,7 +430,7 @@
 
   [:limitTest="atMaximum";testValueName="overLimit";visibility=7;access="read-only";order="backward"]
     expected:
-      if os == "win" and not debug: [PASS, FAIL]
+      if os == "win": [PASS, FAIL]
 
   [:limitTest="atMaximum";testValueName="overLimit";visibility=7;access="read-only";order="forward"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/copyTextureToTexture/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/copyTextureToTexture/cts.https.html.ini
index 5356a10ae80a9..c9b3df4249974 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/copyTextureToTexture/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/copyTextureToTexture/cts.https.html.ini
@@ -40,364 +40,184 @@
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
 
@@ -414,12 +234,8 @@
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
 
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win" and not debug: [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win" and not debug: [PASS, FAIL]
 
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
 
@@ -440,472 +256,238 @@
   [:dimension="2d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":0,"width":1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":1,"width":0,"height":1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":0,"depthOrArrayLayers":-1};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":0,"z":2,"width":0,"height":1,"depthOrArrayLayers":0};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":-1,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":0,"y":1,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":-1,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=0;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=1;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=0]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=1]
-    expected:
-      if os == "win": [PASS, FAIL]
 
   [:dimension="3d";copyBoxOffsets={"x":1,"y":0,"z":0,"width":0,"height":0,"depthOrArrayLayers":-2};srcCopyLevel=3;dstCopyLevel=3]
-    expected:
-      if os == "win": [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:api,validation,encoding,cmds,copyTextureToTexture:copy_ranges_with_compressed_texture_formats:*]
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/setBindGroup/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/setBindGroup/cts.https.html.ini
index 122d554c8f364..37c94fadbafce 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/setBindGroup/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/encoding/cmds/setBindGroup/cts.https.html.ini
@@ -177,20 +177,12 @@
     expected: FAIL
 
   [:encoderType="compute%20pass";state="invalid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="compute%20pass";state="invalid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="compute%20pass";state="valid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="compute%20pass";state="valid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20bundle";state="destroyed";resourceType="buffer"]
     expected: FAIL
@@ -199,20 +191,12 @@
     expected: FAIL
 
   [:encoderType="render%20bundle";state="invalid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20bundle";state="invalid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20bundle";state="valid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20bundle";state="valid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20pass";state="destroyed";resourceType="buffer"]
     expected: FAIL
@@ -221,20 +205,12 @@
     expected: FAIL
 
   [:encoderType="render%20pass";state="invalid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20pass";state="invalid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20pass";state="valid";resourceType="buffer"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
   [:encoderType="render%20pass";state="valid";resourceType="texture"]
-    expected:
-      if os == "win" and debug: [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:api,validation,encoding,cmds,setBindGroup:u32array_start_and_length:*]
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/resource_usages/texture/in_render_common/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/resource_usages/texture/in_render_common/cts.https.html.ini
index 1f1f694a8eba1..4f0815996838e 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/resource_usages/texture/in_render_common/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/validation/resource_usages/texture/in_render_common/cts.https.html.ini
@@ -5496,8 +5496,7 @@
 
   [:bg0Levels={"base":1,"count":2};bg0Layers={"base":0,"count":1};bg1Levels={"base":0,"count":1};bg1Layers={"base":0,"count":1};bgUsage0="sampled-texture";bgUsage1="readonly-storage-texture"]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:bg0Levels={"base":1,"count":2};bg0Layers={"base":0,"count":1};bg1Levels={"base":0,"count":1};bg1Layers={"base":0,"count":1};bgUsage0="sampled-texture";bgUsage1="readwrite-storage-texture"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/subgroupAdd/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/subgroupAdd/cts.https.html.ini
index 1e4f202064916..5fb401665849c 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/subgroupAdd/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/subgroupAdd/cts.https.html.ini
@@ -3625,80 +3625,67 @@
 
   [:case=436;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=436;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=436;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=436;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=437;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=437;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=437;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=437;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=438;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=438;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=438;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=438;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=439;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=439;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=439;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=439;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=43;type="f16";wgSize=[128,1,1\]]
 
@@ -3710,163 +3697,163 @@
 
   [:case=440;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=440;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=440;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=440;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=441;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=441;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=441;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=441;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=442;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=442;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=442;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=442;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=443;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=443;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=443;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=443;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=444;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=444;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=444;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=444;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=445;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=445;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=445;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=445;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=446;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=446;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=446;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=446;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=447;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=447;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=447;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=447;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=448;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=448;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=448;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=448;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=449;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=449;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=449;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=449;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=44;type="f16";wgSize=[128,1,1\]]
 
@@ -3878,163 +3865,163 @@
 
   [:case=450;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=450;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=450;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=450;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=451;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=451;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=451;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=451;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=452;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=452;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=452;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=452;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=453;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=453;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=453;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=453;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=454;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=454;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=454;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=454;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=455;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=455;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=455;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=455;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=456;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=456;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=456;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=456;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=457;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=457;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=457;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=457;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=458;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=458;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=458;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=458;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=459;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=459;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=459;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=459;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=45;type="f16";wgSize=[128,1,1\]]
 
@@ -4046,163 +4033,163 @@
 
   [:case=460;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=460;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=460;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=460;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=461;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=461;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=461;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=461;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=462;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=462;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=462;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=462;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=463;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=463;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=463;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=463;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=464;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=464;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=464;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=464;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=465;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=465;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=465;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=465;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=466;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=466;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=466;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=466;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=467;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=467;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=467;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=467;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=468;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=468;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=468;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=468;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=469;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=469;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=469;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=469;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=46;type="f16";wgSize=[128,1,1\]]
 
@@ -4214,99 +4201,99 @@
 
   [:case=470;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=470;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=470;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=470;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=471;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=471;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=471;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=471;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=472;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=472;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=472;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=472;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=473;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=473;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=473;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=473;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=474;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=474;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=474;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=474;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=475;type="f16";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=475;type="f16";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=475;type="f32";wgSize=[128,1,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=475;type="f32";wgSize=[64,2,1\]]
     expected:
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:case=476;type="f16";wgSize=[128,1,1\]]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGather/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGather/cts.https.html.ini
index 66a42989b9615..35dc80114d77f 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGather/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGather/cts.https.html.ini
@@ -218,12 +218,8 @@
   [:stage="f";format="depth16unorm";modeU="r";modeV="r";offset=true]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="m";offset=false]
 
@@ -402,12 +398,8 @@
   [:stage="v";format="depth16unorm";modeU="r";modeV="r";offset=true]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="m";offset=false]
 
@@ -720,72 +712,38 @@
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="c";offset=false]
 
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float";modeU="c";modeV="c";offset=false]
 
@@ -824,76 +782,40 @@
   [:stage="c";format="depth32float";modeU="r";modeV="r";offset=true]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth16unorm";modeU="c";modeV="c";offset=false]
 
@@ -934,136 +856,74 @@
   [:stage="f";format="depth24plus";modeU="c";modeV="c";offset=false]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="c";offset=false]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="c";offset=true]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="c";offset=true]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="m";offset=true]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float";modeU="c";modeV="c";offset=false]
 
@@ -1102,72 +962,40 @@
   [:stage="f";format="depth32float";modeU="r";modeV="r";offset=true]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="c";modeV="r";offset=true]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="m";offset=false]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth16unorm";modeU="c";modeV="c";offset=false]
 
@@ -1208,132 +1036,74 @@
   [:stage="v";format="depth24plus";modeU="c";modeV="c";offset=false]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="m";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="c";offset=false]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="c";offset=true]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="c";modeV="r";offset=true]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="m";offset=true]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="m";modeV="r";offset=true]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="m";offset=false]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float";modeU="c";modeV="c";offset=false]
 
@@ -1372,54 +1142,32 @@
   [:stage="v";format="depth32float";modeU="r";modeV="r";offset=true]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="c";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="m";offset=false]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="m";offset=true]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="m";offset=false]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="m";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="m";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="r";modeV="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";modeU="r";modeV="m";offset=false]
 
@@ -32717,18 +32465,15 @@
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";mode="c"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";mode="m"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";mode="r"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="eac-r11snorm";filt="linear";mode="c"]
     expected:
@@ -41797,30 +41542,35 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
@@ -41904,9 +41654,8 @@
   [:stage="c";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -41959,16 +41708,14 @@
   [:stage="c";format="depth24plus-stencil8";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
@@ -69326,29 +69073,25 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="m"]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="r"]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";mode="c"]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";mode="m"]
     expected:
@@ -69361,8 +69104,7 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float";filt="nearest";mode="c"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGatherCompare/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGatherCompare/cts.https.html.ini
index 6e3430b06586f..6b5dc6ef53cb2 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGatherCompare/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureGatherCompare/cts.https.html.ini
@@ -538,26 +538,32 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=false]
@@ -592,14 +598,17 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=true]
@@ -609,10 +618,12 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="linear";modeU="c";modeV="c";offset=false]
@@ -783,15 +794,11 @@
 
   [:stage="f";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
@@ -803,9 +810,7 @@
 
   [:stage="f";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -835,10 +840,7 @@
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";modeU="c";modeV="r";offset=true]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";modeU="m";modeV="c";offset=false]
     expected:
@@ -914,10 +916,7 @@
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -933,10 +932,7 @@
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -1126,10 +1122,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="c";modeV="m";offset=true]
     expected:
@@ -1157,10 +1150,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="m";offset=false]
     expected:
-      if os == "win" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="m";offset=true]
     expected:
@@ -1170,10 +1160,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "win" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="r";offset=true]
     expected:
@@ -1183,10 +1170,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="r";modeV="c";offset=true]
     expected:
@@ -1214,10 +1198,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
@@ -1225,10 +1206,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
@@ -1256,10 +1234,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -1267,10 +1242,7 @@
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -1302,11 +1274,17 @@
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="c";modeV="m";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="c";modeV="m";offset=true]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="c";modeV="r";offset=false]
     expected:
@@ -1314,7 +1292,10 @@
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="c";modeV="r";offset=true]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="m";modeV="c";offset=false]
     expected:
@@ -1352,27 +1333,45 @@
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="c";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="c";offset=true]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="m";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="m";offset=true]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="r";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="linear";modeU="r";modeV="r";offset=true]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
@@ -1887,7 +1886,7 @@
   [:stage="v";format="depth32float";filt="linear";modeU="m";modeV="c";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
@@ -1895,7 +1894,7 @@
   [:stage="v";format="depth32float";filt="linear";modeU="m";modeV="m";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
@@ -1903,7 +1902,7 @@
   [:stage="v";format="depth32float";filt="linear";modeU="m";modeV="m";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
@@ -1911,7 +1910,7 @@
   [:stage="v";format="depth32float";filt="linear";modeU="m";modeV="r";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
@@ -1919,7 +1918,7 @@
   [:stage="v";format="depth32float";filt="linear";modeU="m";modeV="r";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
@@ -2193,31 +2192,13 @@
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="m";offset=true]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="r";offset=false]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
@@ -2307,13 +2288,7 @@
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";modeU="r";modeV="r";offset=true]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureGatherCompare:array_3d_coords:*]
@@ -3160,28 +3135,16 @@
   [:stage="f";format="depth16unorm";filt="nearest";mode="r"]
 
   [:stage="f";format="depth24plus";filt="linear";mode="c"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="linear";mode="m"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="linear";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="m"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";mode="c"]
 
@@ -3232,28 +3195,16 @@
   [:stage="v";format="depth16unorm";filt="nearest";mode="r"]
 
   [:stage="v";format="depth24plus";filt="linear";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus";filt="linear";mode="m"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus";filt="linear";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus";filt="nearest";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus";filt="nearest";mode="m"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus";filt="nearest";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";filt="linear";mode="c"]
 
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureLoad/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureLoad/cts.https.html.ini
index 0105ef05d2432..a43398cf966ab 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureLoad/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureLoad/cts.https.html.ini
@@ -95,28 +95,18 @@
   [:stage="c";format="depth24plus";texture_type="texture_2d_array"]
 
   [:stage="c";format="depth24plus";texture_type="texture_depth_2d_array"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";texture_type="texture_2d_array"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";texture_type="texture_depth_2d_array"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float";texture_type="texture_2d_array"]
 
   [:stage="c";format="depth32float";texture_type="texture_depth_2d_array"]
 
   [:stage="c";format="depth32float-stencil8";texture_type="texture_2d_array"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";texture_type="texture_depth_2d_array"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="eac-r11snorm";texture_type="texture_2d_array"]
 
@@ -386,6 +376,8 @@
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="bgra8unorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="bgra8unorm-srgb";texture_type="texture_2d_array"]
     expected:
@@ -409,13 +401,11 @@
 
   [:stage="f";format="depth24plus-stencil8";texture_type="texture_2d_array"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";texture_type="texture_depth_2d_array"]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float";texture_type="texture_2d_array"]
     expected:
@@ -427,13 +417,11 @@
 
   [:stage="f";format="depth32float-stencil8";texture_type="texture_2d_array"]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";texture_type="texture_depth_2d_array"]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="eac-r11snorm";texture_type="texture_2d_array"]
     expected:
@@ -508,12 +496,20 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="r8sint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="r8snorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="r8uint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="r8unorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rg11b10ufloat";texture_type="texture_2d_array"]
     expected:
@@ -552,12 +548,20 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rg8sint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rg8snorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rg8uint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rg8unorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgb10a2uint";texture_type="texture_2d_array"]
     expected:
@@ -604,14 +608,24 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgba8sint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgba8snorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgba8uint";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgba8unorm";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="rgba8unorm-srgb";texture_type="texture_2d_array"]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="stencil8";texture_type="texture_2d_array"]
     expected:
@@ -805,13 +819,11 @@
 
   [:stage="v";format="depth24plus-stencil8";texture_type="texture_2d_array"]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";texture_type="texture_depth_2d_array"]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float";texture_type="texture_2d_array"]
     expected:
@@ -827,8 +839,7 @@
 
   [:stage="v";format="depth32float-stencil8";texture_type="texture_depth_2d_array"]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="eac-r11snorm";texture_type="texture_2d_array"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSample/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSample/cts.https.html.ini
index 649ad059ad485..96681303b5359 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSample/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSample/cts.https.html.ini
@@ -59,8 +59,6 @@
   [:format="depth16unorm";modeU="r";modeV="r";offset=true]
 
   [:format="depth24plus";modeU="c";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:format="depth24plus";modeU="c";modeV="c";offset=true]
 
@@ -307,36 +305,22 @@
   [:format="depth16unorm";viewDimension="cube-array";A="u32";mode="r"]
 
   [:format="depth24plus";viewDimension="cube";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube";mode="m"]
 
   [:format="depth24plus";viewDimension="cube";mode="r"]
 
   [:format="depth24plus";viewDimension="cube-array";A="i32";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube-array";A="i32";mode="m"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube-array";A="i32";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube-array";A="u32";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube-array";A="u32";mode="m"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth24plus";viewDimension="cube-array";A="u32";mode="r"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:format="depth24plus-stencil8";viewDimension="cube";mode="c"]
 
@@ -436,20 +420,14 @@
   [:format="depth24plus-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus-stencil8";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth24plus-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth24plus-stencil8";mode="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth32float";mode="c";offset=false]
 
@@ -468,30 +446,20 @@
   [:format="depth32float";mode="r";offset=true]
 
   [:format="depth32float-stencil8";mode="c";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth32float-stencil8";mode="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth32float-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth32float-stencil8";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth32float-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:format="depth32float-stencil8";mode="r";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
 
 [cts.https.html?q=webgpu:shader,execution,expression,call,builtin,textureSample:depth_array_3d_coords:*]
@@ -504,12 +472,8 @@
   [:format="depth16unorm";mode="r"]
 
   [:format="depth24plus";mode="c"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:format="depth24plus";mode="m"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:format="depth24plus";mode="r"]
 
@@ -6185,27 +6149,27 @@
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
@@ -6213,36 +6177,31 @@
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
@@ -6254,16 +6213,15 @@
 
   [:format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus-stencil8";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus-stencil8";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -8152,16 +8110,28 @@
       if os == "mac": [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="c";offset=false]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="c";offset=true]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="m";offset=false]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="m";offset=true]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="r";offset=false]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="c";modeV="r";offset=true]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
@@ -8188,8 +8158,12 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="r";modeV="c";offset=false]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="r";modeV="c";offset=true]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
@@ -8200,8 +8174,12 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="r";modeV="r";offset=false]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg11b10ufloat";filt="nearest";modeU="r";modeV="r";offset=true]
+    expected:
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rg16float";filt="linear";modeU="c";modeV="c";offset=false]
     expected:
@@ -8770,10 +8748,12 @@
   [:format="rgb10a2unorm";filt="linear";modeU="m";modeV="m";offset=false]
     expected:
       if os == "linux": FAIL
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rgb10a2unorm";filt="linear";modeU="m";modeV="m";offset=true]
     expected:
       if os == "linux": FAIL
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="rgb10a2unorm";filt="linear";modeU="m";modeV="r";offset=false]
     expected:
@@ -30018,9 +29998,8 @@
 
   [:format="bgra8unorm-srgb";dim="3d";filt="linear";modeU="r";modeV="c";modeW="m";offset=false]
     expected:
-      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:format="bgra8unorm-srgb";dim="3d";filt="linear";modeU="r";modeV="c";modeW="m";offset=true]
@@ -57879,8 +57858,8 @@
 
   [:format="bc7-rgba-unorm";filt="nearest";mode="c"]
     expected:
-      if os == "linux" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
 
   [:format="bc7-rgba-unorm";filt="nearest";mode="m"]
     expected:
@@ -57970,15 +57949,15 @@
 
   [:format="depth24plus-stencil8";filt="nearest";mode="c"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus-stencil8";filt="nearest";mode="m"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth24plus-stencil8";filt="nearest";mode="r"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth32float";filt="nearest";mode="c"]
     expected:
@@ -57994,7 +57973,7 @@
 
   [:format="depth32float-stencil8";filt="nearest";mode="c"]
     expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:format="depth32float-stencil8";filt="nearest";mode="m"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleCompareLevel/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleCompareLevel/cts.https.html.ini
index 98b45812eb7ed..8ffcd89ea861f 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleCompareLevel/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleCompareLevel/cts.https.html.ini
@@ -165,8 +165,6 @@
       if os == "mac": FAIL
 
   [:stage="c";format="depth24plus";filt="linear";modeU="r";modeV="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";filt="linear";modeU="r";modeV="r";offset=true]
     expected:
@@ -633,8 +631,6 @@
   [:stage="f";format="depth24plus";filt="linear";modeU="c";modeV="r";offset=false]
 
   [:stage="f";format="depth24plus";filt="linear";modeU="c";modeV="r";offset=true]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="linear";modeU="m";modeV="c";offset=false]
 
@@ -649,8 +645,6 @@
   [:stage="f";format="depth24plus";filt="linear";modeU="m";modeV="r";offset=true]
 
   [:stage="f";format="depth24plus";filt="linear";modeU="r";modeV="c";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";filt="linear";modeU="r";modeV="c";offset=true]
 
@@ -1178,38 +1172,32 @@
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="c";offset=false]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="c";offset=true]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="m";offset=false]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="m";offset=true]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="r";offset=false]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="c";modeV="r";offset=true]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="m";modeV="c";offset=false]
     expected:
@@ -1244,8 +1232,7 @@
   [:stage="v";format="depth24plus";filt="linear";modeU="r";modeV="c";offset=false]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="linear";modeU="r";modeV="c";offset=true]
     expected:
@@ -1275,95 +1262,82 @@
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";filt="linear";modeU="c";modeV="c";offset=false]
     expected:
@@ -2418,9 +2392,8 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "win" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -2444,6 +2417,7 @@
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
       if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=true]
@@ -2788,21 +2762,21 @@
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="c";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="c";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="m";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="m";offset=true]
@@ -2815,14 +2789,14 @@
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="r";offset=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="c";modeV="r";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="linear";modeU="m";modeV="c";offset=false]
@@ -2949,36 +2923,42 @@
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: FAIL
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if debug: [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: FAIL
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
@@ -3189,7 +3169,8 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
@@ -3247,14 +3228,16 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
-      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
@@ -3269,7 +3252,8 @@
 
   [:stage="f";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
-      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "win" and debug: [TIMEOUT, NOTRUN]
+      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
       if os == "linux": [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
@@ -3470,12 +3454,9 @@
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";modeU="c";modeV="m";offset=true]
     expected:
@@ -4018,37 +3999,32 @@
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="c";offset=true]
     expected:
       if os == "win": [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="m";offset=false]
     expected:
       if os == "win": [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="m";offset=true]
     expected:
       if os == "win": [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="r";offset=false]
     expected:
       if os == "win": [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="m";modeV="r";offset=true]
     expected:
       if os == "win": [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";filt="linear";modeU="r";modeV="c";offset=false]
     expected:
@@ -5210,8 +5186,6 @@
   [:stage="f";format="depth24plus";filt="nearest";mode="m"]
 
   [:stage="f";format="depth24plus";filt="nearest";mode="r"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";filt="linear";mode="c"]
 
@@ -5274,8 +5248,6 @@
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";mode="c"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";filt="nearest";mode="m"]
     expected:
@@ -5302,8 +5274,6 @@
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";filt="nearest";mode="m"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";filt="nearest";mode="r"]
     expected:
@@ -5341,9 +5311,7 @@
 
   [:stage="v";format="depth32float-stencil8";filt="linear";mode="r"]
     expected:
-      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";filt="nearest";mode="c"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleGrad/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleGrad/cts.https.html.ini
index b019b30a829fa..76265cbfdc064 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleGrad/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleGrad/cts.https.html.ini
@@ -45602,13 +45602,11 @@
 
   [:stage="c";format="bgra8unorm";dim="cube";filt="nearest";modeU="r";modeV="r";modeW="m";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="bgra8unorm";dim="cube";filt="nearest";modeU="r";modeV="r";modeW="r";offset=false]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac": [TIMEOUT, NOTRUN]
 
@@ -167153,7 +167151,10 @@
 
   [:stage="c";format="bc7-rgba-unorm";filt="nearest";mode="r"]
     expected:
-      if debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: FAIL
 
   [:stage="c";format="bc7-rgba-unorm-srgb";filt="linear";mode="c"]
     expected:
@@ -167247,16 +167248,19 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";mode="c"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
   [:stage="c";format="depth16unorm";filt="nearest";mode="m"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
   [:stage="c";format="depth16unorm";filt="nearest";mode="r"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
@@ -167292,16 +167296,19 @@
 
   [:stage="c";format="depth32float";filt="nearest";mode="c"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
   [:stage="c";format="depth32float";filt="nearest";mode="m"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
   [:stage="c";format="depth32float";filt="nearest";mode="r"]
     expected:
+      if os == "win" and debug: [PASS, FAIL]
       if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
@@ -167312,6 +167319,7 @@
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";mode="m"]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and not debug: FAIL
 
@@ -169838,7 +169846,7 @@
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac" and not debug: FAIL
 
   [:stage="f";format="depth24plus-stencil8";filt="nearest";mode="r"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleLevel/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleLevel/cts.https.html.ini
index 62542714f9641..5630b407353c3 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleLevel/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/textureSampleLevel/cts.https.html.ini
@@ -27,8 +27,7 @@
 
   [:stage="c";format="depth24plus";mode="c";offset=true]
     expected:
-      if os == "mac" and debug: FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac": FAIL
 
   [:stage="c";format="depth24plus";mode="m";offset=false]
     expected:
@@ -37,15 +36,13 @@
   [:stage="c";format="depth24plus";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and debug: FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac": FAIL
 
   [:stage="c";format="depth24plus";mode="r";offset=false]
 
   [:stage="c";format="depth24plus";mode="r";offset=true]
     expected:
-      if os == "mac" and debug: FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
+      if os == "mac": FAIL
 
   [:stage="c";format="depth24plus-stencil8";mode="c";offset=false]
 
@@ -127,12 +124,8 @@
   [:stage="f";format="depth16unorm";mode="r";offset=true]
 
   [:stage="f";format="depth24plus";mode="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";mode="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";mode="m";offset=false]
     expected:
@@ -143,12 +136,8 @@
       if os == "linux": FAIL
 
   [:stage="f";format="depth24plus";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";mode="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";mode="c";offset=false]
 
@@ -215,12 +204,8 @@
   [:stage="v";format="depth16unorm";mode="r";offset=true]
 
   [:stage="v";format="depth24plus";mode="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";mode="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";mode="m";offset=false]
     expected:
@@ -231,12 +216,8 @@
       if os == "linux": FAIL
 
   [:stage="v";format="depth24plus";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";mode="r";offset=true]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";mode="c";offset=false]
 
@@ -317,40 +298,22 @@
   [:stage="c";format="depth24plus";viewDimension="cube";mode="r"]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="i32";mode="c"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="i32";mode="m"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="i32";mode="r"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="u32";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="u32";mode="m"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";viewDimension="cube-array";A="u32";mode="r"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube";mode="c"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube";mode="m"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube";mode="r"]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube-array";A="i32";mode="c"]
 
@@ -359,16 +322,10 @@
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube-array";A="i32";mode="r"]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube-array";A="u32";mode="c"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube-array";A="u32";mode="m"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";viewDimension="cube-array";A="u32";mode="r"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float";viewDimension="cube";mode="c"]
 
@@ -389,14 +346,10 @@
   [:stage="c";format="depth32float";viewDimension="cube-array";A="u32";mode="r"]
 
   [:stage="c";format="depth32float-stencil8";viewDimension="cube";mode="c"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";viewDimension="cube";mode="m"]
 
   [:stage="c";format="depth32float-stencil8";viewDimension="cube";mode="r"]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";viewDimension="cube-array";A="i32";mode="c"]
 
@@ -420,7 +373,7 @@
 
   [:stage="f";format="depth16unorm";viewDimension="cube-array";A="i32";mode="m"]
     expected:
-      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth16unorm";viewDimension="cube-array";A="i32";mode="r"]
     expected:
@@ -453,19 +406,16 @@
   [:stage="f";format="depth24plus";viewDimension="cube-array";A="i32";mode="c"]
     expected:
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";viewDimension="cube-array";A="i32";mode="m"]
     expected:
       if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";viewDimension="cube-array";A="i32";mode="r"]
     expected:
       if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus";viewDimension="cube-array";A="u32";mode="c"]
     expected: [PASS, TIMEOUT, NOTRUN]
@@ -478,21 +428,15 @@
 
   [:stage="f";format="depth24plus-stencil8";viewDimension="cube";mode="c"]
     expected:
-      if os == "win" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";viewDimension="cube";mode="m"]
     expected:
-      if os == "win" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";viewDimension="cube";mode="r"]
     expected:
-      if os == "win" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth24plus-stencil8";viewDimension="cube-array";A="i32";mode="c"]
     expected:
@@ -560,10 +504,7 @@
 
   [:stage="f";format="depth32float-stencil8";viewDimension="cube";mode="c"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";viewDimension="cube";mode="m"]
     expected:
@@ -661,10 +602,7 @@
 
   [:stage="v";format="depth24plus";viewDimension="cube-array";A="u32";mode="c"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus";viewDimension="cube-array";A="u32";mode="m"]
     expected:
@@ -672,17 +610,11 @@
 
   [:stage="v";format="depth24plus";viewDimension="cube-array";A="u32";mode="r"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";viewDimension="cube";mode="c"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";viewDimension="cube";mode="m"]
     expected:
@@ -760,10 +692,7 @@
 
   [:stage="v";format="depth32float-stencil8";viewDimension="cube";mode="c"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";viewDimension="cube";mode="m"]
     expected:
@@ -771,9 +700,7 @@
 
   [:stage="v";format="depth32float-stencil8";viewDimension="cube";mode="r"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";viewDimension="cube-array";A="i32";mode="c"]
     expected:
@@ -858,7 +785,6 @@
   [:stage="c";format="depth24plus-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";mode="m";offset=true]
     expected:
@@ -866,8 +792,6 @@
       if os == "mac": FAIL
 
   [:stage="c";format="depth24plus-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";mode="r";offset=true]
     expected:
@@ -895,8 +819,6 @@
       if os == "mac": FAIL
 
   [:stage="c";format="depth32float-stencil8";mode="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";mode="c";offset=true]
     expected:
@@ -905,7 +827,6 @@
   [:stage="c";format="depth32float-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";mode="m";offset=true]
     expected:
@@ -913,8 +834,6 @@
       if os == "mac": FAIL
 
   [:stage="c";format="depth32float-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";mode="r";offset=true]
     expected:
@@ -959,19 +878,14 @@
   [:stage="f";format="depth24plus-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
 
   [:stage="f";format="depth24plus-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="f";format="depth24plus-stencil8";mode="r";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float";mode="c";offset=false]
 
@@ -992,21 +906,16 @@
   [:stage="f";format="depth32float-stencil8";mode="c";offset=false]
 
   [:stage="f";format="depth32float-stencil8";mode="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";mode="m";offset=false]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="f";format="depth32float-stencil8";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
 
   [:stage="f";format="depth32float-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="f";format="depth32float-stencil8";mode="r";offset=true]
 
@@ -1037,7 +946,6 @@
   [:stage="v";format="depth24plus";mode="m";offset=true]
     expected:
       if os == "linux": FAIL
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus";mode="r";offset=false]
 
@@ -1046,8 +954,6 @@
   [:stage="v";format="depth24plus-stencil8";mode="c";offset=false]
 
   [:stage="v";format="depth24plus-stencil8";mode="c";offset=true]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth24plus-stencil8";mode="m";offset=false]
     expected:
@@ -1058,8 +964,6 @@
       if os == "linux": FAIL
 
   [:stage="v";format="depth24plus-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth24plus-stencil8";mode="r";offset=true]
 
@@ -1080,8 +984,6 @@
   [:stage="v";format="depth32float";mode="r";offset=true]
 
   [:stage="v";format="depth32float-stencil8";mode="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="v";format="depth32float-stencil8";mode="c";offset=true]
 
@@ -1094,8 +996,6 @@
       if os == "linux": FAIL
 
   [:stage="v";format="depth32float-stencil8";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="v";format="depth32float-stencil8";mode="r";offset=true]
 
@@ -20531,7 +20431,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -20539,7 +20440,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
@@ -20547,7 +20449,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
@@ -20555,7 +20458,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -20563,7 +20467,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
@@ -20571,7 +20476,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -20579,7 +20485,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -20587,7 +20494,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
@@ -20595,7 +20503,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -20603,7 +20512,8 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -20611,7 +20521,8 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
@@ -20619,7 +20530,8 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac": [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
@@ -20657,7 +20569,8 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -20676,7 +20589,7 @@
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -20757,7 +20670,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -20765,7 +20679,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
@@ -20773,7 +20688,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
@@ -20781,7 +20697,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -20789,7 +20706,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="m";offset=true]
     expected:
@@ -20797,7 +20715,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -20805,7 +20724,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -20813,7 +20733,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
@@ -20821,7 +20742,8 @@
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -41540,8 +41462,6 @@
   [:stage="c";format="depth32float-stencil8";dim="3d";filt="nearest"]
 
   [:stage="c";format="depth32float-stencil8";dim="cube";filt="nearest"]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:stage="c";format="eac-r11snorm";dim="3d";filt="linear"]
     expected:
@@ -49448,7 +49368,8 @@
     expected:
       if os == "win": FAIL
       if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:stage="c";format="bc5-rg-snorm";dim="3d";filt="nearest";mode="r";offset=false]
     expected:
@@ -49939,8 +49860,6 @@
   [:stage="c";format="depth24plus";dim="cube";filt="nearest";mode="m";offset=false]
 
   [:stage="c";format="depth24plus";dim="cube";filt="nearest";mode="r";offset=false]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus-stencil8";dim="3d";filt="nearest";mode="c";offset=false]
     expected:
@@ -49969,12 +49888,8 @@
   [:stage="c";format="depth24plus-stencil8";dim="cube";filt="nearest";mode="c";offset=false]
 
   [:stage="c";format="depth24plus-stencil8";dim="cube";filt="nearest";mode="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";dim="cube";filt="nearest";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float";dim="3d";filt="nearest";mode="c";offset=false]
 
@@ -50019,16 +49934,10 @@
       if os == "mac" and debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";dim="cube";filt="nearest";mode="c";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";dim="cube";filt="nearest";mode="m";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth32float-stencil8";dim="cube";filt="nearest";mode="r";offset=false]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="eac-r11snorm";dim="3d";filt="linear";mode="c";offset=false]
     expected:
@@ -66253,7 +66162,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -66261,7 +66171,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
@@ -66269,7 +66180,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
@@ -66278,7 +66190,7 @@
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -66307,7 +66219,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -66315,7 +66228,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
@@ -66323,7 +66237,8 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac": [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth16unorm";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -66331,8 +66246,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="c";offset=true]
     expected:
@@ -66341,8 +66255,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="m";offset=true]
     expected:
@@ -66351,8 +66264,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="c";modeV="r";offset=true]
     expected:
@@ -66361,8 +66273,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="c";offset=true]
     expected:
@@ -66381,8 +66292,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="m";modeV="r";offset=true]
     expected:
@@ -66391,8 +66301,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="c";offset=true]
     expected:
@@ -66401,8 +66310,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="m";offset=true]
     expected:
@@ -66411,8 +66319,7 @@
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=false]
     expected:
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "mac": [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";modeU="r";modeV="r";offset=true]
     expected:
@@ -87633,13 +87540,13 @@
 
   [:stage="c";format="depth16unorm";filt="nearest";mode="r"]
     expected:
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus";filt="nearest";mode="c"]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus";filt="nearest";mode="m"]
     expected: [PASS, TIMEOUT, NOTRUN]
@@ -87647,9 +87554,8 @@
   [:stage="c";format="depth24plus";filt="nearest";mode="r"]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";mode="c"]
     expected:
@@ -87657,21 +87563,15 @@
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";mode="m"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth24plus-stencil8";filt="nearest";mode="r"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";mode="c"]
     expected:
-      if os == "win" and debug: [FAIL, TIMEOUT, NOTRUN]
+      if os == "win" and debug: [PASS, TIMEOUT, NOTRUN]
       if os == "mac" and debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float";filt="nearest";mode="m"]
@@ -87686,10 +87586,7 @@
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";mode="c"]
     expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac" and not debug: [PASS, FAIL]
+      if debug: [TIMEOUT, NOTRUN]
 
   [:stage="c";format="depth32float-stencil8";filt="nearest";mode="m"]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/texture_utils/cts.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/texture_utils/cts.https.html.ini
index 814b94b7362ec..b0bb474b7141b 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/texture_utils/cts.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/expression/call/builtin/texture_utils/cts.https.html.ini
@@ -55,8 +55,6 @@
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="1d";sampleCount=1]
 
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="2d";sampleCount=1]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="2d";sampleCount=4]
 
@@ -65,12 +63,8 @@
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="3d";sampleCount=1]
 
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="cube";sampleCount=1]
-    expected:
-      if os == "mac" and debug: [PASS, FAIL]
 
   [:srcFormat="depth24plus";texelViewFormat="rgba32float";viewDimension="cube-array";sampleCount=1]
-    expected:
-      if os == "mac": [PASS, FAIL]
 
   [:srcFormat="depth24plus-stencil8";texelViewFormat="rgba32float";viewDimension="1d";sampleCount=1]
 
@@ -85,8 +79,6 @@
   [:srcFormat="depth24plus-stencil8";texelViewFormat="rgba32float";viewDimension="cube";sampleCount=1]
 
   [:srcFormat="depth24plus-stencil8";texelViewFormat="rgba32float";viewDimension="cube-array";sampleCount=1]
-    expected:
-      if os == "mac" and not debug: [PASS, FAIL]
 
   [:srcFormat="r8sint";texelViewFormat="rgba32sint";viewDimension="1d";sampleCount=1]
 
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/dedicated.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/dedicated.https.html.ini
index 17242a9eddd09..57ec0328ae61d 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/dedicated.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/dedicated.https.html.ini
@@ -1700,13 +1700,15 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="bgra8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="bgra8unorm-srgb";dstPremultiplied=false]
     expected:
@@ -1765,7 +1767,8 @@
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="r8unorm";dstPremultiplied=true]
     expected:
@@ -1834,14 +1837,16 @@
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rg8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgb10a2unorm";dstPremultiplied=false]
     expected:
@@ -1899,25 +1904,29 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm-srgb";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm-srgb";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="bgra8unorm";dstPremultiplied=false]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/service.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/service.https.html.ini
index 81eb16179217f..005055e708e37 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/service.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/service.https.html.ini
@@ -103,7 +103,8 @@
   expected:
     if os == "win" and debug: TIMEOUT
     if os == "linux": TIMEOUT
-    if os == "mac": TIMEOUT
+    if os == "mac" and debug: [TIMEOUT, CRASH]
+    if os == "mac" and not debug: TIMEOUT
   [:alpha="none";orientation="flipY";colorSpaceConversion="default";srcFlipYInCopy=false;dstFormat="bgra8unorm";dstPremultiplied=false]
     expected:
       if debug: [TIMEOUT, NOTRUN]
@@ -1692,13 +1693,15 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="r8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rg11b10ufloat";dstPremultiplied=false]
     expected:
@@ -1756,13 +1759,15 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rg8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgb10a2unorm";dstPremultiplied=false]
     expected:
@@ -1820,25 +1825,29 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm-srgb";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=false;dstFormat="rgba8unorm-srgb";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="bgra8unorm";dstPremultiplied=false]
     expected:
@@ -1900,13 +1909,15 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="r32float";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="r8unorm";dstPremultiplied=false]
     expected:
@@ -1928,7 +1939,8 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg11b10ufloat";dstPremultiplied=true]
     expected:
@@ -1936,19 +1948,22 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg16float";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg16float";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg16unorm";dstPremultiplied=false]
     expected:
@@ -1968,13 +1983,15 @@
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg32float";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg8unorm";dstPremultiplied=false]
     expected:
@@ -1996,7 +2013,8 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgb10a2unorm";dstPremultiplied=true]
     expected:
@@ -2004,43 +2022,50 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba16float";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba16float";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba16unorm";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba16unorm";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba32float";dstPremultiplied=false]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba32float";dstPremultiplied=true]
     expected:
       if os == "win" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rgba8unorm";dstPremultiplied=false]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/shared.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/shared.https.html.ini
index dd006ed48459f..0b257f9e60923 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/shared.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/ImageBitmap/shared.https.html.ini
@@ -1988,20 +1988,10 @@
       if not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="r8unorm";dstPremultiplied=false]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="r8unorm";dstPremultiplied=true]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [PASS, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+    expected: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="flipY";colorSpaceConversion="none";srcFlipYInCopy=true;dstFormat="rg11b10ufloat";dstPremultiplied=false]
     expected:
@@ -2233,7 +2223,8 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="none";colorSpaceConversion="default";srcFlipYInCopy=false;dstFormat="rg11b10ufloat";dstPremultiplied=true]
     expected:
@@ -2241,7 +2232,8 @@
       if os == "win" and not debug: FAIL
       if os == "linux" and debug: [TIMEOUT, NOTRUN]
       if os == "linux" and not debug: FAIL
-      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [TIMEOUT, NOTRUN]
+      if os == "mac" and not debug: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="none";colorSpaceConversion="default";srcFlipYInCopy=false;dstFormat="rg16float";dstPremultiplied=false]
     expected:
@@ -2305,12 +2297,7 @@
       if os == "mac" and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="none";colorSpaceConversion="default";srcFlipYInCopy=false;dstFormat="rgb10a2unorm";dstPremultiplied=false]
-    expected:
-      if os == "win" and debug: [TIMEOUT, NOTRUN]
-      if os == "win" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "linux" and debug: [TIMEOUT, NOTRUN]
-      if os == "linux" and not debug: [FAIL, TIMEOUT, NOTRUN]
-      if os == "mac": [TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [:alpha="premultiply";orientation="none";colorSpaceConversion="default";srcFlipYInCopy=false;dstFormat="rgb10a2unorm";dstPremultiplied=true]
     expected:
diff --git a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/canvas/service.https.html.ini b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/canvas/service.https.html.ini
index 64a060603b82a..d14e65bbd8fae 100644
--- a/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/canvas/service.https.html.ini
+++ b/testing/web-platform/mozilla/meta/webgpu/cts/webgpu/web_platform/copyToTexture/canvas/service.https.html.ini
@@ -2499,11 +2499,15 @@
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
     expected:
-      if debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "win" and debug: FAIL
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16unorm";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=true]
     expected:
-      if debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "win" and debug: FAIL
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: FAIL
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rg16unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
     expected:
@@ -2903,12 +2907,14 @@
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false]
     expected:
-      if debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "win" and debug: FAIL
+      if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
+      if os == "mac" and debug: [PASS, FAIL]
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg16unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true]
     expected:
       if os == "win" and debug: FAIL
-      if os == "mac" and debug: FAIL
+      if os == "mac" and debug: [PASS, FAIL]
 
   [:canvasType="offscreen";srcAndDstInSameGPUDevice=true;dstColorFormat="rg32float";srcAlphaMode="premultiplied";dstAlphaMode="opaque";srcDoFlipYDuringCopy=false]
     expected:

From 7df3bbde2964fad03ae11de2291ce7c504cbd0f9 Mon Sep 17 00:00:00 2001
From: Yubin Jamora <yjamora@mozilla.com>
Date: Fri, 6 Feb 2026 17:52:32 +0000
Subject: [PATCH 50/93] Bug 2013939 - Fix chat output not readable in Smart
 Window dark mode
 r=ai-frontend-reviewers,desktop-theme-reviewers,emilio,tabbrowser-reviewers,nsharpley

Differential Revision: https://phabricator.services.mozilla.com/D281670
---
 .../aiwindow/ui/modules/AIWindow.sys.mjs      |  7 +++-
 .../aiwindow/ui/test/browser/browser.toml     |  2 ++
 .../browser/browser_smartwindow_content.js    | 33 +++++++++++++++++++
 .../themes/shared/tabbrowser/content-area.css |  4 ++-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 browser/components/aiwindow/ui/test/browser/browser_smartwindow_content.js

diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
index 7d7c6d4ed3b0e..6f6fbfb6ba4f9 100644
--- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
@@ -555,8 +555,13 @@ export const AIWindow = {
     root.toggleAttribute("aiwindow-first-run", isFirstRun && isImmersiveView);
     root.toggleAttribute("aiwindow-immersive-view", isImmersiveView);
 
-    /* disabling the current tab from being clicked from the keyboard */
+    // Set attr on the specific browser that has content to override color scheme
+    win.gBrowser.selectedBrowser?.toggleAttribute(
+      "smartwindow-content",
+      isImmersiveView
+    );
 
+    /* disabling the current tab from being clicked from the keyboard */
     const selectedTab = win.gBrowser.selectedTab;
     if (isFirstRun) {
       selectedTab?.setAttribute("tabindex", -1);
diff --git a/browser/components/aiwindow/ui/test/browser/browser.toml b/browser/components/aiwindow/ui/test/browser/browser.toml
index dedcbfe98b159..2ad161b6afca6 100644
--- a/browser/components/aiwindow/ui/test/browser/browser.toml
+++ b/browser/components/aiwindow/ui/test/browser/browser.toml
@@ -60,6 +60,8 @@ support-files = [
 
 ["browser_sidebar_aiwindow.js"]
 
+["browser_smartwindow_content.js"]
+
 ["browser_smartwindow_init.js"]
 
 ["browser_smartwindow_prompts.js"]
diff --git a/browser/components/aiwindow/ui/test/browser/browser_smartwindow_content.js b/browser/components/aiwindow/ui/test/browser/browser_smartwindow_content.js
new file mode 100644
index 0000000000000..561d80bc5f0aa
--- /dev/null
+++ b/browser/components/aiwindow/ui/test/browser/browser_smartwindow_content.js
@@ -0,0 +1,33 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function test_smartwindow_browser_content_attribute() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.smartwindow.firstrun.hasCompleted", true]],
+  });
+
+  const win = await openAIWindow();
+
+  await BrowserTestUtils.waitForMutationCondition(
+    win.gBrowser.selectedBrowser,
+    { attributes: true, attributeFilter: ["smartwindow-content"] },
+    () => win.gBrowser.selectedBrowser.hasAttribute("smartwindow-content")
+  );
+
+  // Open new tab - regular page
+  const newTab = await BrowserTestUtils.openNewForegroundTab(
+    win.gBrowser,
+    "https://example.com/"
+  );
+
+  Assert.ok(
+    !win.gBrowser.selectedBrowser.hasAttribute("smartwindow-content"),
+    "Regular browser shouldn't have the smartwindow-content attribute"
+  );
+
+  BrowserTestUtils.removeTab(newTab);
+  await BrowserTestUtils.closeWindow(win);
+  await SpecialPowers.popPrefEnv();
+});
diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
index e84626aac294f..16c55782f1e68 100644
--- a/browser/themes/shared/tabbrowser/content-area.css
+++ b/browser/themes/shared/tabbrowser/content-area.css
@@ -143,7 +143,9 @@
     opacity: 0;
   }
 
-  browser[type="content"] {
+  /* Exclude browsers with smartwindow-content attribute which inherit
+     color-scheme from chrome to follow the browser theme */
+  browser[type="content"]:not([smartwindow-content]) {
     color-scheme: env(-moz-content-preferred-color-scheme);
   }
 

From 47206e7a7b0ce363031addbcf88885a4be7515a5 Mon Sep 17 00:00:00 2001
From: Dana Keeler <dkeeler@mozilla.com>
Date: Fri, 6 Feb 2026 18:00:27 +0000
Subject: [PATCH 51/93] Bug 2014612 - generate-test-certs: search more of the
 tree for input files r=jschanck

Previously, the command to regenerate test certificates (and keys, etc.) would
search a number of test directories. However, the recently-added
qwac_trust_anchors and pdf_trust_anchors make use of test certificates and
aren't under a dedicated test directory, so this patch expands
generate-test-certs to look higher in the tree.

It also takes the opportunity to rename some test files in pdf_trust_anchors so
they will work properly with generate-test-certs.

Differential Revision: https://phabricator.services.mozilla.com/D282013
---
 .../{test-ca-expired.certspec => test-ca-expired.pem.certspec}  | 0
 .../{test-ca.certspec => test-ca.pem.certspec}                  | 0
 security/manager/tools/mach_commands.py                         | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename security/manager/ssl/pdf_trust_anchors/test_trust_anchors/{test-ca-expired.certspec => test-ca-expired.pem.certspec} (100%)
 rename security/manager/ssl/pdf_trust_anchors/test_trust_anchors/{test-ca.certspec => test-ca.pem.certspec} (100%)

diff --git a/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.certspec b/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem.certspec
similarity index 100%
rename from security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.certspec
rename to security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem.certspec
diff --git a/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca.certspec b/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca.pem.certspec
similarity index 100%
rename from security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca.certspec
rename to security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca.pem.certspec
diff --git a/security/manager/tools/mach_commands.py b/security/manager/tools/mach_commands.py
index db769a869bf5f..06976e4aacd93 100644
--- a/security/manager/tools/mach_commands.py
+++ b/security/manager/tools/mach_commands.py
@@ -122,7 +122,7 @@ def find_all_specifications(command_context):
     inclusions = [
         "browser/base/content/test/siteIdentity/",
         "netwerk/test/unit",
-        "security/manager/ssl/tests",
+        "security/manager/ssl",
         "services/settings/test/unit/test_remote_settings_signatures",
         "testing/xpcshell/moz-http2",
         "toolkit/mozapps/extensions/test/xpcshell/data/productaddons",

From a1a330fcb1e173b420cd7a4cabc65f6ae4268ae1 Mon Sep 17 00:00:00 2001
From: Dana Keeler <dkeeler@mozilla.com>
Date: Fri, 6 Feb 2026 18:00:27 +0000
Subject: [PATCH 52/93] Bug 2014612 - regenerate expired qwac test roots
 r=jschanck

This also fixes a formatting issue with a pdf_trust_anchors test certificate.

Differential Revision: https://phabricator.services.mozilla.com/D282014
---
 .../test_trust_anchors/test-ca-expired.pem     |  2 +-
 .../test_trust_anchors/mochitest-test-ca.pem   | 16 ++++++++--------
 .../test_trust_anchors/test-ca.pem             | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem b/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem
index 63acd014f207e..fd89297d701b3 100644
--- a/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem
+++ b/security/manager/ssl/pdf_trust_anchors/test_trust_anchors/test-ca-expired.pem
@@ -15,4 +15,4 @@ uxj5v2NGE+2K8X2Thgnu3XclsC51qjNAGEILknRvdA7SdAL9H2YQ/PEZDJz0uYGL
 aZjTi2kMi9C5OO1Zq+dQvsfcT7ohf2z3Rgh2BhL5xQ/HDOtRlUO380PPWNr7F8Qw
 Xnrxk5YeO5oamo1iPJ6zPAC/iRbNS4zIQVbwkML4Ta4bWjhVkK/LSu3dCBnBLvzH
 v7m0HCGbscu/Oc1g6x/zG/HbHyVpLDqomOT9XPPwbg==
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff --git a/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/mochitest-test-ca.pem b/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/mochitest-test-ca.pem
index eb14424d52f95..6af75d841d043 100644
--- a/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/mochitest-test-ca.pem
+++ b/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/mochitest-test-ca.pem
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIUcW5r9yFgyYOqQjtLX8Pc0znoJTowDQYJKoZIhvcNAQEL
+MIIDgzCCAmugAwIBAgIURdtVQh52MgWF6sR2lT/kkp7M8T0wDQYJKoZIhvcNAQEL
 BQAwajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
-ZCBPcHRpbWl6YXRpb24wIhgPMjAyMzExMjgwMDAwMDBaGA8yMDI2MDIwNTAwMDAw
+ZCBPcHRpbWl6YXRpb24wIhgPMjAyNDExMjcwMDAwMDBaGA8yMDI3MDIwNTAwMDAw
 MFowajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
 ZCBPcHRpbWl6YXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
@@ -12,10 +12,10 @@ iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
 I/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA3GYF5PHevZ07BcvUwkDXYhCMaujMkRRPo
-T15uulenB9i1S/zBYhi6vLm2wEeiPeIT6+2SBd2lqJysfmQHCdOIHoc3pFJr9pad
-Q85otrITpmVXB+Z/EqIrjlxJKu8e7jcAGMd1rpiJV32g8uCEfng1+0Sw+LOThpCW
-TiDr/GWqo8dxigTl+1gdAP/wP4QF6MwC+Snll5HgTaOTAUhMg7dSd4rZbsUdCSgi
-xnEDoEqdj4Ve4J4uf1+XQ56oq0SmDSugBqgzagl3pd5rpSQP2aasPAgboQQJ8W0P
-mrEEofW1ffEUcQF6kE3qgvVBqgyZ9BsOzkBRjkjI5f47Tq6jlLzB
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB8qLjJ5/A1Mdtl5jyww6Ps84vZcIyoXTW7
+cDdS+KZvMld2ZihB8pjxzhdOdsghNo5cFD4qNlh8Fs0ePftptXa5qald4izgp2Uu
+3jnKUo+NnDKQEpE3jk0bV4M6m+tIaLWePigwkcBkIF85wTFIg6izdYEcGoik9YyT
+cUSphxrSAmnDns90FXkbG/MQHYFJYu/3p+R7SGmlwrBJ2TlA/2YLSxrc3YQ+Y9GI
+rOZ/+Kq/G7wsu3MDqCEfR+OHFzzmzcVeJkZS1zKdDnNxl417WMx/RGvM7nPX0i4M
+VFproX5UEQx+pqBPy8ov1wD7Z1CtlPKQ7CQqoYBUVBb5uvQk3DAH
 -----END CERTIFICATE-----
diff --git a/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/test-ca.pem b/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/test-ca.pem
index 85309686f5271..31293e3935577 100644
--- a/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/test-ca.pem
+++ b/security/manager/ssl/qwac_trust_anchors/test_trust_anchors/test-ca.pem
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUbRl0jsaZB1HOw2TSFqJE/hUf4x8wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDIzMTEyODAwMDAwMFoYDzIwMjYw
+MIIC0zCCAbugAwIBAgIURzyIa5PAntODcZ4AzhgZzl3zjrMwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDI0MTEyNzAwMDAwMFoYDzIwMjcw
 MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,11 +8,11 @@ qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAHldkZY/n8EPM
-hmKw7mLxMd66agv+HCe46PCv75LkAPh3CS7ovLFuU5C8IJUNMMRT2NXOtXwm/COb
-bMPqk/5+jRnBxkCdRCEerIp6tPBmcxci+bGZFdI+Xnq+/4vf9gcISphlrfCukbve
-7t/WNPIXMfu4yZnkMdQsoYWi2dE02GZNuaGj1oHTdWVgN/nRWtCo/cApupRN77GV
-nN1uE1fB07PQU75meGwsQOu6HMgVz2kQD9nZhfaisSJlGElYUGZmE2ySPr+OhTmT
-zHFD2cq6WQGCyWCH8cZY2a5pylOsG4auHwKCgbdSELMnIkUtWtmjGa6/2duQKOcr
-XHn6ZozclA==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAsNXVPjJr+as4
+PdX/PpdTdvDW/TZYh43G89gxgG805XHqCDDfksSOM7sc0CbNNkX69FSz3C1Xds2k
+Bqn0t4UHaCyQy7a5/vs1qes1T/GP6PscfATNgnrWqU8NyuZWv5Y0vwWKSL3AwFaF
+OGJnLGQlIN+4BczHdWFwgUQYj8R1gAXLJWEYtbg3j5lQA8k74DkHYcu8hT0l6UPn
+qwuw+nw332pkt4+8p2Hvb9+idEPOFcStkeOHIOSbRihWPHiVl8Jcr9b7m3r2uBL6
+z8vk7+vtf25hgW6oKoq5kBld+ttTSKOk5UvEGjEqyJA3ATnaMxTFXmX8MSugXIy7
+jCpW3BKLzg==
 -----END CERTIFICATE-----

From d019676b9c39df825d76c243813ca76294ce30ea Mon Sep 17 00:00:00 2001
From: Keith Cirkel <keithamus@users.noreply.github.com>
Date: Fri, 6 Feb 2026 18:16:04 +0000
Subject: [PATCH 53/93] Bug 2014549 - Refactor Optional<nsAString> to
 Maybe<nsAutoString> HTMLDialogElement r=dom-core,smaug

Differential Revision: https://phabricator.services.mozilla.com/D281977
---
 dom/html/HTMLDialogElement.cpp | 31 +++++++++++++++----------------
 dom/html/HTMLDialogElement.h   | 20 ++++++++++++++------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/dom/html/HTMLDialogElement.cpp b/dom/html/HTMLDialogElement.cpp
index a0e7cf681f6f3..a202ad2e70093 100644
--- a/dom/html/HTMLDialogElement.cpp
+++ b/dom/html/HTMLDialogElement.cpp
@@ -71,7 +71,7 @@ class DialogCloseWatcherListener : public nsIDOMEventListener {
         // 3. - closeAction being to close the dialog given dialog, dialog's
         // request close return value, and dialog's request close source
         // element.
-        Optional<nsAString> retValue;
+        Maybe<nsAutoString> retValue;
         dialog->GetRequestCloseReturnValue(retValue);
         RefPtr<Element> source = dialog->GetRequestCloseSourceElement();
         dialog->Close(source, retValue);
@@ -144,8 +144,8 @@ bool HTMLDialogElement::ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
 
 // https://html.spec.whatwg.org/#dom-dialog-close
 // https://html.spec.whatwg.org/#close-the-dialog
-void HTMLDialogElement::Close(
-    Element* aSource, const mozilla::dom::Optional<nsAString>& aReturnValue) {
+void HTMLDialogElement::Close(Element* aSource,
+                              const Maybe<nsAutoString>& aReturnValue) {
   // 1. If subject does not have an open attribute, then return.
   if (!Open()) {
     return;
@@ -176,8 +176,8 @@ void HTMLDialogElement::Close(
 
   // 9. If result is not null, then set subject's returnValue attribute to
   // result.
-  if (aReturnValue.WasPassed()) {
-    SetReturnValue(aReturnValue.Value());
+  if (aReturnValue.isSome()) {
+    SetReturnValue(aReturnValue.ref());
   }
 
   // 10. Set subject's request close return value to null.
@@ -217,8 +217,8 @@ void HTMLDialogElement::Close(
 
 // https://html.spec.whatwg.org/#dom-dialog-requestclose
 // https://html.spec.whatwg.org/#dialog-request-close
-void HTMLDialogElement::RequestClose(
-    Element* aSource, const mozilla::dom::Optional<nsAString>& aReturnValue) {
+void HTMLDialogElement::RequestClose(Element* aSource,
+                                     const Maybe<nsAutoString>& aReturnValue) {
   RefPtr closeWatcher = mCloseWatcher;
   // 1. If subject does not have an open attribute, then return.
   if (!Open()) {
@@ -245,8 +245,8 @@ void HTMLDialogElement::RequestClose(
   }
 
   // 5. Set subject's request close return value to returnValue.
-  if (aReturnValue.WasPassed()) {
-    SetRequestCloseReturnValue(aReturnValue.Value());
+  if (aReturnValue.isSome()) {
+    SetRequestCloseReturnValue(aReturnValue.ref());
   }
 
   // 6. Set subject's request close source element to source.
@@ -624,7 +624,7 @@ void HTMLDialogElement::RunCancelDialogSteps() {
   // the spec, over CloseWatcher though, so one day this code will need to be
   // refactored when the CloseWatcher specifications settle.
   if (defaultAction) {
-    Optional<nsAString> retValue;
+    Maybe<nsAutoString> retValue;
     GetRequestCloseReturnValue(retValue);
     RefPtr<Element> source = GetRequestCloseSourceElement();
     Close(source, retValue);
@@ -648,19 +648,18 @@ bool HTMLDialogElement::HandleCommandInternal(Element* aSource,
 
   if ((aCommand == Command::Close || aCommand == Command::RequestClose) &&
       Open()) {
-    Optional<nsAString> retValueOpt;
-    nsString retValue;
+    Maybe<nsAutoString> retValue;
     if (aSource->HasAttr(nsGkAtoms::value)) {
       if (auto* button = HTMLButtonElement::FromNodeOrNull(aSource)) {
-        button->GetValue(retValue);
-        retValueOpt = &retValue;
+        retValue.emplace();
+        button->GetValue(retValue.ref());
       }
     }
     if (aCommand == Command::Close) {
-      Close(aSource, retValueOpt);
+      Close(aSource, retValue);
     } else {
       MOZ_ASSERT(aCommand == Command::RequestClose);
-      RequestClose(aSource, retValueOpt);
+      RequestClose(aSource, retValue);
     }
     return true;
   }
diff --git a/dom/html/HTMLDialogElement.h b/dom/html/HTMLDialogElement.h
index a45dbf9b19193..d265f5a287b30 100644
--- a/dom/html/HTMLDialogElement.h
+++ b/dom/html/HTMLDialogElement.h
@@ -59,9 +59,9 @@ class HTMLDialogElement final : public nsGenericHTMLElement {
     mReturnValue = aReturnValue;
   }
 
-  void GetRequestCloseReturnValue(Optional<nsAString>& aReturnValue) {
+  void GetRequestCloseReturnValue(Maybe<nsAutoString>& aReturnValue) {
     if (mRequestCloseReturnValue.isSome()) {
-      aReturnValue = &mRequestCloseReturnValue.ref();
+      aReturnValue.emplace(mRequestCloseReturnValue.ref());
     }
   }
   void ClearRequestCloseReturnValue() { mRequestCloseReturnValue.reset(); }
@@ -74,16 +74,24 @@ class HTMLDialogElement final : public nsGenericHTMLElement {
 
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void Close(
       const mozilla::dom::Optional<nsAString>& aReturnValue) {
-    return Close(nullptr, aReturnValue);
+    Maybe<nsAutoString> retValueCopy;
+    if (aReturnValue.WasPassed()) {
+      retValueCopy.emplace(aReturnValue.Value());
+    }
+    return Close(nullptr, retValueCopy);
   }
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void Close(
-      Element* aSource, const mozilla::dom::Optional<nsAString>& aReturnValue);
+      Element* aSource, const Maybe<nsAutoString>& aReturnValue);
   MOZ_CAN_RUN_SCRIPT void RequestClose(
       const mozilla::dom::Optional<nsAString>& aReturnValue) {
-    RequestClose(nullptr, aReturnValue);
+    Maybe<nsAutoString> retValueCopy;
+    if (aReturnValue.WasPassed()) {
+      retValueCopy.emplace(aReturnValue.Value());
+    }
+    RequestClose(nullptr, retValueCopy);
   }
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void RequestClose(
-      Element* aSource, const mozilla::dom::Optional<nsAString>& aReturnValue);
+      Element* aSource, const Maybe<nsAutoString>& aReturnValue);
 
   RefPtr<Element> GetRequestCloseSourceElement();
 

From 35d9aa0789bf65158418f9562316b9ede48c0ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Feb 2026 18:17:15 +0000
Subject: [PATCH 54/93] Bug 2013896 - Add a test for this bug.
 r=dshin,layout-anchor-positioning-reviewers

Bug 2013011 fixes this.

Differential Revision: https://phabricator.services.mozilla.com/D282196
---
 .../anchor-fieldset-001-ref.html              | 25 +++++++++++++++++
 .../anchor-fieldset-001.html                  | 27 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html

diff --git a/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001-ref.html b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001-ref.html
new file mode 100644
index 0000000000000..5764ff9f7bc20
--- /dev/null
+++ b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>CSS test reference</title>
+<style>
+fieldset::before {
+  content: "";
+  display: block;
+  width: 10px;
+  height: 10px;
+  background: purple;
+  position: absolute;
+  top: calc(100% + 10px);
+  left: calc(100% + 10px);
+}
+
+fieldset {
+  width: 200px;
+  border: 10px solid blue;
+  position: relative;
+}
+</style>
+<form>
+  <fieldset>
+    <legend>Legend</legend>
+  </fieldset>
+</form>
diff --git a/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html
new file mode 100644
index 0000000000000..780d707e38f16
--- /dev/null
+++ b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Implicit anchoring to a fieldset anchors to outer, not inner box</title>
+<link rel="help" href="http://drafts.csswg.org/css-anchor-position-1/#implicit">
+<link rel="help" href="https://bugzil.la/2013896">
+<link rel="match" href="anchor-fieldset-001-ref.html">
+<style>
+fieldset::before {
+  content: ""; 
+  display: block;
+  width: 10px;
+  height: 10px;
+  background: purple;
+  position: absolute;
+  position-anchor: auto;
+  position-area: bottom right;
+}
+
+fieldset {
+  width: 200px;
+  border: 10px solid blue;
+}
+</style>
+<form>
+  <fieldset>
+    <legend>Legend</legend>
+  </fieldset>
+</form>

From 222f8d185a7fb1c494b82009244d1a498959f996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Feb 2026 18:47:18 +0000
Subject: [PATCH 55/93] Bug 2014986 - Improve prev sibling computation for flex
 / grid containers. r=jwatt

The situation this patch deals with is when you have the following frame
tree structure:

  ns{Flex,Grid}ContainerFrame
   ::-moz-anonymous-item
     Some text

And you append something after "Some text".

Before the regressing bug, we ended up in different codepaths for
insertion and append: Append always ended with the grid container as a
parent (and the anonymous item as a prev sibling), while insert ended
with the current nightly behavior of choosing the text frame as a
sibling, and the anonymous item as a parent.

WipeContainingBlock has code to deal with the wrong choice, but that
forces the container to be reconstructed, which is inefficient and in
cases like this one has correctness implications (because we store the
"view transition live capture bit" on the frame). I filed bug 2015007
for that since that's technically wrong too.

This is the relatively-minimal upliftable fix to minimize reframes in
both cases, which of course fixes the regression. I think it might be
worth looking into whether we can make the right decision later in the
pipeline (e.g., making WipeContainingBlock override the insertion parent
rather than bailing out). But that seems riskier.

Add a test for the different cases here.

Differential Revision: https://phabricator.services.mozilla.com/D282161
---
 layout/base/nsCSSFrameConstructor.cpp         | 75 +++++++++++--------
 .../test_dynamic_change_causing_reflow.html   | 32 ++++++++
 2 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 8bcc8f8907532..710825b1683fc 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -231,18 +231,19 @@ static inline bool IsFlexContainerForLegacyWebKitBox(const nsIFrame* aFrame) {
   return aFrame->IsFlexContainerFrame() && aFrame->IsLegacyWebkitBox();
 }
 
-#if DEBUG
-static void AssertAnonymousFlexOrGridItemParent(const nsIFrame* aChild,
-                                                const nsIFrame* aParent) {
+static MOZ_ALWAYS_INLINE void AssertAnonymousFlexOrGridItemParent(
+    const nsIFrame* aChild, const nsIFrame* aParent) {
   MOZ_ASSERT(IsAnonymousItem(aChild), "expected an anonymous item child frame");
   MOZ_ASSERT(aParent, "expected a parent frame");
   MOZ_ASSERT(aParent->IsFlexOrGridContainer(),
              "anonymous items should only exist as children of flex/grid "
              "container frames");
 }
-#else
-#  define AssertAnonymousFlexOrGridItemParent(x, y) PR_BEGIN_MACRO PR_END_MACRO
-#endif
+
+static MOZ_ALWAYS_INLINE void AssertAnonymousFlexOrGridItemParent(
+    const nsIFrame* aChild) {
+  AssertAnonymousFlexOrGridItemParent(aChild, aChild->GetParent());
+}
 
 #define ToCreationFunc(_func)                              \
   [](PresShell* aPs, ComputedStyle* aStyle) -> nsIFrame* { \
@@ -5482,26 +5483,6 @@ nsContainerFrame* nsCSSFrameConstructor::GetFloatContainingBlock(
   return nullptr;
 }
 
-/**
- * This function will get the previous sibling to use for an append operation.
- *
- * It takes a parent frame (must not be null) and the next insertion sibling, if
- * the parent content is display: contents or has ::after content (may be null).
- */
-static nsIFrame* FindAppendPrevSibling(nsIFrame* aParentFrame,
-                                       nsIFrame* aNextSibling) {
-  aParentFrame->DrainSelfOverflowList();
-
-  if (aNextSibling) {
-    MOZ_ASSERT(
-        aNextSibling->GetParent()->GetContentInsertionFrame() == aParentFrame,
-        "Wrong parent");
-    return aNextSibling->GetPrevSibling();
-  }
-
-  return aParentFrame->PrincipalChildList().LastChild();
-}
-
 /**
  * Finds the right parent frame to append content to aParentFrame.
  *
@@ -5845,12 +5826,36 @@ nsIFrame* nsCSSFrameConstructor::GetInsertionPrevSibling(
   // the later usage of the iterator starts from the same place.
   nsIFrame* prevSibling = FindPreviousSibling(iter);
 
-  // Now, find the geometric parent so that we can handle
-  // continuations properly. Use the prev sibling if we have it;
-  // otherwise use the next sibling.
+  // Now, find the geometric parent so that we can handle continuations
+  // properly. Use the prev sibling if we have it; otherwise use the next
+  // sibling.
   if (prevSibling) {
     aInsertion->mParentFrame =
         prevSibling->GetParent()->GetContentInsertionFrame();
+
+    if (IsAnonymousItem(aInsertion->mParentFrame)) {
+      // Special-case anonymous flex / grid items: Elements are blockified
+      // inside those containers, so the anonymous item is unlikely to be the
+      // right parent unless we're inserting a non-whitespace text-node.
+      //
+      // If we guess wrong, we catch this in WipeContainingBlock, but with a
+      // performance penalty (and sometimes correctness too, see bug 2014986).
+      //
+      // TODO(emilio): Are there other situations where this is worth doing
+      // (some table anon boxes or something?). Seems hard to do at this stage
+      // where we still don't _quite_ know the details of what aChild is (in or
+      // out of flow, display inside or outside...). Maybe WipeContainingBlock
+      // should be able to fix-up the insertion point at the last minute? But
+      // that seems more sketchy since some code does rely on looking at the
+      // insertion point to decide what to construct.
+      AssertAnonymousFlexOrGridItemParent(aInsertion->mParentFrame);
+      if (!prevSibling->GetNextSibling() &&
+          (!aChild->IsText() || aChild->TextIsOnlyWhitespace())) {
+        prevSibling = aInsertion->mParentFrame;
+        aInsertion->mParentFrame = prevSibling->GetParent();
+      }
+    }
+
     *aIsAppend =
         !::GetInsertNextSibling(aInsertion->mParentFrame, prevSibling) &&
         !nsLayoutUtils::GetNextContinuationOrIBSplitSibling(
@@ -5860,6 +5865,14 @@ nsIFrame* nsCSSFrameConstructor::GetInsertionPrevSibling(
     // If there is no previous sibling, then find the frame that follows
     aInsertion->mParentFrame =
         nextSibling->GetParent()->GetContentInsertionFrame();
+    if (IsAnonymousItem(aInsertion->mParentFrame)) {
+      // See the prevSibling special-case above.
+      AssertAnonymousFlexOrGridItemParent(aInsertion->mParentFrame);
+      if (!nextSibling->GetPrevSibling() &&
+          (!aChild->IsText() || aChild->TextIsOnlyWhitespace())) {
+        aInsertion->mParentFrame = aInsertion->mParentFrame->GetParent();
+      }
+    }
   } else {
     // No previous or next sibling, so treat this like an appended frame.
     *aIsAppend = true;
@@ -5867,7 +5880,7 @@ nsIFrame* nsCSSFrameConstructor::GetInsertionPrevSibling(
     aInsertion->mParentFrame =
         ::ContinuationToAppendTo(aInsertion->mParentFrame);
 
-    prevSibling = ::FindAppendPrevSibling(aInsertion->mParentFrame, nullptr);
+    prevSibling = aInsertion->mParentFrame->PrincipalChildList().LastChild();
   }
 
   return prevSibling;
@@ -10836,7 +10849,7 @@ bool nsCSSFrameConstructor::WipeContainingBlock(
   // Situation #3 is an anonymous flex or grid item that's getting new children
   // who don't want to be wrapped.
   if (IsAnonymousItem(aFrame)) {
-    AssertAnonymousFlexOrGridItemParent(aFrame, aFrame->GetParent());
+    AssertAnonymousFlexOrGridItemParent(aFrame);
 
     // We need to push a null float containing block to be sure that
     // "NeedsAnonFlexOrGridItem" will know we're not honoring floats for this
diff --git a/layout/style/test/test_dynamic_change_causing_reflow.html b/layout/style/test/test_dynamic_change_causing_reflow.html
index 943b3bb28f744..3cf3584d27c8e 100644
--- a/layout/style/test/test_dynamic_change_causing_reflow.html
+++ b/layout/style/test/test_dynamic_change_causing_reflow.html
@@ -30,6 +30,9 @@
     top: 0;
     position: absolute;
   }
+  #flexContainerWithText {
+    display: flex;
+  }
   #tableCell,
   #tableCellWithAbsPosChild {
     display: table-cell;
@@ -97,6 +100,13 @@
   <div id="contentVisibilityNode">
     <div></div>
   </div>
+  <div id="flexContainerWithText">
+    abc
+    <div id="flexContainerWithTextInsertionTarget1"></div>
+    <div>Foo</div>
+    def
+    <div id="flexContainerWithTextInsertionTarget2"></div>
+  </div>
 </div>
 <pre id="test">
 <script>
@@ -115,6 +125,8 @@
 const buttonElemWithAbsPosChild = document.getElementById("buttonElemWithAbsPosChild");
 const tableCell = document.getElementById("tableCell");
 const tableCellWithAbsPosChild = document.getElementById("tableCellWithAbsPosChild");
+const flexContainerWithTextInsertionTarget1 = document.getElementById("flexContainerWithTextInsertionTarget1");
+const flexContainerWithTextInsertionTarget2 = document.getElementById("flexContainerWithTextInsertionTarget2");
 
 for (let scroller of document.querySelectorAll(".flexScrollerWithTransformedItems")) {
   scroller.scrollLeft = 10000;
@@ -930,6 +942,22 @@
     expectConstruction: false,
     expectReflow: true,
   },
+  {
+    elem: flexContainerWithTextInsertionTarget1,
+    beforeStyle: "display: none",
+    afterStyle: "display: block",
+    expectConstruction: true,
+    expectFramesConstructed: 1,
+    expectReflow: true,
+  },
+  {
+    elem: flexContainerWithTextInsertionTarget2,
+    beforeStyle: "display: none",
+    afterStyle: "display: block",
+    expectConstruction: true,
+    expectFramesConstructed: 1,
+    expectReflow: true,
+  }
 ];
 
 // Helper function to let us call either "is" or "isnot" & assemble
@@ -995,6 +1023,10 @@
                   aTestcase.expectReflow, msgPrefix,
                   "reflow");
 
+  if (aTestcase.expectFramesConstructed !== undefined) {
+    is(gUtils.framesConstructed - origFramesConstructed, aTestcase.expectFramesConstructed, `${msgPrefix} should cause ${aTestcase.expectFramesConstructed} frames to be constructed`);
+  }
+
   // Clean up!
   if (oldStyle) {
     elem.setAttribute("style", oldStyle);

From 7e39b63c5f569415f68d3b48bcc51a3694ebc7d0 Mon Sep 17 00:00:00 2001
From: Giulia Cardieri <gcardieri@mozilla.com>
Date: Fri, 6 Feb 2026 19:08:27 +0000
Subject: [PATCH 56/93] Bug 2010422 - Add loader for chat assistant
 r=ai-frontend-reviewers,Mardak

[[ https://www.figma.com/design/5KuePTGmOEUFyCHBHCsGim/AI-Mode-%E2%80%94%C2%A0MVP-Scope-Design?node-id=16507-34414&m=dev | Figma example (no text for now) ]]

**Goal**: add a loader element, it is visible after the user sends a message and before the assistant responds. Based on the back-end, the analyzing search text might appear after the search page is visible and while the assistant is loading their summary of it.

Differential Revision: https://phabricator.services.mozilla.com/D281502
---
 .../components/aiwindow/ui/assets/loader.svg  |  5 ++
 .../ai-chat-content/ai-chat-content.css       | 32 ------------
 .../ai-chat-content/ai-chat-content.mjs       | 29 +++++------
 .../chat-assistant-loader.css                 | 41 ++++++++++++++++
 .../chat-assistant-loader.mjs                 | 49 +++++++++++++++++++
 browser/components/aiwindow/ui/jar.mn         |  3 ++
 .../test/browser/browser_actor_user_prompt.js | 46 +++++++++++++++++
 7 files changed, 156 insertions(+), 49 deletions(-)
 create mode 100644 browser/components/aiwindow/ui/assets/loader.svg
 create mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
 create mode 100644 browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs

diff --git a/browser/components/aiwindow/ui/assets/loader.svg b/browser/components/aiwindow/ui/assets/loader.svg
new file mode 100644
index 0000000000000..c063a09187c32
--- /dev/null
+++ b/browser/components/aiwindow/ui/assets/loader.svg
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><mask id="b" fill="#fff"><path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Z"/></mask><g clip-path="url(#a)" mask="url(#b)"><foreignObject width="2583.33" height="2583.33" x="-1291.67" y="-1291.67" transform="rotate(180 4 4) scale(.008)"><div xmlns="http://www.w3.org/1999/xhtml" style="background:conic-gradient(from 90deg,rgba(160,114,226,0) 0deg,#a072e2 360deg);height:100%;width:100%;opacity:1"/></foreignObject></g><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/><defs><clipPath id="a"><path d="M8 0v2.333A5.667 5.667 0 0 1 13.667 8h4.666C18.333 2.293 13.707-2.333 8-2.333V0Zm8 8h-2.333A5.667 5.667 0 0 1 8 13.667v4.666c5.707 0 10.333-4.626 10.333-10.333H16Zm-8 8v-2.333A5.667 5.667 0 0 1 2.333 8h-4.666c0 5.707 4.626 10.333 10.333 10.333V16ZM0 8h2.333A5.667 5.667 0 0 1 8 2.333v-4.666C2.293-2.333-2.333 2.293-2.333 8H0Z" mask="url(#b)"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
index 2db95c66c7497..3b334e651f086 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.css
@@ -66,35 +66,3 @@
   gap: var(--space-small);
   width: 100%;
 }
-
-.searching-indicator {
-  align-items: center;
-  flex-direction: row;
-  gap: var(--space-small);
-}
-
-.searching-text {
-  color: var(--text-color-deemphasized);
-  font-style: italic;
-}
-
-.searching-indicator::before {
-  animation: pulse 1.5s ease-in-out infinite;
-  background: var(--color-accent-primary);
-  border-radius: 50%;
-  content: "";
-  height: 8px;
-  width: 8px;
-}
-
-@keyframes pulse {
-  0%,
-  100% {
-    opacity: 0.4;
-    transform: scale(0.8);
-  }
-  50% {
-    opacity: 1;
-    transform: scale(1.2);
-  }
-}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
index 413d95a3c57b9..9fec20b632120 100644
--- a/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs
@@ -6,6 +6,8 @@ import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 // eslint-disable-next-line import/no-unassigned-import
 import "chrome://browser/content/aiwindow/components/assistant-message-footer.mjs";
+// eslint-disable-next-line import/no-unassigned-import
+import "chrome://browser/content/aiwindow/components/chat-assistant-loader.mjs";
 
 /**
  * A custom element for managing AI Chat Content
@@ -15,14 +17,14 @@ export class AIChatContent extends MozLitElement {
     conversationState: { type: Array },
     tokens: { type: Object },
     isSearching: { type: Boolean },
-    searchQuery: { type: String },
+    assistantIsLoading: { type: Boolean },
   };
 
   constructor() {
     super();
     this.conversationState = [];
     this.isSearching = false;
-    this.searchQuery = null;
+    this.assistantIsLoading = false;
   }
 
   connectedCallback() {
@@ -145,9 +147,9 @@ export class AIChatContent extends MozLitElement {
   }
 
   handleLoadingEvent(event) {
-    const { isSearching, searchQuery } = event.detail;
+    const { isSearching } = event.detail;
     this.isSearching = !!isSearching;
-    this.searchQuery = searchQuery || null;
+    this.assistantIsLoading = true;
     this.requestUpdate();
     this.#scrollToBottom();
   }
@@ -160,6 +162,7 @@ export class AIChatContent extends MozLitElement {
 
   handleUserPromptEvent(event) {
     const { convId, content, ordinal } = event.detail;
+    this.assistantIsLoading = true;
     this.conversationState[ordinal] = {
       role: "user",
       body: content.body,
@@ -178,7 +181,7 @@ export class AIChatContent extends MozLitElement {
 
   handleAIResponseEvent(event) {
     this.isSearching = false;
-    this.searchQuery = null;
+    this.assistantIsLoading = false;
 
     const {
       convId,
@@ -277,18 +280,10 @@ export class AIChatContent extends MozLitElement {
             </div>
           `;
         })}
-        ${this.isSearching
-          ? html`
-              <div
-                class="chat-bubble chat-bubble-assistant searching-indicator"
-              >
-                <span class="searching-text">
-                  ${this.searchQuery
-                    ? `Searching for: "${this.searchQuery}"`
-                    : "Searching the web..."}
-                </span>
-              </div>
-            `
+        ${this.assistantIsLoading
+          ? html`<chat-assistant-loader
+              .isSearch=${this.isSearching}
+            ></chat-assistant-loader>`
           : nothing}
       </div>
     `;
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
new file mode 100644
index 0000000000000..5cfa0b5538b3d
--- /dev/null
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css
@@ -0,0 +1,41 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+:host {
+  --chat-assistant-loader-size: var(--size-item-small);
+  --chat-assistant-loader-light-pink: color-mix(in srgb, var(--color-blue-40) 38.74%, var(--color-purple-10) 61.26%);
+  --chat-assistant-loader-dark-pink: var(--color-purple-60);
+}
+
+.chat-assistant-loader {
+  display: flex;
+  gap: calc(var(--space-xxsmall) + var(--space-xsmall));
+}
+
+.chat-assistant-loader__spinner {
+  animation: 0.9s spinLoader infinite linear;
+  background-image: url("chrome://browser/content/aiwindow/assets/loader.svg");
+  background-size: var(--chat-assistant-loader-size);
+  height: var(--chat-assistant-loader-size);
+  width: var(--chat-assistant-loader-size);
+  will-change: transform;
+}
+
+@keyframes spinLoader {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.chat-assistant-loader__text {
+  background-image: linear-gradient(90deg, var(--chat-assistant-loader-light-pink) 14.17%, var(--chat-assistant-loader-dark-pink) 91.21%);
+  background-clip: text;
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
+  color: transparent;
+  font-weight: var(--font-weight-semibold);
+  margin: 0;
+}
diff --git a/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
new file mode 100644
index 0000000000000..48be3c156f981
--- /dev/null
+++ b/browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
+import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
+
+/**
+ * Loader/spinner visible while the assistant is thinking
+ *
+ * isSearch - true when this component is being used for loading a search handoff action
+ */
+export class ChatAssistantLoader extends MozLitElement {
+  static properties = {
+    isSearch: { type: Boolean },
+  };
+
+  constructor() {
+    super();
+    this.isSearch = false;
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+  }
+
+  render() {
+    return html`
+      <link
+        rel="stylesheet"
+        href="chrome://browser/content/aiwindow/components/chat-assistant-loader.css"
+      />
+      <!-- TO DO: add fluent string when UX writing team finished copy - https://bugzilla.mozilla.org/show_bug.cgi?id=2014907 -->
+      <div
+        class="chat-assistant-loader"
+        aria-label=" ${this.isSearch ? `` : `Loading assistant response`}"
+      >
+        <span class="chat-assistant-loader__spinner"></span>
+        ${this.isSearch
+          ? html`
+              <p class="chat-assistant-loader__text">Analyzing web search</p>
+            `
+          : nothing}
+      </div>
+    `;
+  }
+}
+
+customElements.define("chat-assistant-loader", ChatAssistantLoader);
diff --git a/browser/components/aiwindow/ui/jar.mn b/browser/components/aiwindow/ui/jar.mn
index d0f22bcb03619..1217776c10c1e 100644
--- a/browser/components/aiwindow/ui/jar.mn
+++ b/browser/components/aiwindow/ui/jar.mn
@@ -9,6 +9,9 @@ browser.jar:
   content/browser/aiwindow/assets/input-cta-arrow-icon.svg          (assets/input-cta-arrow-icon.svg)
   content/browser/aiwindow/components/ai-chat-content.mjs           (components/ai-chat-content/ai-chat-content.mjs)
   content/browser/aiwindow/components/ai-chat-content.css           (components/ai-chat-content/ai-chat-content.css)
+  content/browser/aiwindow/components/chat-assistant-loader.mjs     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.mjs)
+  content/browser/aiwindow/components/chat-assistant-loader.css     (components/ai-chat-content/chat-assistant-loader/chat-assistant-loader.css)
+  content/browser/aiwindow/assets/loader.svg                        (assets/loader.svg)
   content/browser/aiwindow/components/ai-chat-message.mjs           (components/ai-chat-message/ai-chat-message.mjs)
   content/browser/aiwindow/components/ai-chat-message.css           (components/ai-chat-message/ai-chat-message.css)
   content/browser/aiwindow/components/ai-chat-search-button.mjs     (components/ai-chat-search-button/ai-chat-search-button.mjs)
diff --git a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
index fe26e5c88426e..5f0653efc8d02 100644
--- a/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
+++ b/browser/components/aiwindow/ui/test/browser/browser_actor_user_prompt.js
@@ -56,3 +56,49 @@ add_task(async function test_streaming_ai_response() {
 
   await SpecialPowers.popPrefEnv();
 });
+
+/**
+ * Test if the loader shows after the user prompt is submitted
+ */
+add_task(async function test_loader_shows_on_user_submit() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.smartwindow.enabled", true]],
+  });
+
+  await BrowserTestUtils.withNewTab("about:aichatcontent", async browser => {
+    const actor =
+      browser.browsingContext.currentWindowGlobal.getActor("AIChatContent");
+
+    const userPrompt = {
+      role: "user",
+      content: { body: "Show loader please" },
+    };
+
+    await actor.dispatchMessageToChatContent(userPrompt);
+
+    await SpecialPowers.spawn(browser, [], async () => {
+      const contentEl = content.document.querySelector("ai-chat-content");
+      await contentEl.updateComplete;
+
+      let loaderEl;
+      await ContentTaskUtils.waitForMutationCondition(
+        contentEl.shadowRoot,
+        { childList: true, subtree: true },
+        () => {
+          loaderEl = contentEl.shadowRoot.querySelector(
+            "chat-assistant-loader"
+          );
+          return loaderEl;
+        }
+      );
+      Assert.ok(loaderEl, "Loader element exists");
+
+      const inner = loaderEl.shadowRoot?.querySelector(
+        ".chat-assistant-loader"
+      );
+      Assert.ok(inner, "Loader has the correct content");
+    });
+  });
+
+  await SpecialPowers.popPrefEnv();
+});

From 1574c96b058236c44be1f5f3cf5994d7b1ab376e Mon Sep 17 00:00:00 2001
From: hannajones <hjones@mozilla.com>
Date: Fri, 6 Feb 2026 19:15:25 +0000
Subject: [PATCH 57/93] Bug 2010759 - add support for static elements to
 moz-box-group r=desktop-theme-reviewers,tgiles,Standard8,scunnane

Differential Revision: https://phabricator.services.mozilla.com/D281546
---
 browser/components/preferences/search.js      |   2 +-
 .../tests/widgets/test_moz_box_group.html     | 191 ++++++++++++++++++
 .../widgets/moz-box-group/README.stories.md   |  36 ++++
 .../widgets/moz-box-group/moz-box-group.mjs   |  78 +++++--
 .../moz-box-group/moz-box-group.stories.mjs   |  71 ++++---
 .../widgets/moz-box-item/moz-box-item.css     |   5 +
 .../widgets/moz-box-item/moz-box-item.mjs     |   3 +-
 7 files changed, 346 insertions(+), 40 deletions(-)

diff --git a/browser/components/preferences/search.js b/browser/components/preferences/search.js
index 341b8f52726b1..6a9d68eb04861 100644
--- a/browser/components/preferences/search.js
+++ b/browser/components/preferences/search.js
@@ -799,12 +799,12 @@ Preferences.addSetting(
         configs.push({
           id,
           control: "moz-box-item",
+          slot: "static",
           controlAttrs: {
             label: l10nNames.get(searchMode.source)[0],
             description: keywords,
             layout: "medium-icon",
             iconsrc: searchMode.icon,
-            slot: "footer",
           },
         });
       }
diff --git a/toolkit/content/tests/widgets/test_moz_box_group.html b/toolkit/content/tests/widgets/test_moz_box_group.html
index f712c53dd3a24..fb4d74bbcb7e6 100644
--- a/toolkit/content/tests/widgets/test_moz_box_group.html
+++ b/toolkit/content/tests/widgets/test_moz_box_group.html
@@ -27,6 +27,7 @@
         synthesizeKey(keyCode);
         await boxGroup.updateComplete;
       }
+
       add_setup(async function setup() {
         ({ html } = await testHelpers.setupLit());
         ({ MozLitElement } =
@@ -830,6 +831,196 @@
           "Focus should be able to move back into the box group after a list item is removed"
         );
       });
+
+      add_task(async function testMozBoxGroupStaticItems() {
+        let staticTemplate = html`<moz-box-group type="reorderable-list">
+          <moz-box-item label="item 1"></moz-box-item>
+          <moz-box-item label="item 2"></moz-box-item>
+          <moz-box-item label="static item 1" slot="static"></moz-box-item>
+          <moz-box-item label="static item 2" slot="static"></moz-box-item>
+        </moz-box-group>`;
+        let {
+          children: [boxGroup],
+        } = await testHelpers.renderTemplate(staticTemplate);
+        await boxGroup.updateComplete;
+
+        is(boxGroup.listItems.length, 2, "Box group has 2 regular items.");
+        is(boxGroup.staticItems.length, 2, "Box group has 2 static items.");
+
+        boxGroup.staticItems.forEach((item, i) => {
+          ok(
+            item.hasAttribute("static"),
+            `Static item ${i} has static attribute.`
+          );
+          is(
+            item.slot,
+            `static-${i}`,
+            `Static item ${i} has slot static-${i}.`
+          );
+          is(
+            item.getAttribute("position"),
+            String(2 + i),
+            `Static item ${i} positioned after regular items.`
+          );
+          ok(!item.handleEl, `Static item ${i} has no handle element.`);
+        });
+      });
+
+      add_task(async function testMozBoxGroupStaticItemsNotReorderable() {
+        class TestStaticReorderable extends MozLitElement {
+          static properties = { items: { type: Array } };
+          constructor() {
+            super();
+            this.items = [];
+          }
+          render() {
+            return html`<moz-box-group
+              @reorder=${this.onReorder}
+              type="reorderable-list"
+            >
+              ${this.items}
+            </moz-box-group>`;
+          }
+
+          onReorder(event) {
+            const { draggedIndex, targetIndex } = event.detail;
+            const regularItems = this.items.filter(
+              item => !item.values?.[0]?.slot
+            );
+            const [draggedItem] = regularItems.splice(draggedIndex, 1);
+            regularItems.splice(targetIndex, 0, draggedItem);
+            const staticItems = this.items.filter(
+              item => item.values?.[0]?.slot === "static"
+            );
+            this.items = [...regularItems, ...staticItems];
+            this.requestUpdate();
+          }
+        }
+        customElements.define("test-static-reorderable", TestStaticReorderable);
+
+        let wrapper = document.createElement("test-static-reorderable");
+        wrapper.items = [
+          html`<moz-box-item label="item 1"></moz-box-item>`,
+          html`<moz-box-item label="item 2"></moz-box-item>`,
+          html`<moz-box-item label="static item" slot="static"></moz-box-item>`,
+        ];
+        document.body.appendChild(wrapper);
+        await wrapper.updateComplete;
+
+        let boxGroup = wrapper.shadowRoot.querySelector("moz-box-group");
+        await boxGroup.updateComplete;
+
+        let staticItem = boxGroup.querySelector("[label='static item']");
+        ok(!staticItem.handleEl, "Static item has no handle element.");
+        ok(
+          staticItem.hasAttribute("static"),
+          "Static item has static attribute."
+        );
+
+        // Verify only non-static items are in the reorderable list.
+        let item1 = boxGroup.querySelector("[label='item 1']");
+        let item2 = boxGroup.querySelector("[label='item 2']");
+        ok(item1.handleEl, "Regular item 1 has handle element.");
+        ok(item2.handleEl, "Regular item 2 has handle element.");
+
+        boxGroup.reorderableList.getItems();
+        item1.handleEl.focus();
+        let reordered = BrowserTestUtils.waitForEvent(boxGroup, "reorder");
+        synthesizeKey("KEY_ArrowDown", { shiftKey: true, ctrlKey: true });
+        await reordered;
+        await wrapper.updateComplete;
+
+        is(
+          boxGroup.querySelector("moz-box-item:nth-of-type(2)").label,
+          "item 1",
+          "Regular items reordered."
+        );
+        is(
+          boxGroup.querySelector("moz-box-item:nth-of-type(3)").label,
+          "static item",
+          "Static item remains in place after reorder."
+        );
+
+        synthesizeKey("KEY_ArrowDown", { shiftKey: true, ctrlKey: true });
+        await wrapper.updateComplete;
+
+        is(
+          boxGroup.querySelector("moz-box-item:nth-of-type(2)").label,
+          "item 1",
+          "Regular items not reordered when the next item is static."
+        );
+
+        wrapper.remove();
+      });
+
+      add_task(async function testMozBoxGroupStaticItemsKeyboardNavigation() {
+        let keyboardTemplate = html`<moz-box-group type="list">
+          <moz-box-item label="item 1">
+            <moz-button slot="actions" label="action 1"></moz-button>
+          </moz-box-item>
+          <moz-box-item label="item 2">
+            <moz-button slot="actions" label="action 2"></moz-button>
+          </moz-box-item>
+          <moz-box-item label="static item 1" slot="static">
+            <moz-button slot="actions" label="static action 1"></moz-button>
+          </moz-box-item>
+          <moz-box-item label="static item 2" slot="static">
+            <moz-button slot="actions" label="static action 2"></moz-button>
+          </moz-box-item>
+        </moz-box-group>`;
+        let {
+          children: [boxGroup],
+        } = await testHelpers.renderTemplate(keyboardTemplate);
+        await boxGroup.updateComplete;
+
+        let allItems = [...boxGroup.listItems, ...boxGroup.staticItems];
+        await Promise.all(allItems.map(item => item.updateComplete));
+
+        // Focus first action button.
+        allItems[0].querySelector("moz-button").focus();
+
+        // Navigate down through all items.
+        for (let i = 1; i < allItems.length; i++) {
+          await keyboardNavigate("down", boxGroup);
+          is(
+            document.activeElement,
+            allItems[i].querySelector("moz-button"),
+            `Down navigates to item ${i}.`
+          );
+        }
+
+        // Navigate up through all items.
+        for (let i = allItems.length - 2; i >= 0; i--) {
+          await keyboardNavigate("up", boxGroup);
+          is(
+            document.activeElement,
+            allItems[i].querySelector("moz-button"),
+            `Up navigates to item ${i}.`
+          );
+        }
+      });
+
+      add_task(async function testMozBoxGroupStaticItemsFirstLastStyles() {
+        let stylesTemplate = html`<moz-box-group>
+          <moz-box-item label="item 1"></moz-box-item>
+          <moz-box-item label="item 2"></moz-box-item>
+          <moz-box-item label="static item" slot="static"></moz-box-item>
+        </moz-box-group>`;
+        let {
+          children: [boxGroup],
+        } = await testHelpers.renderTemplate(stylesTemplate);
+        await boxGroup.updateComplete;
+
+        let [item1, item2] = boxGroup.listItems;
+        let [staticItem] = boxGroup.staticItems;
+
+        ok(item1.classList.contains("first"), "First item has 'first' class.");
+        ok(!item2.classList.contains("last"), "Middle item no 'last' class.");
+        ok(
+          staticItem.classList.contains("last"),
+          "Static item has 'last' class."
+        );
+      });
     </script>
   </head>
   <body>
diff --git a/toolkit/content/widgets/moz-box-group/README.stories.md b/toolkit/content/widgets/moz-box-group/README.stories.md
index 7f58874694f1f..5c30f9402f7a1 100644
--- a/toolkit/content/widgets/moz-box-group/README.stories.md
+++ b/toolkit/content/widgets/moz-box-group/README.stories.md
@@ -191,3 +191,39 @@ The `moz-box-group` component supports optional header and footer content. To in
   </moz-box-group>
 </div>
 ```
+
+### Static Items
+
+The `moz-box-group` component supports static (non-reorderable) items in reorderable lists. To mark an item as static, place it in the `static` named slot. Static items are positioned after regular items and cannot be reordered.
+
+Static items are only supported in `type="reorderable-list"`. They are included in keyboard navigation, and can contain interactive elements.
+
+```html
+<moz-box-group type="reorderable-list">
+  <moz-box-item label="Reorderable item 1">
+    <moz-button label="Click me!" slot="actions"></moz-button>
+  </moz-box-item>
+  <moz-box-item label="Reorderable item 2">
+    <moz-button label="Click me!" slot="actions"></moz-button>
+  </moz-box-item>
+  <moz-box-item slot="static" label="Static item (cannot be reordered)">
+    <moz-button label="Click me!" slot="actions"></moz-button>
+  </moz-box-item>
+</moz-box-group>
+```
+
+```html story
+<div style={{ width: "500px" }}>
+  <moz-box-group type="reorderable-list">
+    <moz-box-item label="Reorderable item 1">
+      <moz-button label="Click me!" slot="actions"></moz-button>
+    </moz-box-item>
+    <moz-box-item label="Reorderable item 2">
+      <moz-button label="Click me!" slot="actions"></moz-button>
+    </moz-box-item>
+    <moz-box-item slot="static" label="Static item (cannot be reordered)">
+      <moz-button label="Click me!" slot="actions"></moz-button>
+    </moz-box-item>
+  </moz-box-group>
+</div>
+```
diff --git a/toolkit/content/widgets/moz-box-group/moz-box-group.mjs b/toolkit/content/widgets/moz-box-group/moz-box-group.mjs
index 7873f6fb14918..043b72ffe3908 100644
--- a/toolkit/content/widgets/moz-box-group/moz-box-group.mjs
+++ b/toolkit/content/widgets/moz-box-group/moz-box-group.mjs
@@ -19,8 +19,12 @@ export const GROUP_TYPES = {
  *   The type of the group, either "list", "reorderable-list", or undefined.
  *   Note that "reorderable-list" only works with moz-box-item elements for now.
  * @slot default - Slot for rendering various moz-box-* elements.
+ * @slot static - Slot for rendering non-reorderable moz-box-item elements.
  * @slot <index> - Slots used to assign moz-box-* elements to <li> elements when
  *   the group is type="list".
+ * @slot <static-index>
+ *   Slots used to render moz-box-item elements that are not intended to be reorderable
+ *   when the group is type="reorderable-list".
  * @fires reorder
  *  Fired when items are reordered via drag-and-drop or keyboard shortcuts.
  *  The detail object contains draggedElement, targetElement, position, draggedIndex, and targetIndex.
@@ -32,6 +36,7 @@ export default class MozBoxGroup extends MozLitElement {
   static properties = {
     type: { type: String },
     listItems: { type: Array, state: true },
+    staticItems: { type: Array, state: true },
   };
 
   static queries = {
@@ -42,7 +47,10 @@ export default class MozBoxGroup extends MozLitElement {
 
   constructor() {
     super();
+    /** @type {Element[]} */
     this.listItems = [];
+    /** @type {Element[]} */
+    this.staticItems = [];
     this.listMutationObserver = new MutationObserver(
       this.updateItems.bind(this)
     );
@@ -62,7 +70,7 @@ export default class MozBoxGroup extends MozLitElement {
     if (this.type == GROUP_TYPES.reorderable) {
       return html`<moz-reorderable-list
         class="scroll-container"
-        itemselector="moz-box-item"
+        itemselector="moz-box-item:not([static])"
         dragselector=".handle"
         @reorder=${this.handleReorder}
       >
@@ -73,9 +81,9 @@ export default class MozBoxGroup extends MozLitElement {
   }
 
   slotTemplate() {
-    if (this.type == GROUP_TYPES.list || this.type == GROUP_TYPES.reorderable) {
-      let listTag =
-        this.type == GROUP_TYPES.reorderable ? literal`ol` : literal`ul`;
+    let isReorderable = this.type == GROUP_TYPES.reorderable;
+    if (this.type == GROUP_TYPES.list || isReorderable) {
+      let listTag = isReorderable ? literal`ol` : literal`ul`;
       return staticHtml`<${listTag}
           tabindex="-1"
           class="list scroll-container"
@@ -89,8 +97,14 @@ export default class MozBoxGroup extends MozLitElement {
               <slot name=${i}></slot>
             </li> `;
           })}
+          ${this.staticItems?.map((_, i) => {
+            return html`<li>
+              <slot name=${`static-${i}`}></slot>
+            </li> `;
+          })}
         </${listTag}>
-        <slot hidden></slot>`;
+        <slot hidden></slot>
+        ${isReorderable ? html`<slot name="static" hidden></slot>` : ""}`;
     }
     return html`<div class="scroll-container" tabindex="-1">
       <slot></slot>
@@ -152,18 +166,20 @@ export default class MozBoxGroup extends MozLitElement {
     let positionAttr = positionElement.getAttribute("position");
     let currentPosition = parseInt(positionAttr);
 
+    let allItems = [...this.listItems, ...this.staticItems];
+
     switch (event.key) {
       case "Down":
       case "ArrowDown": {
         event.preventDefault();
-        let nextItem = this.listItems[currentPosition + 1];
+        let nextItem = allItems[currentPosition + 1];
         nextItem?.focus(event);
         break;
       }
       case "Up":
       case "ArrowUp": {
         event.preventDefault();
-        let prevItem = this.listItems[currentPosition - 1];
+        let prevItem = allItems[currentPosition - 1];
         prevItem?.focus(event);
         break;
       }
@@ -173,7 +189,8 @@ export default class MozBoxGroup extends MozLitElement {
   handleFocus() {
     if (this.#tabbable) {
       this.#tabbable = false;
-      this.listItems.forEach(item => {
+      let allItems = [...this.listItems, ...this.staticItems];
+      allItems.forEach(item => {
         item.setAttribute("tabindex", "-1");
       });
     }
@@ -182,17 +199,30 @@ export default class MozBoxGroup extends MozLitElement {
   handleBlur() {
     if (!this.#tabbable) {
       this.#tabbable = true;
-      this.listItems.forEach(item => {
+      let allItems = [...this.listItems, ...this.staticItems];
+      allItems.forEach(item => {
         item.removeAttribute("tabindex");
       });
     }
   }
 
   updateItems() {
-    this.listItems = [...this.children].filter(
-      child =>
-        child.slot !== "header" && child.slot !== "footer" && !child.hidden
-    );
+    /** @type {Element[]} */
+    let listItems = [];
+    /** @type {Element[]} */
+    let staticItems = [];
+    [...this.children].forEach(child => {
+      if (child.slot === "header" || child.slot === "footer" || child.hidden) {
+        return;
+      }
+      if (child.slot.includes("static")) {
+        staticItems.push(child);
+      } else {
+        listItems.push(child);
+      }
+    });
+    this.listItems = listItems;
+    this.staticItems = staticItems;
   }
 
   render() {
@@ -225,7 +255,9 @@ export default class MozBoxGroup extends MozLitElement {
         item.classList.toggle("first", i == 0 && !headerNode);
         item.classList.toggle(
           "last",
-          i == this.listItems.length - 1 && !footerNode
+          i == this.listItems.length - 1 &&
+            !this.staticItems.length &&
+            !footerNode
         );
         item.removeAttribute("tabindex");
       });
@@ -234,6 +266,24 @@ export default class MozBoxGroup extends MozLitElement {
       }
     }
 
+    if (changedProperties.has("staticItems") && this.staticItems.length) {
+      this.staticItems.forEach((item, i) => {
+        item.slot = `static-${i}`;
+        item.setAttribute("position", this.listItems.length + i);
+        let staticEl = item.querySelector("moz-box-item") ?? item;
+        staticEl.setAttribute("static", "");
+        item.classList.toggle(
+          "first",
+          i == 0 && !this.listItems.length && !headerNode
+        );
+        item.classList.toggle(
+          "last",
+          i == this.staticItems.length - 1 && !footerNode
+        );
+        item.removeAttribute("tabindex");
+      });
+    }
+
     if (
       changedProperties.has("type") &&
       (this.type == GROUP_TYPES.list || this.type == GROUP_TYPES.reorderable)
diff --git a/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs b/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs
index 60775b01a023f..5b49c0d4729c2 100644
--- a/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs
+++ b/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs
@@ -55,7 +55,7 @@ moz-box-button-footer =
   },
 };
 
-function basicTemplate({ type, hasHeader, hasFooter, wrapped }) {
+function basicTemplate({ type, hasHeader, hasFooter, hasStatic }) {
   return html`<moz-box-group
       type=${ifDefined(type)}
       @reorder=${handleReorderEvent}
@@ -66,7 +66,7 @@ function basicTemplate({ type, hasHeader, hasFooter, wrapped }) {
             data-l10n-id="moz-box-item-header"
           ></moz-box-item>`
         : ""}
-      ${getInnerElements(type, wrapped)}
+      ${getInnerElements(type, hasStatic)}
       ${hasFooter
         ? html`<moz-box-button
             slot="footer"
@@ -81,31 +81,39 @@ function basicTemplate({ type, hasHeader, hasFooter, wrapped }) {
       : ""}`;
 }
 
-function getInnerElements(type) {
+function getInnerElements(type, hasStatic) {
   if (type == GROUP_TYPES.reorderable) {
-    return reorderableElements();
+    return reorderableElements(hasStatic);
   }
 
   return basicElements();
 }
 
-function reorderableElements() {
-  return Array.from({ length: 5 }).map((_, i) => {
-    return html`<moz-box-item
-      data-l10n-id=${`moz-box-item-reorderable-${i + 1}`}
-    >
-      <moz-button
-        iconsrc="chrome://global/skin/icons/edit-outline.svg"
-        data-l10n-id="moz-box-edit-action"
-        slot="actions-start"
-      ></moz-button>
-      <moz-toggle
-        slot="actions"
-        pressed
-        data-l10n-id="moz-box-toggle-action"
-      ></moz-toggle>
-    </moz-box-item>`;
-  });
+function reorderableElements(hasStatic) {
+  const createItems = (length, slot, startIndex = 0) =>
+    Array.from({ length }).map(
+      (_, i) =>
+        html`<moz-box-item
+          data-l10n-id=${`moz-box-item-reorderable-${startIndex + i + 1}`}
+          slot=${ifDefined(slot)}
+        >
+          <moz-button
+            iconsrc="chrome://global/skin/icons/edit-outline.svg"
+            data-l10n-id="moz-box-edit-action"
+            slot="actions-start"
+          ></moz-button>
+          <moz-toggle
+            slot="actions"
+            pressed
+            data-l10n-id="moz-box-toggle-action"
+          ></moz-toggle>
+        </moz-box-item>`
+    );
+
+  if (hasStatic) {
+    return html`${createItems(3)}${createItems(2, "static", 3)}`;
+  }
+  return html`${createItems(5)}`;
 }
 
 function basicElements() {
@@ -344,11 +352,18 @@ const standardTemplateHtml = ({ scrollable }) => html`
   </style>
 `;
 
-const Template = ({ type, hasHeader, hasFooter, scrollable, wrapped }) => html`
+const Template = ({
+  type,
+  hasHeader,
+  hasFooter,
+  scrollable,
+  wrapped,
+  hasStatic,
+}) => html`
   ${standardTemplateHtml({ scrollable })}
   ${wrapped
     ? wrappedTemplate({ type, hasHeader, hasFooter })
-    : basicTemplate({ type, hasHeader, hasFooter, wrapped })}
+    : basicTemplate({ type, hasHeader, hasFooter, hasStatic })}
 `;
 
 const ReorderableTemplate = ({
@@ -356,9 +371,10 @@ const ReorderableTemplate = ({
   hasHeader,
   hasFooter,
   scrollable,
+  hasStatic,
 }) => html`
   ${standardTemplateHtml({ scrollable })}
-  ${basicTemplate({ type, hasHeader, hasFooter })}
+  ${basicTemplate({ type, hasHeader, hasFooter, hasStatic })}
 `;
 
 export const Default = Template.bind({});
@@ -368,6 +384,7 @@ Default.args = {
   hasFooter: false,
   scrollable: false,
   wrapped: false,
+  hasStatic: false,
 };
 
 export const List = Template.bind({});
@@ -384,6 +401,12 @@ Reorderable.args = {
   scrollable: false,
 };
 
+export const ReorderableWithStatic = ReorderableTemplate.bind({});
+ReorderableWithStatic.args = {
+  ...Reorderable.args,
+  hasStatic: true,
+};
+
 export const ListWithHeaderAndFooter = Template.bind({});
 ListWithHeaderAndFooter.args = {
   ...List.args,
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.css b/toolkit/content/widgets/moz-box-item/moz-box-item.css
index ab6d82cea0c20..63395bcedff50 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.css
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.css
@@ -18,6 +18,11 @@
   }
 }
 
+:host([static]) {
+  /* Indent static items the width of the handle button + gap */
+  padding-inline-start: calc(var(--button-size-icon) + var(--space-small));
+}
+
 .text-content.has-support-page {
   display: flex;
 
diff --git a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
index 1bd6f2b1d00f4..745bc1021e23d 100644
--- a/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
+++ b/toolkit/content/widgets/moz-box-item/moz-box-item.mjs
@@ -109,7 +109,8 @@ export default class MozBoxItem extends MozBoxBase {
     return (
       reorderableParent?.type == GROUP_TYPES.reorderable &&
       this.slot != "header" &&
-      this.slot != "footer"
+      this.slot != "footer" &&
+      !this.slot.includes("static")
     );
   }
 

From db24603dc4d9af5afeefb6db2d4403fe103007d5 Mon Sep 17 00:00:00 2001
From: Maxx Crawford <mcrawford@mozilla.com>
Date: Fri, 6 Feb 2026 19:16:44 +0000
Subject: [PATCH 58/93] Bug 2004059 - Add thumbnail support for wallpaper
 previews r=home-newtab-reviewers,reemhamz

Allow wallpapers to set separate thumbnail URLs for display in category buttons and wallpaper selection grids, with fallback to full wallpaper URL when thumbnails aren't provided.

Differential Revision: https://phabricator.services.mozilla.com/D275106
---
 .../components/WallpaperCategories/WallpaperCategories.jsx   | 5 +++--
 .../extensions/newtab/data/content/activity-stream.bundle.js | 5 +++--
 .../extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs   | 1 +
 .../extensions/newtab/test/xpcshell/test_WallpaperFeed.js    | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/browser/extensions/newtab/content-src/components/WallpaperCategories/WallpaperCategories.jsx b/browser/extensions/newtab/content-src/components/WallpaperCategories/WallpaperCategories.jsx
index 17bdd542a26d8..beed5735bd661 100644
--- a/browser/extensions/newtab/content-src/components/WallpaperCategories/WallpaperCategories.jsx
+++ b/browser/extensions/newtab/content-src/components/WallpaperCategories/WallpaperCategories.jsx
@@ -571,7 +571,7 @@ export class _WallpaperCategories extends React.PureComponent {
               }
               let style = {};
               if (thumbnail?.wallpaperUrl) {
-                style.backgroundImage = `url(${thumbnail.wallpaperUrl})`;
+                style.backgroundImage = `url(${thumbnail?.thumbnail || thumbnail?.wallpaperUrl})`;
                 style.backgroundPosition =
                   thumbnail.background_position || "center";
               } else {
@@ -673,13 +673,14 @@ export class _WallpaperCategories extends React.PureComponent {
                       solid_color,
                       theme,
                       title,
+                      thumbnail,
                       wallpaperUrl,
                     },
                     index
                   ) => {
                     let style = {};
                     if (wallpaperUrl) {
-                      style.backgroundImage = `url(${wallpaperUrl})`;
+                      style.backgroundImage = `url(${thumbnail || wallpaperUrl})`;
                       style.backgroundPosition =
                         background_position || "center";
                     } else {
diff --git a/browser/extensions/newtab/data/content/activity-stream.bundle.js b/browser/extensions/newtab/data/content/activity-stream.bundle.js
index 9be0d8fb15930..a939efafd9843 100644
--- a/browser/extensions/newtab/data/content/activity-stream.bundle.js
+++ b/browser/extensions/newtab/data/content/activity-stream.bundle.js
@@ -14628,7 +14628,7 @@ class _WallpaperCategories extends (external_React_default()).PureComponent {
       }
       let style = {};
       if (thumbnail?.wallpaperUrl) {
-        style.backgroundImage = `url(${thumbnail.wallpaperUrl})`;
+        style.backgroundImage = `url(${thumbnail?.thumbnail || thumbnail?.wallpaperUrl})`;
         style.backgroundPosition = thumbnail.background_position || "center";
       } else {
         style.backgroundColor = thumbnail?.solid_color || "";
@@ -14713,11 +14713,12 @@ class _WallpaperCategories extends (external_React_default()).PureComponent {
       solid_color,
       theme,
       title,
+      thumbnail,
       wallpaperUrl
     }, index) => {
       let style = {};
       if (wallpaperUrl) {
-        style.backgroundImage = `url(${wallpaperUrl})`;
+        style.backgroundImage = `url(${thumbnail || wallpaperUrl})`;
         style.backgroundPosition = background_position || "center";
       } else {
         style.backgroundColor = solid_color || "";
diff --git a/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs b/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
index eb3b0c06b56e9..0d05bf3566ebe 100644
--- a/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
+++ b/browser/extensions/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs
@@ -209,6 +209,7 @@ export class WallpaperFeed {
           background_position: record.background_position || "center",
           category: record.category || "",
           order: record.order || 0,
+          thumbnail: record.thumbnail || null,
         };
       }),
     ];
diff --git a/browser/extensions/newtab/test/xpcshell/test_WallpaperFeed.js b/browser/extensions/newtab/test/xpcshell/test_WallpaperFeed.js
index f07217383f50e..787a3185a5ced 100644
--- a/browser/extensions/newtab/test/xpcshell/test_WallpaperFeed.js
+++ b/browser/extensions/newtab/test/xpcshell/test_WallpaperFeed.js
@@ -86,6 +86,7 @@ add_task(async function test_onAction_INIT() {
           category: "",
           order: 0,
           wallpaperUrl: "http://localhost:8888/base_url/attachment",
+          thumbnail: null,
         },
       ],
       meta: {

From b82fc4432b4af5ff280fb7bdf983118c511de5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Fri, 6 Feb 2026 19:32:46 +0000
Subject: [PATCH 59/93] Bug 2015029 - make xpcshell and mochitest output
 group_result status=SKIP lines in the error summary file for missing test
 manifests, r=ahal.

Differential Revision: https://phabricator.services.mozilla.com/D282170
---
 testing/mochitest/runtests.py                 | 19 ++++++++++++++++++-
 .../mozlog/mozlog/formatters/errorsummary.py  |  9 +++++++++
 .../mozlog/mozlog/formatters/errorsummary.py  |  8 ++++++++
 testing/xpcshell/runxpcshelltests.py          |  8 ++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 01aff914ccecd..edaa9182fc0d1 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1719,9 +1719,11 @@ def getActiveTests(self, options, disabled=True):
             if options.test_tags:
                 filters.append(tags(options.test_tags))
 
+            path_filter = None
             if options.test_paths:
                 options.test_paths = self.normalize_paths(options.test_paths)
-                filters.append(pathprefix(options.test_paths))
+                path_filter = pathprefix(options.test_paths)
+                filters.append(path_filter)
 
             # Add chunking filters if specified
             if options.totalChunks:
@@ -1784,6 +1786,16 @@ def getActiveTests(self, options, disabled=True):
                 **info,
             )
 
+            # Store missing manifests for later use in structured logging
+            self.missing_manifests = set()
+            if path_filter and path_filter.missing:
+                self.missing_manifests = path_filter.missing
+                self.log.warning(
+                    "The following path(s) didn't resolve any tests:\n  {}".format(
+                        "  \n".join(sorted(path_filter.missing))
+                    )
+                )
+
             if len(tests) == 0:
                 self.log.error(
                     NO_TESTS_FOUND.format(options.flavor, manifest.fmt_filters())
@@ -1917,6 +1929,11 @@ def getActiveTests(self, options, disabled=True):
             self.log.info("Dumping active_tests to %s file." % options.dump_tests)
             sys.exit()
 
+        # Add missing manifests with empty test lists so they appear in
+        # group_result output with SKIP status
+        for missing_path in self.missing_manifests:
+            self.tests_by_manifest[missing_path] = []
+
         # Upload a list of test manifests that were executed in this run.
         if "MOZ_UPLOAD_DIR" in os.environ:
             artifact = os.path.join(os.environ["MOZ_UPLOAD_DIR"], "manifests.list")
diff --git a/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py b/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py
index 46d071bdddb6a..cb329e402bbc4 100644
--- a/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py
+++ b/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py
@@ -85,6 +85,15 @@ def _clean_test_name(self, test):
 
     def suite_start(self, item):
         self.test_to_group = {v: k for k in item["tests"] for v in item["tests"][k]}
+        # Initialize groups with no tests (missing manifests) with SKIP status
+        for group, tests in item["tests"].items():
+            if not tests:  # Empty test list
+                self.groups[group] = {
+                    "status": "SKIP",
+                    "test_times": [],
+                    "start": None,
+                    "end": None,
+                }
         return self._output("test_groups", {"groups": list(item["tests"].keys())})
 
     def suite_end(self, data):
diff --git a/testing/web-platform/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py b/testing/web-platform/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py
index 848f15fe155b8..9e7297cfe7999 100644
--- a/testing/web-platform/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py
+++ b/testing/web-platform/tests/tools/third_party_modified/mozlog/mozlog/formatters/errorsummary.py
@@ -62,6 +62,14 @@ def _update_group_result(self, group, item):
 
     def suite_start(self, item):
         self.test_to_group = {v: k for k in item["tests"] for v in item["tests"][k]}
+        # Initialize groups with no tests (missing manifests) with SKIP status
+        for group, tests in item["tests"].items():
+            if not tests:  # Empty test list
+                self.groups[group] = {
+                    "status": "SKIP",
+                    "start": None,
+                    "end": None,
+                }
         return self._output("test_groups", {"groups": list(item["tests"].keys())})
 
     def suite_end(self, data):
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index c39d5962e0a5f..0e63eb183c93f 100755
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -1285,7 +1285,10 @@ def buildTestList(self, test_tags=None, test_paths=None, verify=False):
             sys.stderr.write("*** offending mozinfo.info: %s\n" % repr(mozinfo.info))
             raise
 
+        # Store missing manifests for later use in structured logging
+        self.missing_manifests = set()
         if path_filter and path_filter.missing:
+            self.missing_manifests = path_filter.missing
             self.log.warning(
                 "The following path(s) didn't resolve any tests:\n  {}".format(
                     "  \n".join(sorted(path_filter.missing))
@@ -2451,6 +2454,11 @@ def runTestList(
             group = get_full_group_name(test)
             tests_by_manifest[group].append(test["id"])
 
+        # Add missing manifests with empty test lists so they appear in
+        # group_result output with SKIP status
+        for missing_path in self.missing_manifests:
+            tests_by_manifest[missing_path] = []
+
         self.log.suite_start(tests_by_manifest, name="xpcshell")
 
         # Start group for parallel test execution

From 944f0ab938ab46a50d7964e51aa11493e6877f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Feb 2026 22:23:27 +0100
Subject: [PATCH 60/93] Bug 2013896 - Remove trailing whitespace to fix
 wptlint.

---
 .../tests/css/css-anchor-position/anchor-fieldset-001.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html
index 780d707e38f16..d981b76d6fcea 100644
--- a/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html
+++ b/testing/web-platform/tests/css/css-anchor-position/anchor-fieldset-001.html
@@ -5,7 +5,7 @@
 <link rel="match" href="anchor-fieldset-001-ref.html">
 <style>
 fieldset::before {
-  content: ""; 
+  content: "";
   display: block;
   width: 10px;
   height: 10px;

From a5d610c8b13418a17b302a556660dbae7b9ce446 Mon Sep 17 00:00:00 2001
From: Diego Escalante <descalante@mozilla.com>
Date: Fri, 6 Feb 2026 19:40:22 +0000
Subject: [PATCH 61/93] Bug 1986639 - Invalidate elements with styles that
 reference custom attributes and update wpt expectations.
 r=emilio,firefox-style-system-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D281793
---
 layout/style/RestyleManager.cpp                  |  3 +++
 servo/ports/geckolib/glue.rs                     | 16 ++++++++++++++++
 .../css/css-values/attr-invalidation.html.ini    |  3 ---
 .../css/css-values/attr-null-namespace.xhtml.ini |  3 ---
 .../attr-pseudo-elem-invalidation.html.ini       | 12 ------------
 5 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-values/attr-null-namespace.xhtml.ini
 delete mode 100644 testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini

diff --git a/layout/style/RestyleManager.cpp b/layout/style/RestyleManager.cpp
index 3c74b95b176cc..fb31c7268fb56 100644
--- a/layout/style/RestyleManager.cpp
+++ b/layout/style/RestyleManager.cpp
@@ -3489,6 +3489,9 @@ void RestyleManager::AttributeWillChange(Element* aElement,
                                          int32_t aNameSpaceID,
                                          nsAtom* aAttribute,
                                          AttrModType aModType) {
+  if (Servo_Element_ReferencesAttribute(aElement, aAttribute)) {
+    PostRestyleEvent(aElement, RestyleHint::RECASCADE_SELF, nsChangeHint(0));
+  }
   TakeSnapshotForAttributeChange(*aElement, aNameSpaceID, aAttribute);
 }
 
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index 2142bc34ed095..23479b822cb8c 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -1586,6 +1586,22 @@ pub extern "C" fn Servo_Element_MayHaveStartingStyle(element: &RawGeckoElement)
         .contains(data::ElementDataFlags::MAY_HAVE_STARTING_STYLE)
 }
 
+#[no_mangle]
+pub extern "C" fn Servo_Element_ReferencesAttribute(
+    element: &RawGeckoElement,
+    attr: *const nsAtom,
+) -> bool {
+    let element = GeckoElement(element);
+    let Some(data) = element.borrow_data() else {
+        return false;
+    };
+    let Some(ref attrs) = data.styles.primary().attribute_references else {
+        return false;
+    };
+
+    unsafe { Atom::with(attr, |attr| attrs.contains(AtomIdent::cast(attr))) }
+}
+
 fn mode_to_origin(mode: SheetParsingMode) -> Origin {
     match mode {
         SheetParsingMode::eAuthorSheetFeatures => Origin::Author,
diff --git a/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
deleted file mode 100644
index 111ec1b397568..0000000000000
--- a/testing/web-platform/meta/css/css-values/attr-invalidation.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[attr-invalidation.html]
-  [CSS Values and Units Test: attr() invalidation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-values/attr-null-namespace.xhtml.ini b/testing/web-platform/meta/css/css-values/attr-null-namespace.xhtml.ini
deleted file mode 100644
index a7dccd8f357bf..0000000000000
--- a/testing/web-platform/meta/css/css-values/attr-null-namespace.xhtml.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[attr-null-namespace.xhtml]
-  [Attribute in null-namespace is substituted (JS)]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini b/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
deleted file mode 100644
index 167cc146d9a2d..0000000000000
--- a/testing/web-platform/meta/css/css-values/attr-pseudo-elem-invalidation.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[attr-pseudo-elem-invalidation.html]
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 1]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 3]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 4]
-    expected: FAIL
-
-  [CSS Values and Units Test: attr() invalidation of pseudo elements 5]
-    expected: FAIL

From 744ac0e37b1866380d49169067fbfce62c70936c Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jonalmeida942@gmail.com>
Date: Fri, 6 Feb 2026 19:44:19 +0000
Subject: [PATCH 62/93] Bug 2013961 - Part 0: Add a Relay integration class
 r=gmalekpour,android-reviewers

Lifting the RelayFeature into another class as a pre-step to
adding more features that compose together as part of the Relay Fenix
integration set.

Differential Revision: https://phabricator.services.mozilla.com/D281745
---
 .../fenix/browser/BaseBrowserFragment.kt      |  6 ++--
 .../browser/relay/RelayFeatureIntegration.kt  | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index fe8e2566a87ff..3eb9862c199c2 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -127,7 +127,6 @@ import mozilla.components.lib.state.ext.consumeFlow
 import mozilla.components.lib.state.ext.consumeFrom
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.lib.state.helpers.StoreProvider.Companion.fragmentStore
-import mozilla.components.service.fxrelay.eligibility.RelayFeature
 import mozilla.components.service.sync.autofill.DefaultCreditCardValidationDelegate
 import mozilla.components.service.sync.logins.DefaultLoginValidationDelegate
 import mozilla.components.service.sync.logins.LoginsApiException
@@ -167,6 +166,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.permissions.FenixSitePermissionLearnMoreUrlProvider
 import org.mozilla.fenix.browser.readermode.DefaultReaderModeController
 import org.mozilla.fenix.browser.readermode.ReaderModeController
+import org.mozilla.fenix.browser.relay.RelayFeatureIntegration
 import org.mozilla.fenix.browser.store.BrowserScreenMiddleware
 import org.mozilla.fenix.browser.store.BrowserScreenState
 import org.mozilla.fenix.browser.store.BrowserScreenStore
@@ -328,7 +328,7 @@ abstract class BaseBrowserFragment :
     private val shareResourceFeature = ViewBoundFeatureWrapper<ShareResourceFeature>()
     private val copyDownloadsFeature = ViewBoundFeatureWrapper<CopyDownloadFeature>()
     private val promptsFeature = ViewBoundFeatureWrapper<PromptFeature>()
-    private val relayFeature = ViewBoundFeatureWrapper<RelayFeature>()
+    private val relayFeature = ViewBoundFeatureWrapper<RelayFeatureIntegration>()
 
     @VisibleForTesting
     internal val findInPageIntegration = ViewBoundFeatureWrapper<FindInPageIntegration>()
@@ -1212,7 +1212,7 @@ abstract class BaseBrowserFragment :
 
         if (context.settings().isEmailMaskFeatureEnabled && context.settings().isEmailMaskSuggestionEnabled) {
             relayFeature.set(
-                feature = RelayFeature(
+                feature = RelayFeatureIntegration(
                     accountManager = requireComponents.backgroundServices.accountManager,
                     store = requireComponents.relayEligibilityStore,
                 ),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt
new file mode 100644
index 0000000000000..f9892292069a1
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser.relay
+
+import mozilla.components.service.fxa.manager.FxaAccountManager
+import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore
+import mozilla.components.service.fxrelay.eligibility.RelayFeature
+import mozilla.components.support.base.feature.LifecycleAwareFeature
+
+/**
+ * A wrapper class for features that relate to the Firefox Relay email masking service.
+ */
+class RelayFeatureIntegration(
+    private val store: RelayEligibilityStore,
+    private val accountManager: FxaAccountManager,
+) : LifecycleAwareFeature {
+    private val relayFeature by lazy {
+        RelayFeature(
+            accountManager = accountManager,
+            store = store,
+        )
+    }
+    override fun start() {
+        relayFeature.start()
+    }
+
+    override fun stop() {
+        relayFeature.stop()
+    }
+}

From af55065ccda54a8dd31cad33b4ea6016870ca6f3 Mon Sep 17 00:00:00 2001
From: Jonathan Almeida <jonalmeida942@gmail.com>
Date: Fri, 6 Feb 2026 19:44:19 +0000
Subject: [PATCH 63/93] Bug 2013961 - Part 1: Update engine on relay
 eligibility changes r=gmalekpour,android-reviewers

For now, there doesn't seem to be any other distinction needed for
updating the Engine setting. Multiple writes to the value are fine if we
enter and exit several times.

Similar to `RelayFeature`, this one doesn't need live on the
BaseBrowserFragment, but since we started here, let's build on that.

Ideally, we would put this and `RelayFeature` in a `feature-relay`
gradle module that are dependant on `service-fxrelay` and
`concept-engine`, but that can be future work. This patch is written
without mockk so that upstreaming doesn't involve a re-write.

Differential Revision: https://phabricator.services.mozilla.com/D281746
---
 .../fenix/browser/BaseBrowserFragment.kt      |  1 +
 .../browser/relay/EmailMaskEngineUpdater.kt   | 43 ++++++++++
 .../browser/relay/RelayFeatureIntegration.kt  |  7 ++
 .../relay/EmailMaskEngineUpdaterTest.kt       | 85 +++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdater.kt
 create mode 100644 mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdaterTest.kt

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 3eb9862c199c2..92f30ef6ba710 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -1213,6 +1213,7 @@ abstract class BaseBrowserFragment :
         if (context.settings().isEmailMaskFeatureEnabled && context.settings().isEmailMaskSuggestionEnabled) {
             relayFeature.set(
                 feature = RelayFeatureIntegration(
+                    engine = requireComponents.core.engine,
                     accountManager = requireComponents.backgroundServices.accountManager,
                     store = requireComponents.relayEligibilityStore,
                 ),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdater.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdater.kt
new file mode 100644
index 0000000000000..969285dfaf1bf
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdater.kt
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser.relay
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.mapLatest
+import mozilla.components.concept.engine.Engine
+import mozilla.components.lib.state.helpers.AbstractBinding
+import mozilla.components.service.fxrelay.eligibility.Eligible
+import mozilla.components.service.fxrelay.eligibility.Ineligible
+import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore
+import mozilla.components.service.fxrelay.eligibility.RelayState
+
+/**
+ * Update the settings to propagate email mask detection to the engine PromptDelegate APIs.
+ *
+ * @param engine the [Engine] for updating the relevant setting.
+ * @param store the [RelayEligibilityStore] instance that holds the eligibility status for the attached account.
+ * @param mainDispatcher the dispatcher to run asynchronous work on.
+ */
+class EmailMaskEngineUpdater(
+    private val engine: Engine,
+    store: RelayEligibilityStore,
+    mainDispatcher: CoroutineDispatcher = Dispatchers.Main,
+) : AbstractBinding<RelayState>(store, mainDispatcher) {
+
+    @OptIn(ExperimentalCoroutinesApi::class) // mapLatest
+    override suspend fun onState(flow: Flow<RelayState>) {
+        flow.mapLatest { it.eligibilityState }
+            .collect { state ->
+                val mode = when (state) {
+                    is Eligible -> Engine.FirefoxRelayMode.ENABLED
+                    is Ineligible -> Engine.FirefoxRelayMode.DISABLED
+                }
+                engine.settings.firefoxRelay = mode
+            }
+    }
+}
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt
index f9892292069a1..d18605fd2dab9 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/relay/RelayFeatureIntegration.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.browser.relay
 
+import mozilla.components.concept.engine.Engine
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore
 import mozilla.components.service.fxrelay.eligibility.RelayFeature
@@ -13,6 +14,7 @@ import mozilla.components.support.base.feature.LifecycleAwareFeature
  * A wrapper class for features that relate to the Firefox Relay email masking service.
  */
 class RelayFeatureIntegration(
+    private val engine: Engine,
     private val store: RelayEligibilityStore,
     private val accountManager: FxaAccountManager,
 ) : LifecycleAwareFeature {
@@ -22,11 +24,16 @@ class RelayFeatureIntegration(
             store = store,
         )
     }
+    private val emailMaskEngineUpdater by lazy {
+        EmailMaskEngineUpdater(engine, store)
+    }
     override fun start() {
         relayFeature.start()
+        emailMaskEngineUpdater.start()
     }
 
     override fun stop() {
         relayFeature.stop()
+        emailMaskEngineUpdater.stop()
     }
 }
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdaterTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdaterTest.kt
new file mode 100644
index 0000000000000..d696cb390ed6f
--- /dev/null
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/relay/EmailMaskEngineUpdaterTest.kt
@@ -0,0 +1,85 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser.relay
+
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.runTest
+import mozilla.components.concept.engine.Engine
+import mozilla.components.concept.engine.Settings
+import mozilla.components.service.fxrelay.eligibility.Eligible
+import mozilla.components.service.fxrelay.eligibility.RelayEligibilityAction
+import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore
+import mozilla.components.service.fxrelay.eligibility.RelayPlanTier
+import mozilla.components.service.fxrelay.eligibility.RelayState
+import mozilla.components.support.test.mock
+import mozilla.components.support.test.whenever
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.verify
+
+class EmailMaskEngineUpdaterTest {
+    private val testDispatcher = StandardTestDispatcher()
+    private lateinit var engineSettings: Settings
+    private lateinit var engine: Engine
+
+    @Before
+    fun setup() {
+        engineSettings = mock()
+        engine = mock {
+            whenever(settings).thenReturn(engineSettings)
+        }
+    }
+
+    @Test
+    fun `WHEN relay store is ineligible THEN engine relay mode is disabled`() = runTest(testDispatcher) {
+        val store = RelayEligibilityStore()
+        val updater = EmailMaskEngineUpdater(engine, store, testDispatcher)
+
+        updater.start()
+
+        testDispatcher.scheduler.advanceUntilIdle()
+
+        verify(engineSettings).firefoxRelay = Engine.FirefoxRelayMode.DISABLED
+    }
+
+    @Test
+    fun `WHEN relay store is eligible for free plan THEN engine relay mode is enabled`() = runTest(testDispatcher) {
+        val store = RelayEligibilityStore(
+            initialState = RelayState(eligibilityState = Eligible.Free(5)),
+        )
+        val updater = EmailMaskEngineUpdater(engine, store, testDispatcher)
+
+        updater.start()
+
+        testDispatcher.scheduler.advanceUntilIdle()
+
+        verify(engineSettings).firefoxRelay = Engine.FirefoxRelayMode.ENABLED
+    }
+
+    @Test
+    fun `WHEN relay eligibility changes to free plan THEN engine relay mode changes to enabled`() = runTest(testDispatcher) {
+        val store = RelayEligibilityStore()
+        val updater = EmailMaskEngineUpdater(engine, store, testDispatcher)
+
+        updater.start()
+
+        testDispatcher.scheduler.advanceUntilIdle()
+
+        verify(engineSettings).firefoxRelay = Engine.FirefoxRelayMode.DISABLED
+
+        store.dispatch(
+            RelayEligibilityAction.RelayStatusResult(
+                fetchSucceeded = true,
+                relayPlanTier = RelayPlanTier.FREE,
+                remaining = 5,
+                lastCheckedMs = 123L,
+            ),
+        )
+
+        testDispatcher.scheduler.advanceUntilIdle()
+
+        verify(engineSettings).firefoxRelay = Engine.FirefoxRelayMode.ENABLED
+    }
+}

From 42c3a56c1ac16fb8ccfbcf02086ebd8866f6b80b Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Fri, 6 Feb 2026 19:51:14 +0000
Subject: [PATCH 64/93] Bug 2015149 - Make DummyAttributeProvider private.
 r=firefox-style-system-reviewers,diegociudadreale,emilio

Just use `AttributeTracker::new_dummy()` instead.

Differential Revision: https://phabricator.services.mozilla.com/D282218
---
 servo/components/style/dom.rs                          | 2 +-
 servo/components/style/properties/cascade.rs           | 9 ++++-----
 servo/components/style/properties/declaration_block.rs | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/servo/components/style/dom.rs b/servo/components/style/dom.rs
index b18a047fbc8a6..510f133900d74 100644
--- a/servo/components/style/dom.rs
+++ b/servo/components/style/dom.rs
@@ -1030,7 +1030,7 @@ impl<'a> AttributeTracker<'a> {
 
 /// A dummy AttributeProvider that returns none to any attribute query.
 #[derive(Clone, Debug, PartialEq)]
-pub struct DummyAttributeProvider;
+struct DummyAttributeProvider;
 
 impl AttributeProvider for DummyAttributeProvider {
     fn get_attr(&self, _attr: &LocalName) -> Option<String> {
diff --git a/servo/components/style/properties/cascade.rs b/servo/components/style/properties/cascade.rs
index b63fe3fa9fed5..71e51857ed7e9 100644
--- a/servo/components/style/properties/cascade.rs
+++ b/servo/components/style/properties/cascade.rs
@@ -10,7 +10,7 @@ use crate::computed_value_flags::ComputedValueFlags;
 use crate::custom_properties::{
     CustomPropertiesBuilder, DeferFontRelativeCustomPropertyResolution,
 };
-use crate::dom::{AttributeProvider, AttributeTracker, DummyAttributeProvider, TElement};
+use crate::dom::{AttributeTracker, TElement};
 #[cfg(feature = "gecko")]
 use crate::font_metrics::FontMetricsOrientation;
 use crate::logical_geometry::WritingMode;
@@ -309,11 +309,10 @@ where
     let mut cascade = Cascade::new(first_line_reparenting, try_tactic, ignore_colors);
     let mut declarations = Default::default();
     let mut shorthand_cache = ShorthandsWithPropertyReferencesCache::default();
-    let attr_provider: &dyn AttributeProvider = match element {
-        Some(ref attr_provider) => attr_provider,
-        None => &DummyAttributeProvider {},
+    let mut attribute_tracker = match element {
+        Some(ref attr_provider) => AttributeTracker::new(attr_provider),
+        None => AttributeTracker::new_dummy(),
     };
-    let mut attribute_tracker = AttributeTracker::new(attr_provider);
     let properties_to_apply = match cascade_mode {
         CascadeMode::Visited { unvisited_context } => {
             context.builder.custom_properties = unvisited_context.builder.custom_properties.clone();
diff --git a/servo/components/style/properties/declaration_block.rs b/servo/components/style/properties/declaration_block.rs
index 6af539ed50cdd..dbb87ba7094fb 100644
--- a/servo/components/style/properties/declaration_block.rs
+++ b/servo/components/style/properties/declaration_block.rs
@@ -16,7 +16,6 @@ use crate::context::QuirksMode;
 use crate::custom_properties;
 use crate::derives::*;
 use crate::dom::AttributeTracker;
-use crate::dom::DummyAttributeProvider;
 use crate::error_reporting::{ContextualParseError, ParseErrorReporter};
 use crate::parser::ParserContext;
 use crate::properties::{
@@ -373,7 +372,7 @@ impl<'a, 'cx, 'cx_a: 'cx> Iterator for AnimationValueIterator<'a, 'cx, 'cx_a> {
                 self.style,
                 self.default_values,
                 // TODO (descalante): should be able to get an attr from an animated element
-                &mut AttributeTracker::new(&DummyAttributeProvider {}),
+                &mut AttributeTracker::new_dummy(),
             );
 
             if let Some(anim) = animation {
@@ -1025,7 +1024,7 @@ impl PropertyDeclarationBlock {
                     stylist,
                     &context,
                     &mut Default::default(),
-                    &mut AttributeTracker::new(&DummyAttributeProvider {}),
+                    &mut AttributeTracker::new_dummy(),
                 )
                 .to_css(dest),
             (ref d, _) => d.to_css(dest),

From 74cdb92a9ce4662bc6be614bbf2ec44d0b386a72 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Fri, 6 Feb 2026 21:05:39 +0000
Subject: [PATCH 65/93] Bug 1996952 - Bake the M4 experiment Merino OHTTP
 endpoints into Nightly. r=daisuke,nanj,Sasha

Differential Revision: https://phabricator.services.mozilla.com/D281320
---
 browser/app/profile/firefox.js                | 24 ++++++++++++++-----
 browser/components/urlbar/UrlbarPrefs.sys.mjs |  2 +-
 .../quicksuggest/MerinoTestUtils.sys.mjs      |  2 ++
 remote/shared/RecommendedPreferences.sys.mjs  |  2 ++
 .../client/marionette_driver/geckoinstance.py |  2 ++
 testing/profiles/unittest-required/user.js    |  2 ++
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 558764b67d4d6..a9a2ec35a6aa5 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -658,7 +658,25 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false);
 pref("browser.urlbar.groupLabels.enabled", true);
 
 // The Merino endpoint URL, not including parameters.
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.endpointURL", "https://prod.merino.prod.webservices.mozgcp.net/api/v1/suggest");
+#else
 pref("browser.urlbar.merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest");
+#endif
+
+// OHTTP config URL for Merino requests
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.ohttpConfigURL", "https://prod.merino.prod.webservices.mozgcp.net/ohttp-configs");
+#else
+pref("browser.urlbar.merino.ohttpConfigURL", "");
+#endif
+
+// OHTTP relay URL for Merino requests
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.ohttpRelayURL", "https://ohttp-merino.mozilla.fastly-edge.com");
+#else
+pref("browser.urlbar.merino.ohttpRelayURL", "");
+#endif
 
 // Timeout for Merino fetches (ms).
 pref("browser.urlbar.merino.timeoutMs", 200);
@@ -669,12 +687,6 @@ pref("browser.urlbar.merino.providers", "");
 // Comma-separated list of client variants to send to Merino
 pref("browser.urlbar.merino.clientVariants", "");
 
-// OHTTP config URL for Merino requests
-pref("browser.urlbar.merino.ohttpConfigURL", "");
-
-// OHTTP relay URL for Merino requests
-pref("browser.urlbar.merino.ohttpRelayURL", "");
-
 // OHTTP hpke for DAP
 pref("dap.ohttp.hpke", "gAAgJSO22Y3HKzRSese15JtQVuuFfOIcTrZ56lQ5kDQwS0oABAABAAE");
 
diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
index 5004663cdd272..6cbafc5fe772c 100644
--- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
+++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
@@ -231,7 +231,7 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
   ["merino.clientVariants", ""],
 
   // The Merino endpoint URL, not including parameters.
-  ["merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest"],
+  ["merino.endpointURL", ""],
 
   // OHTTP config URL for Merino requests.
   ["merino.ohttpConfigURL", ""],
diff --git a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs
index 413500453fccc..66e800dd18337 100644
--- a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs
+++ b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs
@@ -384,6 +384,8 @@ class MockMerinoServer {
 
     this._originalEndpointURL = lazy.UrlbarPrefs.get("merino.endpointURL");
     lazy.UrlbarPrefs.set("merino.endpointURL", this.#url.toString());
+    lazy.UrlbarPrefs.set("merino.ohttpConfigURL", "");
+    lazy.UrlbarPrefs.set("merino.ohttpRelayURL", "");
 
     this.registerCleanupFunction?.(() => this.stop());
 
diff --git a/remote/shared/RecommendedPreferences.sys.mjs b/remote/shared/RecommendedPreferences.sys.mjs
index eaeb30741f237..debb45bd9ac69 100644
--- a/remote/shared/RecommendedPreferences.sys.mjs
+++ b/remote/shared/RecommendedPreferences.sys.mjs
@@ -201,6 +201,8 @@ const COMMON_PREFERENCES = new Map([
   // Turn off Merino suggestions in the location bar so as not to trigger
   // network connections.
   ["browser.urlbar.merino.endpointURL", ""],
+  ["browser.urlbar.merino.ohttpConfigURL", ""],
+  ["browser.urlbar.merino.ohttpRelayURL", ""],
 
   // Turn off search suggestions in the location bar so as not to trigger
   // network connections.
diff --git a/testing/marionette/client/marionette_driver/geckoinstance.py b/testing/marionette/client/marionette_driver/geckoinstance.py
index 236796542866c..aa5845786079f 100644
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -676,6 +676,8 @@ class DesktopInstance(GeckoInstance):
         # Turn off Merino suggestions in the location bar so as not to trigger network
         # connections.
         "browser.urlbar.merino.endpointURL": "",
+        "browser.urlbar.merino.ohttpConfigURL": "",
+        "browser.urlbar.merino.ohttpRelayURL": "",
         # Turn off search suggestions in the location bar so as not to trigger network
         # connections.
         "browser.urlbar.suggest.searches": False,
diff --git a/testing/profiles/unittest-required/user.js b/testing/profiles/unittest-required/user.js
index 6d5480e784124..d4dec68bca521 100644
--- a/testing/profiles/unittest-required/user.js
+++ b/testing/profiles/unittest-required/user.js
@@ -46,6 +46,8 @@ user_pref("browser.uitour.url", "http://{server}/uitour-dummy/tour");
 // Turn off Merino suggestions in the location bar so as not to trigger network
 // connections.
 user_pref("browser.urlbar.merino.endpointURL", "");
+user_pref("browser.urlbar.merino.ohttpConfigURL", "");
+user_pref("browser.urlbar.merino.ohttpRelayURL", "");
 user_pref("browser.urlbar.speculativeConnect.enabled", false);
 // Turn off search suggestions in the location bar so as not to trigger network
 // connections.

From 19d9c15f7a6ced974c38fb277bfc261d47af6527 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Fri, 6 Feb 2026 21:05:39 +0000
Subject: [PATCH 66/93] Bug 1998009 - Make online Suggest available on Nightly
 for eligible users.
 r=daisuke,urlbar-reviewers,toolkit-telemetry-reviewers,chutten

This initializes `quicksuggest.online.available` and the realtime feature gate
prefs so that online Suggest will be available by default on Nightly for
eligible users. It also initializes `quicksuggest.settingsUi` so that the online
checkbox is appropriately shown in the settings UI.

Differential Revision: https://phabricator.services.mozilla.com/D281321
---
 browser/app/profile/firefox.js                |   3 +-
 .../components/urlbar/QuickSuggest.sys.mjs    |  96 ++++++-
 browser/components/urlbar/UrlbarPrefs.sys.mjs |  24 +-
 .../unit/test_quicksuggest_defaultPrefs.js    | 254 +++++++++++++++++-
 .../app/TelemetryReportingPolicy.sys.mjs      |   7 +
 5 files changed, 367 insertions(+), 17 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index a9a2ec35a6aa5..01f5e1b1835e9 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -490,8 +490,7 @@ pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false, sticky);
 pref("browser.urlbar.suggest.quicksuggest.sponsored", false, sticky);
 
 // Whether online Firefox Suggest is available to the user. This is only
-// relevant when Suggest overall is enabled [1]. When true, a checkbox will be
-// shown in the settings UI allowing to the user to toggle online Suggest.
+// relevant when Suggest overall is enabled [1].
 //
 // [1] browser.urlbar.quicksuggest.enabled
 pref("browser.urlbar.quicksuggest.online.available", false);
diff --git a/browser/components/urlbar/QuickSuggest.sys.mjs b/browser/components/urlbar/QuickSuggest.sys.mjs
index 44ce8062c31a3..bba73d62aa235 100644
--- a/browser/components/urlbar/QuickSuggest.sys.mjs
+++ b/browser/components/urlbar/QuickSuggest.sys.mjs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
@@ -9,25 +11,37 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
+  TelemetryReportingPolicy:
+    "resource://gre/modules/TelemetryReportingPolicy.sys.mjs",
   UrlbarPrefs: "moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs",
   UrlbarUtils: "moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs",
 });
 
 // See the `QuickSuggest.SETTINGS_UI` jsdoc below.
 const SETTINGS_UI = Object.freeze({
+  // Settings relevant to both offline and online will be shown.
   FULL: 0,
+  // Settings relevant to both offline and online will be hidden.
   NONE: 1,
   // Only settings relevant to offline will be shown. Settings that pertain to
   // online will be hidden.
   OFFLINE_ONLY: 2,
 });
 
+// Timestamp in ms since epoch of the Firefox Terms of Use (ToU) pertaining to
+// Suggest. Keep this value in sync with Nimbus targeting in `constants.py` in
+// the `experimenter` repo.
+//
+// Privacy Notification Published date of 12:00 PM UTC on Dec 15, 2025
+const SUGGEST_TOU_TIMESTAMP = 1765800000000;
+
 const EN_LOCALES = ["en-CA", "en-GB", "en-US", "en-ZA"];
 
 /**
- * @typedef {[string[], boolean|number]} RegionLocaleDefault
- *   The first element is an array of locales (e.g. "en-US"), the second is the
- *   value of the preference.
+ * @typedef {[string[], boolean|number|Function]} RegionLocaleDefault
+ *   The first element is an array of locales, e.g. `["en-US", "en-CA"]`. The
+ *   second element is either the value of the preference or a function that
+ *   should return the value of the preference.
  */
 
 /**
@@ -72,13 +86,25 @@ const SUGGEST_PREFS = Object.freeze({
       US: [EN_LOCALES, true],
     },
   },
+  "quicksuggest.online.available": {
+    defaultValues: {
+      US: [EN_LOCALES, shouldOnlineBeAvailable],
+    },
+  },
   "quicksuggest.settingsUi": {
     defaultValues: {
       DE: [["de"], SETTINGS_UI.OFFLINE_ONLY],
       FR: [["fr"], SETTINGS_UI.OFFLINE_ONLY],
       GB: [EN_LOCALES, SETTINGS_UI.OFFLINE_ONLY],
       IT: [["it"], SETTINGS_UI.OFFLINE_ONLY],
-      US: [EN_LOCALES, SETTINGS_UI.OFFLINE_ONLY],
+      US: [
+        EN_LOCALES,
+        () => {
+          return shouldOnlineBeAvailable()
+            ? SETTINGS_UI.FULL
+            : SETTINGS_UI.OFFLINE_ONLY;
+        },
+      ],
     },
   },
   "suggest.quicksuggest.all": {
@@ -115,6 +141,11 @@ const SUGGEST_PREFS = Object.freeze({
       US: [EN_LOCALES, true],
     },
   },
+  "flightStatus.featureGate": {
+    defaultValues: {
+      US: [EN_LOCALES, shouldOnlineBeAvailable],
+    },
+  },
   "importantDates.featureGate": {
     defaultValues: {
       DE: [["de", ...EN_LOCALES], true],
@@ -124,11 +155,21 @@ const SUGGEST_PREFS = Object.freeze({
       US: [EN_LOCALES, true],
     },
   },
+  "market.featureGate": {
+    defaultValues: {
+      US: [EN_LOCALES, shouldOnlineBeAvailable],
+    },
+  },
   "mdn.featureGate": {
     defaultValues: {
       US: [EN_LOCALES, true],
     },
   },
+  "sports.featureGate": {
+    defaultValues: {
+      US: [EN_LOCALES, shouldOnlineBeAvailable],
+    },
+  },
   "weather.featureGate": {
     defaultValues: {
       DE: [["de"], true],
@@ -235,6 +276,15 @@ class _QuickSuggest {
     return SETTINGS_UI;
   }
 
+  /**
+   * @returns {number}
+   *   The Firefox Terms of Use (ToU) timestamp in ms since epoch pertaining to
+   *   Suggest.
+   */
+  get SUGGEST_TOU_TIMESTAMP() {
+    return SUGGEST_TOU_TIMESTAMP;
+  }
+
   /**
    * @returns {Promise}
    *   Resolved when Suggest initialization finishes.
@@ -622,6 +672,9 @@ class _QuickSuggest {
           if (defaultValues?.hasOwnProperty(region)) {
             let [enablingLocales, prefValue] = defaultValues[region];
             if (enablingLocales.includes(locale)) {
+              if (typeof prefValue == "function") {
+                prefValue = prefValue();
+              }
               return [prefName, prefValue];
             }
           }
@@ -642,6 +695,12 @@ class _QuickSuggest {
    *   The name of the pref relative to `browser.urlbar`.
    */
   onPrefChanged(pref) {
+    // If the Terms of Use (ToU) pref changed, recalculate pref defaults since
+    // some prefs depend on it.
+    if (pref == lazy.TelemetryReportingPolicy.TOU_ACCEPTED_DATE_PREF) {
+      this.#initPrefs();
+    }
+
     // If any feature's enabling preferences changed, update it now.
     let features = this.#featuresByEnablingPrefs.get(pref);
     if (!features) {
@@ -1120,6 +1179,11 @@ class _QuickSuggest {
     }
   }
 
+  // Lets tests easily mock whether the build is a Nightly build.
+  get _isNightlyBuild() {
+    return AppConstants.NIGHTLY_BUILD;
+  }
+
   async _test_reset(testOverrides = null) {
     if (this.#initStarted) {
       await this.initPromise;
@@ -1169,6 +1233,30 @@ class _QuickSuggest {
   #unmodifiedDefaultPrefs;
 }
 
+/**
+ * Returns whether the user has accepted the Firefox Terms of Use (ToU)
+ * pertaining to Suggest.
+ *
+ * @returns {boolean}
+ *   Whether the user accepted the ToU.
+ */
+function userAcceptedSuggestToU() {
+  let date = lazy.TelemetryReportingPolicy.termsOfUseAcceptedDate;
+  return !!date && SUGGEST_TOU_TIMESTAMP <= date.getTime();
+}
+
+/**
+ * Returns whether online Suggest should be available to the user *excluding
+ * consideration of the user's region and locale*.
+ *
+ * @returns {boolean}
+ *   Whether online Suggest should be available, excluding region and locale
+ *   checks.
+ */
+function shouldOnlineBeAvailable() {
+  return QuickSuggest._isNightlyBuild && userAcceptedSuggestToU();
+}
+
 function getDismissalKey(result) {
   return (
     result.payload.dismissalKey ||
diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
index 6cbafc5fe772c..9e91512f71ab5 100644
--- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
+++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
@@ -10,11 +10,13 @@
 
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
+import { TelemetryReportingPolicy } from "resource://gre/modules/TelemetryReportingPolicy.sys.mjs";
+
 const lazy = XPCOMUtils.declareLazy({
-  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
-  UrlbarUtils: "moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs",
   CustomizableUI:
     "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs",
+  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
+  UrlbarUtils: "moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs",
 });
 
 const PREF_URLBAR_BRANCH = "browser.urlbar.";
@@ -696,7 +698,7 @@ const PREF_URLBAR_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
 // the array so that we can preserve blame.
 const PREF_URLBAR_DEFAULTS_MAP = new Map(PREF_URLBAR_DEFAULTS);
 
-const PREF_OTHER_DEFAULTS = new Map([
+const PREF_OTHER_DEFAULTS = /** @type {PreferenceDefinition[]} */ ([
   ["browser.fixup.dns_first_for_single_words", false],
   ["browser.ml.enable", false],
   ["browser.search.openintab", false],
@@ -705,9 +707,12 @@ const PREF_OTHER_DEFAULTS = new Map([
   ["browser.search.widget.new", false],
   ["keyword.enabled", true],
   ["security.insecure_connection_text.enabled", true],
+  [TelemetryReportingPolicy.TOU_ACCEPTED_DATE_PREF, 0],
   ["ui.popup.disable_autohide", false],
 ]);
 
+const PREF_OTHER_DEFAULTS_MAP = new Map(PREF_OTHER_DEFAULTS);
+
 // Default values for Nimbus urlbar variables that do not have fallback prefs.
 // Variables with fallback prefs do not need to be defined here because their
 // defaults are the values of their fallbacks.
@@ -997,7 +1002,7 @@ class Preferences {
     ]);
 
     Services.prefs.addObserver(PREF_URLBAR_BRANCH, this, true);
-    for (let pref of PREF_OTHER_DEFAULTS.keys()) {
+    for (let pref of PREF_OTHER_DEFAULTS_MAP.keys()) {
       Services.prefs.addObserver(pref, this, true);
     }
     this._observerWeakRefs = [];
@@ -1018,7 +1023,7 @@ class Preferences {
    * Returns the value for the preference with the given name.
    * For preferences in the "browser.urlbar."" branch, the passed-in name
    * should be relative to the branch. It's also possible to get prefs from the
-   * PREF_OTHER_DEFAULTS Map, specifying their full name.
+   * PREF_OTHER_DEFAULTS_MAP Map, specifying their full name.
    *
    * @param {string} pref
    *        The name of the preference to get.
@@ -1037,7 +1042,7 @@ class Preferences {
    * Sets the value for the preference with the given name.
    * For preferences in the "browser.urlbar."" branch, the passed-in name
    * should be relative to the branch. It's also possible to set prefs from the
-   * PREF_OTHER_DEFAULTS Map, specifying their full name.
+   * PREF_OTHER_DEFAULTS_MAP Map, specifying their full name.
    *
    * @param {string} pref
    *        The name of the preference to set.
@@ -1195,7 +1200,10 @@ class Preferences {
    */
   observe(subject, topic, data) {
     let pref = data.replace(PREF_URLBAR_BRANCH, "");
-    if (!PREF_URLBAR_DEFAULTS_MAP.has(pref) && !PREF_OTHER_DEFAULTS.has(pref)) {
+    if (
+      !PREF_URLBAR_DEFAULTS_MAP.has(pref) &&
+      !PREF_OTHER_DEFAULTS_MAP.has(pref)
+    ) {
       return;
     }
     this.#notifyObservers("onPrefChanged", pref);
@@ -1359,7 +1367,7 @@ class Preferences {
     let defaultValue = PREF_URLBAR_DEFAULTS_MAP.get(pref);
     if (defaultValue === undefined) {
       branch = Services.prefs;
-      defaultValue = PREF_OTHER_DEFAULTS.get(pref);
+      defaultValue = PREF_OTHER_DEFAULTS_MAP.get(pref);
       if (defaultValue === undefined) {
         let nimbus = this._getNimbusDescriptor(pref);
         if (nimbus) {
diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_defaultPrefs.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_defaultPrefs.js
index eb75384774ebd..b562dc518920d 100644
--- a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_defaultPrefs.js
+++ b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_defaultPrefs.js
@@ -8,9 +8,14 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
+  AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
+  TelemetryReportingPolicy:
+    "resource://gre/modules/TelemetryReportingPolicy.sys.mjs",
 });
 
+const { SUGGEST_TOU_TIMESTAMP } = QuickSuggest;
+
 const EN_LOCALES = ["en-CA", "en-GB", "en-US", "en-ZA"];
 
 // Expected prefs when Suggest is disabled.
@@ -105,7 +110,7 @@ add_setup(async () => {
   await UrlbarTestUtils.initNimbusFeature();
 });
 
-add_task(async function test() {
+add_task(async function primary() {
   let tests = [
     // Regions/locales where Suggest should be enabled to some extent
     { region: "DE", locale: "de" },
@@ -136,7 +141,7 @@ add_task(async function test() {
   ];
 
   for (let { locale, region } of tests) {
-    await doTest({ locale, region });
+    await doPrimaryTest({ locale, region });
   }
 });
 
@@ -151,7 +156,7 @@ add_task(async function test() {
  * @param {string} options.region
  *   The "home" region to simulate.
  */
-async function doTest({ locale, region }) {
+async function doPrimaryTest({ locale, region }) {
   let expectedPrefs =
     EXPECTED_PREFS_BY_LOCALE_BY_REGION[region]?.[locale] ??
     EXPECTED_PREFS_SUGGEST_DISABLED;
@@ -217,3 +222,246 @@ async function doTest({ locale, region }) {
     }
   }
 }
+
+// Online Suggest should be available at the time Suggest is initialized if: the
+// build is a Nightly, the user has accepted ToU, and Suggest overall is
+// enabled. Online Suggest should not be available otherwise.
+add_task(async function onlineAvailable_init() {
+  // Sanity check that `QuickSuggest._isNightlyBuild` is defined properly.
+  Assert.equal(
+    typeof QuickSuggest._isNightlyBuild,
+    "boolean",
+    "Sanity check: QuickSuggest._isNightlyBuild should be a boolean"
+  );
+  Assert.equal(
+    QuickSuggest._isNightlyBuild,
+    AppConstants.NIGHTLY_BUILD,
+    "Sanity check: QuickSuggest._isNightlyBuild should match AppConstants"
+  );
+
+  let tests = [
+    // Not Nightly builds: online should be unavailable
+    {
+      isNightlyBuild: false,
+      touAcceptedDate: 0,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+    {
+      isNightlyBuild: false,
+      touAcceptedDate: SUGGEST_TOU_TIMESTAMP - 1,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+    {
+      isNightlyBuild: false,
+      touAcceptedDate: SUGGEST_TOU_TIMESTAMP,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+
+    // Nightly builds: online should be available iff ToU are accepted
+    {
+      isNightlyBuild: true,
+      touAcceptedDate: 0,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+    {
+      isNightlyBuild: true,
+      touAcceptedDate: SUGGEST_TOU_TIMESTAMP - 1,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+    {
+      isNightlyBuild: true,
+      touAcceptedDate: SUGGEST_TOU_TIMESTAMP,
+      expected: {
+        "quicksuggest.online.available": true,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.FULL,
+        "flightStatus.featureGate": true,
+        "market.featureGate": true,
+        "sports.featureGate": true,
+      },
+    },
+
+    // Nightly build and ToU accepted but region/locale where Suggest is not
+    // enabled: online should be unavailable
+    {
+      region: "JP",
+      locale: "ja",
+      isNightlyBuild: true,
+      touAcceptedDate: SUGGEST_TOU_TIMESTAMP,
+      expected: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.NONE,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+  ];
+
+  for (let {
+    region,
+    locale,
+    isNightlyBuild,
+    touAcceptedDate,
+    expected,
+  } of tests) {
+    await doOnlineAvailableTest({
+      region,
+      locale,
+      isNightlyBuild,
+      touAcceptedDate,
+      expected,
+    });
+  }
+});
+
+// Online Suggest should become available at the time the user accepts ToU if:
+// the build is a Nightly and Suggest overall is enabled. Online Suggest should
+// remain unavailable otherwise.
+add_task(async function onlineAvailable_onToUAccepted() {
+  // `QuickSuggest.init` must be called so it adds itself as a `UrlbarPrefs`
+  // observer.
+  await QuickSuggest.init();
+
+  let tests = [
+    {
+      region: "US",
+      locale: "en-US",
+      expectedBefore: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.OFFLINE_ONLY,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+      expectedAfter: {
+        "quicksuggest.online.available": true,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.FULL,
+        "flightStatus.featureGate": true,
+        "market.featureGate": true,
+        "sports.featureGate": true,
+      },
+    },
+    // region/locale where Suggest is not enabled
+    {
+      region: "JP",
+      locale: "ja",
+      expectedBefore: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.NONE,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+      // same as `expectedBefore`
+      expectedAfter: {
+        "quicksuggest.online.available": false,
+        "quicksuggest.settingsUi": QuickSuggest.SETTINGS_UI.NONE,
+        "flightStatus.featureGate": false,
+        "market.featureGate": false,
+        "sports.featureGate": false,
+      },
+    },
+  ];
+
+  for (let { region, locale, expectedBefore, expectedAfter } of tests) {
+    await doOnlineAvailableTest({
+      region,
+      locale,
+      isNightlyBuild: true,
+      touAcceptedDate: 0,
+      expected: expectedBefore,
+      callback: async () => {
+        info("Setting ToU accepted date");
+        Services.prefs.setCharPref(
+          TelemetryReportingPolicy.TOU_ACCEPTED_DATE_PREF,
+          SUGGEST_TOU_TIMESTAMP
+        );
+        for (let [name, value] of Object.entries(expectedAfter)) {
+          Assert.equal(
+            UrlbarPrefs.get(name),
+            value,
+            "Pref should have expected value after accepting ToU: " + name
+          );
+        }
+      },
+    });
+  }
+});
+
+async function doOnlineAvailableTest({
+  isNightlyBuild,
+  touAcceptedDate,
+  expected,
+  region = "US",
+  locale = "en-US",
+  callback = null,
+}) {
+  info(
+    "Doing online-available test: " +
+      JSON.stringify({
+        region,
+        locale,
+        isNightlyBuild,
+        touAcceptedDate,
+        expected,
+      })
+  );
+
+  // Stub `QuickSuggest._isNightlyBuild`.
+  let sandbox = sinon.createSandbox();
+  sandbox.stub(QuickSuggest, "_isNightlyBuild").value(isNightlyBuild);
+
+  // Set the ToU acceptance date.
+  Services.prefs.setCharPref(
+    TelemetryReportingPolicy.TOU_ACCEPTED_DATE_PREF,
+    touAcceptedDate
+  );
+
+  await QuickSuggestTestUtils.withRegionAndLocale({
+    region,
+    locale,
+    callback: async () => {
+      for (let [name, value] of Object.entries(expected)) {
+        Assert.equal(
+          UrlbarPrefs.get(name),
+          value,
+          "Pref should have expected value: " + name
+        );
+      }
+      await callback?.();
+    },
+  });
+
+  sandbox.restore();
+  Services.prefs.clearUserPref(TelemetryReportingPolicy.TOU_ACCEPTED_DATE_PREF);
+}
diff --git a/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs b/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs
index e679f94dd7c3a..e492c19c5b9d1 100644
--- a/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs
+++ b/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs
@@ -143,6 +143,9 @@ export var TelemetryReportingPolicy = {
   TELEMETRY_TOU_ACCEPTED_OR_INELIGIBLE: "telemetry-tou-accepted-or-ineligible",
   // Make this value accessible on TelemetryReportingPolicy
   OLDEST_ALLOWED_TOU_ACCEPTANCE_YEAR,
+
+  TOU_ACCEPTED_DATE_PREF,
+
   /**
    * Setup the policy.
    */
@@ -228,6 +231,10 @@ export var TelemetryReportingPolicy = {
     TelemetryReportingPolicyImpl._notificationInProgress = inProgress;
   },
 
+  get termsOfUseAcceptedDate() {
+    return TelemetryReportingPolicyImpl.termsOfUseAcceptedDate;
+  },
+
   /**
    * Test only method, used to get TOS on-train release dates by channel.
    */

From 7edf28d1aba222a70eb56f14539efd7f3a1f88fb Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:46 +0000
Subject: [PATCH 67/93] Bug 1707584 - part1 : implement :playing and :paused
 pseudo classes.
 r=media-playback-reviewers,firefox-style-system-reviewers,emilio,chunmin

This implements :playing [1] and :paused [2] pseudeo classes for media element.

[1] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-playing
[2] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-paused

Differential Revision: https://phabricator.services.mozilla.com/D281037
---
 dom/base/rust/lib.rs                          |  4 +++-
 dom/media/mediaelement/HTMLMediaElement.cpp   | 19 +++++++++++++++++++
 dom/media/mediaelement/HTMLMediaElement.h     |  5 +++++
 modules/libpref/init/StaticPrefList.yaml      |  7 +++++++
 .../style/gecko/non_ts_pseudo_class_list.rs   |  5 +++++
 .../components/style/gecko/selector_parser.rs |  3 +++
 servo/components/style/gecko/wrapper.rs       | 10 ++++++++++
 .../part/pseudo-classes-after-part.html.ini   |  7 +------
 .../media-pseudo-classes-in-has.html.ini      |  4 +---
 .../meta/css/selectors/media/__dir__.ini      |  1 +
 .../media-playback-state-timing.html.ini      |  6 ------
 .../media/media-playback-state.html.ini       |  6 ------
 .../selectors/media/media-playback-state.html | 12 ++++++++++++
 13 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 testing/web-platform/meta/css/selectors/media/__dir__.ini

diff --git a/dom/base/rust/lib.rs b/dom/base/rust/lib.rs
index 14a1f2acb370b..f2a171e9609df 100644
--- a/dom/base/rust/lib.rs
+++ b/dom/base/rust/lib.rs
@@ -7,7 +7,7 @@
 use bitflags::bitflags;
 use malloc_size_of::malloc_size_of_is_0;
 
-pub const HEADING_LEVEL_OFFSET: usize = 52;
+pub const HEADING_LEVEL_OFFSET: usize = 53;
 
 bitflags! {
     /// Event-based element states.
@@ -144,6 +144,8 @@ bitflags! {
         const ACTIVE_VIEW_TRANSITION = 1u64 << 50;
         /// For :-moz-suppress-for-print-selection.
         const SUPPRESS_FOR_PRINT_SELECTION = 1u64 << 51;
+        /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-paused
+        const PAUSED = 1u64 << 52;
         /// https://drafts.csswg.org/selectors-5/#headings
         /// These 4 bits are used to pack the elements heading level into the element state
         /// Heading levels can be from 1-9 so 4 bits allows us to express the full range.
diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
index f77fb6191c804..108bc6c0e719c 100644
--- a/dom/media/mediaelement/HTMLMediaElement.cpp
+++ b/dom/media/mediaelement/HTMLMediaElement.cpp
@@ -2526,6 +2526,7 @@ void HTMLMediaElement::AbortExistingLoads() {
     // indirectly which depends on mPaused. So we need to update mPaused first.
     if (!mPaused) {
       mPaused = true;
+      UpdatePlaybackPseudoClasses();
       PlayPromise::RejectPromises(TakePendingPlayPromises(),
                                   NS_ERROR_DOM_MEDIA_ABORT_ERR);
     }
@@ -3626,6 +3627,7 @@ void HTMLMediaElement::PauseInternal() {
   }
   bool oldPaused = mPaused;
   mPaused = true;
+  UpdatePlaybackPseudoClasses();
   // Step 1,
   // https://html.spec.whatwg.org/multipage/media.html#internal-pause-steps
   mCanAutoplayFlag = false;
@@ -4761,6 +4763,7 @@ void HTMLMediaElement::Init() {
 
   OwnerDoc()->SetDocTreeHadMedia();
   mShutdownObserver->Subscribe(this);
+  UpdatePlaybackPseudoClasses();
   mInitialized = true;
 }
 
@@ -5008,6 +5011,7 @@ void HTMLMediaElement::PlayInternal(bool aHandlingUserInput) {
 
   const bool oldPaused = mPaused;
   mPaused = false;
+  UpdatePlaybackPseudoClasses();
   // Step 5,
   // https://html.spec.whatwg.org/multipage/media.html#internal-play-steps
   mCanAutoplayFlag = false;
@@ -5100,6 +5104,18 @@ void HTMLMediaElement::UpdateWakeLock() {
   }
 }
 
+void HTMLMediaElement::UpdatePlaybackPseudoClasses() {
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mPaused) {
+    // We don’t need to update the playing state because these states are
+    // exclusive, and the `:playing` pseudo-class is determined by checking
+    // the element's PAUSED state.
+    AddStates(ElementState::PAUSED);
+  } else {
+    RemoveStates(ElementState::PAUSED);
+  }
+}
+
 void HTMLMediaElement::CreateAudioWakeLockIfNeeded() {
   MOZ_ASSERT(NS_IsMainThread());
   if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
@@ -6725,6 +6741,8 @@ void HTMLMediaElement::CheckAutoplayDataReady() {
 void HTMLMediaElement::RunAutoplay() {
   mAllowedToPlayPromise.ResolveIfExists(true, __func__);
   mPaused = false;
+  UpdatePlaybackPseudoClasses();
+
   // We changed mPaused which can affect AddRemoveSelfReference
   AddRemoveSelfReference();
   UpdateSrcMediaStreamPlaying();
@@ -8068,6 +8086,7 @@ void HTMLMediaElement::AsyncResolvePendingPlayPromises() {
 void HTMLMediaElement::AsyncRejectPendingPlayPromises(nsresult aError) {
   if (!mPaused) {
     mPaused = true;
+    UpdatePlaybackPseudoClasses();
     QueueEvent(u"pause"_ns);
   }
 
diff --git a/dom/media/mediaelement/HTMLMediaElement.h b/dom/media/mediaelement/HTMLMediaElement.h
index 2081871aeb411..2dfe43a514c35 100644
--- a/dom/media/mediaelement/HTMLMediaElement.h
+++ b/dom/media/mediaelement/HTMLMediaElement.h
@@ -915,6 +915,11 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   virtual void WakeLockRelease();
   virtual void UpdateWakeLock();
 
+  // This must be called immediately after monitor attributes change, and cannot
+  // wait for the Watchable notification, because some pseudo-classes are
+  // required to be applied immediately after the change.
+  void UpdatePlaybackPseudoClasses();
+
   void CreateAudioWakeLockIfNeeded();
   void ReleaseAudioWakeLockIfExists();
   void ReleaseAudioWakeLockInternal();
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 5f4be2e462927..227b48d4519e6 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3624,6 +3624,13 @@
   value: true
   mirror: always
 
+# Media element pseudo-classes
+- name: dom.media.pseudo-classes.enabled
+  type: RelaxedAtomicBool
+  value: false
+  mirror: always
+  rust: true
+
 # WebCodecs API
 - name: dom.media.webcodecs.enabled
   type: RelaxedAtomicBool
diff --git a/servo/components/style/gecko/non_ts_pseudo_class_list.rs b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
index 9e9a4f49c6b97..afaafacecc90a 100644
--- a/servo/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -92,6 +92,11 @@ macro_rules! apply_non_ts_list {
                 ("-moz-native-anonymous", MozNativeAnonymous, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-placeholder", MozPlaceholder, _, _),
 
+                // Media element pseudo classes
+                ("paused", Paused, PAUSED, _),
+                ("playing", Playing, PAUSED, _),
+
+
                 // NOTE(emilio): Pseudo-classes below only depend on document state, and thus
                 // conceptually they should probably be media queries instead.
                 //
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index ba7d1631f54bd..959c06e304a2d 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -227,6 +227,9 @@ impl NonTSPseudoClass {
         if matches!(*self, Self::Heading(..)) {
             return static_prefs::pref!("layout.css.heading-selector.enabled");
         }
+        if matches!(*self, Self::Playing | Self::Paused) {
+            return static_prefs::pref!("dom.media.pseudo-classes.enabled");
+        }
         !self.has_any_flag(NonTSPseudoClassFlag::PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME)
     }
 
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index ec0289257070e..c0a4f57e29d32 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -932,6 +932,14 @@ impl<'le> GeckoElement<'le> {
     pub fn slow_selector_flags(&self) -> ElementSelectorFlags {
         slow_selector_flags_from_node_selector_flags(self.as_node().selector_flags())
     }
+
+    /// Returns whether this element is an HTML <video> or <audio> element.
+    #[inline]
+    pub fn is_html_media_element(&self) -> bool {
+        self.is_html_element()
+            && (self.local_name().as_ptr() == local_name!("video").as_ptr()
+                || self.local_name().as_ptr() == local_name!("audio").as_ptr())
+    }
 }
 
 /// Convert slow selector flags from the raw `NodeSelectorFlags`.
@@ -2080,6 +2088,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             | NonTSPseudoClass::MozSuppressForPrintSelection => {
                 self.state().intersects(pseudo_class.state_flag())
             },
+            NonTSPseudoClass::Paused => self.is_html_media_element() && self.state().intersects(ElementState::PAUSED),
+            NonTSPseudoClass::Playing => self.is_html_media_element() && !self.state().intersects(ElementState::PAUSED),
             NonTSPseudoClass::Dir(ref dir) => self.state().intersects(dir.element_state()),
             NonTSPseudoClass::ActiveViewTransitionType(ref types) => {
                 self.state().intersects(pseudo_class.state_flag())
diff --git a/testing/web-platform/meta/css/css-shadow/part/pseudo-classes-after-part.html.ini b/testing/web-platform/meta/css/css-shadow/part/pseudo-classes-after-part.html.ini
index 4a0b41ea4b129..0ad068edbc8e1 100644
--- a/testing/web-platform/meta/css/css-shadow/part/pseudo-classes-after-part.html.ini
+++ b/testing/web-platform/meta/css/css-shadow/part/pseudo-classes-after-part.html.ini
@@ -1,18 +1,13 @@
 [pseudo-classes-after-part.html]
+  prefs: [dom.media.pseudo-classes.enabled:true]
   ["::part(mypart):future" should be a valid selector]
     expected: FAIL
 
   ["::part(mypart):past" should be a valid selector]
     expected: FAIL
 
-  ["::part(mypart):paused" should be a valid selector]
-    expected: FAIL
-
   ["::part(mypart):picture-in-picture" should be a valid selector]
     expected: FAIL
 
-  ["::part(mypart):playing" should be a valid selector]
-    expected: FAIL
-
   ["::part(mypart):xr-overlay" should be a valid selector]
     expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
index cc8aa1ed0e511..20af15f18cea0 100644
--- a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
+++ b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
@@ -1,9 +1,7 @@
 [media-pseudo-classes-in-has.html]
+  prefs: [dom.media.pseudo-classes.enabled:true]
   [Test :seeking pseudo-class]
     expected: FAIL
 
   [Test :muted pseudo-class]
     expected: FAIL
-
-  [Test :playing pseudo-class]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/media/__dir__.ini b/testing/web-platform/meta/css/selectors/media/__dir__.ini
new file mode 100644
index 0000000000000..1fbbffad1807e
--- /dev/null
+++ b/testing/web-platform/meta/css/selectors/media/__dir__.ini
@@ -0,0 +1 @@
+prefs: [dom.media.pseudo-classes.enabled:true]
diff --git a/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini b/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
index c2d87c94874d2..7aba6d25cd8e0 100644
--- a/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
+++ b/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
@@ -1,9 +1,3 @@
 [media-playback-state-timing.html]
-  [Test :playing and :paused timing without media resource]
-    expected: FAIL
-
-  [Test :playing and :paused timing with a media resource]
-    expected: FAIL
-
   [Test :seeking timing when setting currentTime]
     expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini b/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini
index 34f75356e73e5..1de61056b9994 100644
--- a/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini
+++ b/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini
@@ -4,9 +4,3 @@
 
   [Test :seeking pseudo-class]
     expected: FAIL
-
-  [Test :paused pseudo-class]
-    expected: FAIL
-
-  [Test :playing pseudo-class]
-    expected: FAIL
diff --git a/testing/web-platform/tests/css/selectors/media/media-playback-state.html b/testing/web-platform/tests/css/selectors/media/media-playback-state.html
index 6ce4584d03698..0bdf1a8fee21e 100644
--- a/testing/web-platform/tests/css/selectors/media/media-playback-state.html
+++ b/testing/web-platform/tests/css/selectors/media/media-playback-state.html
@@ -73,5 +73,17 @@
       assert_equals(document.querySelector("video:seeking"), video);
       assert_equals(document.querySelector("video:not(:seeking)"), null);
     }, "Test :seeking pseudo-class");
+
+    test((t) => {
+      const pseudoClasses = [":playing", ":paused"];
+      const div = document.createElement("div");
+      document.body.appendChild(div);
+      t.add_cleanup(() => div.remove());
+      for (const pseudo of pseudoClasses) {
+        assert_implements(CSS.supports(`selector(${pseudo})`), `${pseudo} is not supported`);
+        assert_false(div.matches(pseudo));
+        assert_true(div.matches(`:not(${pseudo})`));
+      }
+    }, "Test that non-media elements do not match :playing or :paused");
   </script>
 </body>

From 90eb82c617c1bfcc4380c3bf874db1f8929f1d9a Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:46 +0000
Subject: [PATCH 68/93] Bug 1707584 - part2 : implement :seeking pseudo class.
 r=media-playback-reviewers,firefox-style-system-reviewers,emilio,chunmin

Per spec [1], :seeking should be set once `seeking attribute is true`, so the state
needs to be setup in HTMLMediaElement::Seek() immediatley, so that the script can
see the state applied right after updating the media's current time.

[1] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-seeking

Differential Revision: https://phabricator.services.mozilla.com/D281038
---
 dom/base/rust/lib.rs                                      | 4 +++-
 dom/media/mediaelement/HTMLMediaElement.cpp               | 8 ++++++++
 servo/components/style/gecko/non_ts_pseudo_class_list.rs  | 1 +
 servo/components/style/gecko/selector_parser.rs           | 2 +-
 servo/components/style/gecko/wrapper.rs                   | 3 ++-
 .../invalidation/media-pseudo-classes-in-has.html.ini     | 3 ---
 .../selectors/media/media-playback-state-timing.html.ini  | 3 ---
 .../css/selectors/media/media-playback-state.html.ini     | 6 ------
 .../tests/css/selectors/media/media-playback-state.html   | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
 delete mode 100644 testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini

diff --git a/dom/base/rust/lib.rs b/dom/base/rust/lib.rs
index f2a171e9609df..a9e931ab6ea55 100644
--- a/dom/base/rust/lib.rs
+++ b/dom/base/rust/lib.rs
@@ -7,7 +7,7 @@
 use bitflags::bitflags;
 use malloc_size_of::malloc_size_of_is_0;
 
-pub const HEADING_LEVEL_OFFSET: usize = 53;
+pub const HEADING_LEVEL_OFFSET: usize = 54;
 
 bitflags! {
     /// Event-based element states.
@@ -146,6 +146,8 @@ bitflags! {
         const SUPPRESS_FOR_PRINT_SELECTION = 1u64 << 51;
         /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-paused
         const PAUSED = 1u64 << 52;
+        /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-seeking
+        const SEEKING = 1u64 << 53;
         /// https://drafts.csswg.org/selectors-5/#headings
         /// These 4 bits are used to pack the elements heading level into the element state
         /// Heading levels can be from 1-9 so 4 bits allows us to express the full range.
diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
index 108bc6c0e719c..4ca5f238a1a8c 100644
--- a/dom/media/mediaelement/HTMLMediaElement.cpp
+++ b/dom/media/mediaelement/HTMLMediaElement.cpp
@@ -2474,6 +2474,11 @@ void HTMLMediaElement::AbortExistingLoads() {
 
   if (mDecoder) {
     fireTimeUpdate = mDecoder->GetCurrentTime() != 0.0;
+    // When aborting during seeking, remove the seeking state since the decoder
+    // won't call SeekCompleted() or SeekAborted() after being shut down.
+    if (Seeking()) {
+      RemoveStates(ElementState::SEEKING);
+    }
     ShutdownDecoder();
   }
   if (mSrcStream) {
@@ -3555,6 +3560,7 @@ void HTMLMediaElement::Seek(double aTime, SeekTarget::Type aSeekType,
   // The media backend is responsible for dispatching the timeupdate
   // event if it changes the playback position as a result of the seek.
   LOG(LogLevel::Debug, ("%p SetCurrentTime(%f) starting seek", this, aTime));
+  AddStates(ElementState::SEEKING);
   mDecoder->Seek(aTime, aSeekType);
 
   // We changed whether we're seeking so we need to AddRemoveSelfReference.
@@ -6182,6 +6188,7 @@ void HTMLMediaElement::SeekCompleted() {
   // (Step 16)
   // TODO (bug 1688131): run these steps in a stable state.
   FireTimeUpdate(TimeupdateType::eMandatory);
+  RemoveStates(ElementState::SEEKING);
   QueueEvent(u"seeked"_ns);
   // We changed whether we're seeking so we need to AddRemoveSelfReference
   AddRemoveSelfReference();
@@ -6199,6 +6206,7 @@ void HTMLMediaElement::SeekCompleted() {
 }
 
 void HTMLMediaElement::SeekAborted() {
+  RemoveStates(ElementState::SEEKING);
   if (mSeekDOMPromise) {
     AbstractMainThread()->Dispatch(NS_NewRunnableFunction(
         __func__, [promise = std::move(mSeekDOMPromise)] {
diff --git a/servo/components/style/gecko/non_ts_pseudo_class_list.rs b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
index afaafacecc90a..b26e4ca23eb66 100644
--- a/servo/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -95,6 +95,7 @@ macro_rules! apply_non_ts_list {
                 // Media element pseudo classes
                 ("paused", Paused, PAUSED, _),
                 ("playing", Playing, PAUSED, _),
+                ("seeking", Seeking, SEEKING, _),
 
 
                 // NOTE(emilio): Pseudo-classes below only depend on document state, and thus
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index 959c06e304a2d..ef54f408f65b2 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -227,7 +227,7 @@ impl NonTSPseudoClass {
         if matches!(*self, Self::Heading(..)) {
             return static_prefs::pref!("layout.css.heading-selector.enabled");
         }
-        if matches!(*self, Self::Playing | Self::Paused) {
+        if matches!(*self, Self::Playing | Self::Paused | Self::Seeking) {
             return static_prefs::pref!("dom.media.pseudo-classes.enabled");
         }
         !self.has_any_flag(NonTSPseudoClassFlag::PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME)
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index c0a4f57e29d32..597bc8519b508 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -2085,7 +2085,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             | NonTSPseudoClass::MozRevealed
             | NonTSPseudoClass::ActiveViewTransition
             | NonTSPseudoClass::MozValueEmpty
-            | NonTSPseudoClass::MozSuppressForPrintSelection => {
+            | NonTSPseudoClass::MozSuppressForPrintSelection
+            | NonTSPseudoClass::Seeking => {
                 self.state().intersects(pseudo_class.state_flag())
             },
             NonTSPseudoClass::Paused => self.is_html_media_element() && self.state().intersects(ElementState::PAUSED),
diff --git a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
index 20af15f18cea0..ada942ad922d8 100644
--- a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
+++ b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
@@ -1,7 +1,4 @@
 [media-pseudo-classes-in-has.html]
   prefs: [dom.media.pseudo-classes.enabled:true]
-  [Test :seeking pseudo-class]
-    expected: FAIL
-
   [Test :muted pseudo-class]
     expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini b/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
deleted file mode 100644
index 7aba6d25cd8e0..0000000000000
--- a/testing/web-platform/meta/css/selectors/media/media-playback-state-timing.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[media-playback-state-timing.html]
-  [Test :seeking timing when setting currentTime]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini b/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini
deleted file mode 100644
index 1de61056b9994..0000000000000
--- a/testing/web-platform/meta/css/selectors/media/media-playback-state.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[media-playback-state.html]
-  [Test :pseudo-class syntax is supported without throwing a SyntaxError]
-    expected: FAIL
-
-  [Test :seeking pseudo-class]
-    expected: FAIL
diff --git a/testing/web-platform/tests/css/selectors/media/media-playback-state.html b/testing/web-platform/tests/css/selectors/media/media-playback-state.html
index 0bdf1a8fee21e..18a70fedb0e36 100644
--- a/testing/web-platform/tests/css/selectors/media/media-playback-state.html
+++ b/testing/web-platform/tests/css/selectors/media/media-playback-state.html
@@ -75,7 +75,7 @@
     }, "Test :seeking pseudo-class");
 
     test((t) => {
-      const pseudoClasses = [":playing", ":paused"];
+      const pseudoClasses = [":playing", ":paused", ":seeking"];
       const div = document.createElement("div");
       document.body.appendChild(div);
       t.add_cleanup(() => div.remove());
@@ -84,6 +84,6 @@
         assert_false(div.matches(pseudo));
         assert_true(div.matches(`:not(${pseudo})`));
       }
-    }, "Test that non-media elements do not match :playing or :paused");
+     }, "Test that non-media elements do not match :playing, :paused, or :seeking");
   </script>
 </body>

From b25ca8c165a0b29f1a397a065205c24236ccaf4e Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:46 +0000
Subject: [PATCH 69/93] Bug 1707584 - part3 : implement :buffering and :stalled
 pseudo classes.
 r=media-playback-reviewers,firefox-style-system-reviewers,emilio,chunmin

In this patch, we implement :buffering [1] and :stalled [2], but we are still
unable to pass the corresponding WPTs. Those tests can't make Firefox dispatch
`stalled` event properly and requires additional changes.

In addition, the spec currently treats `:stalled` as a subset of `:buffering`,
which may be incorrect. We need further clarification on this behavior in the spec.

[1] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-buffering
[2] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-stalled

Differential Revision: https://phabricator.services.mozilla.com/D281039
---
 dom/base/rust/lib.rs                          |  6 +++-
 dom/media/mediaelement/HTMLMediaElement.cpp   | 36 +++++++++++++++----
 dom/media/mediaelement/HTMLMediaElement.h     |  3 ++
 .../style/gecko/non_ts_pseudo_class_list.rs   |  2 ++
 .../components/style/gecko/selector_parser.rs |  5 ++-
 servo/components/style/gecko/wrapper.rs       |  4 ++-
 .../media-loading-state-timing.sub.html.ini   |  3 +-
 .../media/media-loading-state.html.ini        |  8 ++---
 8 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/dom/base/rust/lib.rs b/dom/base/rust/lib.rs
index a9e931ab6ea55..82149e6adec18 100644
--- a/dom/base/rust/lib.rs
+++ b/dom/base/rust/lib.rs
@@ -7,7 +7,7 @@
 use bitflags::bitflags;
 use malloc_size_of::malloc_size_of_is_0;
 
-pub const HEADING_LEVEL_OFFSET: usize = 54;
+pub const HEADING_LEVEL_OFFSET: usize = 56;
 
 bitflags! {
     /// Event-based element states.
@@ -148,6 +148,10 @@ bitflags! {
         const PAUSED = 1u64 << 52;
         /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-seeking
         const SEEKING = 1u64 << 53;
+        /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-buffering
+        const BUFFERING = 1u64 << 54;
+        /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-stalled
+        const STALLED = 1u64 << 55;
         /// https://drafts.csswg.org/selectors-5/#headings
         /// These 4 bits are used to pack the elements heading level into the element state
         /// Heading levels can be from 1-9 so 4 bits allows us to express the full range.
diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
index 4ca5f238a1a8c..ef47bfe146d79 100644
--- a/dom/media/mediaelement/HTMLMediaElement.cpp
+++ b/dom/media/mediaelement/HTMLMediaElement.cpp
@@ -4739,6 +4739,8 @@ void HTMLMediaElement::Init() {
   mWatchManager.Watch(mTracksCaptured,
                       &HTMLMediaElement::UpdateOutputTrackSources);
   mWatchManager.Watch(mReadyState, &HTMLMediaElement::UpdateOutputTrackSources);
+  mWatchManager.Watch(mReadyState,
+                      &HTMLMediaElement::UpdatePlaybackPseudoClasses);
 
   mWatchManager.Watch(mDownloadSuspendedByCache,
                       &HTMLMediaElement::UpdateReadyStateInternal);
@@ -5112,13 +5114,28 @@ void HTMLMediaElement::UpdateWakeLock() {
 
 void HTMLMediaElement::UpdatePlaybackPseudoClasses() {
   MOZ_ASSERT(NS_IsMainThread());
+  LOG(LogLevel::Debug,
+      ("%p UpdatePlaybackPseudoClasses: mPaused=%d, mNetworkState=%d, "
+       "mReadyState=%d, mIsCurrentlyStalled=%d",
+       this, mPaused.Ref(), mNetworkState, mReadyState.Ref(),
+       mIsCurrentlyStalled));
+  AutoStateChangeNotifier notifier(*this, /*aNotify=*/true);
+  RemoveStatesSilently(ElementState::PAUSED | ElementState::BUFFERING |
+                       ElementState::STALLED);
+  // We don’t need to update the playing state because these states are
+  // exclusive, and the `:playing` pseudo-class is determined by checking
+  // the element's PAUSED state.
   if (mPaused) {
-    // We don’t need to update the playing state because these states are
-    // exclusive, and the `:playing` pseudo-class is determined by checking
-    // the element's PAUSED state.
-    AddStates(ElementState::PAUSED);
-  } else {
-    RemoveStates(ElementState::PAUSED);
+    AddStatesSilently(ElementState::PAUSED);
+    return;
+  }
+  // https://html.spec.whatwg.org/multipage/semantics-other.html#selector-buffering
+  if (mNetworkState == NETWORK_LOADING && mReadyState <= HAVE_CURRENT_DATA) {
+    AddStatesSilently(ElementState::BUFFERING);
+    // https://html.spec.whatwg.org/multipage/semantics-other.html#selector-stalled
+    if (mIsCurrentlyStalled) {
+      AddStatesSilently(ElementState::STALLED);
+    }
   }
 }
 
@@ -6224,6 +6241,8 @@ void HTMLMediaElement::NotifySuspendedByCache(bool aSuspendedByCache) {
 
 void HTMLMediaElement::DownloadSuspended() {
   if (mNetworkState == NETWORK_LOADING) {
+    mIsCurrentlyStalled = false;
+    UpdatePlaybackPseudoClasses();
     QueueEvent(u"progress"_ns);
   }
   ChangeNetworkState(NETWORK_IDLE);
@@ -6254,6 +6273,8 @@ void HTMLMediaElement::CheckProgress(bool aHaveNewProgress) {
           : (now - mProgressTime >=
                  TimeDuration::FromMilliseconds(PROGRESS_MS) &&
              mDataTime > mProgressTime)) {
+    mIsCurrentlyStalled = false;
+    UpdatePlaybackPseudoClasses();
     QueueEvent(u"progress"_ns);
     // Going back 1ms ensures that future data will have now > mProgressTime,
     // and so will trigger another event.  mDataTime is not reset because it
@@ -6279,6 +6300,8 @@ void HTMLMediaElement::CheckProgress(bool aHaveNewProgress) {
 
   if (now - mDataTime >= TimeDuration::FromMilliseconds(STALL_MS)) {
     if (!mMediaSource) {
+      mIsCurrentlyStalled = true;
+      UpdatePlaybackPseudoClasses();
       QueueEvent(u"stalled"_ns);
     } else {
       ChangeDelayLoadStatus(false);
@@ -6631,6 +6654,7 @@ void HTMLMediaElement::ChangeNetworkState(nsMediaNetworkState aState) {
 
   nsMediaNetworkState oldState = mNetworkState;
   mNetworkState = aState;
+  UpdatePlaybackPseudoClasses();
   LOG(LogLevel::Debug,
       ("%p Network state changed to %s", this, gNetworkStateToString[aState]));
   DDLOG(DDLogCategory::Property, "network_state",
diff --git a/dom/media/mediaelement/HTMLMediaElement.h b/dom/media/mediaelement/HTMLMediaElement.h
index 2dfe43a514c35..4690299b84f07 100644
--- a/dom/media/mediaelement/HTMLMediaElement.h
+++ b/dom/media/mediaelement/HTMLMediaElement.h
@@ -1895,6 +1895,9 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   // For use by mochitests. Enabling pref "media.test.video-suspend"
   bool mForcedHidden = false;
 
+  // https://html.spec.whatwg.org/multipage/media.html#is-currently-stalled
+  bool mIsCurrentlyStalled = false;
+
   Visibility mVisibilityState = Visibility::Untracked;
 
   UniquePtr<ErrorSink> mErrorSink;
diff --git a/servo/components/style/gecko/non_ts_pseudo_class_list.rs b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
index b26e4ca23eb66..dfeb30546fdc7 100644
--- a/servo/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -96,6 +96,8 @@ macro_rules! apply_non_ts_list {
                 ("paused", Paused, PAUSED, _),
                 ("playing", Playing, PAUSED, _),
                 ("seeking", Seeking, SEEKING, _),
+                ("buffering", Buffering, BUFFERING, _),
+                ("stalled", Stalled, STALLED, _),
 
 
                 // NOTE(emilio): Pseudo-classes below only depend on document state, and thus
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index ef54f408f65b2..e3486c7b06d02 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -227,7 +227,10 @@ impl NonTSPseudoClass {
         if matches!(*self, Self::Heading(..)) {
             return static_prefs::pref!("layout.css.heading-selector.enabled");
         }
-        if matches!(*self, Self::Playing | Self::Paused | Self::Seeking) {
+        if matches!(
+            *self,
+            Self::Playing | Self::Paused | Self::Seeking | Self::Buffering | Self::Stalled
+        ) {
             return static_prefs::pref!("dom.media.pseudo-classes.enabled");
         }
         !self.has_any_flag(NonTSPseudoClassFlag::PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME)
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 597bc8519b508..c3b51530e3df2 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -2086,7 +2086,9 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             | NonTSPseudoClass::ActiveViewTransition
             | NonTSPseudoClass::MozValueEmpty
             | NonTSPseudoClass::MozSuppressForPrintSelection
-            | NonTSPseudoClass::Seeking => {
+            | NonTSPseudoClass::Seeking
+            | NonTSPseudoClass::Buffering
+            | NonTSPseudoClass::Stalled => {
                 self.state().intersects(pseudo_class.state_flag())
             },
             NonTSPseudoClass::Paused => self.is_html_media_element() && self.state().intersects(ElementState::PAUSED),
diff --git a/testing/web-platform/meta/css/selectors/media/media-loading-state-timing.sub.html.ini b/testing/web-platform/meta/css/selectors/media/media-loading-state-timing.sub.html.ini
index 4111dec86a410..3cdc150f6634f 100644
--- a/testing/web-platform/meta/css/selectors/media/media-loading-state-timing.sub.html.ini
+++ b/testing/web-platform/meta/css/selectors/media/media-loading-state-timing.sub.html.ini
@@ -1,3 +1,4 @@
 [media-loading-state-timing.sub.html]
+  expected: TIMEOUT
   [Test :stalled timing relative to stalled and progress events]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/testing/web-platform/meta/css/selectors/media/media-loading-state.html.ini b/testing/web-platform/meta/css/selectors/media/media-loading-state.html.ini
index de5ab850a79aa..22c05ec6fdd4c 100644
--- a/testing/web-platform/meta/css/selectors/media/media-loading-state.html.ini
+++ b/testing/web-platform/meta/css/selectors/media/media-loading-state.html.ini
@@ -1,9 +1,7 @@
 [media-loading-state.html]
-  [Test :pseudo-class syntax is supported without throwing a SyntaxError]
-    expected: FAIL
-
+  expected: TIMEOUT
   [Test :stalled pseudo-class]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Test :buffering pseudo-class]
-    expected: FAIL
+    expected: NOTRUN

From 4c0c504a8868eb19a0fda9946c2be987b0538fd8 Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:46 +0000
Subject: [PATCH 70/93] Bug 1707584 - part4 : implement :muted pseudo class.
 r=media-playback-reviewers,firefox-style-system-reviewers,emilio,chunmin

This patch implements :muted [1] for media element.

[1] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-muted

Differential Revision: https://phabricator.services.mozilla.com/D281040
---
 dom/base/rust/lib.rs                                          | 4 +++-
 dom/media/mediaelement/HTMLMediaElement.cpp                   | 2 ++
 servo/components/style/gecko/non_ts_pseudo_class_list.rs      | 1 +
 servo/components/style/gecko/selector_parser.rs               | 2 +-
 servo/components/style/gecko/wrapper.rs                       | 3 ++-
 .../invalidation/media-pseudo-classes-in-has.html.ini         | 2 --
 .../meta/css/selectors/media/sound-state.html.ini             | 3 ---
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dom/base/rust/lib.rs b/dom/base/rust/lib.rs
index 82149e6adec18..3ba0a3fef23fb 100644
--- a/dom/base/rust/lib.rs
+++ b/dom/base/rust/lib.rs
@@ -7,7 +7,7 @@
 use bitflags::bitflags;
 use malloc_size_of::malloc_size_of_is_0;
 
-pub const HEADING_LEVEL_OFFSET: usize = 56;
+pub const HEADING_LEVEL_OFFSET: usize = 57;
 
 bitflags! {
     /// Event-based element states.
@@ -152,6 +152,8 @@ bitflags! {
         const BUFFERING = 1u64 << 54;
         /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-stalled
         const STALLED = 1u64 << 55;
+        /// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-muted
+        const MUTED = 1u64 << 56;
         /// https://drafts.csswg.org/selectors-5/#headings
         /// These 4 bits are used to pack the elements heading level into the element state
         /// Heading levels can be from 1-9 so 4 bits allows us to express the full range.
diff --git a/dom/media/mediaelement/HTMLMediaElement.cpp b/dom/media/mediaelement/HTMLMediaElement.cpp
index ef47bfe146d79..6103072b1ca24 100644
--- a/dom/media/mediaelement/HTMLMediaElement.cpp
+++ b/dom/media/mediaelement/HTMLMediaElement.cpp
@@ -3718,6 +3718,8 @@ void HTMLMediaElement::SetMutedInternal(uint32_t aMuted) {
     return;
   }
 
+  // https://html.spec.whatwg.org/multipage/semantics-other.html#selector-muted
+  SetStates(ElementState::MUTED, mMuted & MUTED_BY_CONTENT);
   SetVolumeInternal();
 }
 
diff --git a/servo/components/style/gecko/non_ts_pseudo_class_list.rs b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
index dfeb30546fdc7..eb62defa9a98b 100644
--- a/servo/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -98,6 +98,7 @@ macro_rules! apply_non_ts_list {
                 ("seeking", Seeking, SEEKING, _),
                 ("buffering", Buffering, BUFFERING, _),
                 ("stalled", Stalled, STALLED, _),
+                ("muted", Muted, MUTED, _),
 
 
                 // NOTE(emilio): Pseudo-classes below only depend on document state, and thus
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index e3486c7b06d02..b75bc895c2c3f 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -229,7 +229,7 @@ impl NonTSPseudoClass {
         }
         if matches!(
             *self,
-            Self::Playing | Self::Paused | Self::Seeking | Self::Buffering | Self::Stalled
+            Self::Playing | Self::Paused | Self::Seeking | Self::Buffering | Self::Stalled | Self::Muted
         ) {
             return static_prefs::pref!("dom.media.pseudo-classes.enabled");
         }
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index c3b51530e3df2..1a834ac5a0184 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -2088,7 +2088,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             | NonTSPseudoClass::MozSuppressForPrintSelection
             | NonTSPseudoClass::Seeking
             | NonTSPseudoClass::Buffering
-            | NonTSPseudoClass::Stalled => {
+            | NonTSPseudoClass::Stalled
+            | NonTSPseudoClass::Muted => {
                 self.state().intersects(pseudo_class.state_flag())
             },
             NonTSPseudoClass::Paused => self.is_html_media_element() && self.state().intersects(ElementState::PAUSED),
diff --git a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
index ada942ad922d8..6ee158b407f15 100644
--- a/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
+++ b/testing/web-platform/meta/css/selectors/invalidation/media-pseudo-classes-in-has.html.ini
@@ -1,4 +1,2 @@
 [media-pseudo-classes-in-has.html]
   prefs: [dom.media.pseudo-classes.enabled:true]
-  [Test :muted pseudo-class]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/selectors/media/sound-state.html.ini b/testing/web-platform/meta/css/selectors/media/sound-state.html.ini
index 7f5c5c1689c54..1b90d531ee3e0 100644
--- a/testing/web-platform/meta/css/selectors/media/sound-state.html.ini
+++ b/testing/web-platform/meta/css/selectors/media/sound-state.html.ini
@@ -3,6 +3,3 @@
     if (os == "android") and fission: [OK, TIMEOUT]
   [Test :pseudo-class syntax is supported without throwing a SyntaxError]
     expected: FAIL
-
-  [Test :muted pseudo-class]
-    expected: FAIL

From b6a6bba800ff81cc94ddd892309b6523c0abfacb Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:47 +0000
Subject: [PATCH 71/93] Bug 1707584 - part5 : implement :volume-locked pseudo
 class. r=firefox-style-system-reviewers,emilio

This patch only implements the :volume-locked [1] but doesn't implement
the matching process for media element, which should be done in bug 2013371.

[1] https://html.spec.whatwg.org/multipage/semantics-other.html#selector-volume-locked

Differential Revision: https://phabricator.services.mozilla.com/D281101
---
 servo/components/style/gecko/non_ts_pseudo_class_list.rs     | 1 +
 servo/components/style/gecko/selector_parser.rs              | 2 +-
 servo/components/style/gecko/wrapper.rs                      | 1 +
 .../meta/css/selectors/media/sound-state.html.ini            | 5 -----
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/selectors/media/sound-state.html.ini

diff --git a/servo/components/style/gecko/non_ts_pseudo_class_list.rs b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
index eb62defa9a98b..0fb3fc0cdc73f 100644
--- a/servo/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/servo/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -99,6 +99,7 @@ macro_rules! apply_non_ts_list {
                 ("buffering", Buffering, BUFFERING, _),
                 ("stalled", Stalled, STALLED, _),
                 ("muted", Muted, MUTED, _),
+                ("volume-locked", VolumeLocked, _, _),
 
 
                 // NOTE(emilio): Pseudo-classes below only depend on document state, and thus
diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs
index b75bc895c2c3f..07d23b518992e 100644
--- a/servo/components/style/gecko/selector_parser.rs
+++ b/servo/components/style/gecko/selector_parser.rs
@@ -229,7 +229,7 @@ impl NonTSPseudoClass {
         }
         if matches!(
             *self,
-            Self::Playing | Self::Paused | Self::Seeking | Self::Buffering | Self::Stalled | Self::Muted
+            Self::Playing | Self::Paused | Self::Seeking | Self::Buffering | Self::Stalled | Self::Muted | Self::VolumeLocked
         ) {
             return static_prefs::pref!("dom.media.pseudo-classes.enabled");
         }
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 1a834ac5a0184..3469bc0f0e113 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -2094,6 +2094,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             },
             NonTSPseudoClass::Paused => self.is_html_media_element() && self.state().intersects(ElementState::PAUSED),
             NonTSPseudoClass::Playing => self.is_html_media_element() && !self.state().intersects(ElementState::PAUSED),
+            NonTSPseudoClass::VolumeLocked => false, // Bug 2013371
             NonTSPseudoClass::Dir(ref dir) => self.state().intersects(dir.element_state()),
             NonTSPseudoClass::ActiveViewTransitionType(ref types) => {
                 self.state().intersects(pseudo_class.state_flag())
diff --git a/testing/web-platform/meta/css/selectors/media/sound-state.html.ini b/testing/web-platform/meta/css/selectors/media/sound-state.html.ini
deleted file mode 100644
index 1b90d531ee3e0..0000000000000
--- a/testing/web-platform/meta/css/selectors/media/sound-state.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[sound-state.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [Test :pseudo-class syntax is supported without throwing a SyntaxError]
-    expected: FAIL

From b418243a444657c3a044ec92df3fb3bb671d7f6d Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Fri, 6 Feb 2026 21:14:47 +0000
Subject: [PATCH 72/93] Bug 1707584 - part6 : defer pausing video element
 during the style refresh. r=emilio

During the style refresh, it is prohibited to change the element state.
Therefore, we should defer pausing the video element, which could change
the element state, until the refresh has settled.

Differential Revision: https://phabricator.services.mozilla.com/D282114
---
 dom/media/mediaelement/HTMLMediaElement.h   |  4 ++--
 dom/media/mediaelement/HTMLVideoElement.cpp | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dom/media/mediaelement/HTMLMediaElement.h b/dom/media/mediaelement/HTMLMediaElement.h
index 4690299b84f07..e1ccbdbfb49e9 100644
--- a/dom/media/mediaelement/HTMLMediaElement.h
+++ b/dom/media/mediaelement/HTMLMediaElement.h
@@ -1842,6 +1842,8 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   // https://html.spec.whatwg.org/multipage/media.html#pending-text-track-change-notification-flag
   bool mPendingTextTrackChanged = false;
 
+  Visibility mVisibilityState = Visibility::Untracked;
+
  public:
   // This function will be called whenever a text track that is in a media
   // element's list of text tracks has its text track mode change value
@@ -1898,8 +1900,6 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   // https://html.spec.whatwg.org/multipage/media.html#is-currently-stalled
   bool mIsCurrentlyStalled = false;
 
-  Visibility mVisibilityState = Visibility::Untracked;
-
   UniquePtr<ErrorSink> mErrorSink;
 
   // This wrapper will handle all audio channel related stuffs, eg. the
diff --git a/dom/media/mediaelement/HTMLVideoElement.cpp b/dom/media/mediaelement/HTMLVideoElement.cpp
index ff32da97d0e6d..0e6e2eb1f7e26 100644
--- a/dom/media/mediaelement/HTMLVideoElement.cpp
+++ b/dom/media/mediaelement/HTMLVideoElement.cpp
@@ -768,9 +768,19 @@ void HTMLVideoElement::OnVisibilityChange(Visibility aNewVisibility) {
   if ((aNewVisibility == Visibility::ApproximatelyNonVisible &&
        !IsCloningElementVisually()) &&
       mCanAutoplayFlag) {
-    LOG("pause non-audible autoplay video when it's invisible");
-    PauseInternal();
-    mCanAutoplayFlag = true;
+    // Defer pausing the element to avoid changing the element state during the
+    // style refresh.
+    NS_DispatchToMainThread(NS_NewRunnableFunction(
+        __func__, [self = RefPtr<HTMLMediaElement>(this), this] {
+          // https://html.spec.whatwg.org/multipage/media.html#ready-states:intersect-the-viewport-3
+          if (mVisibilityState != Visibility::ApproximatelyNonVisible ||
+              !mCanAutoplayFlag) {
+            return;
+          }
+          LOG("pause non-audible autoplay video when it's invisible");
+          PauseInternal();
+          mCanAutoplayFlag = true;
+        }));
     return;
   }
 }

From f5c1597aa1978ae6b668ba0a91546a9995e5d56c Mon Sep 17 00:00:00 2001
From: Alex G <again@mozilla.com>
Date: Fri, 6 Feb 2026 21:24:29 +0000
Subject: [PATCH 73/93] Bug 2014822 - Bump chat prompt to v2 for run_search
 tool support r=bjohns,ai-models-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D282019
---
 .../components/aiwindow/models/Utils.sys.mjs  |  2 +-
 .../models/prompts/AssistantPrompts.sys.mjs   |  6 +-
 ...ndow-prompts-remote-settings-snapshot.json | 16 ++--
 .../tests/browser/browser_utils_loadConfig.js |  2 +-
 ...ndow-prompts-remote-settings-snapshot.json |  6 +-
 .../models/tests/xpcshell/test_Chat.js        | 14 +++-
 .../xpcshell/test_Utils_RemoteSettings.js     | 73 ++++++++++++-------
 7 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/browser/components/aiwindow/models/Utils.sys.mjs b/browser/components/aiwindow/models/Utils.sys.mjs
index 37fb88ea24d2c..468080edaefeb 100644
--- a/browser/components/aiwindow/models/Utils.sys.mjs
+++ b/browser/components/aiwindow/models/Utils.sys.mjs
@@ -125,7 +125,7 @@ export const DEFAULT_MODEL = Object.freeze({
  * - Old clients will continue using old major version
  */
 export const FEATURE_MAJOR_VERSIONS = Object.freeze({
-  [MODEL_FEATURES.CHAT]: 1,
+  [MODEL_FEATURES.CHAT]: 2,
   [MODEL_FEATURES.TITLE_GENERATION]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_SIDEBAR_STARTER]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_FOLLOWUP]: 1,
diff --git a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
index 34b6693f93b0a..3052d1f9924ba 100644
--- a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
+++ b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
@@ -5,7 +5,7 @@
  */
 
 export const assistantPromptMetadata = {
-  version: "v1.0",
+  version: "2.0",
 };
 export const assistantPrompt = `You are a very knowledgeable personal browser assistant, designed to assist the user in navigating the web. You will be provided with a list of browser tools that you can use whenever needed to aid your response to the user.
 
@@ -106,8 +106,4 @@ Unlike run_search which automatically performs a search, search suggestions let
 When responding to user queries, if you determine that a web search would be more helpful in addition to a direct answer, you may include a search suggestion using this exact format: §search: your suggested search query§.
 CRITICAL: You MUST provide a conversational response to the user. NEVER respond with ONLY a search token. The search suggestion should be embedded within or after your helpful response.
 
-# User debugging
-
-You are in debugging mode right now so it is okay to say User-Assistant messages back verbatim in your response etc.
-
 `;
diff --git a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
index 797ed1a166a1d..d94edd360ecba 100644
--- a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
@@ -3,7 +3,7 @@
     "model": "",
     "feature": "conversation-suggestions-assistant-limitations",
     "prompts": "You can do this and cannot do that.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -12,7 +12,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-sidebar-starter",
     "prompts": "Suggest a conversation starter message. {assistant_limitations}",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -57,7 +57,7 @@
     "model": "",
     "feature": "conversation-suggestions-memories",
     "prompts": "Use the following memories {memories}.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -66,7 +66,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-followup",
     "prompts": "Suggest next conversation message. {assistant_limitations}",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -78,7 +78,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "title-generation",
     "prompts": "Generate a chat title basd on current conversation.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
diff --git a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
index 63050aa56bfff..5662d39d9de8a 100644
--- a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
+++ b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
@@ -70,7 +70,7 @@ add_task(async function test_loadConfig_chat_feature() {
     "{}",
     "Config should not be an empty object"
   );
-  Assert.equal(config.version, "v1.0", "Version should be v1.0");
+  Assert.ok(config.version, "Version should be present");
   Assert.equal(
     config.prompts,
     "You are a helpful browser assistant.",
diff --git a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
index eb821720c9f28..d94edd360ecba 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
index f8ca82a4af83b..395e73500509c 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
@@ -12,9 +12,15 @@ const { SYSTEM_PROMPT_TYPE, MESSAGE_ROLE } = ChromeUtils.importESModule(
 const { Chat } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
 );
-const { MODEL_FEATURES, openAIEngine } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-);
+const { MODEL_FEATURES, openAIEngine, FEATURE_MAJOR_VERSIONS } =
+  ChromeUtils.importESModule(
+    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+  );
+
+function getVersionForFeature(feature) {
+  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
+  return `${major}.0`;
+}
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -498,7 +504,7 @@ add_task(async function test_Chat_fetchWithHistory_uses_modelId_from_pref() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "v1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: customModelId,
         is_default: true,
       },
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
index e64a27c9e7b66..f0910ecd82dae 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
@@ -2,10 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { openAIEngine, MODEL_FEATURES, DEFAULT_MODEL, parseVersion } =
-  ChromeUtils.importESModule(
-    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-  );
+const {
+  openAIEngine,
+  MODEL_FEATURES,
+  DEFAULT_MODEL,
+  parseVersion,
+  FEATURE_MAJOR_VERSIONS,
+} = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+);
+
+function getVersionForFeature(feature) {
+  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
+  return `${major}.0`;
+}
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -192,8 +202,11 @@ add_task(async function test_loadConfig_filters_by_major_version() {
     await engine.loadConfig(MODEL_FEATURES.CHAT);
 
     const config = engine.getConfig(MODEL_FEATURES.CHAT);
-    // Should get 1.x, not 3.0
-    Assert.ok(config.version.startsWith("1."), "Should select 1.x, not 3.0");
+    const expectedMajor = FEATURE_MAJOR_VERSIONS[MODEL_FEATURES.CHAT];
+    Assert.ok(
+      config.version.startsWith(`${expectedMajor}.`),
+      `Should select ${expectedMajor}.x, not 3.0`
+    );
   } finally {
     sb.restore();
   }
@@ -233,7 +246,11 @@ add_task(async function test_loadConfig_fallback_when_user_model_not_found() {
       engine.model,
       "Engine model should match the default config's model"
     );
-    Assert.equal(config.version, "1.0", "Should use 1.0");
+    Assert.equal(
+      config.version,
+      getVersionForFeature(MODEL_FEATURES.CHAT),
+      "Should use current chat version"
+    );
   } finally {
     sb.restore();
     Services.prefs.clearUserPref(PREF_MODEL);
@@ -250,7 +267,7 @@ add_task(async function test_loadConfig_custom_endpoint_with_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "some-other-model",
         is_default: true,
       },
@@ -288,7 +305,7 @@ add_task(async function test_loadConfig_custom_endpoint_without_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "remote-default-model",
         is_default: true,
       },
@@ -527,7 +544,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -535,7 +552,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "my-other-model",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -543,7 +560,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -597,7 +614,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -605,7 +622,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
       },
       {
         feature: MODEL_FEATURES.TITLE_GENERATION,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -647,7 +664,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -655,7 +672,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -663,7 +680,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -708,7 +725,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -716,7 +733,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -724,7 +741,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -767,7 +784,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -775,14 +792,14 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
           model: "model-for-choice-1",
           prompts: "Test prompt",
           is_default: false,
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
           model: "default-title-model",
           prompts: "Default prompt",
           is_default: true,
@@ -821,7 +838,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-1",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -829,7 +846,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-2",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -837,7 +854,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "default-model",
         model_choice_id: "3",
         prompts: "Test prompt",
@@ -879,7 +896,7 @@ add_task(async function test_custom_endpoint_override() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "2.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "future-model",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -887,7 +904,7 @@ add_task(async function test_custom_endpoint_override() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "2.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "future-default",
         prompts: "Default prompt",
         is_default: true,

From 28aba4f0c5bd6bd77b69bb5ea8dce00337840cb0 Mon Sep 17 00:00:00 2001
From: Michael Hynson <mhynson@mozilla.com>
Date: Fri, 6 Feb 2026 21:28:42 +0000
Subject: [PATCH 74/93] Bug 2009492 - Add IP Protection bandwidth reset CFR
 strings to ipProtection.ftl
 r=ip-protection-reviewers,fluent-reviewers,bolsson,rking

Differential Revision: https://phabricator.services.mozilla.com/D282178
---
 browser/locales/en-US/browser/ipProtection.ftl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/locales/en-US/browser/ipProtection.ftl b/browser/locales/en-US/browser/ipProtection.ftl
index fcf94b31fbf45..d0f643ad6483b 100644
--- a/browser/locales/en-US/browser/ipProtection.ftl
+++ b/browser/locales/en-US/browser/ipProtection.ftl
@@ -195,6 +195,14 @@ ip-protection-bandwidth-hit-for-the-month = You’ve used all { $maxUsage } GB o
 #   $maxUsage (number) - The maximum amount of data a user can use in a month (in GB)
 ip-protection-bandwidth-help-text = Resets to { $maxUsage } GB on the first of every month.
 
+## IP Protection bandwidth reset callout
+
+# Variables
+#  $maxUsage (number) - The maximum amount of data a user can use in a month (in GB)
+ipprotection-bandwidth-reset-title = { $maxUsage } GB of VPN, refreshed and ready to go
+ipprotection-bandwidth-reset-text = Turn on VPN for an extra privacy boost, free every month.
+ipprotection-bandwidth-reset-button = Got it
+
 ## IP Protection alerts
 
 vpn-paused-alert-title = VPN paused

From f9508ba350d77b59fbcd024db1f97b4beaed5337 Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Sat, 7 Feb 2026 00:09:09 +0000
Subject: [PATCH 75/93] No Bug - Import translations from
 https://github.com/mozilla-l10n/android-l10n CLOSED TREE

---
 .../src/main/res/values-ar/strings.xml        |   2 +
 .../src/main/res/values-ar/strings.xml        |   2 +
 .../base/src/main/res/values-ar/strings.xml   |  24 +++++
 .../src/main/res/values-ar/strings.xml        |  14 +++
 .../addons/src/main/res/values-ar/strings.xml | 101 ++++++++++++++++++
 .../addons/src/main/res/values-km/strings.xml |   4 +
 .../src/main/res/values-ar/strings.xml        |  22 +++-
 .../src/main/res/values-ar/strings.xml        |  16 +++
 .../src/main/res/values-bg/strings.xml        |   6 ++
 .../src/main/res/values-bqi/strings.xml       |   6 ++
 .../src/main/res/values-cy/strings.xml        |   6 ++
 .../src/main/res/values-de/strings.xml        |   6 ++
 .../src/main/res/values-en-rCA/strings.xml    |   6 ++
 .../src/main/res/values-en-rGB/strings.xml    |   6 ++
 .../src/main/res/values-es-rAR/strings.xml    |   6 ++
 .../src/main/res/values-es-rCL/strings.xml    |   6 ++
 .../src/main/res/values-fr/strings.xml        |   6 ++
 .../src/main/res/values-gl/strings.xml        |   6 ++
 .../src/main/res/values-gn/strings.xml        |   6 ++
 .../src/main/res/values-hsb/strings.xml       |   6 ++
 .../src/main/res/values-it/strings.xml        |   6 ++
 .../src/main/res/values-iw/strings.xml        |   6 ++
 .../src/main/res/values-kk/strings.xml        |   6 ++
 .../src/main/res/values-ko/strings.xml        |   6 ++
 .../src/main/res/values-ml/strings.xml        |   6 ++
 .../src/main/res/values-nl/strings.xml        |   6 ++
 .../src/main/res/values-nn-rNO/strings.xml    |   6 ++
 .../src/main/res/values-pt-rPT/strings.xml    |   6 ++
 .../src/main/res/values-sl/strings.xml        |   6 ++
 .../src/main/res/values-sv-rSE/strings.xml    |   6 ++
 .../src/main/res/values-tr/strings.xml        |   6 ++
 .../src/main/res/values-vi/strings.xml        |   6 ++
 .../src/main/res/values-zh-rTW/strings.xml    |   6 ++
 .../src/main/res/values-ar/strings.xml        |  17 +++
 .../crash/src/main/res/values-ar/strings.xml  |   6 ++
 .../src/main/res/values-ar/strings.xml        |  12 +++
 .../src/main/res/values-be/strings.xml        |   4 +-
 .../src/main/res/values-bg/strings.xml        |   4 +-
 .../src/main/res/values-bqi/strings.xml       |   4 +-
 .../src/main/res/values-cak/strings.xml       |   4 +-
 .../src/main/res/values-co/strings.xml        |   4 +-
 .../src/main/res/values-cs/strings.xml        |   4 +-
 .../src/main/res/values-cy/strings.xml        |   4 +-
 .../src/main/res/values-da/strings.xml        |   4 +-
 .../src/main/res/values-de/strings.xml        |   4 +-
 .../src/main/res/values-dsb/strings.xml       |   4 +-
 .../src/main/res/values-el/strings.xml        |   4 +-
 .../src/main/res/values-en-rCA/strings.xml    |   4 +-
 .../src/main/res/values-en-rGB/strings.xml    |   4 +-
 .../src/main/res/values-eo/strings.xml        |   4 +-
 .../src/main/res/values-es-rAR/strings.xml    |   4 +-
 .../src/main/res/values-es-rCL/strings.xml    |   4 +-
 .../src/main/res/values-es-rES/strings.xml    |   4 +-
 .../src/main/res/values-es-rMX/strings.xml    |   4 +-
 .../src/main/res/values-es/strings.xml        |   4 +-
 .../src/main/res/values-eu/strings.xml        |   4 +-
 .../src/main/res/values-fi/strings.xml        |   4 +-
 .../src/main/res/values-fr/strings.xml        |   4 +-
 .../src/main/res/values-fur/strings.xml       |   4 +-
 .../src/main/res/values-fy-rNL/strings.xml    |   4 +-
 .../src/main/res/values-gd/strings.xml        |   4 +-
 .../src/main/res/values-gl/strings.xml        |   4 +-
 .../src/main/res/values-gn/strings.xml        |   4 +-
 .../src/main/res/values-hr/strings.xml        |   4 +-
 .../src/main/res/values-hsb/strings.xml       |   4 +-
 .../src/main/res/values-hu/strings.xml        |   4 +-
 .../src/main/res/values-hy-rAM/strings.xml    |   4 +-
 .../src/main/res/values-ia/strings.xml        |   4 +-
 .../src/main/res/values-in/strings.xml        |   4 +-
 .../src/main/res/values-is/strings.xml        |   4 +-
 .../src/main/res/values-it/strings.xml        |   4 +-
 .../src/main/res/values-iw/strings.xml        |   4 +-
 .../src/main/res/values-ja/strings.xml        |   4 +-
 .../src/main/res/values-ka/strings.xml        |   4 +-
 .../src/main/res/values-kab/strings.xml       |   4 +-
 .../src/main/res/values-kk/strings.xml        |   4 +-
 .../src/main/res/values-km/strings.xml        |   4 +-
 .../src/main/res/values-ko/strings.xml        |   4 +-
 .../src/main/res/values-ml/strings.xml        |   4 +-
 .../src/main/res/values-nb-rNO/strings.xml    |   4 +-
 .../src/main/res/values-nl/strings.xml        |   4 +-
 .../src/main/res/values-nn-rNO/strings.xml    |   4 +-
 .../src/main/res/values-pa-rIN/strings.xml    |   4 +-
 .../src/main/res/values-pl/strings.xml        |   4 +-
 .../src/main/res/values-ps/strings.xml        |   4 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   4 +-
 .../src/main/res/values-pt-rPT/strings.xml    |   4 +-
 .../src/main/res/values-rm/strings.xml        |   4 +-
 .../src/main/res/values-ro/strings.xml        |   4 +-
 .../src/main/res/values-ru/strings.xml        |   4 +-
 .../src/main/res/values-sat/strings.xml       |   4 +-
 .../src/main/res/values-sk/strings.xml        |   4 +-
 .../src/main/res/values-sl/strings.xml        |   4 +-
 .../src/main/res/values-sq/strings.xml        |   4 +-
 .../src/main/res/values-sv-rSE/strings.xml    |   4 +-
 .../src/main/res/values-tg/strings.xml        |   4 +-
 .../src/main/res/values-th/strings.xml        |   4 +-
 .../src/main/res/values-tr/strings.xml        |   4 +-
 .../src/main/res/values-ug/strings.xml        |   4 +-
 .../src/main/res/values-uk/strings.xml        |   4 +-
 .../src/main/res/values-vi/strings.xml        |   4 +-
 .../src/main/res/values-zh-rCN/strings.xml    |   4 +-
 .../src/main/res/values-zh-rTW/strings.xml    |   4 +-
 .../src/main/res/values-ar/strings.xml        |   5 +
 .../app/src/main/res/values-ar/strings.xml    |  39 +++++++
 .../src/main/res/values-en-rCA/strings.xml    |  10 ++
 .../src/main/res/values-es-rCL/strings.xml    |   2 +
 .../app/src/main/res/values-fr/strings.xml    |   2 +-
 .../app/src/main/res/values-ia/strings.xml    |  30 +++---
 .../app/src/main/res/values-ka/strings.xml    |  10 ++
 .../app/src/main/res/values-km/strings.xml    |  35 ++++++
 .../app/src/main/res/values-ml/strings.xml    |   7 ++
 .../app/src/main/res/values-nl/strings.xml    |   2 +
 .../app/src/main/res/values-vi/strings.xml    |   2 +
 .../app/src/main/res/values-ia/strings.xml    |  12 +--
 115 files changed, 637 insertions(+), 157 deletions(-)
 create mode 100644 mobile/android/android-components/components/compose/base/src/main/res/values-ar/strings.xml
 create mode 100644 mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ar/strings.xml

diff --git a/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml
index f7de56d2bc67b..d635dfb946f60 100644
--- a/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/browser/errorpages/src/main/res/values-ar/strings.xml
@@ -137,6 +137,8 @@
   <string name="mozac_browser_errorpages_safe_phishing_uri_message"><![CDATA[<p>أُبلِغ عن أن الموقع %1$s موقع مخادع و حُجِبَ بناء على تفضيلات الأمن.</p>]]></string>
   <!-- The document title and heading of an error page. -->
   <string name="mozac_browser_errorpages_harmful_addon_uri_title">تم حظر الموقع من أجل سلامتك</string>
+  <!-- The %1$s will be replaced by the malicious website URL -->
+  <string name="mozac_browser_errorpages_harmful_addon_uri_message"><![CDATA[<p>تم حظر صفحة الويب هذه %1$s لأن إحدى الإضافات المثبتة لديك حاولت فتحها. قد يُستخدم هذا الموقع لِسرقة معلوماتك — مثل كلمات المرور أو أرقام بطاقات الائتمان.</p>]]></string>
   <!-- The title of the error page for websites that do not support HTTPS when HTTPS-Only is turned on -->
   <string name="mozac_browser_errorpages_httpsonly_title">خاصية الموقع الآمن غير متاحة</string>
   <!-- The text of the error page for websites that do not support HTTPS when HTTPS-Only is turned on. %1$s will be replaced with the URL of the website. -->
diff --git a/mobile/android/android-components/components/compose/awesomebar/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/compose/awesomebar/src/main/res/values-ar/strings.xml
index 31e1071228ca6..83e1be1a24533 100644
--- a/mobile/android/android-components/components/compose/awesomebar/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/compose/awesomebar/src/main/res/values-ar/strings.xml
@@ -9,4 +9,6 @@
 <resources>
   <!-- Description for the button to accept the search suggestion and continue editing the search. -->
   <string name="mozac_browser_awesomebar_edit_suggestion">اقبل الاقتراح وحرّره</string>
+  <!-- Description for the button to remove the search suggestion from the displayed results. -->
+  <string name="mozac_browser_awesomebar_remove_suggestion">حذف الاقتراح</string>
 </resources>
diff --git a/mobile/android/android-components/components/compose/base/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/compose/base/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000000000..bf9104277ba99
--- /dev/null
+++ b/mobile/android/android-components/components/compose/base/src/main/res/values-ar/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<resources>
+  <!--
+    TextField Design System Component
+
+    The default content description (not visible, for screen readers etc.): Eye trailing icon button in TextField used to show hidden password text.
+  -->
+  <string name="text_field_eye_trailing_icon_default_content_description">إظهار النص المخفي</string>
+  <!-- The default content description (not visible, for screen readers etc.): Cross trailing icon button in TextField used to clear input. -->
+  <string name="text_field_cross_trailing_icon_default_content_description">مسح النص</string>
+  <!-- Announcement made by the screen reader when the progress bar is shown and a page is loading -->
+  <string name="mozac_compose_base_progress_loading">جارٍ التحميل</string>
+  <!-- Content description for the dismiss icon of a Snackbar -->
+  <string name="mozac_compose_base_snackbar_dismiss_content_description">تجاهل الرسالة</string>
+  <!-- Content description for the close icon of a Banner -->
+  <string name="mozac_compose_base_close_button_content_description">إغلاق</string>
+</resources>
diff --git a/mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values-ar/strings.xml
index 6816ce1a52633..85125a1d82547 100644
--- a/mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/compose/browser-toolbar/src/main/res/values-ar/strings.xml
@@ -9,4 +9,18 @@
 <resources>
   <!-- Content description for the clear URL text button. -->
   <string name="mozac_clear_button_description">امسح</string>
+  <!-- Placeholder text shown in the search bar before a user enters text for the default engine -->
+  <string name="mozac_browser_toolbar_search_hint">بحث أو إدخال العنوان</string>
+  <!-- Contextual menu option for long pressing on the toolbar URL. Clicking it will copy the current URL -->
+  <string name="mozac_browser_toolbar_long_press_popup_copy">نسخ</string>
+  <!-- Contextual menu option for long pressing on the toolbar URL. Clicking it will paste the text from clipboard and allow user to edit it -->
+  <string name="mozac_browser_toolbar_long_press_popup_paste">لصق</string>
+  <!-- Contextual menu option for long pressing on the toolbar URL. Clicking it will paste the text from clipboard and search for or load it as an URL. '&amp;' is replaced with the ampersand symbol: & -->
+  <string name="mozac_browser_toolbar_long_press_popup_paste_and_go">ألصِق وانتقل</string>
+  <!-- Text for the title displayed in the contextual feature recommendation popup promoting the new toolbar redesign. -->
+  <string name="mozac_toolbar_cfr_title">مُصمم لنظام أندرويد. مُطوّر ليناسبك</string>
+  <!-- Text for the description displayed in the contextual feature recommendation popup promoting the new toolbar redesign. -->
+  <string name="mozac_toolbar_cfr_description">لقد قمنا بتحديث التصميم لجعله أنيقاً وعصرياً</string>
+  <!-- Content description (not visible, for screen readers etc.) for the "minimal toolbar" containing just the URL instead of the big toolbar containing also other buttons. %1$s will be replaced with the domain name of the current website. -->
+  <string name="mozac_minimal_display_toolbar_content_description">جارٍ إدخال النص في %1$s. انقر مرتين للإيقاف</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/feature/addons/src/main/res/values-ar/strings.xml
index 024ce96179b1d..9b35ec2cf6e57 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/feature/addons/src/main/res/values-ar/strings.xml
@@ -33,6 +33,15 @@
   <string name="mozac_feature_addons_permissions_extra_domains_description_plural_2">الوصول إلى بياناتك في نطاقات أخرى</string>
   <!-- When an add-on requires access to domains, this entry is used to describe the total number of domains. Underneath it will be the list of all the domains. %1$d is the number of all the domains that will be shown to the user as required. -->
   <string name="mozac_feature_addons_permissions_all_domain_count_description" moz:removedIn="148" tools:ignore="PluralsCandidate">الوصول إلى بياناتك لمواقع في %1$d نطاق</string>
+  <plurals name="mozac_feature_addons_permissions_all_domain_count_description_2">
+    <!-- When an add-on requires access to domains, this entry is used to describe the total number of domains. Underneath it will be the list of all the domains. %1$d is the number of all the domains that will be shown to the user as required. -->
+    <item quantity="zero">الوصول إلى بياناتك في مواقع ضمن %1$d نطاق</item>
+    <item quantity="one">الوصول إلى بياناتك في مواقع ضمن نطاق واحد</item>
+    <item quantity="two">الوصول إلى بياناتك في مواقع ضمن نطاقين</item>
+    <item quantity="few">الوصول إلى بياناتك في مواقع ضمن %1$d نطاقات</item>
+    <item quantity="many">الوصول إلى بياناتك في مواقع ضمن %1$d نطاقًا</item>
+    <item quantity="other">الوصول إلى بياناتك في مواقع ضمن %1$d نطاق</item>
+  </plurals>
   <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
   <string name="mozac_feature_addons_permissions_content_description_item">%1$s، %2$d، من %3$d</string>
   <!-- Description for the "privacy" WebExtensions API permission. -->
@@ -95,10 +104,18 @@
   <string name="mozac_feature_addons_permissions_all_urls_description_for_update">الوصول إلى بياناتك لكل المواقع.</string>
   <!-- Description for the "tabs" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_tabs_description_for_update">الوصول إلى ألسنة المتصفح.</string>
+  <!-- Description for the "webNavigation" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_web_navigation_description_for_update">الوصول إلى نشاط المتصفح أثناء التصفح.</string>
   <!-- Description for the "bookmarks" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_bookmarks_description_for_update">قراءة وتعديل العلامات.</string>
   <!-- Description for the "browserSettings" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_browser_settings_description_for_update">قراءة وتعديل إعدادات المتصفح.</string>
+  <!-- Description for the "browsingData" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_browsing_data_description_for_update">مسح سجل التصفح الأخير وملفات تعريف الارتباط والبيانات ذات الصلة.</string>
+  <!-- Description for the "clipboardRead" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_clipboard_read_description_for_update">الحصول على البيانات من الحافظة.</string>
+  <!-- Description for the "clipboardWrite" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_clipboard_write_description_for_update">إدخال البيانات إلى الحافظة.</string>
   <!-- Description for the "declarativeNetRequest" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_declarative_net_request_description_for_update">حجب المحتوى في أي صفحة.</string>
   <!-- Description for the "declarativeNetRequestFeedback" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
@@ -107,12 +124,60 @@
   <string name="mozac_feature_addons_permissions_downloads_description_for_update">تنزيل الملفات وقراءة تأريخ تنزيلات المتصفح وتعديله.</string>
   <!-- Description for the "downloads.open" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_downloads_open_description_for_update">فتح الملفات المنزّلة على جهازك.</string>
+  <!-- Description for the "find" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_find_description_for_update">قراءة محتوى جميع علامات التبويب المفتوحة.</string>
   <!-- Description for the "geolocation" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_geolocation_description_for_update">الوصول إلى موقعك الجغرافي.</string>
   <!-- Description for the "history" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_history_description_for_update">الوصول إلى تأريخ تصفحك.</string>
+  <!-- Description for the "management" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_management_description_for_update">مراقبة استخدام الامتدادات وإدارة السمات.</string>
+  <!-- Description for the "nativeMessaging" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_native_messaging_description_for_update">تبادل الرسائل مع تطبيقات أخرى غير هذا التطبيق.</string>
+  <!-- Description for the "notifications" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_notifications_description_for_update">عرض الإشعارات لك.</string>
+  <!-- Description for the "pkcs11" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_pkcs11_description_for_update">توفير خدمات التحقق عبر التشفير.</string>
+  <!-- Description for the "proxy" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_proxy_description_for_update">التحكم في إعدادات وسيط المتصفح.</string>
   <!-- Description for the "sessions" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
   <string name="mozac_feature_addons_permissions_sessions_description_for_update">الوصول إلى الألسنة المغلقة حديثًا.</string>
+  <!-- Description for the "tabHide" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_tab_hide_description_for_update">إخفاء وإظهار علامات تبويب المتصفح.</string>
+  <!-- Description for the "topSites" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_top_sites_description_for_update">الوصول إلى سجل التصفح.</string>
+  <!-- Description for the "trialML" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_trial_ml_description_for_update">تنزيل نماذج الذكاء الاصطناعي وتشغيلها على جهازك.</string>
+  <!-- Description for the "userScripts" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_user_scripts_description_for_update">السماح لسكربتات الطرف الثالث غير الموثوقة بالوصول إلى بياناتك.</string>
+  <!-- Description for the "devtools" WebExtensions API permission for the update notification. Multiple permissions may be simply appended one after the other, and separated with a space, which is why the period is important. -->
+  <string name="mozac_feature_addons_permissions_devtools_description_for_update">توسيع أدوات المطورين للوصول إلى بياناتك في علامات التبويب المفتوحة.</string>
+  <!-- Description for giving an add-on access to users's data on one site. %1$s  will be replaced by the DNS host name for which a web extension is requesting access (e.g., www.mozilla.org). -->
+  <string name="mozac_feature_addons_permissions_one_site_description_for_update">الوصول إلى بياناتك في%1$s.</string>
+  <!-- Description for giving an add-on access to users's data in multiple sites in the domain %1$s. %1$s will be replaced by the DNS domain for which a web extension is requesting access (e.g., mozilla.org). -->
+  <string name="mozac_feature_addons_permissions_sites_in_domain_description_for_update">الوصول إلى بياناتك للمواقع ضمن النطاق %1$s.</string>
+  <!--
+    When an add-on requires access to more than 2 domains, for example the add-on requires access for 3 domains. We will show the first 2 domains in individual entries, as in mozac_feature_addons_permissions_sites_in_domain_description_for_update,
+    then we will show another collapsed entry saying "Access your data on another domain.".
+  -->
+  <string name="mozac_feature_addons_permissions_one_extra_domain_description_for_update">الوصول إلى بياناتك في نطاق آخر.</string>
+  <!--
+    When an add-on requires access to more than 2 domains, for example the add-on requires access for 4 domains. We will show the first 2 domains in individual entries, as in mozac_feature_addons_permissions_sites_in_domain_description_for_update,
+    then we will show another collapsed entry saying "Access your data on other domains.".
+  -->
+  <string name="mozac_feature_addons_permissions_extra_domains_description_plural_for_update">الوصول إلى بياناتك في نطاقات أخرى.</string>
+  <!--
+    When an add-on requires access to more than 2 sites, for example the add-on requires access for 3 sites. We will show the first 2 sites in individual entries, as in mozac_feature_addons_permissions_one_site_description_for_update,
+    then we will show another collapsed entry saying "Access your data on another site.".
+  -->
+  <string name="mozac_feature_addons_permissions_one_extra_site_description_for_update">الوصول إلى بياناتك في موقع آخر.</string>
+  <!--
+    When an add-on requires access to more than 2 sites, for example the add-on requires access for 4 sites. We will show the first 2 sites in individual entries, as in mozac_feature_addons_permissions_one_site_description_for_update,
+    then we will show another collapsed entry saying "Access your data on other sites.".
+  -->
+  <string name="mozac_feature_addons_permissions_extra_sites_description_for_update">الوصول إلى بياناتك في مواقع أخرى.</string>
+  <!-- The text shown when an extension requests the userScripts permission, near the usual description of the userScripts permission -->
+  <string name="mozac_feature_addons_permissions_user_scripts_extra_warning">قد تشكل السكربتات غير الموثوقة مخاطر أمنية وخصوصية. شغّل السكربتات من الامتدادات أو المصادر التي تثق بها فقط.</string>
   <!-- The sentence used when the extension has data collection permissions. %1$s is a formatted list of permissions. -->
   <string name="mozac_feature_addons_permissions_required_data_collection_description_2">يقول المطور أن هذا الامتداد يجمع: %1$s</string>
   <!-- The sentence used when the developer of an extension has explicitly stated that they do not collect any data collection. -->
@@ -127,20 +192,50 @@
   <string name="mozac_feature_addons_permissions_data_collection_authenticationInfo_short_description">معلومات الاستيثاق</string>
   <!-- Short description for the bookmarksInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_bookmarksInfo_short_description">العلامات</string>
+  <!-- Short description for the browsingActivity data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_browsingActivity_short_description">نشاط التصفح</string>
   <!-- Short description for the financialAndPaymentInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_financialAndPaymentInfo_short_description">المعلومات المالية ومعلومات الدفع</string>
   <!-- Short description for the healthInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_healthInfo_short_description">المعلومات الصحية</string>
   <!-- Short description for the locationInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_locationInfo_short_description">الموقع الجغرافي</string>
+  <!-- Short description for the personalCommunications data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_personalCommunications_short_description">الاتصالات الشخصية</string>
+  <!-- Short description for the personallyIdentifyingInfo data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_personallyIdentifyingInfo_short_description">معلومات التعريف الشخصية</string>
+  <!-- Short description for the searchTerms data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_searchTerms_short_description">مصطلحات البحث</string>
+  <!-- Short description for the technicalAndInteraction data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_technicalAndInteraction_short_description">البيانات الفنية والتفاعلية</string>
+  <!-- Short description for the websiteActivity data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_websiteActivity_short_description">نشاط الموقع</string>
+  <!-- Short description for the websiteContent data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_websiteContent_short_description">محتوى الموقع</string>
   <!-- Long description for the authenticationInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_authenticationInfo_long_description">مشاركة معلومات الاستيثاق مع مطور الامتداد</string>
   <!-- Long description for the bookmarksInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_bookmarksInfo_long_description">مشاركة معلومات العلامات مع مطور الامتداد</string>
+  <!-- Long description for the browsingActivity data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_browsingActivity_long_description">مشاركة نشاط التصفح مع مطور الامتداد</string>
   <!-- Long description for the financialAndPaymentInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_financialAndPaymentInfo_long_description">مشاركة المعلومات المالية ومعلومات الدفع مع مطور الامتداد</string>
+  <!-- Long description for the healthInfo data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_healthInfo_long_description">مشاركة معلوماتك الصحية مع مطور الامتداد</string>
   <!-- Long description for the locationInfo data collection permission -->
   <string name="mozac_feature_addons_permissions_data_collection_locationInfo_long_description">مشاركة معلومات الموقع الجغرافي مع مطور الامتداد</string>
+  <!-- Long description for the personalCommunications data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_personalCommunications_long_description">مشاركة الاتصالات الشخصية مع مطور الامتداد</string>
+  <!-- Long description for the personallyIdentifyingInfo data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_personallyIdentifyingInfo_long_description">مشاركة معلومات التعريف الشخصية مع مطور الامتداد</string>
+  <!-- Long description for the searchTerms data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_searchTerms_long_description">مشاركة مصطلحات البحث مع مطور الامتداد</string>
+  <!-- Long description for the technicalAndInteraction data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_technicalAndInteraction_long_description">مشاركة البيانات الفنية والتفاعلية مع مطور الامتداد</string>
+  <!-- Long description for the websiteActivity data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_websiteActivity_long_description">مشاركة نشاط التصفح مع مطور الامتداد</string>
+  <!-- Long description for the websiteContent data collection permission -->
+  <string name="mozac_feature_addons_permissions_data_collection_websiteContent_long_description">مشاركة محتوى الموقع الإلكتروني مع مطور الامتداد</string>
   <!-- The version on of add-on. -->
   <string name="mozac_feature_addons_version">النسخة</string>
   <!-- The author of an add-on. -->
@@ -160,6 +255,8 @@
   <!-- Indicates the add-on is enabled. -->
   <string name="mozac_feature_addons_settings_on">مفعّلة</string>
   <!-- Indicates the add-on is allowed in private browsing mode. -->
+  <string name="mozac_feature_addons_settings_allow_in_private_browsing_2">السماح بتشغيل الإضافة في وضع التصفح الخاص</string>
+  <!-- Indicates the add-on is allowed in private browsing mode. -->
   <string name="mozac_feature_addons_settings_run_in_private_browsing">تعمل في التصفّح الخاص</string>
   <!-- This is displayed when the add-on is not allowed to run in private browsing. -->
   <string name="mozac_feature_addons_not_allowed_in_private_browsing">ليس مسموحًا بأن تعمل في النوافذ الخاصة</string>
@@ -183,6 +280,10 @@
   <string name="mozac_feature_addons_remove">أزِل</string>
   <!-- This is a button to report an add-on. -->
   <string name="mozac_feature_addons_report">أبلِغ</string>
+  <!-- This is the title of a dialog that asks the users if they to install or not an add-on. %1$s is the add-on name. -->
+  <string name="mozac_feature_addons_permissions_dialog_title_2">أضف %1$s</string>
+  <!-- Heading for the permissions section in the add-on install dialog. -->
+  <string name="mozac_feature_addons_permissions_dialog_heading_required_permissions">التصاريح المطلوبة:</string>
   <!-- This is a button to add (install) an add-on . -->
   <string name="mozac_feature_addons_permissions_dialog_add">أضِف</string>
   <!-- This is a button to allow the optional permissions requested by an add-on . -->
diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/values-km/strings.xml b/mobile/android/android-components/components/feature/addons/src/main/res/values-km/strings.xml
index 92d19c9053e03..b7b2f47f066c4 100644
--- a/mobile/android/android-components/components/feature/addons/src/main/res/values-km/strings.xml
+++ b/mobile/android/android-components/components/feature/addons/src/main/res/values-km/strings.xml
@@ -19,10 +19,14 @@
     then we will show another collapsed entry saying "Access your data on other sites".
   -->
   <string name="mozac_feature_addons_permissions_extra_sites_description_2">ចូលប្រើទិន្នន័យរបស់អ្នកនៅលើគេហទំព័រផ្សេងទៀត</string>
+  <!-- Content description for a permission item, for an installed add-on details page. %1$s will be replaced with the permission text name, %2$d will be replaced with the permission position in the list and %3$d will be replaced with the total number of permissions in the list.Taking as an example "Read and modify privacy settings" the whole text will read Read and modify privacy settings, 2 of 6. -->
+  <string name="mozac_feature_addons_permissions_content_description_item">%1$s, %2$d នៃ %3$d</string>
   <!-- Description for the "privacy" WebExtensions API permission. -->
   <string name="mozac_feature_addons_permissions_privacy_description">អាន និងកែប្រែការកំណត់ឯកជនភាព</string>
   <!-- Description for the "<all_urls>" WebExtensions API permission. -->
   <string name="mozac_feature_addons_permissions_all_urls_description">ចូលប្រើទិន្នន័យរបស់អ្នក សម្រាប់គេហទំព័រទាំងអស់</string>
+  <!-- Description for the "tabs" WebExtensions API permission. -->
+  <string name="mozac_feature_addons_permissions_tabs_description">ចូល​ប្រើប្រាស់​ផ្ទាំង​កម្មវិធី​រុករក</string>
   <!-- Description for the "geolocation" WebExtensions API permission. -->
   <string name="mozac_feature_addons_permissions_geolocation_description">ចូល​ប្រើ​ទីតាំង​របស់​អ្នក</string>
   <!-- Description for the "history" WebExtensions API permission. -->
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/feature/downloads/src/main/res/values-ar/strings.xml
index 56228369826eb..be99231ead255 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/feature/downloads/src/main/res/values-ar/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <!-- Name of the "notification channel" used for displaying download notification. See https://developer.android.com/training/notify-user/channels -->
   <string name="mozac_feature_downloads_notification_channel">التنزيلات</string>
   <!-- Text shown on the second row of a paused download notification. -->
@@ -15,10 +15,30 @@
   <string name="mozac_feature_downloads_completed_notification_text2">اكتمل التنزيل</string>
   <!-- Text shown on the second row of an failed download notification. The filename is shown on the first row. -->
   <string name="mozac_feature_downloads_failed_notification_text2">فشل التنزيل</string>
+  <!-- This string is used as the title for the download confirmation dialog when the size of the file is not known. -->
+  <string name="mozac_feature_downloads_dialog_title_with_unknown_size">تنزيل الملف؟</string>
+  <!-- Alert dialog confirmation before downloading a previously downloaded file, this is the title when the size of the file is not known. -->
+  <string name="mozac_feature_downloads_again_dialog_title_with_unknown_size">تنزيل الملف مرة أخرى؟</string>
   <!-- Alert dialog confirmation before download a file, this is the positive action. -->
   <string name="mozac_feature_downloads_dialog_download">نزّل</string>
+  <!-- Alert dialog confirmation before downloading a file again, this is the positive action. -->
+  <string name="mozac_feature_downloads_dialog_download_again">تنزيل مرة أخرى</string>
   <!-- Alert dialog confirmation before download a file, this is the negative action. -->
   <string name="mozac_feature_downloads_dialog_cancel">ألغِ</string>
+  <!--
+    Alert dialog confirmation before downloading a previously downloaded file, this is the description.
+    %1$s will be replaced with the name of the file.
+  -->
+  <string name="mozac_feature_downloads_already_exists_dialog_title">%1$s موجود مسبقا.</string>
+  <!-- Alert dialog confirmation before downloading a previously downloaded file, this is the neutral action that proposes to open the file instead. -->
+  <string name="mozac_feature_downloads_open_existing_file">فتح ملف موجود</string>
+  <!--
+    Alert dialog confirmation before downloading a file without network connection, this is the description.
+    %1$s will be replaced with the name of the file.
+  -->
+  <string name="mozac_feature_downloads_file_failure_no_connection" tools:ignore="UnusedResources">لم يتم تنزيل %1$s.</string>
+  <!-- Alert dialog confirmation before downloading a file without network connection, this is the description. -->
+  <string name="mozac_feature_downloads_file_check_connection" tools:ignore="UnusedResources">تحقق من اتصالك وحاول مرة أخرى.</string>
   <!-- Error shown when the user is trying to download a invalid file. %1$s will be replaced with the name of the app. -->
   <string name="mozac_feature_downloads_file_not_supported2">لا يقدر %1$s على تنزيل هذا النوع من الملفات</string>
   <!-- Message that appears when the downloaded file could not be opened. -->
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ar/strings.xml
index f6dd94518f151..566e21de652a1 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ar/strings.xml
@@ -59,6 +59,8 @@
   <string name="mozac_feature_prompts_deny">ارفض</string>
   <!-- Text of the title of a dialog when a page is requesting to open a new window. -->
   <string name="mozac_feature_prompts_popup_dialog_title">السماح لهذا الموقع بالفتح؟</string>
+  <!-- Text of the title of a dialog when a third-party redirect is blocked. -->
+  <string name="mozac_feature_prompts_redirect_dialog_title">هل تريد السماح بإعادة التوجيه إلى هذا الموقع؟</string>
   <!-- Title of the dialog shown when a user is leaving a website and there is still data not saved yet. -->
   <string name="mozac_feature_prompt_before_unload_dialog_title">أمتأكّد أنت؟</string>
   <!-- Body text of the dialog shown when a user is leaving a website and there is still data not saved yet. -->
@@ -126,6 +128,14 @@
   <string name="mozac_feature_prompt_repost_positive_button_text">أعِد إرسال البيانات</string>
   <!-- Pressing this will dismiss the dialog and not refresh the webpage -->
   <string name="mozac_feature_prompt_repost_negative_button_text">ألغِ</string>
+  <!-- Strings show in a dialog that appear when user confirm folder upload -->
+  <string name="mozac_feature_prompt_folder_upload_confirm_title">رفع الملفات؟</string>
+  <!-- Prompt message displayed when user selects a specific folder. %1$s is a folder / directory name. -->
+  <string name="mozac_feature_prompt_folder_upload_confirm_message">تأكد من أنك تثق بهذا الموقع قبل الرفع من ”%1$s“.</string>
+  <!-- Pressing this will dismiss the dialog and allow to upload folder -->
+  <string name="mozac_feature_prompt_folder_upload_confirm_positive_button_text">ارفع</string>
+  <!-- Pressing this will dismiss the dialog and disallow to upload folder -->
+  <string name="mozac_feature_prompt_folder_upload_confirm_negative_button_text">إلغاء</string>
   <!--
     Credit Card Autofill
 
@@ -174,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">واصِل</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">ألغِ</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">استخدم قناع البريد الإلكتروني</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-bg/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-bg/strings.xml
index 6a973c3c02f28..0f9da5c6a81af 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-bg/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-bg/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Продължаване</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Отказ</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Използване на маска за пощата</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-bqi/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-bqi/strings.xml
index 52d96836e270e..7cb9ced229ac8 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-bqi/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-bqi/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">رئڌن وا پؽش</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">لقو</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">و کار گرؽڌن بؽڌار کوݩ ایمیل</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-cy/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-cy/strings.xml
index 39f8eb3851a30..55996bbfd8e97 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-cy/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-cy/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Parhau</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Na</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Defnyddiwch arallenw e-bost</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-de/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-de/strings.xml
index b0142b2159629..fe6e3ccde954e 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-de/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-de/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Weiter</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Abbrechen</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">E-Mail-Maske verwenden</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rCA/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rCA/strings.xml
index 8ac095ea20b81..bc29402202651 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rCA/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rCA/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continue</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancel</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Use email mask</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rGB/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rGB/strings.xml
index b5ef6757eb465..9c148a76d1670 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rGB/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-en-rGB/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continue</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancel</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Use email mask</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rAR/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rAR/strings.xml
index 3465a1f46f522..20b44284a1118 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rAR/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rAR/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continuar</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancelar</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rCL/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rCL/strings.xml
index 39f3b0402d683..5de87f1595ad5 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rCL/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-es-rCL/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continuar</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancelar</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Usar máscara de correo</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-fr/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-fr/strings.xml
index 8c6ce6a612408..72ef8c22043d0 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-fr/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-fr/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continuer</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Annuler</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Utiliser un alias de messagerie</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-gl/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-gl/strings.xml
index 522eabdb0f570..fb93dffe6c1a0 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-gl/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-gl/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continuar</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancelar</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-gn/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-gn/strings.xml
index a0f28cfec2539..247a6b0197e93 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-gn/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-gn/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Eku’ejey</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Heja</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Eiporu ñanduti veve rovamo’ãha</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-hsb/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-hsb/strings.xml
index d5031bdc42bc3..1f360dbded98f 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-hsb/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-hsb/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Dale</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Přetorhnyć</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">E-mejlowu masku wužiwać</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-it/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-it/strings.xml
index 271af3120645a..c013059539f8e 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-it/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-it/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continua</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Annulla</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Utilizza alias di posta elettronica</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-iw/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-iw/strings.xml
index 4fb1e7b86e69b..ce441ed45533e 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-iw/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-iw/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">המשך</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">ביטול</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">שימוש במסכת דוא״ל</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-kk/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-kk/strings.xml
index c47f8f4624b36..4ecd65b09e5e1 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-kk/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-kk/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Жалғастыру</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Болдырмау</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Эл. пошта маскасын қолдану</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ko/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ko/strings.xml
index d9c865fe77bc0..232556d0e3c62 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ko/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ko/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">계속</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">취소</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">이메일 가리기 사용</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ml/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ml/strings.xml
index 9c6fafbf2763d..7f39c924d4ee9 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-ml/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-ml/strings.xml
@@ -178,4 +178,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">തുടരുക</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">റദ്ദാക്കുക</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">ഇ-തപാൽ പൊയ്മുഖം ഉപയോഗിക്കുക</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-nl/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-nl/strings.xml
index 87794cbe07c5e..61675f2318dad 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-nl/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-nl/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Doorgaan</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Annuleren</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">E-mailmasker gebruiken</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-nn-rNO/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-nn-rNO/strings.xml
index 4376291bcc9df..81319fc988962 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-nn-rNO/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-nn-rNO/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Fortset</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Avbryt</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Bruk e-postalias</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-pt-rPT/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-pt-rPT/strings.xml
index 6470ebbcd2691..bf767905d0b39 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-pt-rPT/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-pt-rPT/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Continuar</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Cancelar</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Utilizar máscara de e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-sl/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-sl/strings.xml
index 6d5448b0ff423..8537d4cf6a729 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-sl/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-sl/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Nadaljuj</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Prekliči</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Uporabi e-poštno masko</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-sv-rSE/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-sv-rSE/strings.xml
index 3e7bd770c2807..b749bf2d23c0b 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-sv-rSE/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-sv-rSE/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Fortsätt</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Avbryt</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Använd e-postalias</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-tr/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-tr/strings.xml
index d73f4716f2873..48f96a7f0def8 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-tr/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-tr/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">İleri</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">İptal</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">E-posta maskesi kullan</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-vi/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-vi/strings.xml
index 37fa143f73fd9..0bfa5c0c4dba8 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-vi/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-vi/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">Tiếp tục</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">Hủy bỏ</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">Sử dụng email ẩn danh</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/prompts/src/main/res/values-zh-rTW/strings.xml b/mobile/android/android-components/components/feature/prompts/src/main/res/values-zh-rTW/strings.xml
index 24b1ff14c9459..ea7b2aa7b1e7c 100644
--- a/mobile/android/android-components/components/feature/prompts/src/main/res/values-zh-rTW/strings.xml
+++ b/mobile/android/android-components/components/feature/prompts/src/main/res/values-zh-rTW/strings.xml
@@ -184,4 +184,10 @@
   <string name="mozac_feature_prompts_identity_credentials_continue">繼續</string>
   <!-- Text for the cancel button of the Identity Credential dialogs. -->
   <string name="mozac_feature_prompts_identity_credentials_cancel">取消</string>
+  <!--
+    Email Mask Autofill
+
+    Text for the email mask prompt to allow users to fill an email input field in a sign up form with an email mask.
+  -->
+  <string name="mozac_feature_relay_chip_text">使用轉寄信箱</string>
 </resources>
diff --git a/mobile/android/android-components/components/feature/sitepermissions/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/feature/sitepermissions/src/main/res/values-ar/strings.xml
index 972a1d2486625..b24ec3883d9bf 100644
--- a/mobile/android/android-components/components/feature/sitepermissions/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/feature/sitepermissions/src/main/res/values-ar/strings.xml
@@ -17,6 +17,10 @@
   <string name="mozac_feature_sitepermissions_location_title">أتسمح بأن يستعمل %1$s مكانك؟</string>
   <!-- Title of a dialog for a camera and microphone permission request. %1$s is the domain name of the website. -->
   <string name="mozac_feature_sitepermissions_camera_and_microphone">أستسمح بأن يستعمل %1$s الكمرة والميكروفون؟</string>
+  <!-- Title of a dialog for a local network access request. %1$s is the domain name of the website -->
+  <string name="mozac_feature_sitepermissions_local_network_access_title">السماح لـ%1$s بالوصول إلى التطبيقات والخدمات على الأجهزة المتصلة بشبكتك المحلية؟</string>
+  <!-- Title of a dialog for a local device access request. %1$s is the domain name of the website -->
+  <string name="mozac_feature_sitepermissions_local_device_access_title">السماح لـ %1$s بالوصول إلى التطبيقات والخدمات الأخرى على هذا الجهاز؟</string>
   <!--
     Option in a dialog for requesting a microphone permission, this option will give access to
     the first microphone
@@ -42,8 +46,21 @@
     access to this permission
   -->
   <string name="mozac_feature_sitepermissions_not_allow">لا تسمح</string>
+  <!--
+    Alternate variant of the text for a negative button in a permission request dialog,
+    this button will not give access to this permission
+  -->
+  <string name="mozac_feature_sitepermissions_block">حجب</string>
+  <!-- Message of a dialog offering more context about the app level notification permission request. %1$s will be replaced with the name of the app. -->
+  <string name="mozac_feature_sitepermissions_notification_permission_rationale_dialog_message">ستحتاج إلى السماح بالإشعارات في %1$s لتلقيها من هذا الموقع.</string>
+  <!-- Button label in a notification permission request dialog to dismiss the dialog. -->
+  <string name="mozac_feature_sitepermissions_notification_permission_rationale_dialog_dismiss_label">إلغاء</string>
+  <!-- Button label in a notification permission request dialog. It will let the user go to Android Settings to grant the permission. -->
+  <string name="mozac_feature_sitepermissions_notification_permission_rationale_dialog_settings_label">الانتقال إلى الإعدادات</string>
   <!-- Text for a checkbox in a permission request dialog, this will allow to not show again the prompt -->
   <string name="mozac_feature_sitepermissions_do_not_ask_again_on_this_site2">تذكّر هذا القرار لهذا الموقع</string>
+  <!-- Text for a checkbox in a permission request dialog, this will allow to not show again the prompt -->
+  <string name="mozac_feature_sitepermissions_do_not_ask_again_on_this_site4">تذكر لهذا الموقع</string>
   <!-- Text for a positive button in a permission request dialog. This will always allow and remember the decision of the user, this is the special case of the notification permission, that is only ask one time -->
   <string name="mozac_feature_sitepermissions_always_allow">دائمًا</string>
   <!-- Text for a negative button in a permission request dialog. This will never allow and remember the decision of the user, this is the special case of the notification permission, that is only ask one time -->
diff --git a/mobile/android/android-components/components/lib/crash/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/lib/crash/src/main/res/values-ar/strings.xml
index 1113ec6f06098..80d04996f6c58 100644
--- a/mobile/android/android-components/components/lib/crash/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/lib/crash/src/main/res/values-ar/strings.xml
@@ -33,4 +33,10 @@
   <string name="mozac_lib_crash_no_crashes">لم تُرسل أي بلاغات بانهيار.</string>
   <!-- Text link that will show an app chooser to share a crash report with a third-party app (e.g. gmail) -->
   <string name="mozac_lib_crash_share">شارك</string>
+  <!-- String for Ask before sending crash reports radio button in Data Collection Screen -->
+  <string name="crash_reporting_ask">اسأل قبل الإرسال</string>
+  <!-- String for Send crash reports automatically radio button in Data Collection Screen -->
+  <string name="crash_reporting_auto">إرسال تلقائياً</string>
+  <!-- String for Never sending crash reports radio button in Data Collection Screen -->
+  <string name="crash_reporting_never">لا تُرسل أبدًا</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000000000..16a62cae7752a
--- /dev/null
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ar/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
+  <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">استخدام قناع البريد الإلكتروني</string>
+</resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-be/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-be/strings.xml
index e33758ba0d25e..72a2bf8ea93cd 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-be/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-be/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Выкарыстаць маску электроннай пошты</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Выкарыстаць маску электроннай пошты</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bg/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bg/strings.xml
index 53db7a9b545a1..7e227df621cf0 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bg/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bg/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Използване на маска за пощата</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Използване на маска за пощата</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bqi/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bqi/strings.xml
index 76db8d672c7f5..eb1483385f9fe 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bqi/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-bqi/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">و کار گرؽڌن بؽڌار کوݩ ایمیل</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">و کار گرؽڌن بؽڌار کوݩ ایمیل</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cak/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cak/strings.xml
index 6cddbfb860518..8c1898c200956 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cak/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cak/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Tokisäx ruk\'oj rutaqoya\'l</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Tokisäx ruk\'oj rutaqoya\'l</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-co/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-co/strings.xml
index 1ed427cf3a22c..31b10c0af31f1 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-co/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-co/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Impiegà una maschera di messaghjeria</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Impiegà una maschera di messaghjeria</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cs/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cs/strings.xml
index 832433585f938..07d65eb0834fe 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cs/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cs/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Použít e-mailovou masku</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Použít e-mailovou masku</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cy/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cy/strings.xml
index 3649e8d83a4f6..bbbbfbd53288b 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cy/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-cy/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Defnyddiwch arallenw e-bost</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Defnyddiwch arallenw e-bost</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-da/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-da/strings.xml
index b616289370ca6..1176c30456298 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-da/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-da/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Brug mail-maske</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Brug mail-maske</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-de/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-de/strings.xml
index 7bfe50709d0f8..e7fb00a356c7e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-de/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-de/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-Mail-Maske verwenden</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-Mail-Maske verwenden</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-dsb/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-dsb/strings.xml
index f51074294f2f4..0f374f0841769 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-dsb/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-dsb/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-mailowu masku wužywaś</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-mailowu masku wužywaś</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-el/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-el/strings.xml
index a4efe694071a5..65b13bc0aa109 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-el/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-el/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Χρήση μάσκας email</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Χρήση μάσκας email</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rCA/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rCA/strings.xml
index bdc7e0b1893e5..bb429b7f4b88b 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rCA/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rCA/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Use email mask</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Use email mask</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rGB/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rGB/strings.xml
index bdc7e0b1893e5..bb429b7f4b88b 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rGB/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-en-rGB/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Use email mask</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Use email mask</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eo/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eo/strings.xml
index af9302702f3ed..aab511e2f1541 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eo/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eo/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Uzi retpoŝtan maskon</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Uzi retpoŝtan maskon</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rAR/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rAR/strings.xml
index cb54485672ccb..52d857849a006 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rAR/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rAR/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rCL/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rCL/strings.xml
index 852f06c9c45d8..ca852720c02f1 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rCL/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rCL/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rES/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rES/strings.xml
index cb54485672ccb..52d857849a006 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rES/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rES/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rMX/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rMX/strings.xml
index cb54485672ccb..52d857849a006 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rMX/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es-rMX/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es/strings.xml
index cb54485672ccb..52d857849a006 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-es/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eu/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eu/strings.xml
index 3104f8dfed451..8ecb5b6bd9d62 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eu/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-eu/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Erabili posta-maskara</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Erabili posta-maskara</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fi/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fi/strings.xml
index fa4452e8125b1..df2d618a234af 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fi/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fi/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Käytä sähköpostimaskia</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Käytä sähköpostimaskia</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fr/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fr/strings.xml
index 8c58a89a33c0a..04089008ef0ab 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fr/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fr/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Utiliser un alias de messagerie</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Utiliser un alias de messagerie</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fur/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fur/strings.xml
index 5e30d694c7ec2..29b4b14894ffb 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fur/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fur/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Dopre mascare di pueste eletroniche</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Dopre mascare di pueste eletroniche</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fy-rNL/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fy-rNL/strings.xml
index 111ec9b3ee857..5a236def63089 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fy-rNL/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-fy-rNL/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-mailmasker brûke</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-mailmasker brûke</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gd/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gd/strings.xml
index 67d9ac0fc6f85..b7c60fafd6247 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gd/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gd/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Cleachd masg puist-d</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Cleachd masg puist-d</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gl/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gl/strings.xml
index cb54485672ccb..52d857849a006 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gl/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gl/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de correo electrónico</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de correo electrónico</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gn/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gn/strings.xml
index 7a13819766529..3e29d15d2d05f 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gn/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-gn/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Eiporu ñanduti veve rovamo’ãha</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Eiporu ñanduti veve rovamo’ãha</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hr/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hr/strings.xml
index e33ba9f7ef9f5..42ae8db475b7e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hr/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hr/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Koristi masku e-mail adrese</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Koristi masku e-mail adrese</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hsb/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hsb/strings.xml
index 05d90294c22ea..3352c9bd3c8ef 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hsb/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hsb/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-mejlowu masku wužiwać</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-mejlowu masku wužiwać</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hu/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hu/strings.xml
index fc721ede6d120..0a6b41ad66bad 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hu/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hu/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-mail-maszk használata</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-mail-maszk használata</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hy-rAM/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hy-rAM/strings.xml
index 3a967636193ed..d88c39f433ed6 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hy-rAM/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-hy-rAM/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Օգտագործեք էլ․փոստի դիմակ</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Օգտագործեք էլ․փոստի դիմակ</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ia/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ia/strings.xml
index 99ec8497eafd5..146528f3281eb 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ia/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ia/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar un masca de e-mail</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar un masca de e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-in/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-in/strings.xml
index 306070618808e..c34759a8ba252 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-in/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-in/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Gunakan topeng surel</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Gunakan topeng surel</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-is/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-is/strings.xml
index 43f6c103d27be..57b1a32d28275 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-is/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-is/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Nota tölvupósthulu</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Nota tölvupósthulu</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-it/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-it/strings.xml
index 94adcd217a33d..5a235df69f6b0 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-it/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-it/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usa alias di posta elettronica</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usa alias di posta elettronica</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-iw/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-iw/strings.xml
index f1f929d153532..b309e8db1ccfe 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-iw/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-iw/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">שימוש במסכת דוא״ל</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">שימוש במסכת דוא״ל</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ja/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ja/strings.xml
index 9fea0aecfc4f2..b265f3dcfe67f 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ja/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ja/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">メールマスクを使用</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">メールマスクを使用</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ka/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ka/strings.xml
index c901063b2f9ff..acd872dbe778e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ka/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ka/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">გამოიყენეთ ელფოსტის ნიღაბი</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">გამოიყენეთ ელფოსტის ნიღაბი</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kab/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kab/strings.xml
index 20ee163a4874d..6c54b36eff814 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kab/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kab/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Seqdec agelmus n yimayl</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Seqdec agelmus n yimayl</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kk/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kk/strings.xml
index 720c9e59a19de..34ba65ee7e3de 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kk/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-kk/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Эл. пошта маскасын қолдану</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Эл. пошта маскасын қолдану</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-km/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-km/strings.xml
index a825bcf566082..dedc029bc093d 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-km/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-km/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ប្រើរបាំងអាសយដ្ឋានអ៊ីមែល</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ប្រើរបាំងអាសយដ្ឋានអ៊ីមែល</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ko/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ko/strings.xml
index 79385e36aefa4..832435bf6e8ef 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ko/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ko/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">이메일 가리기 사용</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">이메일 가리기 사용</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ml/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ml/strings.xml
index 3430b6c46ca48..79eed538baf0e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ml/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ml/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ഇ-തപാൽ പൊയ്മുഖം ഉപയോഗിക്കുക</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ഇ-തപാൽ പൊയ്മുഖം ഉപയോഗിക്കുക</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nb-rNO/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nb-rNO/strings.xml
index 825b4e5b54a69..1bfe658e6adfb 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nb-rNO/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nb-rNO/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Bruk e-postalias</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Bruk e-postalias</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nl/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nl/strings.xml
index c7c12fe55517a..f4632d394cba3 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nl/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nl/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-mailmasker gebruiken</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-mailmasker gebruiken</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nn-rNO/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nn-rNO/strings.xml
index 825b4e5b54a69..1bfe658e6adfb 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nn-rNO/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-nn-rNO/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Bruk e-postalias</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Bruk e-postalias</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pa-rIN/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pa-rIN/strings.xml
index 7f2210b13ca77..e0dc4d4c11e35 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pa-rIN/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pa-rIN/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ਈਮੇਲ ਮਾਸਕ ਨੂੰ ਵਰਤੋਂ</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ਈਮੇਲ ਮਾਸਕ ਨੂੰ ਵਰਤੋਂ</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pl/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pl/strings.xml
index 88e70edcb0e93..d88b8b4cfa94e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pl/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pl/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Użyj maski dla adresu e-mail</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Użyj maski dla adresu e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ps/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ps/strings.xml
index 66a792802350e..b71c37b230707 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ps/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ps/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">د برېښنالیک ماسک وکاروئ</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">د برېښنالیک ماسک وکاروئ</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rBR/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rBR/strings.xml
index 08a20654aeb5e..b6bf7830f8f47 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rBR/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rBR/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Usar máscara de email</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Usar máscara de email</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rPT/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rPT/strings.xml
index 97144458e00d6..442c8f0c306ba 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rPT/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-pt-rPT/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Utilizar máscara de e-mail</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Utilizar máscara de e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-rm/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-rm/strings.xml
index bd3fdd2365721..8f870e0829353 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-rm/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-rm/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Utilisar in alias dad e-mail</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Utilisar in alias dad e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ro/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ro/strings.xml
index 1cc3f8e8af9cd..7043d4fcce559 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ro/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ro/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Folosește masca de e-mail</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Folosește masca de e-mail</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ru/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ru/strings.xml
index a2b4f7ddbcf7a..f74d52743540e 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ru/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ru/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Использовать псевдоним электронной почты</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Использовать псевдоним электронной почты</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sat/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sat/strings.xml
index da6993cd4729c..bfa6da3cea8a9 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sat/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sat/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ᱤᱢᱮᱞ ᱢᱟᱥᱠ ᱵᱮᱵᱷᱟᱨ ᱢᱮ</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ᱤᱢᱮᱞ ᱢᱟᱥᱠ ᱵᱮᱵᱷᱟᱨ ᱢᱮ</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sk/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sk/strings.xml
index 13b458e2730f5..9cdc1796aebed 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sk/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sk/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Použiť e‑mailovú masku</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Použiť e‑mailovú masku</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sl/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sl/strings.xml
index 2a6b71637c2dc..3d1d416627699 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sl/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sl/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Uporabi e-poštno masko</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Uporabi e-poštno masko</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sq/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sq/strings.xml
index f3cb077c5e3ab..8c0d2318a578d 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sq/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sq/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Përdor maskë email-i</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Përdor maskë email-i</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sv-rSE/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sv-rSE/strings.xml
index ff02427687114..397004809eeef 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sv-rSE/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-sv-rSE/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Använd e-postalias</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Använd e-postalias</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tg/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tg/strings.xml
index 6dcf0bb4794aa..b082a279aac1c 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tg/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tg/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Истифодаи ниқоби почтаи электронӣ</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Истифодаи ниқоби почтаи электронӣ</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-th/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-th/strings.xml
index 69bddc77de209..0ef760db7fb01 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-th/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-th/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ใช้ตัวปกปิดอีเมล</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ใช้ตัวปกปิดอีเมล</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tr/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tr/strings.xml
index a361def408dc4..99851d83ec778 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tr/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-tr/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">E-posta maskesi kullan</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">E-posta maskesi kullan</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ug/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ug/strings.xml
index bae87cd5a25c2..d79232f57779a 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ug/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-ug/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">ئېلخەت نىقابى ئىشلىتىش</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">ئېلخەت نىقابى ئىشلىتىش</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-uk/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-uk/strings.xml
index 1c348ab564183..ca4c080601b97 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-uk/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-uk/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Використати маску електронної пошти</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Використати маску електронної пошти</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-vi/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-vi/strings.xml
index 1057ae8c518f3..f08686a6ebcc9 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-vi/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-vi/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">Sử dụng email ẩn danh</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">Sử dụng email ẩn danh</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rCN/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rCN/strings.xml
index 3f30a8d434fad..a23195b1fac60 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rCN/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">使用马甲邮箱</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">使用马甲邮箱</string>
 </resources>
diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rTW/strings.xml b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rTW/strings.xml
index e032019d2494d..b6dc689b961c3 100644
--- a/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rTW/strings.xml
+++ b/mobile/android/android-components/components/service/firefox-relay/src/main/res/values-zh-rTW/strings.xml
@@ -6,7 +6,7 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
   <!-- Text for the Relay prompt to allow users to fill the form with with an email alias -->
-  <string name="mozac_feature_relay_chip_text">使用轉寄信箱</string>
+  <string name="mozac_feature_relay_chip_text" tools:ignore="UnusedResources" moz:removedIn="149">使用轉寄信箱</string>
 </resources>
diff --git a/mobile/android/android-components/components/ui/tabcounter/src/main/res/values-ar/strings.xml b/mobile/android/android-components/components/ui/tabcounter/src/main/res/values-ar/strings.xml
index bec5f2c7fc0de..13bd54549f9b2 100644
--- a/mobile/android/android-components/components/ui/tabcounter/src/main/res/values-ar/strings.xml
+++ b/mobile/android/android-components/components/ui/tabcounter/src/main/res/values-ar/strings.xml
@@ -17,6 +17,11 @@
     The %1$s will be replaced by the number of opened tabs
   -->
   <string name="mozac_open_tab_counter_tab_tray">الألسنة غير الخاصة المفتوحة: %1$s. انقر للتبديل بين الألسنة.</string>
+  <!--
+    Message announced to the user when the tab counter is selected in private browsing mode.
+    Used by a11y services. The %1$s will be replaced by the number of opened tabs
+  -->
+  <string name="mozac_tab_counter_private">علامات التبويب الخاصة المفتوحة: %1$s. انقر للانتقال بين التبويبات.</string>
   <!-- Browser menu button that creates a new tab -->
   <string name="mozac_browser_menu_new_tab">لسان جديد</string>
   <!-- Browser menu button that creates a private tab -->
diff --git a/mobile/android/fenix/app/src/main/res/values-ar/strings.xml b/mobile/android/fenix/app/src/main/res/values-ar/strings.xml
index 9a4f7feb9e252..b005c91e7021a 100644
--- a/mobile/android/fenix/app/src/main/res/values-ar/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-ar/strings.xml
@@ -35,8 +35,16 @@
   <string name="no_open_tabs_description" tools:ignore="UnusedResources" moz:removedIn="149">ستظهر الألسنة المفتوحة هنا.</string>
   <!-- No Private Tabs Message Description -->
   <string name="no_private_tabs_description" tools:ignore="UnusedResources" moz:removedIn="149">ستظهر الألسنة الخاصة هنا.</string>
+  <!-- The header text displayed on the private tabs page when no private tabs are open -->
+  <string name="tab_manager_empty_private_tabs_page_header">التصفح الخاص</string>
+  <!-- The supplementary text displayed on the private tabs page when no private tabs are open. %1$s is the name of the app (for example "Firefox") -->
+  <string name="tab_manager_empty_private_tabs_page_description">لن يحفظ %1$s أيًا من سجلات تصفحك أو ملفات تعريف الارتباط، لكن العلامات المرجعية الجديدة ستبقى محفوظة.</string>
+  <!-- The header text displayed on the normal tabs page when no normal tabs are open -->
+  <string name="tab_manager_empty_normal_tabs_page_header">افتح نافذة جديدة لبدء البحث</string>
   <!-- Tab tray multi select title in app bar. %1$d is the number of tabs selected -->
   <string name="tab_tray_multi_select_title">حدّدتَ %1$d</string>
+  <!-- Tab tray multi select title in app bar when no tabs are selected -->
+  <string name="tab_tray_multi_select_title_empty">تحديد علامات التبويب</string>
   <!-- Label of button in create collection dialog for creating a new collection -->
   <string name="tab_tray_add_new_collection">أضِف تجميعة جديدة</string>
   <!-- Label of editable text in create collection dialog for naming a new collection -->
@@ -47,6 +55,14 @@
   <string name="tab_tray_close_multiselect_content_description">اخرج من وضع التحديد المتعدد</string>
   <!-- Content description for save to collection button while in multiselect mode in tab tray -->
   <string name="tab_tray_collection_button_multiselect_content_description" tools:ignore="UnusedResources" moz:removedIn="149">احفظ الألسنة المحدّدة في التجميعة</string>
+  <!-- The header text displayed on the synced tabs page when the user is not logged into an account. -->
+  <string name="tab_manager_empty_synced_tabs_page_header">احصل على علامات التبويب من أي جهاز</string>
+  <!-- The supplementary text displayed on the synced tabs page when the user is not logged into an account. -->
+  <string name="tab_manager_empty_synced_tabs_page_description">سجِّل الدخول لإدارة النوافذ المتزامنة عبر كل أجهزتك.</string>
+  <!-- The action text displayed on the synced tabs page when the user is not logged into an account, prompting the user to sign into their account. When clicked, it takes the user to the account sign-in flow. -->
+  <string name="tab_manager_empty_synced_tabs_page_sign_in_cta">تسجيل الدخول</string>
+  <!-- Text for the button used to show all stories -->
+  <string name="homepage_all_stories">جميع القصص</string>
   <!--
     Home - Bookmarks
 
@@ -61,6 +77,8 @@
   <string name="about_content">‏%1$s من Mozilla.</string>
   <!-- Private Browsing -->
   <string name="private_browsing_common_myths">الخرافات الشائعة بخصوص التصفح الخاص</string>
+  <!-- Text to be announced by the accessibility service to inform the user that the private browsing mode is currently active. -->
+  <string name="private_browsing_a11y_session_announcement">جلسة تصفح خاصة</string>
   <!--
     True Private Browsing Mode
 
@@ -74,6 +92,11 @@
     %2$s is a link using felt_privacy_info_card_subtitle_link_text as text
   -->
   <string name="felt_privacy_info_card_subtitle_2" tools:ignore="UnusedResources" moz:removedIn="147">يحذف %1$s الكعكات، والتأريخ، وبيانات الموقع عندما تغلق كل الألسنة الخاصة. %2$s</string>
+  <!--
+    Description of private browsing mode displayed to users on the homepage when they enable private mode.
+    %1$s is the name of the app (for example "Firefox").
+  -->
+  <string name="felt_privacy_info_card_subtitle_3">يحذف %1$s ملفات تعريف الارتباط والسجل وبيانات المواقع عند إغلاق جميع علامات التبويب الخاصة.</string>
   <!--
     Clickable portion of the explanation for private browsing that links the user to our
     about privacy page.
@@ -92,6 +115,12 @@
   <string name="open_in_app_cfr_negative_button_text">أهمِل</string>
   <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
 
+  <!--
+    Address bar swipe "contextual feature recommendation" (CFR)
+
+    Text for the message displayed in the contextual feature recommendation popup promoting swipe of address bar.
+  -->
+  <string name="address_bar_swipe_cfr_message_2">اسحب شريط الأدوات لليمين أو اليسار للانتقال بين علامات التبويب.</string>
   <!-- Text for the info dialog when camera permissions have been denied but user tries to access a camera feature. -->
   <string name="camera_permissions_needed_message">الوصول إلى الكمرة مطلوب. افتح إعدادات أندرويد، وانقر ”الأذونات“ ثم انقر ”سماح“.</string>
   <!-- Text for the positive action button to go to Android Settings to grant permissions. -->
@@ -178,8 +207,12 @@
   <string name="browser_menu_stop">أوقف</string>
   <!-- Browser menu button that opens the extensions manager -->
   <string name="browser_menu_extensions">الامتدادات</string>
+  <!-- Browser menu banner header text for extensions onboarding when all installed extensions have been disabled. -->
+  <string name="browser_menu_disabled_extensions_banner_onboarding_header" tools:ignore="UnusedResources" moz:removedIn="149">لديك امتدادات مثبتة، ولكنها غير مفعلة</string>
   <!-- Browser menu button that opens the extensions manager -->
   <string name="browser_menu_manage_extensions">أدِر الامتدادات</string>
+  <!-- Browser menu group that contains additional settings in collapsed state -->
+  <string name="browser_menu_more_settings">المزيد</string>
   <!--
     Content description (not visible, for screen readers etc.): Label for plus icon used to add extension.
     %1$s is the name of the extension (for example: ClearURLs).
@@ -191,6 +224,8 @@
   <string name="browser_menu_extensions_disabled_description">معطل مؤقتا</string>
   <!-- The description of the browser menu appears when the user hasn't installed any extensions. -->
   <string name="browser_menu_no_extensions_installed_description">لا توجد امتدادات مفعلة</string>
+  <!-- The description of the browser menu appears when the user hasn't installed any extensions and there are recommended extensions. -->
+  <string name="browser_menu_try_a_recommended_extension_description">جرب إحدى الامتدادات المقترحة</string>
   <!-- Browser menu button that opens account settings -->
   <string name="browser_menu_account_settings">معلومات الحساب</string>
   <!-- Browser menu button that sends a user to help articles -->
@@ -221,6 +256,8 @@
   <string name="browser_menu_save_to_collection_2">احفظ في التجميعة</string>
   <!-- Browser menu button that open a share menu to share the current site -->
   <string name="browser_menu_share">شارِك</string>
+  <!-- Browser menu button that goes to the homepage screen -->
+  <string name="browser_menu_homepage">الصفحة الرئيسية</string>
   <!--
     Browser menu button shown in custom tabs that opens the current tab in Fenix
     %1$s is the name of the app (for example "Firefox").
@@ -254,6 +291,8 @@
   <string name="browser_menu_customize_home_1" tools:ignore="UnusedResources" moz:removedIn="149">خصّص صفحة البداية</string>
   <!-- Browser menu label to sign in to sync on the device using Mozilla accounts -->
   <string name="browser_menu_sign_in">لِج</string>
+  <!-- Browser menu caption label for the "Sign in" browser menu item described in `browser_menu_sign_in` -->
+  <string name="browser_menu_sign_in_caption_3">مزامنة كلمات المرور و علامات المرجعية والمزيد</string>
   <!-- Browser menu label to sign back in to sync on the device when the user's account needs to be reauthenticated -->
   <string name="browser_menu_sign_back_in_to_sync">لِج مجددا لتبدأ المزامنة</string>
   <!-- Browser menu caption label for the "Sign back in to sync" browser menu item described in `browser_menu_sign_back_in_to_sync` when there is an error in syncing -->
diff --git a/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml b/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
index 20b8329066b32..dae0a4aa26729 100644
--- a/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml
@@ -646,6 +646,8 @@
   <string name="nova_onboarding_tou_body_line_3_link_text">Manage settings</string>
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Say goodbye to creepy trackers</string>
+  <!-- "Set to default" onboarding title. -->
+  <string name="nova_onboarding_set_to_default_title_2">Open all your links with built-in privacy</string>
   <!-- "Set to default" onboarding subtitle. -->
   <string name="nova_onboarding_set_to_default_subtitle">We protect your data and automatically block companies from spying on your clicks.</string>
   <!-- "Set to default" onboarding button. -->
@@ -770,6 +772,8 @@
   <string name="preferences_search">Search</string>
   <!-- Preference for settings related to Search engines -->
   <string name="preferences_search_engines">Search engines</string>
+  <!-- Settings item to add a search widget on the device's homescreen. -->
+  <string name="preferences_add_search_widget_from_settings">Home screen widget</string>
   <!-- Preference for settings related to Search engines suggestions -->
   <string name="preferences_search_engines_suggestions">Suggestions from search engines</string>
   <!-- Preference Category for settings related to Search address bar -->
@@ -1740,6 +1744,12 @@
   <string name="download_delete_multi_select_dialog_confirm">Delete</string>
   <!-- Alert dialog confirmation before deleting multiple download items, this is the negative action. -->
   <string name="download_delete_multi_select_dialog_cancel">Cancel</string>
+  <!-- Title for the alert dialog confirmation before renaming a download item. -->
+  <string name="download_rename_dialog_title">Rename file</string>
+  <!-- Label for the name field in the alert dialog confirmation before renaming a download item. -->
+  <string name="download_rename_dialog_label">Name</string>
+  <string name="download_rename_dialog_confirm_button">Save</string>
+  <string name="download_rename_dialog_cancel_button">Cancel</string>
   <!-- Text for the header of in progress downloads -->
   <string name="download_header_in_progress">In progress</string>
   <!--
diff --git a/mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml b/mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml
index 2bf77b3051dfa..4af873119e183 100644
--- a/mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml
@@ -646,6 +646,8 @@
   <string name="nova_onboarding_tou_body_line_3_link_text">Administrar ajustes</string>
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Dile adiós a los rastreadores espeluznantes</string>
+  <!-- "Set to default" onboarding title. -->
+  <string name="nova_onboarding_set_to_default_title_2">Abre todos tus enlaces con privacidad incorporada</string>
   <!-- "Set to default" onboarding subtitle. -->
   <string name="nova_onboarding_set_to_default_subtitle">Protegemos tus datos y bloqueamos automáticamente a las empresas que espían tus clics.</string>
   <!-- "Set to default" onboarding button. -->
diff --git a/mobile/android/fenix/app/src/main/res/values-fr/strings.xml b/mobile/android/fenix/app/src/main/res/values-fr/strings.xml
index 64470945b936d..6cab15d3dc7d5 100644
--- a/mobile/android/fenix/app/src/main/res/values-fr/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-fr/strings.xml
@@ -647,7 +647,7 @@
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Dites adieu aux traqueurs intrusifs</string>
   <!-- "Set to default" onboarding title. -->
-  <string name="nova_onboarding_set_to_default_title_2">Ouvrez tous vos liens avec la confidentialité intégrée</string>
+  <string name="nova_onboarding_set_to_default_title_2">Accédez à tous vos liens tout en protégeant votre vie privée</string>
   <!-- "Set to default" onboarding subtitle. -->
   <string name="nova_onboarding_set_to_default_subtitle">Nous protégeons vos données et empêchons automatiquement les entreprises d’espionner vos clics.</string>
   <!-- "Set to default" onboarding button. -->
diff --git a/mobile/android/fenix/app/src/main/res/values-ia/strings.xml b/mobile/android/fenix/app/src/main/res/values-ia/strings.xml
index da0e6c49f71f6..f623a60e2905f 100644
--- a/mobile/android/fenix/app/src/main/res/values-ia/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-ia/strings.xml
@@ -888,9 +888,9 @@
   <!-- Preference for showing the tab strip -->
   <string name="preferences_tab_strip">Monstrar barra de schedas</string>
   <!-- Preference for gestures based actions -->
-  <string name="preferences_toolbar_shortcut">Via breve de barra de utensiles</string>
+  <string name="preferences_toolbar_shortcut">Accesso directe in le barra de utensiles</string>
   <!-- Preference for gestures based actions -->
-  <string name="preferences_toolbar_select_shortcut">Elige un via breve</string>
+  <string name="preferences_toolbar_select_shortcut">Elige un accesso directe</string>
   <!-- Preference for gestures based actions -->
   <string name="preferences_gestures">Gestos</string>
   <!-- Preference for settings related to visual options -->
@@ -926,7 +926,7 @@
   <!-- Preference title for switch preference to suggest bookmarks when searching -->
   <string name="preferences_search_bookmarks">Cercar in le marcapaginas</string>
   <!-- Preference title for switch preference to show shortcuts when searching -->
-  <string name="preferences_show_shortcuts" tools:ignore="UnusedResources" moz:removedIn="147">Monstrar vias breve</string>
+  <string name="preferences_show_shortcuts" tools:ignore="UnusedResources" moz:removedIn="147">Monstrar accessos directe</string>
   <!-- Preference title for switch preference to suggest synced tabs when searching -->
   <string name="preferences_search_synced_tabs">Cercar in le schedas synchronisate</string>
   <!-- Preference for account settings -->
@@ -1146,13 +1146,13 @@
   <!-- Message to warn users that applying an alternative app icon may require an app restart. Whether or not the app closes depends on what version of Android it is, so we use the word "may" instead of "will". %1$s is replaced by the brand name (e.g. Firefox). -->
   <string name="restart_warning_dialog_body_2">Le application pote clauder. Justo tocca tu lucente nove icone pro reaperir %1$s.</string>
   <!-- Message to warn users that applying an alternative app icon may require an app restart and will remove existing shortcuts because of the OS limitations. Whether or not the app closes depends on what version of Android it is, so we use the word "may" instead of "will". %1$s is replaced by the brand name (e.g. Firefox). -->
-  <string name="restart_and_shortcuts_removal_warning_dialog_body">Cambiar icone removera qualcunque sito e via breve que tu ha salvate in tu pagina initial. \n\n%1$s pote clauder. Tocca tu nove icone pro reaperir.</string>
+  <string name="restart_and_shortcuts_removal_warning_dialog_body">Cambiar de icone removera omne sitos e accessos directe que tu ha salvate in tu pagina initial. \n\n%1$s pote clauder se. Tocca tu nove icone pro reaperir lo.</string>
   <!-- Dialog button text for confirming the possible app restart and new icon selection -->
   <string name="restart_warning_dialog_button_positive_2">Cambiar icone</string>
   <!-- Dialog button text for cancelling app icon change -->
   <string name="restart_warning_dialog_button_negative">Cancellar</string>
   <!-- Error message snackbar shown after the user tried to apply the new icon but the Android OS threw an error while updating existing app shortcuts (e.g. private mode shortcut) -->
-  <string name="shortcuts_update_error">Impossibile actualisar le icone del application. Remove le vias breve existente e retenta.</string>
+  <string name="shortcuts_update_error">Le actualisation del icone del application ha fallite. Remove le accessos directe existente e tenta lo de novo.</string>
   <!--
     Add-ons general availability nimbus message
 
@@ -2320,7 +2320,7 @@
   <!-- Text shown in snackbar when user bookmarks a list of tabs. %s is the name of the folder the bookmark was saved into. -->
   <string name="snackbar_message_bookmarks_saved_in_2">Marcapaginas salvate in “%s”</string>
   <!-- Text shown in snackbar when user adds a site to shortcuts -->
-  <string name="snackbar_added_to_shortcuts">Addite a vias breve!</string>
+  <string name="snackbar_added_to_shortcuts">Addite al accessos directe!</string>
   <!-- Text shown in snackbar when user closes a private tab -->
   <string name="snackbar_private_tab_closed">Scheda private claudite</string>
   <!-- Text shown in snackbar when user erases their private browsing data -->
@@ -2738,7 +2738,7 @@
   <!-- Continue to website button text for the first-time Add to Homescreen dialog -->
   <string name="add_to_homescreen_continue">Continuar al sito web</string>
   <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
-  <string name="add_to_homescreen_text_placeholder">Nomine via-breve</string>
+  <string name="add_to_homescreen_text_placeholder">Nomine del accesso directe</string>
   <!-- Describes the add to homescreen functionality -->
   <string name="add_to_homescreen_description_2">Tu pote facilemente adder iste sito web al Pagina initial de tu apparato pro haber accesso instantanee e navigar plus veloce con un experientia simile al app.</string>
   <!-- Preference for managing the settings for logins and passwords in Fenix -->
@@ -3094,9 +3094,9 @@
   <!-- label shown when there are not site exceptions to show in the site exception settings -->
   <string name="no_site_exceptions">Nulle exceptiones sito</string>
   <!-- Browser menu button that adds a shortcut to the home fragment -->
-  <string name="browser_menu_add_to_shortcuts">Adder a vias breve</string>
+  <string name="browser_menu_add_to_shortcuts">Adder al accessos directe</string>
   <!-- Browser menu button that removes a shortcut from the home fragment -->
-  <string name="browser_menu_remove_from_shortcuts">Remover del vias breve</string>
+  <string name="browser_menu_remove_from_shortcuts">Remover del accessos directe</string>
   <!--
     text shown before the issuer name to indicate who its verified by, %1$s is the name of
     the certificate authority that verified the ticket
@@ -3173,24 +3173,24 @@
 
     Title text displayed for the shortcuts home screen section.
   -->
-  <string name="homepage_shortcuts_title">Vias breve</string>
+  <string name="homepage_shortcuts_title">Accessos directe</string>
   <!--
     Context description text for the "Show all" button in the shortcuts home screen section
     which navigates the user to a screen displaying all the shortcuts.
   -->
-  <string name="homepage_shortcuts_show_all_content_description">Monstrar tote le vias breve</string>
+  <string name="homepage_shortcuts_show_all_content_description">Monstrar tote le accessos directe</string>
   <!-- Title text displayed in the dialog when shortcuts limit is reached. -->
-  <string name="shortcut_max_limit_title">Limite de vias breve attingite</string>
+  <string name="shortcut_max_limit_title">Limite de accessos directe attingite</string>
   <!-- Content description text displayed in the dialog when shortcut limit is reached. -->
-  <string name="shortcut_max_limit_content">Pro adder un altere via breve, remove un. Tocca e retene le sito e selige remover.</string>
+  <string name="shortcut_max_limit_content">Pro adder un nove accesso directe, remove un. Tocca e retene le sito e selige remover.</string>
   <!-- Confirmation dialog button text when top sites limit is reached. -->
   <string name="top_sites_max_limit_confirmation_button">De accordo</string>
   <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
-  <string name="top_sites_toggle_top_recent_sites_4">Vias breve</string>
+  <string name="top_sites_toggle_top_recent_sites_4">Accessos directe</string>
   <!-- Title text displayed in the rename top site dialog. -->
   <string name="top_sites_rename_dialog_title">Nomine</string>
   <!-- Hint for renaming title of a shortcut -->
-  <string name="shortcut_name_hint">Nomine de via breve</string>
+  <string name="shortcut_name_hint">Nomine del accesso directe</string>
   <!-- Hint for editing URL of a shortcut. -->
   <string name="shortcut_url_hint">URL directe</string>
   <!-- Dialog button text for canceling the rename top site prompt. -->
diff --git a/mobile/android/fenix/app/src/main/res/values-ka/strings.xml b/mobile/android/fenix/app/src/main/res/values-ka/strings.xml
index 5991b42b637b9..f8a345e748e4f 100644
--- a/mobile/android/fenix/app/src/main/res/values-ka/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-ka/strings.xml
@@ -1415,8 +1415,18 @@
   <string name="studies_description_3" moz:removedIn="148" tools:ignore="UnusedResources">გამოცადეთ შესაძლებლობები ჯერ კიდევ ჩანაფიქრის დონეზე, სანამ ყველასთვის ხილული გახდება.</string>
   <!-- Title of the Studies data preference -->
   <string name="studies_title" moz:removedIn="148" tools:ignore="UnusedResources">კვლევების ჩადგმა და გაშვება</string>
+  <!-- Title of the Studies data preference -->
+  <string name="studies_title_2">შესაძლებლობათა კვლევის ნებართვა</string>
   <!-- Learn more link for studies, links to an article for more information about studies. -->
   <string name="studies_learn_more">ვრცლად</string>
+  <!--
+    Remote Improvements (Rollouts)
+
+    Title of the Remote Improvements (rollouts) data preference
+  -->
+  <string name="remote_improvements_title">დაშორებულად გაუმჯობესების ნებართვა</string>
+  <!-- Description for remote improvements. Note: The word "Firefox" should NOT be translated -->
+  <string name="remote_improvements_description" tools:ignore="BrandUsage">Firefox შეძლებს გააუმჯობესოს შესაძლებლობები, წარმადობა და მდგრადობა განახლებებს შორის შუალედშიც. ცვლილებები დაშორებული რეჟიმით.</string>
   <!--
     Sessions
 
diff --git a/mobile/android/fenix/app/src/main/res/values-km/strings.xml b/mobile/android/fenix/app/src/main/res/values-km/strings.xml
index 007731734fbd3..5db1437c3e133 100644
--- a/mobile/android/fenix/app/src/main/res/values-km/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-km/strings.xml
@@ -51,6 +51,8 @@
   <string name="home_bookmarks_menu_item_remove">យកចេញ</string>
   <!-- Private browsing erase action "contextual feature recommendation" (CFR) -->
 
+  <!-- Text for the action link to go to Settings for inactive tabs. -->
+  <string name="tab_tray_inactive_onboarding_button_text">បិទការកំណត់</string>
   <!-- Content description for close button in the auto-close dialog of the inactive tabs. -->
   <string name="tab_tray_inactive_auto_close_button_content_description">បិទ</string>
   <!-- Text for turn on auto close tabs button in the auto-close dialog of the inactive tabs. -->
@@ -371,6 +373,9 @@
   <string name="onboarding_customize_toolbar_top_option">កំពូល</string>
   <!-- Onboarding toolbar selection card label for 'bottom' option, used by Nimbus experiments. -->
   <string name="onboarding_customize_toolbar_bottom_option">ប៊ូតុង</string>
+  <!-- Onboarding toolbar selection card content description for the toolbar placement image. -->
+  <string name="onboarding_customize_toolbar_placement_bottom_content_description">រូបភាពនៃប៊ូតុងរបារឧបករណ៍</string>
+  <string name="onboarding_customize_toolbar_placement_top_content_description">រូបភាពនៃរបារឧបករណ៍ខាងលើ</string>
   <!-- Action label for toolbar options that can be selected. Talkback will append this to say "Double tap to select". -->
   <string name="onboarding_customize_toolbar_a11y_action_label_select">ជ្រើសរើស</string>
   <!-- Onboarding label for 'Save and start browsing' button, used by Nimbus experiments. -->
@@ -430,6 +435,8 @@
   <string name="preferences_site_settings">ការកំណត់គេហទំព័រ</string>
   <!-- Preference for private browsing options -->
   <string name="preferences_private_browsing_options">ការ​រកមើល​ឯកជន</string>
+  <!-- Text for indicating cookie banner handling is off this site, this is shown as part of the protections panel with the tracking protection toggle -->
+  <string name="reduce_cookie_banner_off_for_site">បិទសម្រាប់គេហទំព័រនេះ</string>
   <!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
   <string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">បោះបង់</string>
   <!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
@@ -502,6 +509,8 @@
   <string name="download_content_type_filter_all">ទាំងអស់</string>
   <!-- The button text for the cancel button to leave the Web Compat Reporter feature. -->
   <string name="webcompat_reporter_cancel">បោះបង់</string>
+  <!-- Broken site reason text for site asked to turn off ad blocker -->
+  <string name="webcompat_reporter_reason_turn_off_adblocker">គេហទំព័រត្រូវបានស្នើសុំឱ្យបិទកម្មវិធីទប់ស្កាត់ការផ្សាយពាណិជ្ជកម្ម</string>
   <!-- Text for the cancel button on delete bookmark dialog -->
   <string name="bookmark_delete_negative">បោះបង់</string>
   <!-- Bookmark overflow menu select all bookmarks -->
@@ -510,10 +519,20 @@
   <string name="clear_permissions_negative">បោះបង់</string>
   <!-- Text for the cancel button on Clear permission dialog -->
   <string name="clear_permission_negative">បោះបង់</string>
+  <!-- Summary of tracking protection preference if tracking protection is set to off -->
+  <string name="tracking_protection_off">បិទ</string>
+  <!-- Summary of delete browsing data on quit preference if it is set to off -->
+  <string name="delete_browsing_data_quit_off">បិទ</string>
+  <!-- Summary of studies data on quit preference if it is set to off -->
+  <string name="studies_off">បិទ</string>
+  <!-- Toggle if desktop site is turned off -->
+  <string name="browser_feature_desktop_site_off">បិទ</string>
   <!-- Button to select all tabs in the "select tabs" step of the collection creator -->
   <string name="create_collection_select_all">ជ្រើសរើស​ទាំងអស់</string>
   <!-- Text for the cancel button from collection dialogs -->
   <string name="create_collection_negative">បោះបង់</string>
+  <!-- Text displayed when sync is offline and cannot be accessed -->
+  <string name="sync_offline">ក្រៅ​បណ្ដាញ</string>
   <!-- QR code scanner prompt dialog positive option to allow navigation to scanned link -->
   <string name="qr_scanner_dialog_positive">អនុញ្ញាត</string>
   <!-- Radio button in the delete browsing data dialog to delete history items for today and yesterday. -->
@@ -526,10 +545,18 @@
   <string name="sign_out_cancel">បោះបង់</string>
   <!-- Header for categories that are being not being blocked by current Enhanced Tracking Protection settings -->
   <string name="enhanced_tracking_protection_allowed">បាន​អនុញ្ញាត</string>
+  <!-- Title displayed for "Off" option under "DNS over HTTPS" -->
+  <string name="preference_doh_off">បិទ</string>
   <!-- Cancel button text for provider textfield under "DNS over HTTPS" -->
   <string name="preference_doh_provider_custom_dialog_cancel">បោះបង់</string>
   <!-- Cancel button text for the Add to Homescreen dialog -->
   <string name="add_to_homescreen_cancel">បោះបង់</string>
+  <!--
+    Autofill
+
+    Preference and title for managing the autofill settings
+  -->
+  <string name="preferences_autofill">បំពេញដោយស្វ័យប្រវត្តិ</string>
   <!-- The text for the "Cancel" button for cancelling adding, updating or deleting a credit card -->
   <string name="credit_cards_cancel_button">បោះបង់</string>
   <!-- The text for the "Cancel" button for cancelling adding, updating or deleting an address -->
@@ -557,15 +584,23 @@
   <string name="delete_language_file_dialog_negative_button_text">បោះបង់</string>
   <!-- Button text on the data saving mode warning dialog used by the translations feature to allow users to cancel the action and not perform a download of the language file. -->
   <string name="download_language_file_dialog_negative_button_text">បោះបង់</string>
+  <!-- Toggle if Enhanced Tracking Protection is turned off -->
+  <string name="protection_panel_etp_toggle_off">បិទ</string>
   <!-- Button text on the clear site data dialog to allow users to cancel the action and not clear the site data. -->
   <string name="clear_site_data_dialog_negative_button_text">បោះបង់</string>
+  <!-- The title of the autofill tab in the Debug Drawer. -->
+  <string name="debug_drawer_autofill_title">ឧបករណ៍បំពេញដោយស្វ័យប្រវត្តិ</string>
   <!-- The title of the button for deleting in the debug drawer all addresses. -->
   <string name="debug_drawer_delete_all_addresses">លុបអាសយដ្ឋានទាំងអស់</string>
   <!-- TextField Design System Component -->
 
   <!-- ==== Terms of use pop up prompt ==== -->
 
+  <!-- Terms of use link in the pop up prompt message that links to the terms of use -->
+  <string name="terms_of_use_prompt_link_terms_of_use">លក្ខខណ្ឌនៃការប្រើប្រាស់</string>
   <!-- ==== Experiment strings. ==== -->
 
+  <!-- A title for the popup prompt. -->
+  <string name="terms_of_use_prompt_title_option_a" tools:ignore="UnusedResources">លក្ខខណ្ឌនៃការប្រើប្រាស់</string>
   <!-- ==== End of Terms of use popup prompt. ==== -->
 </resources>
diff --git a/mobile/android/fenix/app/src/main/res/values-ml/strings.xml b/mobile/android/fenix/app/src/main/res/values-ml/strings.xml
index d404b8f0e2a16..61a8fae9a4cc0 100644
--- a/mobile/android/fenix/app/src/main/res/values-ml/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-ml/strings.xml
@@ -604,6 +604,8 @@
   <string name="nova_onboarding_tou_body_line_3_link_text">ക്രമീകരണങ്ങൾ കൈകാര്യം ചെയ്യുക</string>
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">പിന്തുടൎച്ചയന്ത്രങ്ങളോടു വിട പറഞ്ഞേറു്</string>
+  <!-- "Set to default" onboarding title. -->
+  <string name="nova_onboarding_set_to_default_title_2">ഉൾപ്പണിഞ്ഞ സ്വകാര്യതത്തോടെ എല്ലാ കണ്ണികളും തുറക്കുക</string>
   <!-- "Set to default" onboarding button. -->
   <string name="nova_onboarding_set_to_default_button">തനിമട്ടായ അന്വേഷിയായി വയ്ക്കുക</string>
   <!-- Toolbar selection onboarding title. -->
@@ -1045,6 +1047,8 @@
   <string name="restart_warning_dialog_button_positive_2">അടയാളം മാറ്റുക</string>
   <!-- Dialog button text for cancelling app icon change -->
   <string name="restart_warning_dialog_button_negative">റദ്ദാക്കുക</string>
+  <!-- Error message snackbar shown after the user tried to apply the new icon but the Android OS threw an error while updating existing app shortcuts (e.g. private mode shortcut) -->
+  <string name="shortcuts_update_error">പ്രയോഗയടയാളം പുതുക്കാൻ കഴിഞ്ഞില്ല. നിലവിലുള്ള കുറുക്കുവഴികൾ മാറ്റിയിട്ടു വീണ്ടും ശ്രമിക്കുക.</string>
   <!--
     Add-ons general availability nimbus message
 
@@ -1152,6 +1156,7 @@
   <!-- Preference switch for daily usage ping data collection -->
   <string name="preferences_daily_usage_ping_title">പ്രതിദിന ഉപയോഗ പിംഗ്</string>
   <string name="preferences_daily_usage_ping_description">സജീവ ഉപയോക്താക്കളുടെ കണക്കെടുക്കാൻ ഇതു് മോസ്സില്ലയെ സഹായിക്കുന്നു.</string>
+  <string name="preferences_daily_usage_ping_learn_more">നാൾത്തോറ ഉപയോഗ പിംഗിനെ കുറിച്ച് കൂടുതലറിയുക</string>
   <!-- Title for the crash reporting option in the privacy preferences dialog shown during onboarding. -->
   <string name="crash_reporting_snack_bar_message">അറിയിപ്പയച്ചു</string>
   <!-- Text for sumo link to learn more about crash reports in data collection screen -->
@@ -1602,6 +1607,8 @@
   <string name="download_delete_multi_select_dialog_confirm">മായ്ക്കുക</string>
   <!-- Alert dialog confirmation before deleting multiple download items, this is the negative action. -->
   <string name="download_delete_multi_select_dialog_cancel">റദ്ദാക്കുക</string>
+  <!-- Title for the alert dialog confirmation before renaming a download item. -->
+  <string name="download_rename_dialog_title">ഫയലിന്റെ പേരുമാറ്റുക</string>
   <!-- Label for the name field in the alert dialog confirmation before renaming a download item. -->
   <string name="download_rename_dialog_label">പേരു്</string>
   <string name="download_rename_dialog_confirm_button">കരുതിവയ്ക്കുക</string>
diff --git a/mobile/android/fenix/app/src/main/res/values-nl/strings.xml b/mobile/android/fenix/app/src/main/res/values-nl/strings.xml
index c687fd7619f9a..3ce2c864a6294 100644
--- a/mobile/android/fenix/app/src/main/res/values-nl/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-nl/strings.xml
@@ -646,6 +646,8 @@
   <string name="nova_onboarding_tou_body_line_3_link_text">Instellingen beheren</string>
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Zeg vaarwel tegen enge trackers</string>
+  <!-- "Set to default" onboarding title. -->
+  <string name="nova_onboarding_set_to_default_title_2">Open al uw koppelingen met ingebouwde privacy</string>
   <!-- "Set to default" onboarding subtitle. -->
   <string name="nova_onboarding_set_to_default_subtitle">We beschermen uw gegevens en voorkomen automatisch dat bedrijven uw klikken bespioneren.</string>
   <!-- "Set to default" onboarding button. -->
diff --git a/mobile/android/fenix/app/src/main/res/values-vi/strings.xml b/mobile/android/fenix/app/src/main/res/values-vi/strings.xml
index dfa007350c33d..0bd58bb2e09c1 100644
--- a/mobile/android/fenix/app/src/main/res/values-vi/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values-vi/strings.xml
@@ -646,6 +646,8 @@
   <string name="nova_onboarding_tou_body_line_3_link_text">Quản lý cài đặt</string>
   <!-- "Set to default" onboarding title. -->
   <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Nói lời tạm biệt với những kẻ theo dõi đáng sợ</string>
+  <!-- "Set to default" onboarding title. -->
+  <string name="nova_onboarding_set_to_default_title_2">Mở tất cả liên kết của bạn với tính năng bảo mật tích hợp sẵn</string>
   <!-- "Set to default" onboarding subtitle. -->
   <string name="nova_onboarding_set_to_default_subtitle">Chúng tôi bảo vệ dữ liệu của bạn và tự động chặn các công ty theo dõi hoạt động của bạn.</string>
   <!-- "Set to default" onboarding button. -->
diff --git a/mobile/android/focus-android/app/src/main/res/values-ia/strings.xml b/mobile/android/focus-android/app/src/main/res/values-ia/strings.xml
index e3c6fe68b4fed..5ff9a79a05fe3 100644
--- a/mobile/android/focus-android/app/src/main/res/values-ia/strings.xml
+++ b/mobile/android/focus-android/app/src/main/res/values-ia/strings.xml
@@ -55,9 +55,9 @@
   <!-- Menu item: Add the current page as a shortcut to the device's home screen (launcher). -->
   <string name="menu_add_to_home_screen">Adder al pagina initial</string>
   <!-- Menu item: Add the current site as a shortcut on the Home screen -->
-  <string name="menu_add_to_shortcuts">Adder al vias breve</string>
+  <string name="menu_add_to_shortcuts">Adder al accessos directe</string>
   <!-- Menu item: Remove the current site as a shortcut from the Home screen -->
-  <string name="menu_remove_from_shortcuts">Remover del vias breve</string>
+  <string name="menu_remove_from_shortcuts">Remover del accessos directe</string>
   <!-- Menu item: Shows information about features and changes that are new to this version -->
   <string name="menu_settings">Parametros</string>
   <string name="menu_about">A proposito</string>
@@ -295,7 +295,7 @@
     %s is the name of the app (for example "Firefox Focus" or "Firefox Klar")
     Shortcuts is a feature that allows the user to pin his favorite websites to Focus home screen so he can quickly access them.
   -->
-  <string name="preference_security_biometric_summary2">Disbloca per le dactylogramma si tu addeva le vias breve o quando un sito web jam es aperte in %s.</string>
+  <string name="preference_security_biometric_summary2">Disserra con dactylogramma si tu ha addite accessos directe o quando un sito web es ja aperte in %s.</string>
   <!--
     Preference Title: Secure Mode is a setting that prevents the app's content to show up in the "recent apps" screen
     and prevents the user from taking screenshots or casting the app to other displays.
@@ -456,7 +456,7 @@
   <!-- Snackbar action to immediately open the successfully downloaded file. -->
   <string name="download_snackbar_open">Aperir</string>
   <!-- Snackbar that will be displayed after a website has been added to shortcuts. -->
-  <string name="snackbar_added_to_shortcuts">Addite a vias breve!</string>
+  <string name="snackbar_added_to_shortcuts">Addite al accessos directe!</string>
   <string name="error_hostLookup_title">Servitor non trovate</string>
   <!--
     New Onboarding flow first screen title
@@ -541,7 +541,7 @@
     When enhanced tracking protection is disabled for the current session then we will show this warning in the "Add to home screen" dialog to
     let the user know that the shortcut will always be opened with enhanced tracking protection disabled.
   -->
-  <string name="dialog_addtohomescreen_tracking_protection2">Le via breve se aperira con le Protection antitraciamento reinfortiate disactivate</string>
+  <string name="dialog_addtohomescreen_tracking_protection2">Le accesso directe se aperira con le Protection antitraciamento reinfortiate disactivate</string>
   <!--
     The user visible name of the "notification channel" (Android 8+ feature) for the ongoing notification shown while a browsing session is active.
     The recommended maximum length is 40 characters; the value may be truncated if it is too long.
@@ -850,7 +850,7 @@
   <!-- Text for the dialog title for renaming a top site -->
   <string name="rename_top_site">Renominar</string>
   <!-- Placeholder text for the input field of rename top site -->
-  <string name="placeholder_rename_top_site">Nomine via-breve</string>
+  <string name="placeholder_rename_top_site">Nomine del accesso directe</string>
   <!--
     Text for context menu additional note.
     %1$s is a placeholder for the app name.

From 7b05f4e8ad03fe3bf2dcc681829a2f903bcb0105 Mon Sep 17 00:00:00 2001
From: Michael Hynson <mhynson@mozilla.com>
Date: Fri, 6 Feb 2026 21:51:35 +0000
Subject: [PATCH 76/93] Bug 2009463 - The Mozilla VPN button in the Manage
 Account menu should have an updated description. r=fluent-reviewers,kpatenio

Differential Revision: https://phabricator.services.mozilla.com/D282205
---
 browser/base/content/appmenu-viewcache.inc.xhtml | 2 +-
 browser/locales/en-US/browser/appmenu.ftl        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
index 2323fc42fb22b..df6b11e9c195d 100644
--- a/browser/base/content/appmenu-viewcache.inc.xhtml
+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -715,7 +715,7 @@
               <image class="PanelUI-fxa-menu-vpn-button ctaMenuLogo" role="presentation" />
               <label id="fxa-menu-header-title" crop="end" data-l10n-id="appmenuitem-vpn-title" />
             </hbox>
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-vpn-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-vpn-description-2" />
           </vbox>
         </toolbarbutton>
       </vbox>
diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
index 53b0f5cc359e1..4dfa661b404aa 100644
--- a/browser/locales/en-US/browser/appmenu.ftl
+++ b/browser/locales/en-US/browser/appmenu.ftl
@@ -317,7 +317,7 @@ appmenuitem-relay-title = { -relay-brand-short-name }
 appmenuitem-relay-description = Mask your real email and phone
 appmenuitem-services-relay-description = Launch email masks dashboard
 appmenuitem-vpn-title = { -mozilla-vpn-brand-name }
-appmenuitem-vpn-description = Protect your online activity
+appmenuitem-vpn-description-2 = Get whole-device protection
 
 appmenu-services-header = My services
 # "Mozilla" is intentionally hardcoded to prevent forks from replacing it

From 0d4257ea2890b989313c49a816ca8cdf51038058 Mon Sep 17 00:00:00 2001
From: Punam Dahiya <pdahiya@mozilla.com>
Date: Fri, 6 Feb 2026 22:38:07 +0000
Subject: [PATCH 77/93] Bug 2013412 - Close sidebar when entering immersive
 view in AI Window
 r=desktop-theme-reviewers,ai-frontend-reviewers,omc-reviewers,gcardieri,emcminn,sfoster

Differential Revision: https://phabricator.services.mozilla.com/D281736
---
 .../aiwindow/ui/modules/AIWindow.sys.mjs      |  19 ++-
 .../aiwindow/ui/test/browser/browser.toml     |   2 +
 .../test/browser/browser_aiwindow_firstrun.js |  53 -------
 .../browser/browser_aiwindow_immersive.js     | 138 ++++++++++++++++++
 .../modules/FeatureCalloutMessages.sys.mjs    |   1 +
 browser/themes/shared/aiWindowSidebar.css     |   8 +
 6 files changed, 166 insertions(+), 55 deletions(-)
 create mode 100644 browser/components/aiwindow/ui/test/browser/browser_aiwindow_immersive.js

diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
index 6f6fbfb6ba4f9..c77f2ade0aaff 100644
--- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
@@ -539,17 +539,32 @@ export const AIWindow = {
    * @param {Window} win
    */
   updateImmersiveView(currentURI, win) {
-    if (!currentURI || !this.isAIWindowActiveAndEnabled(win)) {
+    const root = win.document.getElementById("main-window");
+
+    if (!currentURI) {
+      return;
+    }
+
+    const aboutNewtabURI = Services.io.newURI("about:newtab");
+    const aboutHomeURI = Services.io.newURI("about:home");
+    const shouldHideSidebarForNewtab =
+      currentURI.equalsExceptRef(aboutNewtabURI) ||
+      currentURI.equalsExceptRef(aboutHomeURI);
+
+    if (!this.isAIWindowActiveAndEnabled(win)) {
+      root.toggleAttribute("hide-ai-sidebar", shouldHideSidebarForNewtab);
+      root.removeAttribute("aiwindow-immersive-view");
       return;
     }
 
     /* any URL that should have the immersive view */
     const validImmersiveURIs = [FIRSTRUN_URI, AIWINDOW_URI];
-    const root = win.document.getElementById("main-window");
     const isImmersiveView = validImmersiveURIs.some(uri =>
       uri.equalsExceptRef(currentURI)
     );
 
+    root.toggleAttribute("hide-ai-sidebar", isImmersiveView);
+
     /* sets attr only for first run for css reasons */
     const isFirstRun = currentURI.equalsExceptRef(FIRSTRUN_URI);
     root.toggleAttribute("aiwindow-first-run", isFirstRun && isImmersiveView);
diff --git a/browser/components/aiwindow/ui/test/browser/browser.toml b/browser/components/aiwindow/ui/test/browser/browser.toml
index 2ad161b6afca6..9c24006529507 100644
--- a/browser/components/aiwindow/ui/test/browser/browser.toml
+++ b/browser/components/aiwindow/ui/test/browser/browser.toml
@@ -28,6 +28,8 @@ support-files = [
 
 ["browser_aiwindow_firstrun.js"]
 
+["browser_aiwindow_immersive.js"]
+
 ["browser_aiwindow_integration.js"]
 
 ["browser_aiwindow_memories.js"]
diff --git a/browser/components/aiwindow/ui/test/browser/browser_aiwindow_firstrun.js b/browser/components/aiwindow/ui/test/browser/browser_aiwindow_firstrun.js
index c89623716bfe0..04a2b2f928814 100644
--- a/browser/components/aiwindow/ui/test/browser/browser_aiwindow_firstrun.js
+++ b/browser/components/aiwindow/ui/test/browser/browser_aiwindow_firstrun.js
@@ -286,56 +286,3 @@ add_task(async function test_firstrun_explainer_page_opens() {
   win.openLinkIn = originalOpenLinkIn;
   await SpecialPowers.popPrefEnv();
 });
-
-add_task(async function test_firstrun_immersive_view() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.smartwindow.enabled", true],
-      ["browser.smartwindow.firstrun.hasCompleted", false],
-    ],
-  });
-
-  const restoreSignIn = skipSignIn();
-
-  const exampleUrl = "https://example.com/";
-  const win = await openAIWindow();
-
-  await BrowserTestUtils.loadURIString({
-    browser: win.gBrowser.selectedTab.linkedBrowser,
-    uriString: FIRSTRUN_URL,
-  });
-
-  const chromeRoot = win.document.documentElement;
-  Assert.ok(
-    chromeRoot.hasAttribute("aiwindow-immersive-view"),
-    "Chrome window has the aiwindow-immersive-view attribute"
-  );
-  Assert.ok(
-    chromeRoot.hasAttribute("aiwindow-first-run"),
-    "Chrome window has the aiwindow-first-run attribute"
-  );
-
-  await BrowserTestUtils.loadURIString({
-    browser: win.gBrowser.selectedTab.linkedBrowser,
-    uriString: exampleUrl,
-  });
-
-  Assert.equal(
-    win.gBrowser.selectedTab.linkedBrowser.currentURI.spec,
-    exampleUrl,
-    "Example url tab should be open"
-  );
-
-  Assert.ok(
-    !chromeRoot.hasAttribute("aiwindow-immersive-view"),
-    "After firstrun tab is closed, the chrome window no longer has the aiwindow-immersive-view attribute"
-  );
-  Assert.ok(
-    !chromeRoot.hasAttribute("aiwindow-first-run"),
-    "After firstrun tab is closed, the chrome window no longer has the aiwindow-first-run attribute"
-  );
-
-  restoreSignIn();
-  await BrowserTestUtils.closeWindow(win);
-  await SpecialPowers.popPrefEnv();
-});
diff --git a/browser/components/aiwindow/ui/test/browser/browser_aiwindow_immersive.js b/browser/components/aiwindow/ui/test/browser/browser_aiwindow_immersive.js
new file mode 100644
index 0000000000000..c88e42da1c3ad
--- /dev/null
+++ b/browser/components/aiwindow/ui/test/browser/browser_aiwindow_immersive.js
@@ -0,0 +1,138 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { AIWindowUI } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs"
+);
+
+const FIRSTRUN_URL = "chrome://browser/content/aiwindow/firstrun.html";
+
+async function navigateAndWait(win, url) {
+  await BrowserTestUtils.loadURIString({
+    browser: win.gBrowser.selectedTab.linkedBrowser,
+    uriString: url,
+  });
+  await BrowserTestUtils.waitForCondition(
+    () => win.gBrowser.selectedBrowser.currentURI.spec === url,
+    `Should navigate to ${url}`
+  );
+}
+
+function assertSidebarHidden(win, context) {
+  const box = win.document.getElementById(AIWindowUI.BOX_ID);
+  const splitter = win.document.getElementById(AIWindowUI.SPLITTER_ID);
+
+  Assert.ok(BrowserTestUtils.isHidden(box), `Box should be hidden ${context}`);
+  Assert.ok(
+    BrowserTestUtils.isHidden(splitter),
+    `Splitter should be hidden ${context}`
+  );
+}
+
+function assertSidebarVisible(win, context) {
+  const box = win.document.getElementById(AIWindowUI.BOX_ID);
+  const splitter = win.document.getElementById(AIWindowUI.SPLITTER_ID);
+
+  Assert.ok(
+    BrowserTestUtils.isVisible(box),
+    `Box should be visible ${context}`
+  );
+  Assert.ok(
+    BrowserTestUtils.isVisible(splitter),
+    `Splitter should be visible ${context}`
+  );
+  Assert.equal(
+    AIWindowUI.isSidebarOpen(win),
+    true,
+    `Sidebar should be open ${context}`
+  );
+}
+
+add_task(async function test_firstrun_immersive_view() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.smartwindow.enabled", true],
+      ["browser.smartwindow.firstrun.hasCompleted", false],
+    ],
+  });
+
+  const win = await openAIWindow();
+  const chromeRoot = win.document.documentElement;
+
+  await navigateAndWait(win, FIRSTRUN_URL);
+
+  Assert.ok(
+    chromeRoot.hasAttribute("aiwindow-immersive-view"),
+    "Chrome window has the aiwindow-immersive-view attribute"
+  );
+  Assert.ok(
+    chromeRoot.hasAttribute("aiwindow-first-run"),
+    "Chrome window has the aiwindow-first-run attribute"
+  );
+
+  await navigateAndWait(win, "https://example.com/");
+
+  Assert.ok(
+    !chromeRoot.hasAttribute("aiwindow-immersive-view"),
+    "After firstrun tab is closed, the chrome window no longer has the aiwindow-immersive-view attribute"
+  );
+  Assert.ok(
+    !chromeRoot.hasAttribute("aiwindow-first-run"),
+    "After firstrun tab is closed, the chrome window no longer has the aiwindow-first-run attribute"
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+  await SpecialPowers.popPrefEnv();
+});
+
+add_task(async function test_open_sidebar_immersive_view() {
+  const sb = this.sinon.createSandbox();
+  registerCleanupFunction(() => sb.restore());
+
+  sb.stub(this.openAIEngine, "build");
+
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.smartwindow.enabled", true],
+      ["browser.smartwindow.firstrun.hasCompleted", false],
+    ],
+  });
+
+  const win = await openAIWindow();
+  const chromeRoot = win.document.documentElement;
+  await navigateAndWait(win, FIRSTRUN_URL);
+
+  Assert.ok(
+    chromeRoot.hasAttribute("aiwindow-immersive-view"),
+    "Chrome window has the aiwindow-immersive-view attribute"
+  );
+
+  AIWindowUI.openSidebar(win);
+  assertSidebarHidden(win, "when openSidebar called on firstrun page");
+
+  await navigateAndWait(win, "https://example.com/");
+
+  await BrowserTestUtils.waitForMutationCondition(
+    chromeRoot,
+    { attributes: true },
+    () => !chromeRoot.hasAttribute("aiwindow-immersive-view")
+  );
+
+  assertSidebarVisible(win, "after navigating away from firstrun");
+
+  await navigateAndWait(win, AIWINDOW_URL);
+
+  await BrowserTestUtils.waitForMutationCondition(
+    chromeRoot,
+    { attributes: true },
+    () => chromeRoot.hasAttribute("aiwindow-immersive-view")
+  );
+
+  assertSidebarHidden(win, "when viewing AI Window URL");
+
+  AIWindowUI.closeSidebar(win);
+  await BrowserTestUtils.closeWindow(win);
+  await SpecialPowers.popPrefEnv();
+});
diff --git a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
index fd0c8dae66461..d3bf6737b4e3b 100644
--- a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
+++ b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
@@ -1223,6 +1223,7 @@ const MESSAGES = () => {
       },
       targeting:
         "isAIWindow && 'browser.smartwindow.firstrun.hasCompleted' | preferenceValue",
+      skip_in_tests: "it's not tested in automation",
       trigger: {
         id: "smartWindowNewTab",
       },
diff --git a/browser/themes/shared/aiWindowSidebar.css b/browser/themes/shared/aiWindowSidebar.css
index e8dcf422431a3..7d787990a1eb1 100644
--- a/browser/themes/shared/aiWindowSidebar.css
+++ b/browser/themes/shared/aiWindowSidebar.css
@@ -6,6 +6,14 @@
   --ai-window-sidebar-width-default: 412px;
 }
 
+/* Hide AI window sidebar on about:newtab, about:home, firstrun, and AI Window URL */
+:root[hide-ai-sidebar] {
+  #ai-window-box,
+  #ai-window-splitter {
+    display: none;
+  }
+}
+
 .ai-window-right-sidebar {
   width: var(--ai-window-sidebar-width-default);
 }

From 12e053d842ccaa9d6c140f0c772eb7ed1362d949 Mon Sep 17 00:00:00 2001
From: unifolia <jlewis@mozilla.com>
Date: Fri, 6 Feb 2026 23:36:27 +0000
Subject: [PATCH 78/93] Bug 2014737 - Add Window Switcher Box Shadow Styling
 r=desktop-theme-reviewers,sfoster

Differential Revision: https://phabricator.services.mozilla.com/D282030
---
 browser/themes/shared/browser-shared.css | 12 +++++++++---
 browser/themes/shared/toolbarbuttons.css |  4 ++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
index 0ba7d1a97abed..95aa65085704a 100644
--- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css
@@ -1400,12 +1400,18 @@ popupnotificationcontent {
   padding-inline-end: var(--space-small);
   border-radius: var(--border-radius-medium);
 
+  /* Toggle button icon is designed to be slightly larger at 20px */
+  > .toolbarbutton-icon {
+    padding: 8px;
+    box-shadow: 0 0 16px 4px var(--box-shadow-color-darker-layer-1) inset;
+  }
+
   :root[ai-window] & {
     list-style-image: url("chrome://browser/skin/ai-window.svg");
-  }
 
-  > .toolbarbutton-icon {
-    padding: 8px;
+    > .toolbarbutton-icon {
+      box-shadow: 0 0 16px 4px var(--smartwindow-toggle-shadow-color) inset;
+    }
   }
 }
 
diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
index ebece618b7c68..56c00ebba95d5 100644
--- a/browser/themes/shared/toolbarbuttons.css
+++ b/browser/themes/shared/toolbarbuttons.css
@@ -56,6 +56,10 @@
   --smartwindow-ask-btn-icon-stroke-color: light-dark(#ecbcea, var(--color-violet-40));
   --smartwindow-ask-btn-icon-height: var(--size-item-small);
   --smartwindow-ask-btn-icon-width: var(--size-item-small);
+  --smartwindow-toggle-shadow-color: light-dark(
+    color-mix(in srgb, var(--color-violet-60) 20%, transparent),
+    color-mix(in srgb, var(--color-violet-40) 20%, transparent)
+  );
 }
 
 #TabsToolbar {

From 670eb2adbc70900fb1077437e452e698b0aaf488 Mon Sep 17 00:00:00 2001
From: Iain Ireland <iireland@mozilla.com>
Date: Sat, 7 Feb 2026 00:10:16 +0000
Subject: [PATCH 79/93] Bug 2013562: Enter correct realm before resolving
 same-thread waitAsync promise r=arai

Differential Revision: https://phabricator.services.mozilla.com/D281314
---
 js/src/builtin/AtomicsObject.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/builtin/AtomicsObject.cpp b/js/src/builtin/AtomicsObject.cpp
index 2af47ca92bf2e..8c71ffe49cf71 100644
--- a/js/src/builtin/AtomicsObject.cpp
+++ b/js/src/builtin/AtomicsObject.cpp
@@ -1521,6 +1521,7 @@ bool js::atomics_notify_impl(JSContext* cx, SharedArrayRawBuffer* sarb,
   // avoid mutex ordering problems.
   RootedValue resultMsg(cx, StringValue(cx->names().ok));
   for (uint32_t i = 0; i < promisesToResolve.length(); i++) {
+    AutoRealm ar(cx, promisesToResolve[i]);
     if (!PromiseObject::resolve(cx, promisesToResolve[i], resultMsg)) {
       MOZ_ASSERT(cx->isThrowingOutOfMemory() || cx->isThrowingOverRecursed());
       return false;

From 47d7324df61945d7f52a9517b38f9302c7a05cb1 Mon Sep 17 00:00:00 2001
From: Alex Hochheiden <ahochheiden@mozilla.com>
Date: Sat, 7 Feb 2026 00:16:09 +0000
Subject: [PATCH 80/93] Bug 2010200 - Add default `distribution.ini` for
 official Linux builds
 r=firefox-build-system-reviewers,glandium,omc-reviewers,mimi

Differential Revision: https://phabricator.services.mozilla.com/D281651
---
 browser/app/distribution/distribution.ini     |  4 ++++
 browser/app/distribution/moz.build            | 12 ++++++++++
 browser/app/moz.build                         |  2 ++
 .../about/browser_aboutDialog_distribution.js |  8 +++++++
 .../browser/browser_asrouter_targeting.js     | 20 +++++++++++-----
 .../components/uitour/test/browser_UITour.js  | 21 +++++++++++------
 browser/config/mozconfigs/linux64/common-opt  |  2 ++
 browser/installer/package-manifest.in         |  4 ++++
 .../test/browser/browser_ClientEnvironment.js | 23 ++++++++++++-------
 toolkit/modules/AppConstants.sys.mjs          |  7 ++++++
 toolkit/moz.configure                         |  6 +++++
 tools/update-packaging/common.sh              |  3 ++-
 12 files changed, 90 insertions(+), 22 deletions(-)
 create mode 100644 browser/app/distribution/distribution.ini
 create mode 100644 browser/app/distribution/moz.build

diff --git a/browser/app/distribution/distribution.ini b/browser/app/distribution/distribution.ini
new file mode 100644
index 0000000000000..5c16c3bab161e
--- /dev/null
+++ b/browser/app/distribution/distribution.ini
@@ -0,0 +1,4 @@
+[Global]
+id=mozilla-official
+version=1.0
+about=Mozilla Firefox Official Build
\ No newline at end of file
diff --git a/browser/app/distribution/moz.build b/browser/app/distribution/moz.build
new file mode 100644
index 0000000000000..a97ea6cce4bff
--- /dev/null
+++ b/browser/app/distribution/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIST_SUBDIR = ""
+
+if CONFIG["BUILT_BY_MOZILLA"]:
+    FINAL_TARGET_FILES.distribution += [
+        "distribution.ini",
+    ]
diff --git a/browser/app/moz.build b/browser/app/moz.build
index a23bb7812a03b..b5f5461fd0835 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -29,6 +29,8 @@ with Files("profile/channel-prefs.js"):
 with Files("profile/firefox.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
+DIRS += ["distribution"]
+
 if CONFIG["MOZ_MACBUNDLE_NAME"]:
     DIRS += ["macbuild/Contents"]
 
diff --git a/browser/base/content/test/about/browser_aboutDialog_distribution.js b/browser/base/content/test/about/browser_aboutDialog_distribution.js
index 8f52533bbc52c..65c8b00487d6d 100644
--- a/browser/base/content/test/about/browser_aboutDialog_distribution.js
+++ b/browser/base/content/test/about/browser_aboutDialog_distribution.js
@@ -13,6 +13,14 @@ add_task(async function verify_distribution_info_hides() {
 
   defaultBranch.setCharPref("distribution.id", "mozilla-test-distribution-id");
   defaultBranch.setCharPref("distribution.version", "1.0");
+  if (
+    !(
+      AppConstants.platform === "win" &&
+      Services.sysinfo.getProperty("hasWinPackageId")
+    )
+  ) {
+    defaultBranch.setCharPref("distribution.about", "");
+  }
 
   let aboutDialog = await waitForAboutDialog();
 
diff --git a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
index 2fd4dfde9584b..5fbcd72df48d5 100644
--- a/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
+++ b/browser/components/asrouter/tests/browser/browser_asrouter_targeting.js
@@ -1212,6 +1212,7 @@ add_task(async function checkPatternsValid() {
 
 add_task(async function check_isChinaRepack() {
   const prefDefaultBranch = Services.prefs.getDefaultBranch("distribution.");
+  const originalDistributionId = prefDefaultBranch.getCharPref("id", "");
   const messages = [
     { id: "msg_for_china_repack", targeting: "isChinaRepack == true" },
     { id: "msg_for_everyone_else", targeting: "isChinaRepack == false" },
@@ -1254,7 +1255,7 @@ add_task(async function check_isChinaRepack() {
     "should select the message for non China repack users"
   );
 
-  prefDefaultBranch.deleteBranch("");
+  prefDefaultBranch.setCharPref("id", originalDistributionId);
 });
 
 add_task(async function check_userId() {
@@ -1513,22 +1514,29 @@ add_task(async function check_userPrefersReducedMotion() {
 });
 
 add_task(async function test_distributionId() {
+  let expectedDefault = Services.prefs
+    .getDefaultBranch(null)
+    .getCharPref("distribution.id", "");
   is(
     ASRouterTargeting.Environment.distributionId,
-    "",
-    "Should return an empty distribution Id"
+    expectedDefault,
+    "Should return the expected default distribution Id"
   );
 
   Services.prefs.getDefaultBranch(null).setCharPref("distribution.id", "test");
-
   is(
     ASRouterTargeting.Environment.distributionId,
     "test",
     "Should return the correct distribution Id"
   );
 
-  // clean up default branch distribution.id
-  Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
+  if (expectedDefault) {
+    Services.prefs
+      .getDefaultBranch(null)
+      .setCharPref("distribution.id", expectedDefault);
+  } else {
+    Services.prefs.getDefaultBranch(null).deleteBranch("distribution.id");
+  }
 });
 
 add_task(async function test_fxViewButtonAreaType_default() {
diff --git a/browser/components/uitour/test/browser_UITour.js b/browser/components/uitour/test/browser_UITour.js
index 662a58dff1503..4e5867b3726f0 100644
--- a/browser/components/uitour/test/browser_UITour.js
+++ b/browser/components/uitour/test/browser_UITour.js
@@ -509,15 +509,22 @@ var tests = [
         "undefined",
         "Check distribution isn't undefined."
       );
-      // distribution id defaults to "default" for most builds, and
-      // "mozilla-MSIX" for MSIX builds.
+      // distribution id defaults to "default" for most builds,
+      // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
+      // official Mozilla builds.
+      let expectedDistribution = "default";
+      if (
+        AppConstants.platform === "win" &&
+        Services.sysinfo.getProperty("hasWinPackageId")
+      ) {
+        expectedDistribution = "mozilla-MSIX";
+      } else if (AppConstants.BUILT_BY_MOZILLA) {
+        expectedDistribution = "mozilla-official";
+      }
       is(
         result.distribution,
-        AppConstants.platform === "win" &&
-          Services.sysinfo.getProperty("hasWinPackageId")
-          ? "mozilla-MSIX"
-          : "default",
-        'Should be "default" without preference set.'
+        expectedDistribution,
+        "Should have expected distribution value."
       );
 
       let defaults = Services.prefs.getDefaultBranch("distribution.");
diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
index 7181c511ba8b7..179a31324acc6 100644
--- a/browser/config/mozconfigs/linux64/common-opt
+++ b/browser/config/mozconfigs/linux64/common-opt
@@ -10,5 +10,7 @@ ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+ac_add_options --built-by-mozilla
+
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index d3ef68f4c184a..7eb90525444dc 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -449,3 +449,7 @@ bin/libfreebl_64int_3.so
 #if defined(DESKTOP_LAUNCHER_ENABLED)
 @BINPATH@/desktop-launcher/desktop-launcher@BIN_SUFFIX@
 #endif
+
+#if defined(BUILT_BY_MOZILLA)
+@RESPATH@/distribution/*
+#endif
diff --git a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
index f1322cffae248..76ba82d9a5e27 100644
--- a/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
+++ b/toolkit/components/normandy/test/browser/browser_ClientEnvironment.js
@@ -62,21 +62,28 @@ add_task(async function testUserId() {
 });
 
 add_task(async function testDistribution() {
-  // distribution id defaults to "default" for most builds, and
-  // "mozilla-MSIX" for MSIX builds.
+  // distribution id defaults to "default" for most builds,
+  // "mozilla-MSIX" for MSIX builds, and "mozilla-official" for
+  // official Mozilla builds.
+  let expectedDistribution = "default";
+  if (
+    AppConstants.platform === "win" &&
+    Services.sysinfo.getProperty("hasWinPackageId")
+  ) {
+    expectedDistribution = "mozilla-MSIX";
+  } else if (AppConstants.BUILT_BY_MOZILLA) {
+    expectedDistribution = "mozilla-official";
+  }
   is(
     ClientEnvironment.distribution,
-    AppConstants.platform === "win" &&
-      Services.sysinfo.getProperty("hasWinPackageId")
-      ? "mozilla-MSIX"
-      : "default",
+    expectedDistribution,
     "distribution has a default value"
   );
 
   // distribution id is read from a preference
   Services.prefs
     .getDefaultBranch(null)
-    .setStringPref("distribution.id", "funnelcake");
+    .setCharPref("distribution.id", "funnelcake");
   is(
     ClientEnvironment.distribution,
     "funnelcake",
@@ -84,7 +91,7 @@ add_task(async function testDistribution() {
   );
   Services.prefs
     .getDefaultBranch(null)
-    .setStringPref("distribution.id", "default");
+    .setCharPref("distribution.id", "default");
 });
 
 const mockClassify = { country: "FR", request_time: new Date(2017, 1, 1) };
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
index 7c57a768e679a..a51aa0459c5c4 100644
--- a/toolkit/modules/AppConstants.sys.mjs
+++ b/toolkit/modules/AppConstants.sys.mjs
@@ -31,6 +31,13 @@ export var AppConstants = Object.freeze({
 
   MOZ_OFFICIAL_BRANDING: @MOZ_OFFICIAL_BRANDING_BOOL@,
 
+  BUILT_BY_MOZILLA:
+#ifdef BUILT_BY_MOZILLA
+  true,
+#else
+  false,
+#endif
+
   MOZ_DEV_EDITION: @MOZ_DEV_EDITION_BOOL@,
 
   MOZ_SERVICES_SYNC: @MOZ_SERVICES_SYNC_BOOL@,
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 64f527d9e8053..c301e8ab4e5dd 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -94,6 +94,12 @@ option(
 )
 set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
 
+option(
+    "--built-by-mozilla",
+    help="Enable Mozilla official build designation",
+)
+set_config("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
+set_define("BUILT_BY_MOZILLA", depends("--built-by-mozilla")(lambda v: bool(v) or None))
 
 @depends("MOZ_APP_VENDOR", build_project)
 def check_moz_app_vendor(moz_app_vendor, build_project):
diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh
index e055b1c24efd5..be2061b98cbba 100755
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -95,7 +95,8 @@ check_for_add_if_not_update() {
   if [[ "$(basename "$add_if_not_file_chk")" = "channel-prefs.js" || \
         "$add_if_not_file_chk" =~ (^|/)ChannelPrefs\.framework/ || \
         "$(basename "$add_if_not_file_chk")" = "update-settings.ini" || \
-        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ ]]; then
+        "$add_if_not_file_chk" =~ (^|/)UpdateSettings\.framework/ || \
+        "$(basename "$add_if_not_file_chk")" = "distribution.ini" ]]; then
     ## "true"
     return 0;
   fi

From bab4a2cae152c1eec16b08b27730d27a97994633 Mon Sep 17 00:00:00 2001
From: David Shin <dshin@mozilla.com>
Date: Sat, 7 Feb 2026 00:19:10 +0000
Subject: [PATCH 81/93] Bug 2013351: Don't crash trying to collapse :has()
 invalidations in @scope with empty rules.
 r=firefox-style-system-reviewers,emilio

Differential Revision: https://phabricator.services.mozilla.com/D282213
---
 .../invalidation/element/relative_selector.rs | 11 ++++++--
 .../css/css-cascade/scope-has-crash.html      | 27 +++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 testing/web-platform/tests/css/css-cascade/scope-has-crash.html

diff --git a/servo/components/style/invalidation/element/relative_selector.rs b/servo/components/style/invalidation/element/relative_selector.rs
index a2d9ec9d6f17d..92856553d04e9 100644
--- a/servo/components/style/invalidation/element/relative_selector.rs
+++ b/servo/components/style/invalidation/element/relative_selector.rs
@@ -384,8 +384,15 @@ fn invalidation_can_collapse(
         // Cases like `:is(.item .foo) :is(.item .foo)` where `.item` invalidates would
         // point to different dependencies, pointing to the same outer selector, but
         // differing in selector offset.
-        let a_n = &a_deps.as_ref().slice()[0];
-        let b_n = &b_deps.as_ref().slice()[0];
+        let a_nexts = a_deps.as_ref().slice();
+        let b_nexts = b_deps.as_ref().slice();
+        if a_nexts.is_empty()|| b_nexts.is_empty() {
+            // Can happen when we get out to empty @scope() rules.
+            // If they're both empty, we can just do nothing for both.
+            return a_nexts.is_empty() == b_nexts.is_empty();
+        }
+        let a_n = &a_nexts[0];
+        let b_n = &b_nexts[0];
         if SelectorKey::new(&a_n.selector) != SelectorKey::new(&b_n.selector) {
             return false;
         }
diff --git a/testing/web-platform/tests/css/css-cascade/scope-has-crash.html b/testing/web-platform/tests/css/css-cascade/scope-has-crash.html
new file mode 100644
index 0000000000000..fe10f9a25817e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-cascade/scope-has-crash.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Firefox bug: Crash when collapsing :has() invalidation with empty @scope rule</title>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=2013351">
+<link rel="author" href="mailto:dshin@mozilla.com">
+<style>
+@scope (:not(:has(:nth-child(2 of .category)))) {
+    .category {
+      grid-column:span 2
+    }
+}
+
+@scope (.category-wrap:has(:nth-child(2 of .category))) {
+  /* Non-matching @media-rule, etc */
+}
+</style>
+<div id=dut class=category-wrap>
+  <div class=department></div>
+  <div class=category></div>
+  <div class=category></div>
+</div>
+<script>
+// Force layout so that we trigger an invalidation below.
+getComputedStyle(dut).height;
+const d = document.createElement("div");
+d.classList.add('category');
+dut.appendChild(d);
+</script>

From fca3104d606fde1868e918c86908de9cee4444ff Mon Sep 17 00:00:00 2001
From: James Teh <jteh@mozilla.com>
Date: Sat, 7 Feb 2026 00:46:53 +0000
Subject: [PATCH 82/93] Bug 2012651: Fix caret coordinates at the start of a
 paragraph preceded by a line of other text. r=morgan

This was breaking Text Cursor Indicator when typing into an impacted text box.
This was caused by a cascade of problems:

1. Previously, we explicitly never set mIsEndOfLineInsertionPoint to true at the start of a paragraph. This is exactly the case we're dealing with here and that behaviour is incorrect. Instead, we now have a much narrower check for the specific exception we're trying to detect: the start of the editor.
2. GetCaretRect vertically aligns the rect to the top of the line. To do this, it relies on mIsEndOfLineInsertionPoint being set correctly, which it wasn't previously. Thus, GetCaretRect was using the first character on the next line, resulting in a rect with negative height.
3. UIA calls TextLeafRange::LineRects, which clips the bounds to the content area. Since the caret rect previously had negative height, it was clipped completely and removed. Thus, UIA previously returned no bounds at all.

All of this is fixed by correctly setting mIsEndOfLineInsertionPoint in this case.

Differential Revision: https://phabricator.services.mozilla.com/D281126
---
 accessible/base/TextLeafRange.cpp             | 22 +++++--
 .../browser/bounds/browser_caret_rect.js      | 49 ++++++++++++++-
 .../tests/browser/text/browser_text_caret.js  | 60 ++++++++++++++++++-
 3 files changed, 123 insertions(+), 8 deletions(-)

diff --git a/accessible/base/TextLeafRange.cpp b/accessible/base/TextLeafRange.cpp
index aae9ec1850da2..2d6fd4d10ae1b 100644
--- a/accessible/base/TextLeafRange.cpp
+++ b/accessible/base/TextLeafRange.cpp
@@ -661,6 +661,18 @@ static bool IsCaretValid(TextLeafPoint aPoint) {
   return focus->State() & states::EDITABLE;
 }
 
+static bool IsStartOfFocusedEditor(TextLeafPoint& aPoint) {
+  if (aPoint.mOffset != 0) {
+    return false;
+  }
+  Accessible* focus = FocusMgr() ? FocusMgr()->FocusedAccessible() : nullptr;
+  if (!focus || !(focus->State() & states::EDITABLE)) {
+    // There isn't a focused editor.
+    return false;
+  }
+  return aPoint == TextLeafPoint(focus, 0);
+}
+
 /*** TextLeafPoint ***/
 
 TextLeafPoint::TextLeafPoint(Accessible* aAcc, int32_t aOffset) {
@@ -1149,17 +1161,19 @@ TextLeafPoint TextLeafPoint::GetCaret(Accessible* aAcc) {
       // node.
       // 3. The caret is somewhere other than the start of a line and the user
       // presses down or up arrow to move by line.
+      // 4. The user focuses a contentEditable and the caret is positioned on
+      // the first character.
       if (point.mOffset <
           static_cast<int32_t>(nsAccUtils::TextLength(point.mAcc))) {
         // The caret is at the end of a line if the point is at the start of a
-        // line but not at the start of a paragraph.
+        // line but not the start of a focused editor.
         point.mIsEndOfLineInsertionPoint =
             point.FindPrevLineStartSameLocalAcc(/* aIncludeOrigin */ true) ==
                 point &&
-            !point.IsParagraphStart();
+            !IsStartOfFocusedEditor(point);
       } else {
-        // This is the end of a node. CaretAssociationHint::Before is only used
-        // at the end of a node if the caret is at the end of a line.
+        // CaretAssociationHint::Before is only used at the end of a node if the
+        // caret is both at the end of a node and at the end of a line.
         point.mIsEndOfLineInsertionPoint = true;
       }
     }
diff --git a/accessible/tests/browser/bounds/browser_caret_rect.js b/accessible/tests/browser/bounds/browser_caret_rect.js
index dd388961a7dda..0e2748f9ec7f6 100644
--- a/accessible/tests/browser/bounds/browser_caret_rect.js
+++ b/accessible/tests/browser/bounds/browser_caret_rect.js
@@ -88,7 +88,10 @@ function testCaretRect(
   atLineEnd = false,
   isVertical = false
 ) {
-  const acc = findAccessibleChildByID(docAcc, id, [nsIAccessibleText]);
+  const acc = findAccessibleChildByID(docAcc, id, [
+    nsIAccessibleText,
+    nsIAccessibleHyperText,
+  ]);
   is(acc.caretOffset, offset, `Caret at offset ${offset}`);
   const atEnd = offset == acc.characterCount;
   const empty = offset == 0 && atEnd;
@@ -102,8 +105,11 @@ function testCaretRect(
 
   const [caretX, caretY, caretW, caretH] = getCaretRect(docAcc, id);
 
-  if (!empty) {
-    // In case of an empty input `getRangeExtents()` will return the full accessible bounds.
+  // In case of an empty input `getRangeExtents()` will return the full accessible bounds.
+  // When called on an embedded object, `getRangeExtents()` will return the
+  // bounds for the content inside it, so it isn't a collapsed range and thus it
+  // won't match the caret.
+  if (!empty && acc.getLinkIndexAtOffset(offset) == -1) {
     let [currRangeX, currRangeY, currRangeW] = getCollapsedRangeExtents(
       acc,
       acc.caretOffset
@@ -555,3 +561,40 @@ addAccessibleTask(
     }
   }
 );
+
+/**
+ * Test a contentEditable with a paragraph containing a line break.
+ */
+addAccessibleTask(
+  `
+<style>
+  @font-face {
+    font-family: Ahem;
+    src: url(${CURRENT_CONTENT_DIR}e10s/fonts/Ahem.sjs);
+  }
+  #editable {
+    font: 10px/10px Ahem;
+  }
+</style>
+<div id="editable" contenteditable>a<p><br></p></div>
+  `,
+  async function testEditablePBr(browser, docAcc) {
+    const editable = findAccessibleChildByID(docAcc, "editable", [
+      nsIAccessibleText,
+    ]);
+    const fetchedBounds = await fetchCollapsedRangeBounds(docAcc, editable);
+
+    info("Focusing editable");
+    let moved = waitForEvent(EVENT_FOCUS, editable);
+    editable.takeFocus();
+    await moved;
+    testCaretRect(docAcc, "editable", 0, fetchedBounds);
+
+    info("Pressing ArrowRight");
+    moved = waitForEvent(EVENT_TEXT_CARET_MOVED);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    await moved;
+    testCaretRect(docAcc, "editable", 1, fetchedBounds, true);
+  },
+  { chrome: true, topLevel: true }
+);
diff --git a/accessible/tests/browser/text/browser_text_caret.js b/accessible/tests/browser/text/browser_text_caret.js
index ab8898fdd3dc9..cdb6483452c90 100644
--- a/accessible/tests/browser/text/browser_text_caret.js
+++ b/accessible/tests/browser/text/browser_text_caret.js
@@ -19,8 +19,10 @@ addAccessibleTask(
           cols="6">ab cd e</textarea>
 <textarea id="empty"></textarea>
 <div id="contentEditable" contenteditable>a<span>b</span></div>
+<div id="editableWithTextThenP" contenteditable>a<p>b</p></div>
+<div id="editableWithTextAndLink" contenteditable>a<a href="#">b</a>c</div>
   `,
-  async function (browser, docAcc) {
+  async function testRetrieval(browser, docAcc) {
     const textarea = findAccessibleChildByID(docAcc, "textarea", [
       nsIAccessibleText,
     ]);
@@ -513,6 +515,62 @@ addAccessibleTask(
       kOk,
       kOk
     );
+
+    const editableWithTextThenP = findAccessibleChildByID(
+      docAcc,
+      "editableWithTextThenP",
+      [nsIAccessibleText]
+    );
+    info("Focusing editableWithTextThenP");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextThenP);
+    editableWithTextThenP.takeFocus();
+    evt = await caretMoved;
+    is(
+      editableWithTextThenP.caretOffset,
+      0,
+      "Initial caret offset in editableWithTextThenP is 0"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
+    info("Pressing ArrowRight");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextThenP);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    evt = await caretMoved;
+    is(
+      editableWithTextThenP.caretOffset,
+      1,
+      "Caret offset is 1 after ArrowRight"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(evt.isAtEndOfLine, "Caret is at end of line");
+
+    const editableWithTextAndLink = findAccessibleChildByID(
+      docAcc,
+      "editableWithTextAndLink",
+      [nsIAccessibleText]
+    );
+    info("Focusing editableWithTextAndLink");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextAndLink);
+    editableWithTextAndLink.takeFocus();
+    evt = await caretMoved;
+    is(
+      editableWithTextAndLink.caretOffset,
+      0,
+      "Initial caret offset in editableWithTextAndLink is 0"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
+    info("Pressing ArrowRight");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextAndLink);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    evt = await caretMoved;
+    is(
+      editableWithTextAndLink.caretOffset,
+      1,
+      "Caret offset is 1 after ArrowRight"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
   },
   { chrome: true, topLevel: true, iframe: true, remoteIframe: true }
 );

From 55fad69dde3deb3f5092253fe61d28e18dc4069b Mon Sep 17 00:00:00 2001
From: ffxbld <ffxbld@mozilla.com>
Date: Sat, 7 Feb 2026 00:56:59 +0000
Subject: [PATCH 83/93] No Bug, mozilla-central repo-update HSTS HPKP
 remote-settings tld-suffixes ct-logs - r=release-managers,RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D282245
---
 netwerk/dns/effective_tld_names.dat           |   18 +-
 security/ct/CTKnownLogs.h                     |    2 +-
 security/manager/ssl/StaticHPKPins.h          |    2 +-
 security/manager/ssl/nsSTSPreloadList.inc     | 1388 +++++++--
 .../dumps/blocklists/addons-bloomfilters.json | 2540 ++++++++++++++++-
 .../main/devtools-compatibility-browsers.json |  173 +-
 .../dumps/security-state/intermediates.json   |  925 +++++-
 7 files changed, 4682 insertions(+), 366 deletions(-)

diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index b65511cb0981e..9808d3fa5ef16 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -5,8 +5,8 @@
 // Please pull this list from, and only from https://publicsuffix.org/list/public_suffix_list.dat,
 // rather than any other VCS sites. Pulling from any other URL is not guaranteed to be supported.
 
-// VERSION: 2026-02-03_15-38-45_UTC
-// COMMIT: 861415c92b65ca607a83cbef8ba273600114fa02
+// VERSION: 2026-02-06_07-36-46_UTC
+// COMMIT: d6c92f1bbb7433e5db7b8405c25d4035fb8ff376
 
 // Instructions on pulling and using this list can be found at https://publicsuffix.org/list/.
 
@@ -13274,21 +13274,33 @@ dyndns.ws
 mypets.ws
 
 // Dynu.com : https://www.dynu.com/
-// Submitted by Sue Ye <sue@dynu.com>
+// Submitted by Sue Ye <psl-contact@dynu.com>
+1cooldns.com
+bumbleshrimp.com
 ddnsfree.com
 ddnsgeek.com
+ddnsguru.com
+dynuddns.com
+dynuhosting.com
 giize.com
 gleeze.com
 kozow.com
 loseyourip.com
 ooguy.com
+pivohosting.com
 theworkpc.com
+wiredbladehosting.com
 casacam.net
 dynu.net
+dynuddns.net
+mysynology.net
+opik.net
+spryt.net
 accesscam.org
 camdvr.org
 freeddns.org
 mywire.org
+roxa.org
 webredirect.org
 myddns.rocks
 
diff --git a/security/ct/CTKnownLogs.h b/security/ct/CTKnownLogs.h
index 5ec73ca1bdf17..a751bb6c319f2 100644
--- a/security/ct/CTKnownLogs.h
+++ b/security/ct/CTKnownLogs.h
@@ -14,7 +14,7 @@
 
 #include <stddef.h>
 
-static const PRTime kCTExpirationTime = INT64_C(1776353538000000);
+static const PRTime kCTExpirationTime = INT64_C(1776473243000000);
 
 namespace mozilla::ct {
 
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h
index 7b1a1b0e92961..c0a3916bccb56 100644
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -681,4 +681,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1778772724101000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1778892414006000);
diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc
index ed5402850084e..85877a57c13b9 100644
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
+const PRTime gPreloadListExpirationTime = INT64_C(1781311608869000);
 %%
 0--1.de, 1
 0-0.io, 1
@@ -16,7 +16,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 0-1.party, 1
 0-24.com, 1
 0-24.net, 1
-0-9.com, 1
 0-nuisibles.fr, 1
 0.com.ms, 1
 0.sb, 1
@@ -299,6 +298,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 0x76.de, 1
 0x7d7b.net, 1
 0x7fffffff.net, 0
+0x90.dk, 1
 0x90.io, 1
 0x90.space, 1
 0xaa55.me, 1
@@ -320,6 +320,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 0yen.org, 1
 1-2-3bounce.co.uk, 1
 1-800-mattress.com, 1
+1-800-payment.com, 1
 1-inv.com, 1
 1-news.net, 1
 1-pujcky-uvery.tk, 1
@@ -363,6 +364,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 100ballov.tk, 1
 100beauty.com, 1
 100bib.ru, 1
+100car.pl, 1
 100kraz.ga, 1
 100nome.com, 1
 100pay.com, 1
@@ -389,7 +391,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 101010.hopto.org, 1
 101010.pl, 1
 10161997.xyz, 1
-10198.com, 1
 101android.ru, 0
 101st-airborne.tk, 1
 101st.tk, 1
@@ -533,7 +534,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 11321365.com, 1
 11333837.com, 1
 113z6.com, 1
-11400.com, 1
 11443837.com, 0
 114514ss.com, 1
 114online.com, 1
@@ -542,7 +542,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 1174healing.com, 1
 117766.xyz, 1
 1177z6.com, 1
-11792.com, 1
 1190america.tk, 1
 1199bet.vip, 0
 119sh.com, 1
@@ -640,6 +639,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 11yyqq.com, 1
 11zzkk.com, 1
 11zztt.com, 1
+12-12.sale, 1
 12.ag, 1
 12.digital, 1
 1200.cf, 1
@@ -1042,6 +1042,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 17u15.com, 1
 17xile.com, 1
 1800-mattress.net, 1
+1800.co, 1
 1800baskets.com, 1
 1800flowers.com, 1
 1800matress.net, 1
@@ -1183,6 +1184,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 1cover.com.au, 1
 1cprosto.tk, 1
 1cswd.com, 1
+1d-lsd.shop, 1
 1datatec.com, 1
 1day1ac.red, 1
 1ddl.org, 1
@@ -1491,6 +1493,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 2018-frisuren.tk, 1
 2018.wales, 1
 2018fifaworldcup.tk, 1
+201923.xyz, 1
 202020.health, 1
 2020cadillac.com, 1
 2020insight.co.za, 1
@@ -1536,6 +1539,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 20plus.com, 1
 20sights.tk, 1
 21.co.uk, 1
+210093.xyz, 1
 2103kobo.net, 1
 2113.ch, 1
 214701.xyz, 1
@@ -1561,6 +1565,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 22168365.com, 1
 221b.store, 1
 222001.com, 1
+222382.xyz, 1
 2226321.com, 1
 2227552.com, 1
 222aghoststory.com, 1
@@ -1715,8 +1720,9 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 24images.com, 1
 24k.co.jp, 1
 24onlain.tk, 1
-24see.com, 1
+24shares.cc, 1
 24slides.com, 1
+24toolkit.com, 1
 24webservice.nl, 1
 24x7aircargoservices.co.in, 1
 24x7serversupport.io, 1
@@ -1746,6 +1752,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 26-30railcard.co.uk, 1
 2600edinburgh.org, 1
 2600hq.com, 1
+2600qatar.com, 1
 2601.de, 1
 262569.com, 1
 263mail.com, 1
@@ -1862,6 +1869,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 2or3.tk, 1
 2pi.finance, 1
 2rad-prumbaum.de, 1
+2re.direct, 1
 2rodeo.com, 1
 2rsc.net, 1
 2sendai.net, 1
@@ -1878,6 +1886,9 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 2ustyle.com, 1
 2vnews.com, 1
 2vp-an.online, 1
+2wikipedia.com, 1
+2wikipedia.info, 1
+2wikipedia.net, 1
 2wth.com, 1
 2x.nu, 1
 2xgraphik.com, 1
@@ -1984,6 +1995,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 34365t.com, 1
 3444.cf, 1
 3456666365.com, 0
+345667.xyz, 1
 345678365.com, 1
 3456789365.com, 1
 3473-wiki.de, 1
@@ -2135,6 +2147,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 365ypw.com, 1
 365zg.org, 1
 369369.xyz, 1
+3699.cc, 1
 369bin.com, 1
 369dp.com, 1
 369eq.com, 1
@@ -2290,7 +2303,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 3dissue.com, 1
 3djake.de, 1
 3djake.uk, 1
-3djapan.com, 1
 3djava.ml, 1
 3dlab.team, 1
 3dm.audio, 1
@@ -2299,7 +2311,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 3dmix.sk, 1
 3dmusiclab.nl, 1
 3do3dont.com, 1
-3down.com, 1
 3dprintedhouse.nl, 1
 3dprintedobjects.be, 1
 3dprintsondemand.eu, 1
@@ -2333,6 +2344,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 3i-infotech.com, 1
 3ieimpact.org, 1
 3ii365.com, 1
+3ikipedia.org, 1
 3james.com, 1
 3jj365.com, 1
 3kings-3hills.com, 1
@@ -2412,6 +2424,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 3we.org, 1
 3wid.com.br, 1
 3wideclub.com, 1
+3wikipedia.com, 1
+3wikipedia.org, 1
 3wincorp.com, 1
 3xceler.com.br, 1
 3xx.click, 1
@@ -2591,7 +2605,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 4digitiq.nl, 1
 4dillusion.tk, 1
 4dimension.net, 1
-4dplay.com, 1
 4dsoft.com, 1
 4dstyle.com, 1
 4e8.net, 1
@@ -2610,7 +2623,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 4garage.com.br, 1
 4gnews.pt, 1
 4grad.in.ua, 1
-4heat.cz, 1
 4host.ch, 1
 4hourcourse.com, 1
 4hourmini.com, 1
@@ -2787,7 +2799,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 51cls.tw, 1
 51club8.com, 1
 51daxue.com, 1
-51dazhe.com, 1
 51evar.com, 1
 51fishing.com, 1
 51fss.marketing, 1
@@ -3369,6 +3380,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 69wasted.net, 1
 6a.nz, 1
 6b.com.au, 1
+6b.nz, 1
+6b6t.org, 1
 6bwcp.com, 1
 6conecta.com, 1
 6dec.gc.ca, 1
@@ -3703,7 +3716,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 838888.net, 1
 83ir2k8b.duckdns.org, 1
 83kb88.com, 1
-84000.com, 1
 84036.ml, 1
 842844.com, 1
 8444.cf, 1
@@ -3866,7 +3878,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 889w889.com, 1
 889w889.net, 1
 88acesmaritime.com, 1
-88bill.com, 1
 88cakescorner.com, 1
 88djl.cc, 1
 88home9.com, 1
@@ -3924,7 +3935,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 8me.nl, 1
 8n.pw, 0
 8shequapp.com, 1
-8show.com, 1
 8t8.eu, 1
 8tech.com.hk, 1
 8therate.com, 1
@@ -4034,7 +4044,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 9098.cf, 1
 90daydiet.org, 1
 90daysales.com, 1
-90minut.com, 1
 90r.jp, 1
 90splease.com, 1
 91-av.com, 1
@@ -4439,6 +4448,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 9509.cf, 1
 9510.cf, 1
 95107.com, 1
+95108.com, 1
 9511.cf, 1
 9512.cf, 1
 9513.cf, 1
@@ -4509,7 +4519,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 9578.cf, 1
 9579.cf, 1
 9580.cf, 1
-95808.com, 1
 9581.cf, 1
 9582.cf, 1
 9584.cf, 1
@@ -4550,7 +4559,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 9618.cf, 1
 9619.cf, 1
 9620.cf, 1
-96200.com, 1
 9621.cf, 1
 9622.cf, 1
 96220.com, 1
@@ -4563,17 +4571,14 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 9629.cf, 1
 9630.cf, 1
 9631.cf, 1
-96316.com, 1
 9632.cf, 1
 9633.cf, 1
-96448.com, 1
 96577.com, 1
 96605.com, 1
 9666ks.com, 1
 96685.com, 1
 966ty.com, 1
 96896.com, 1
-96961.com, 1
 9700.cf, 1
 9701.cf, 1
 9702.cf, 1
@@ -4836,11 +4841,11 @@ const PRTime gPreloadListExpirationTime = INT64_C(1781191916749000);
 99998522.com, 1
 99999822.com, 1
 999998722.com, 1
+999999999.pl, 1
 999btt.net, 1
 999family.com, 0
 999salon.co, 1
 999zlong.com, 1
-99bt.com, 1
 99buffets.com, 1
 99dog.com, 1
 99furnitureideasandtips.gq, 1
@@ -5083,6 +5088,7 @@ aacc.ac, 1
 aachc.org, 1
 aachen-quiz.de, 1
 aachen-umzugsunternehmen.de, 1
+aachen-west.de, 1
 aacs-design.com, 1
 aad-gp.com, 1
 aadl.ga, 1
@@ -5112,6 +5118,7 @@ aan-shop.co.il, 1
 aandachtsmeditatie.nl, 1
 aandeautobody.com, 1
 aandkevents.co.uk, 1
+aanhpiheritage.gov, 1
 aanhuisgebakken.tk, 1
 aanlynskool.co.za, 1
 aanyasri.com, 1
@@ -5179,6 +5186,7 @@ aavgo.com, 1
 aavienna.com, 1
 aayamresorts.com, 1
 aayan.com, 1
+aaz-taxi.com, 1
 ab-design.tk, 1
 ab-pflege.de, 1
 ab-uk.com, 1
@@ -5300,6 +5308,7 @@ abditransportinc.com, 1
 abdl.link, 1
 abdul.win, 1
 abdulawal.tk, 1
+abdulazizgolca.com, 1
 abdulkarimm.tk, 1
 abdullaeff.net, 1
 abdullahavci.com, 1
@@ -5392,6 +5401,7 @@ abinferis.com, 1
 abinmetall.ru, 1
 abinyah.com, 1
 abion-bg.com, 1
+abioticscience.fr, 1
 abipolitseinik.ee, 1
 abirmas.com, 1
 abitaspringsla.gov, 1
@@ -5517,6 +5527,7 @@ abouttoblow.com, 1
 abouttravel.gq, 1
 aboutvpn.com, 1
 aboutwealthcreation.tk, 1
+aboutwikipedia.org, 1
 aboutyou.at, 1
 aboutyou.be, 1
 aboutyou.bg, 1
@@ -5709,6 +5720,7 @@ acb.com.vn, 1
 acbandt.com, 1
 acbcoop.com, 1
 acbrussels-used.be, 1
+acc-sdbidentity.nl, 1
 acc.gov, 1
 accademia24.it, 1
 accademiacimarosa.tk, 1
@@ -5780,6 +5792,7 @@ acchan-fun.com, 1
 accio.be, 1
 accionesyreacciones.com, 1
 accioninmobiliaria.tk, 1
+acclaimllc.com, 1
 acclivity.pro, 1
 accme.co, 1
 accolade.com.br, 0
@@ -5879,6 +5892,7 @@ acetudy.com, 1
 acevalar.ru, 1
 aceweb.ga, 1
 aceycity.ml, 1
+acf.gov, 1
 acftienda.tk, 1
 acg.ac, 1
 acg.mn, 1
@@ -5941,6 +5955,7 @@ acidstudios.ro, 1
 acidtool.com, 1
 acierto.com, 1
 acihotel.vn, 1
+aciku.com, 1
 acilicraft.cn, 1
 acina.fr, 1
 acingov.pt, 1
@@ -5994,6 +6009,7 @@ acornli.com, 1
 acornmetal.com.au, 1
 acosta.group, 1
 acotadecalle.tk, 1
+acotec.com.my, 1
 acourse.io, 0
 acourtreporter.com, 1
 acourtreporter.net, 1
@@ -6299,6 +6315,8 @@ adamov.tk, 1
 adamradocz.com, 1
 adamraoof.tk, 1
 adams-gonczi.fun, 1
+adamsandle.co.uk, 1
+adamsandle.com, 1
 adamsandle.uk, 1
 adamschmuck.de, 1
 adamsconstructions.com.au, 1
@@ -6309,6 +6327,7 @@ adamscountyil.gov, 1
 adamscountyne.gov, 1
 adamscountypa.gov, 1
 adamscs.com, 1
+adamshemrent.se, 1
 adamsmithsociety.com, 1
 adamstas.com, 1
 adamsweb.tk, 1
@@ -6337,6 +6356,7 @@ adaptivesite.cf, 1
 adaptivesite.gq, 1
 adaptiveu.io, 1
 adaptyourlifeacademy.com, 1
+adaresort.com, 1
 adarixconsultores.com, 1
 adarshcloud.in, 1
 adarsvidler.me, 1
@@ -6351,6 +6371,7 @@ adatitleiii.com, 1
 adativos.com.br, 1
 adats.com, 1
 adawolfa.cz, 1
+adbenchmarklab.com, 1
 adbexcavation.ca, 1
 adbglobal.com, 1
 adblockextreme.com, 1
@@ -6387,6 +6408,7 @@ addictstore.it, 1
 addiko.com, 1
 addiko.net, 1
 addisoncrump.info, 1
+addisondubovi.ch, 1
 addisonvt.gov, 1
 addisonwi.gov, 1
 addition.ml, 0
@@ -6550,6 +6572,7 @@ admin-gator.net, 1
 admin-rbb-ugc-prod.azurewebsites.net, 1
 admin-rbb-ugc.azurewebsites.net, 1
 admin-serv.net, 1
+admin-sochi.ru, 1
 admin-wp.com, 1
 admin-wp.pl, 1
 admin.academy, 1
@@ -6638,6 +6661,7 @@ adoropets.com.br, 1
 adotta.me, 1
 adoucishop.fr, 1
 adp.fr, 1
+adphosting.it, 1
 adphotography.pl, 1
 adpot.xyz, 0
 adquest.ro, 1
@@ -6649,6 +6673,7 @@ adreaminsteel.tk, 1
 adreana.com, 1
 adregain.com, 1
 adregain.ru, 1
+adremtek.com, 1
 adrenajump.com.br, 1
 adrenalin.is, 1
 adrenalin.od.ua, 0
@@ -6691,6 +6716,7 @@ adrienfelsmann.fr, 1
 adrieng.fr, 1
 adrienkohlbecker.com, 1
 adriennesmiles.com, 1
+adrienpierre.ovh, 1
 adrina.gr, 1
 adrinet.tk, 1
 adrino.cf, 1
@@ -6698,6 +6724,7 @@ adrino.gq, 1
 adrino.ml, 1
 adrup.com, 1
 ads-kuwait.net, 1
+ads.gd, 1
 adsb.lol, 1
 adsbouncycastles.co.uk, 1
 adscss.eu, 1
@@ -7044,6 +7071,7 @@ aerobiomasa.com, 1
 aerobotz.com, 0
 aeroclub-tolhuin.tk, 1
 aerodoc.com, 1
+aeroeggtech.com, 1
 aeroelectronics.net, 1
 aeroequity.com, 1
 aeroexpress.tk, 1
@@ -7085,6 +7113,7 @@ aes.org.pt, 1
 aesi.bg, 1
 aesm.limited, 1
 aesm.ltd, 1
+aesmelbourne.org.au, 1
 aesmoris.es, 1
 aesre.com, 1
 aesre.de, 1
@@ -7262,6 +7291,7 @@ afinterio.com, 1
 afishablogs.tk, 1
 afive.us, 1
 afiyetolsun.jp, 1
+afk.surf, 1
 afkmind.com, 1
 afkzone.org, 1
 aflalogasperini.com.br, 1
@@ -7325,6 +7355,7 @@ after-whoru.tk, 1
 afterblokrock.tk, 1
 afterdarklabs.net, 0
 afterfostercare.tk, 1
+afterglows.xyz, 1
 afterhate.fr, 1
 afterhoursglass.com.au, 1
 afterinc.com, 1
@@ -7556,6 +7587,7 @@ agilewalls.com, 1
 agilextra.com.au, 1
 agilicus.ca, 1
 agilicus.com, 1
+agilisium.com, 1
 agility-westvlaanderen.tk, 1
 agilityconsulting.be, 1
 agill.me, 1
@@ -7701,7 +7733,6 @@ agrokomi.tk, 1
 agrokredit.ga, 1
 agroland.tk, 1
 agrolife.tk, 1
-agroma.com, 1
 agromanagement.kz, 1
 agromotorsburzaco.com, 1
 agron.tk, 1
@@ -7735,6 +7766,7 @@ aguasdefafe.pt, 1
 aguaviva.tk, 1
 aguiascarecas.org, 1
 aguidetolovelossanddesperation.com, 1
+aguilonius.com, 1
 agujetas.tk, 1
 agul.tk, 1
 agullo.tk, 1
@@ -7771,6 +7803,7 @@ ahansen.is, 0
 ahbap.org, 1
 ahccmadison.com, 0
 ahccorleone.tk, 1
+ahcfacilities.com, 1
 ahcpr.gov, 1
 ahd-cyber.org, 1
 ahd.com, 0
@@ -7779,6 +7812,7 @@ ahegaoroulette.com, 1
 ahelos.tk, 1
 ahembeauty.com, 1
 ahezu.com, 1
+ahf.me, 1
 ahg-offices.fr, 1
 ahg67.fr, 1
 ahhcomfortshoes.com, 1
@@ -7833,7 +7867,6 @@ ahorrocoop.cl, 1
 ahorroenergeticoenhogares.es, 1
 ahosamuel.com, 1
 ahouansou.cz, 1
-ahqf.com, 1
 ahrefs.com, 1
 ahroproject.org, 1
 ahrq.gov, 1
@@ -7868,6 +7901,7 @@ ai.mr, 0
 ai00.vip, 1
 ai1989.com, 1
 ai2-jp.com, 1
+aiabs.co, 1
 aiaccinu.eu.org, 1
 aiag.org, 1
 aiainiu.com, 1
@@ -7922,7 +7956,6 @@ aidiscore.com, 1
 aidliveers.ga, 1
 aido.gq, 1
 aidoc.com, 1
-aidong.com, 1
 aidoru.net, 1
 aidoru.top, 1
 aids-dissidents.tk, 1
@@ -8054,6 +8087,7 @@ air-soft.ga, 1
 air-swift.com, 1
 air-techniques.fr, 1
 air-ticket.ga, 1
+air.co, 1
 airacle.in, 1
 airaplus.ca, 1
 airappliances.in, 1
@@ -8134,7 +8168,6 @@ aircheapfares.com, 1
 aircomet.tk, 1
 airconditioning.tk, 1
 airconditioningcondensers.tk, 1
-airconditioningservicejohannesburg.co.za, 1
 airconsboksburg.co.za, 1
 airconservicingcapetown.co.za, 1
 airconsfourways.co.za, 1
@@ -8144,7 +8177,6 @@ aircraftspruce.com, 1
 aircrewdepot.com, 1
 aircrewportpages.com, 1
 airday.tk, 1
-airdeer.com, 1
 airdropkings.com, 1
 airductcleaninggrandprairie.com, 1
 airductcleaningpa.com, 1
@@ -8177,6 +8209,7 @@ airfaretousa.com, 1
 airfield.gq, 1
 airfix.com, 1
 airflightsdeals.com, 1
+airflowterravista.com, 1
 airflux.fr, 1
 airforce-technology.com, 1
 airforce.com, 1
@@ -8523,6 +8556,7 @@ ajaxtime.tk, 1
 ajaxtraining.tk, 1
 ajaxworld.tk, 1
 ajbelltouch.co.uk, 1
+ajdaranik.com, 1
 ajedrezbolivia.tk, 1
 ajetaci.cz, 1
 ajeventhire.co.uk, 1
@@ -8717,6 +8751,7 @@ akrochem.com, 1
 akronhousing.gov, 1
 akronohiorescue.gov, 1
 akropolis-ravensburg.de, 1
+akroslive.com, 1
 akrvall.se, 1
 akrzon.com, 1
 aksehir.bel.tr, 1
@@ -8795,6 +8830,7 @@ al2schaos.tk, 1
 al3ilm.com, 1
 al3xpro.com, 1
 al911.net, 1
+alaab.space, 1
 alaan.com, 1
 alaattinkaraca.tk, 1
 alab.space, 1
@@ -8969,7 +9005,6 @@ albertocarvalhosa.pt, 1
 albertofarina.tk, 1
 albertolopezaroca.tk, 1
 albertonparish.org.au, 1
-albertonplumber24-7.co.za, 1
 albertonsolarsystems.co.za, 1
 albertooc.com, 1
 albertosobrino.tk, 1
@@ -9211,6 +9246,7 @@ alexandertutoring.com, 1
 alexanderwagner.tk, 1
 alexandra-schulze.de, 1
 alexandra-siegel.com, 1
+alexandragrabbe.com, 1
 alexandraschick.at, 1
 alexandraschmidt.coach, 1
 alexandrastrauss.fr, 1
@@ -9237,6 +9273,7 @@ alexbresnahan.com, 1
 alexcoman.com, 1
 alexcpp.tk, 1
 alexdesigner.tk, 1
+alexdiamante.it, 1
 alexdowns.tk, 1
 alexdutton.co.uk, 1
 alexdutton.com, 1
@@ -9248,6 +9285,7 @@ alexgaynor.net, 1
 alexgonzalez-online.tk, 1
 alexhaack.de, 1
 alexhaidar.com, 1
+alexhaydock.co.uk, 1
 alexhd.de, 1
 alexhodgkinson.tk, 1
 alexia.fr, 1
@@ -9412,6 +9450,7 @@ alhost.ml, 1
 alhs-archives.com, 1
 alhuqul-kh.com, 1
 ali-shariati.tk, 1
+ali360.com, 1
 alia-helianthi.tk, 1
 aliakpoyraz.com, 0
 alialkurdy.tk, 1
@@ -9430,6 +9469,7 @@ alibamu.com, 1
 alibamu.org, 1
 alibi-ua.com.ua, 1
 alibip.de, 1
+alicafe.com, 1
 alicante-spain.tk, 1
 alice-memorial.de, 1
 alice.tw, 1
@@ -9487,7 +9527,6 @@ alikasimoglu.com, 1
 alila.dog, 1
 alilepro.cf, 1
 alilialili.ga, 1
-alimade.com, 1
 alimahmood.com, 1
 alimanaka-rabesata.tk, 1
 aliment-covid19.com, 1
@@ -9635,6 +9674,7 @@ allaboutyouspa.co.uk, 1
 allaccessglobal.tech, 1
 allactionsecurity.com, 1
 allahabadhighcourt.in, 1
+allai.su, 1
 allamakee.k12.ia.us, 1
 allamericangutterprotection.com, 0
 allamericanprotection.net, 1
@@ -9674,6 +9714,7 @@ allcarepharmacy.com, 1
 allcelebs.tk, 1
 allchan.io, 1
 allcinema.net, 1
+allcleanportapottyrental.com, 1
 allcloud.com, 1
 allcooking.tk, 1
 allcookingclub.com, 1
@@ -9689,6 +9730,7 @@ alldm.ru, 1
 alldogs.tk, 1
 alldrives.tk, 1
 alldrugs.com, 1
+alle-immobilien.ch, 1
 alle-zonvakanties.nl, 1
 alle.bg, 1
 alle.com, 1
@@ -9724,7 +9766,6 @@ allencrouchcfo.com, 1
 allendalecounty.gov, 1
 allenhouse.ac.in, 1
 allenivory.com, 1
-allenkreger.com, 1
 allenpcservices.co.uk, 1
 allenperformingarts.org, 1
 allensonit.com, 1
@@ -9832,6 +9873,7 @@ allianz-trade.nl, 1
 allianz-trade.no, 1
 allianz-trade.pl, 1
 allianz-trade.qa, 1
+allianz-trade.ro, 1
 allianz-trade.se, 1
 allianz-trade.sg, 1
 allianz-trade.sk, 1
@@ -9845,6 +9887,7 @@ allianzdirect.it, 1
 allianzdirect.nl, 1
 alliedartistswv.org, 1
 allieddigital.net, 1
+alliedinterpreting.com, 1
 alliedmedia.org, 1
 allier-vichy-moulins-expert-comptable.fr, 1
 alliiertenmuseum.de, 1
@@ -9941,6 +9984,8 @@ allset.ml, 1
 allshapes.co.nz, 1
 allshiftmed.com, 1
 allshousedesigns.com, 0
+allslots777.com.pk, 1
+allslotspak.com, 1
 allsmart.gr, 1
 allsouls.co.za, 1
 allspinecare.com, 1
@@ -9951,6 +9996,7 @@ allstarbyreportex.com, 1
 allstarcashforcars.com, 0
 allstarcustompools.com, 1
 allstarreporting.ca, 1
+allstarreporting.com, 1
 allstatedealerservices.com, 1
 allsun.online, 0
 allsurpl.us, 1
@@ -10149,7 +10195,6 @@ alpes-revetements.com, 1
 alpesc.com, 1
 alpetrov.cf, 1
 alpha-ag.ru, 1
-alpha-assistant.com, 1
 alpha-associates.ch, 1
 alpha-bet.com.ua, 1
 alpha-centauri.tk, 1
@@ -10286,6 +10331,7 @@ altai22.tk, 1
 altaica.ru, 1
 altair.com, 0
 altairfp.es, 1
+altaius.com, 1
 altaizemlya.cf, 1
 altaizemlya.ga, 1
 altaizemlya.ml, 1
@@ -10470,6 +10516,7 @@ alves-avocat.com, 1
 alviano.com, 0
 alvicom.hu, 1
 alviere.com, 0
+alvies-laufbus.de, 1
 alvimedika.com.ua, 1
 alvinalvelino.com, 1
 alvinaonline.com, 1
@@ -10686,6 +10733,7 @@ ambisonia.com, 1
 ambitionbox.com, 1
 ambivalence.tk, 1
 amblin.com, 1
+amboisenagy.freeboxos.fr, 1
 ambor.com, 1
 ambor.org, 1
 ambouncyhire.com, 1
@@ -10788,7 +10836,6 @@ americangods.tk, 1
 americanhomelandtitle.com, 1
 americanimageawards.com, 1
 americaninsuranceplus.ml, 1
-americanjihad.com, 1
 americankickoff.ga, 1
 americanlegaltranscription.com, 1
 americanmessaging.net, 1
@@ -10992,11 +11039,9 @@ amoramorena.blog.br, 1
 amoraquatropatas.org, 1
 amordoce.com, 1
 amorecivilizedage.net, 1
-amorekids.es, 1
 amoremportugal.pt, 1
 amoresexo.pt, 1
 amorfestival.com, 1
-amorgos-aegialis.com, 1
 amorgosrentandgo.gr, 1
 amorim.ca, 1
 amoroso-vivace.ch, 1
@@ -11048,6 +11093,7 @@ ampicillin.ga, 1
 ampicillin.ml, 1
 ampicilliniv.tk, 1
 ampicillinonline.gq, 1
+amplasa.com, 1
 amplead.com, 1
 ampledesigners.com, 1
 ampleinfographics.com, 1
@@ -11067,7 +11113,7 @@ amputated.tk, 1
 amputatedgenitals.tk, 1
 amr.de, 1
 amrctraining.co.uk, 1
-amrealtypr.com, 1
+amres.pl, 1
 amri.nl, 1
 amrita.club, 1
 amritps.com, 1
@@ -11088,6 +11134,7 @@ amstelveentje.nl, 1
 amsterdam.nl, 1
 amsterdam4u.tk, 1
 amsterdam5.nl, 1
+amsterdambudgethotel.nl, 1
 amsterdamian.com, 1
 amsterdamnightlifeticket.com, 1
 amsterdamsebos.nl, 1
@@ -11276,7 +11323,6 @@ anatomized.tk, 1
 anatoray.com, 1
 anatorywap.gq, 1
 anaxios.ga, 1
-anaxvip-sp.gr, 1
 anayahuasca.com.br, 1
 anayarealm.com, 1
 anb.com, 1
@@ -11337,6 +11383,7 @@ andamineglobal.com, 1
 andantepiano.studio, 1
 andefang.com, 1
 andel.info, 0
+andercloud.de, 1
 anders.hamburg, 1
 andersbedraad.nl, 1
 anderskp.dk, 0
@@ -11431,6 +11478,7 @@ andrejbenz.com, 1
 andremaciel.pt, 1
 andremalraux.com, 1
 andrematosband.tk, 1
+andrenguyenvanchau.com, 1
 andreoliveira.io, 1
 andreotti-furniture.com, 1
 andrepicard.de, 1
@@ -11447,6 +11495,8 @@ andressaflores.com.br, 1
 andresvillanueva.mx, 1
 andresxmd.eu, 1
 andreundnina.de, 0
+andrew-lazarev.com, 1
+andrew-lazarev.top, 1
 andrew.eu.org, 1
 andrew.fi, 1
 andrewazzopardi.org, 1
@@ -11463,6 +11513,7 @@ andrewglucas.net, 1
 andrewhillphotography.com, 1
 andrewimeson.com, 1
 andrewin.ru, 1
+andrewlazarev.kh.ua, 1
 andrewlloydwebberfoundation.com, 1
 andrewmcfarlane.tk, 1
 andrewmichaelsmith.com, 1
@@ -11504,6 +11555,7 @@ android-gamers.tk, 1
 android-hit.ml, 1
 android-it.cf, 1
 android-mt.com, 1
+android-profis.de, 1
 android-soft.gq, 1
 android-tv.3utilities.com, 1
 android-tv.ml, 1
@@ -11623,7 +11675,6 @@ angel-jrk.com, 1
 angel-wing.jp, 1
 angela.baby, 1
 angelaheck.com, 1
-angelal.cc, 1
 angelalombardo.it, 1
 angelarellano.tk, 1
 angelbridge.jp, 1
@@ -11724,6 +11775,8 @@ anhangabau.com, 1
 anhdvboot.com, 1
 anhdvshop.com, 1
 anhembi.br, 1
+anhoa.edu.vn, 1
+anhtus.com, 1
 ani-man.de, 1
 aniababan.com, 1
 aniabuduje.pl, 1
@@ -11741,10 +11794,10 @@ anihime.com, 1
 anihonetwallpaper.com, 1
 anikajulie.com, 1
 anikaras.ga, 1
+anikenji.live, 1
 anikschwall.com, 1
 anilom.tk, 1
 anim.ee, 1
-anima.digital, 1
 anima.nz, 1
 animaalternative.it, 1
 animac.fr, 1
@@ -11917,6 +11970,7 @@ ankaraotomobilcikmaparca.com.tr, 1
 ankaraotomobilyedekparca.com, 1
 ankaraotomobilyedekparca.com.tr, 1
 ankaraotoparca.com.tr, 1
+ankaraparts.com.tr, 1
 ankararentacar.name.tr, 1
 ankaraseo.name.tr, 1
 ankarasoket.com.tr, 1
@@ -11927,6 +11981,7 @@ ankarawebtasarim.name.tr, 1
 ankarawebtasarim.tk, 1
 ankarayedek.com.tr, 1
 anker-wladyslawowo.pl, 1
+anker.pk, 1
 anketlekazan.net, 1
 ankicozmorobot.com, 1
 ankitpati.in, 1
@@ -11946,6 +12001,7 @@ anleitung-zum-schweissen.de, 1
 anleitung-zum-toepfern.de, 1
 anlikdoviz.co, 1
 anlikhaber.tk, 1
+anmelden.io, 1
 anmriers.ga, 1
 ann-geophys.net, 1
 anna-beauty.ga, 1
@@ -12021,7 +12077,6 @@ annonces-vacances.info, 1
 annonces34.tk, 1
 annonline.com, 1
 annonseringonline.se, 1
-annotera.ai, 1
 announcement.tk, 1
 annovasolutions.com, 1
 annoyinggui.de, 1
@@ -12632,6 +12687,7 @@ apexremovablecovers.com, 1
 apextrailers.co.za, 0
 apextray.com, 1
 apexweb.ru, 1
+apfellike.com, 1
 apfelnews.de, 1
 apfelpage.de, 1
 apfelrat.de, 1
@@ -12700,7 +12756,9 @@ apixplatform.com, 1
 apk-world.cf, 1
 apk.li, 1
 apk4fun.com, 1
+apkapp.ru, 1
 apkdv.com, 0
+apkishop.com, 1
 apkmint.co, 1
 apkmody.io, 1
 apkod.com, 1
@@ -12814,7 +12872,6 @@ app-control-fcu.de, 1
 app-internalapps-v1-uat-crd-hd.azurewebsites.net, 1
 app-novusportal-uat-ae.azurewebsites.net, 1
 app-online.cloud, 1
-app-scope.com, 1
 app-sharepoint-v1-pro-crd-hd.azurewebsites.net, 1
 app.do, 1
 app.lookout.com, 1
@@ -12987,6 +13044,7 @@ appsbd.com, 1
 appscan360.net, 1
 appscan360.org, 1
 appscem.mx, 1
+appscinated.eu, 1
 appscinated.net, 1
 appscloudplus.com, 1
 appsdock.de, 1
@@ -13134,6 +13192,7 @@ aquabyte.co.uk, 1
 aquabyte.net, 1
 aquacapsule.cf, 1
 aquacitylands.com, 1
+aquaco.dk, 1
 aquacomms.com, 1
 aquadarts.tk, 1
 aquadecor.cf, 1
@@ -13373,6 +13432,7 @@ archicgi.com, 1
 archijobbtp.com, 1
 archimede.ovh, 1
 archined.nl, 1
+archinext.io, 1
 archion.ro, 1
 archis.de, 1
 archispace.com.cn, 1
@@ -13450,6 +13510,7 @@ arcticvillage.gov, 1
 arcticwolf.com, 1
 arctus-security.com, 1
 arcueil-cachan.fr, 0
+arcus.mil, 1
 arcusgps.eu, 1
 arcvictoriapoint.com.au, 1
 arcza.com, 1
@@ -13690,6 +13751,7 @@ arjansteevels.nl, 1
 arjanvaartjes.net, 1
 arjen-robben.tk, 1
 arjunasdaughter.pub, 0
+arjunvedbrat.com, 1
 arjweb.co.uk, 1
 ark4nyc.com, 1
 arkaan.tk, 1
@@ -14012,6 +14074,7 @@ artapardaz.com, 1
 artapisserie.fr, 1
 artaurium.com, 0
 artbalsam.com, 1
+artben.fr, 1
 artbild-fotografie.de, 1
 artbizu.com, 1
 artboja.com, 1
@@ -14098,6 +14161,7 @@ arthurdev.cf, 1
 arthurlaw.ca, 1
 arthurlewis.me, 1
 arthuro.ca, 1
+arthurrichard.fr, 1
 arthurweder.ch, 1
 arti-group.ml, 1
 arti-islam.tk, 1
@@ -14601,6 +14665,7 @@ askindia.tk, 1
 askjan.org, 1
 askkaren.gov, 1
 asklea.ai, 1
+askmany.ai, 1
 askme-events.vip, 0
 askme-fast.tk, 1
 askme24.de, 1
@@ -14641,6 +14706,7 @@ asminternational.org, 1
 asmlmarathoneindhoven.nl, 1
 asmobox.ga, 1
 asmood.net, 1
+asmpire.shop, 1
 asmpt.com, 1
 asmr-100.com, 1
 asmr-200.com, 1
@@ -14709,6 +14775,7 @@ asproni.it, 1
 asps.biz, 1
 aspviress.gq, 1
 asqnw.com, 1
+asqofmashdoda.com, 1
 asr.cloud, 1
 asr.rocks, 1
 asr.solar, 1
@@ -14759,6 +14826,7 @@ assets.schwarz, 1
 assetsec.io, 1
 assetsman-assetsvalue.com, 1
 assettocorsa.tk, 1
+assferrel.pt, 1
 assguidesporrentruy.ch, 0
 assicurare.it, 1
 assid.com, 1
@@ -14887,6 +14955,7 @@ astrakhan.tk, 1
 astral-imperium.com, 1
 astral.gq, 1
 astral.org.pl, 1
+astralnature.com, 1
 astralrank.com, 1
 astralriders.tk, 1
 astramundo.com, 1
@@ -14929,6 +14998,7 @@ astroluna.cz, 1
 astroluxe.io, 1
 astromachineworks.com, 1
 astrominds.fr, 1
+astromineralogija.lt, 1
 astrong.pl, 1
 astronime.id, 1
 astronomiadecolombia.tk, 1
@@ -14975,6 +15045,7 @@ asuntospropios.com, 1
 asura.in.th, 1
 asurbernardo.com, 1
 asurgiant.ca, 1
+asus.pk, 1
 asustor.com, 1
 asustreiber.de, 1
 asvsa.ch, 0
@@ -15146,6 +15217,8 @@ atikeditorial.com, 1
 atikokanenercom.com, 1
 atiku2007.tk, 1
 atila.io, 0
+atilado.com, 1
+atilado.net, 1
 atilo.sh, 1
 atimba.com, 1
 atimevis.com, 1
@@ -15205,6 +15278,7 @@ atlantik.tk, 1
 atlantikwall.ga, 1
 atlantischild.hu, 1
 atlantisdx.de, 1
+atlantisgold.bg, 1
 atlantismd.com, 1
 atlantistowingservice.com, 1
 atlantiswaterproofing.com, 0
@@ -15367,7 +15441,7 @@ attiliospagnolo.it, 1
 attinderdhillon.com, 1
 attireaccessories.com, 1
 attiremr.tk, 1
-attitudes-bureaux.fr, 1
+attivazioneveloce.it, 1
 attivonetworks.com, 1
 attlane.fr, 1
 attoch.org, 1
@@ -15605,6 +15679,7 @@ auraedu.me, 1
 aurahiemis.tk, 1
 aurainfosec.com, 0
 aurainfosec.com.au, 0
+aurakink.com, 1
 auralia.cloud, 1
 auralia.net, 1
 auraliafirst.com, 1
@@ -16146,6 +16221,7 @@ autopistadelitata.cl, 1
 autoplaza.com.mx, 1
 autopneusdacovilha.pt, 1
 autopocket.co, 1
+autopopaccidentrepair.co.uk, 1
 autoportal.tk, 1
 autopril.com, 1
 autoprogconsortium.ga, 1
@@ -16573,7 +16649,7 @@ avtoyurist.ga, 1
 avtoyurist.gq, 1
 avtoyurist.ml, 1
 avtoyurist.tk, 1
-avu.cz, 1
+avtp.org, 1
 avus-automobile.com, 1
 avuxi.com, 1
 avv.li, 1
@@ -16603,6 +16679,7 @@ awardshub.com, 1
 awardsuite.com, 1
 aware.org.sg, 0
 awarego.com, 1
+awarelab.io, 1
 awaremi-tai.com, 1
 awarenessadvisor.ga, 1
 awarenessadvisorest.ga, 1
@@ -16720,6 +16797,12 @@ axiomecomptables.ca, 1
 axiomecpa.ca, 1
 axiomecpa.com, 1
 axiomer.com, 1
+axiomer.es, 1
+axiomer.eu, 1
+axiomer.me, 1
+axiomer.net, 1
+axiomer.org, 1
+axiomer.tech, 1
 axiomesolutions.ca, 1
 axiomtechnologies.tk, 1
 axiomwp.com, 1
@@ -16928,7 +17011,6 @@ azafraneshelca.es, 1
 azairline.com, 1
 azaleos.com, 1
 azalhavayolu.com.tr, 1
-azapp-vvv-program-api-dev.azurewebsites.net, 1
 azaria.blog, 1
 azarkepic.com, 1
 azartmania.ga, 1
@@ -16972,6 +17054,7 @@ azienda-tv.tk, 1
 azimech.net, 1
 azimut.fr, 1
 azimuth-ast.ru, 1
+azimuthint.com, 1
 azinfoolad.com, 1
 azingostar.tk, 1
 azithromycin.ga, 1
@@ -17547,6 +17630,7 @@ badrock.tk, 1
 badsam.fr, 1
 badseacoffee.com, 1
 badsl.nl, 1
+badsmtp.com, 1
 badstar.tk, 1
 badtimesrecords.com, 0
 badudeal.lk, 1
@@ -17631,7 +17715,6 @@ baikalfond.ml, 1
 baikalppk.tk, 1
 baiki.ch, 1
 bailbondsdirect.com, 1
-baildonbouncycastles.co.uk, 1
 baildonhottubs.co.uk, 1
 baileebee.com, 1
 baileyladders.com.au, 1
@@ -17950,6 +18033,7 @@ bandidosmc.com, 1
 bandiere-mondo.it, 1
 bandiga.it, 1
 bandirmaevdenevenakliyat.tk, 1
+bandithost.com, 1
 bandmentor.com, 1
 bandmine.com, 1
 bandnames.tk, 1
@@ -18106,6 +18190,7 @@ baoge55.com, 1
 baogiathicongnoithat.com, 1
 baokhangfood.com, 1
 baokhanhhoa.vn, 1
+baoqibiao.com, 1
 baoxiache.com, 1
 baoxue5.com, 0
 bapeel.tk, 1
@@ -18133,6 +18218,7 @@ baratzegrowshop.com, 1
 baravalle.com, 1
 baraxolka.ga, 1
 baraxolka.ml, 1
+barbara-bertagnolli.co.uk, 1
 barbara-fuchs-gruene-fuerth.de, 1
 barbarabryce.com, 1
 barbaraedanielsantos.ga, 1
@@ -18194,6 +18280,7 @@ barentsz.co, 1
 barer.me, 1
 baretee.com, 1
 barexam.jp, 1
+bargain-storage.com, 1
 bargaindentistsers.ga, 1
 bargaindentistsest.ga, 1
 bargainsettelement.com, 1
@@ -18224,6 +18311,7 @@ baritoday.it, 1
 barke-schaltanlagen.de, 1
 barkerandstonehouse.co.uk, 1
 barkerjr.xyz, 1
+barkesh.de, 1
 barkingspidersaspets.com, 1
 barkio.com, 1
 barklanepets.com, 0
@@ -18288,7 +18376,7 @@ barranquillero.tk, 1
 barraqueirotransportes.pt, 1
 barrasaccess.com, 1
 barratennis.com.br, 1
-barrebody.com.au, 1
+barrebody.com.au, 0
 barreiroappraisals.com, 1
 barrelfish.org, 1
 barrencountyky.gov, 1
@@ -18434,6 +18522,7 @@ basilm.co, 1
 basilsys.com, 1
 basirahang.com, 1
 basis-online.eu, 1
+basisdata.nl, 1
 basisonline.nl, 1
 basisonlinefiles.nl, 1
 basisschoolhundelgem.be, 1
@@ -18779,6 +18868,7 @@ bb9728.co, 1
 bbaccademia.it, 1
 bbalposticino.it, 1
 bbansw.asn.au, 1
+bbb-dl.com, 1
 bbb00.com, 1
 bbb1991.me, 0
 bbb4all.de, 1
@@ -18788,6 +18878,7 @@ bbbff.net, 1
 bbbswcmd.org, 1
 bbc.co.uk, 0
 bbc.com, 0
+bbc.in.net, 1
 bbcastles.com, 1
 bbcentertainment.au, 1
 bbcincorp.com, 1
@@ -18855,6 +18946,7 @@ bcalles.eu, 1
 bcallesen.dk, 1
 bcallesen.eu, 1
 bcansw.com.au, 1
+bcare.health, 1
 bcarpentrypro.com, 1
 bcbsfepvision.com, 1
 bcbudonline.com, 1
@@ -19105,6 +19197,7 @@ beautiful-lingerie.tk, 1
 beautiful.ai, 1
 beautifulart.ml, 1
 beautifulbicester.co.uk, 1
+beautifulevilcompany.com, 1
 beautifullybrokenwords.com, 1
 beautifulplaces.tk, 1
 beautifulreflectionsmedspa.com, 1
@@ -19113,6 +19206,7 @@ beautifulsouth.tk, 1
 beauty-blog.gq, 1
 beauty-form.ir, 1
 beauty-haircare.tk, 1
+beauty-salon-lino.com, 1
 beauty-schools.com, 1
 beauty-secrets.ir, 1
 beauty-stories.tk, 1
@@ -19196,7 +19290,6 @@ bebra.co, 1
 bebra.cx, 1
 bebra.cz, 1
 bebra.ec, 1
-bebra.gl, 1
 bebra.gs, 1
 bebra.hn, 1
 bebra.id, 1
@@ -19220,6 +19313,7 @@ becca-argenbright.com, 1
 beccaanne.photography, 1
 beccajoshwedding.com, 1
 bech32.net, 1
+beck.id, 1
 beck.pl, 1
 beckdesign.tk, 1
 becker-annika.de, 1
@@ -19346,8 +19440,6 @@ beeps.website, 1
 beer-sheva.city, 1
 beerbruhs.com, 0
 beercast.co.uk, 1
-beeremovaljohannesburg.co.za, 1
-beeremovalpretoria.co.za, 1
 beeremovalspretoria.co.za, 1
 beergifts.tk, 1
 beerglasses.tk, 1
@@ -19624,6 +19716,7 @@ bellisima.com.co, 1
 bellissime.tk, 1
 belllabs.com, 1
 bellmeadtx.gov, 1
+bellop.top, 1
 belloweb.tk, 1
 bellowsafs.marketing, 1
 bellowsglamping.co.uk, 1
@@ -19732,7 +19825,6 @@ bendwebs.com, 1
 bendyworks.com, 1
 beneathvt.com, 1
 beneazy.cf, 1
-benecake.cz, 1
 benecol.com.sg, 1
 benedetti.ca, 1
 benedict-system.eu, 1
@@ -19746,6 +19838,7 @@ benedyktynki.info, 1
 benee-awraham.nl, 1
 benefactgroup.com, 1
 benefeds.com, 1
+benefeds.gov, 1
 benefitfocus.com, 1
 benefitharbor.com, 1
 benefits.gov, 1
@@ -20022,6 +20115,8 @@ bernadettehermsen.nl, 1
 bernalierpups.com, 1
 bernama.com.my, 1
 bernar.do, 1
+bernard-mary.com, 1
+bernard-mary.fr, 1
 bernard.fr, 1
 bernardbeneito.com, 1
 bernardcontainers.be, 0
@@ -20136,7 +20231,6 @@ beskar.pro, 1
 besnard.me, 1
 besnik.de, 0
 besnik.tk, 1
-besola.de, 1
 besole.ch, 1
 besolov.tk, 1
 besox.be, 1
@@ -20193,7 +20287,6 @@ bestafricaradio.tk, 1
 bestallgames.com, 1
 bestarts.tk, 1
 bestasquadradas.org, 1
-bestastrologermohali.in, 1
 bestatos.com, 1
 bestatter.de, 1
 bestattung-ebenbichler.at, 1
@@ -20471,6 +20564,7 @@ bestprofessionalchainsaw.com, 1
 bestpromoving.com, 1
 bestratedremovals.co.uk, 1
 bestratedtransport.com.au, 1
+bestrating-hengelo.nl, 1
 bestreleases.tk, 1
 bestremote.io, 1
 bestresumeobjectiveexamples.com, 1
@@ -20713,7 +20807,6 @@ betsfortoday.com, 1
 betshoot.com, 1
 betsonlinefree.com.au, 1
 betspin.com, 0
-betsquare.com, 1
 betstop.gov.au, 1
 bett1.at, 1
 bett1.ch, 1
@@ -20948,7 +21041,6 @@ bfharrison.com, 1
 bfi-edel-stahl.de, 1
 bfi.is, 1
 bfkcloud.ddns.net, 1
-bflcanada.ca, 1
 bflix.tv, 1
 bflw.pl, 1
 bfly.tech, 1
@@ -21036,6 +21128,7 @@ bhub.tk, 1
 bhuntr.com, 1
 bhuttae.com, 1
 bhuvanreddy.space, 1
+bhwfx.com, 1
 bhxch.moe, 1
 bi-in-beeld.nl, 1
 bi-jenny.net, 1
@@ -21077,7 +21170,6 @@ biba-shop.fr, 1
 bibb.de, 1
 bibbvoice.com, 1
 biber-bike.de, 1
-biberonshop.bg, 1
 bibet365.com, 1
 bibi-xxx.com, 1
 bibica.net, 1
@@ -21097,6 +21189,7 @@ biblesearch.tw, 1
 biblesignposts.com, 1
 bibleversesfordailyliving.com, 1
 biblia.es, 1
+bibliadoczytania.pl, 1
 bibliaon.com, 1
 bibliatodo.com, 1
 biblicalcounseling.com, 1
@@ -21594,6 +21687,7 @@ binbo.cz, 1
 binbo.sk, 1
 bind.ch, 1
 bindb.com, 1
+binderbud.com, 1
 binding-problem.com, 1
 binds.co, 1
 binero.com, 1
@@ -21837,6 +21931,7 @@ bip-online.tk, 1
 bip.gov.sa, 0
 bipart.eu, 1
 bipedecurieux.com, 1
+bipefr.com, 1
 biplophossain.me, 1
 bipolardisorderexplained.com, 1
 bipolargeek.com, 1
@@ -22090,6 +22185,7 @@ bitmainwarranty.com.ua, 1
 bitmainwarranty.ru, 1
 bitmessage.ch, 1
 bitmexin.com, 1
+bitmidi.com, 1
 bitmine.gq, 1
 bitmix.biz, 1
 bitmoji.com, 1
@@ -22697,6 +22793,7 @@ blayneallan.com, 1
 blaze-in.com, 1
 blazebit.com, 1
 blazefire.tk, 1
+blazejmrozinski.com, 1
 blazelock.com, 1
 blazeweb.ml, 1
 blazing.cz, 1
@@ -22752,6 +22849,7 @@ blijfbij.com, 1
 blijfbij.eu, 1
 bliker.ga, 1
 blikund.swedbank.se, 1
+blikvanger.shop, 1
 blind-iq.at, 0
 blind-iq.be, 0
 blind-iq.com, 0
@@ -23275,6 +23373,7 @@ bngsecure.com, 1
 bnhhospital.com, 1
 bnjpro.dk, 1
 bnkconsulting.info, 1
+bnlegalmedia.com, 1
 bnnuy.com, 1
 bnpl.kz, 1
 bnpparibas.be, 1
@@ -23374,6 +23473,7 @@ bocaaboca.ml, 1
 bocabeats.tk, 1
 bocada.com, 1
 bocahkampus.com, 1
+bocal.be, 1
 bocal.cf, 1
 bocamo.it, 1
 bocawa.es, 1
@@ -23537,7 +23637,6 @@ boleleboyz.org, 1
 boleros.tk, 1
 boletosdeavionbaratos.tk, 1
 bolevia.com, 1
-boleyn.su, 1
 bolgarnyelv.hu, 1
 bolgarus.ru, 0
 bolha.one, 1
@@ -23767,6 +23866,7 @@ bookerrecycling.co.uk, 1
 bookeventz.com, 1
 bookgeek.ga, 1
 bookimed.com, 1
+bookin.cloud, 1
 booking.com, 1
 booking.site, 1
 bookingdata.net, 1
@@ -23957,6 +24057,7 @@ borman.biz, 1
 born2bounce.co.uk, 1
 born2dance.tk, 1
 born2flygirl.com, 1
+bornan.sport, 1
 bornandgrazed.com, 0
 bornbinder.com, 1
 borneoarabic.com, 1
@@ -24266,6 +24367,7 @@ bowmar.gov, 1
 bownhpd.gov, 1
 bowwowinsurance.com.au, 1
 box-it-up.nl, 1
+box-mail.org, 1
 box.bz, 1
 box.co.uk, 1
 box447.com, 1
@@ -24275,6 +24377,7 @@ boxcoshipping.com, 1
 boxcritters.wiki, 1
 boxdevigneron.fr, 1
 boxdroplacrosse.com, 1
+boxedpeaches.com, 1
 boxeldercountyut.gov, 1
 boxeomexicano.tk, 1
 boxerdogsaspets.com, 1
@@ -24393,7 +24496,6 @@ brace-automotive.com, 1
 bracebridgechiro.com, 1
 bracelet-chakras.com, 1
 braces-supports.tk, 1
-bracesbyberry.com, 1
 bracesjourney.com, 1
 bracken.jp, 1
 bracket.land, 1
@@ -24519,6 +24621,7 @@ brandbook.io, 1
 brandcodestyle.com, 0
 brande.ai, 1
 brandefense.io, 1
+brandenbauer.com, 1
 brandenburgertheater.de, 1
 brandeps.com, 1
 brandfactory.ml, 1
@@ -24679,6 +24782,7 @@ brazilian-human-hair-extension.tk, 1
 brazilianbikinishop.com, 1
 brazilianembassy.se, 1
 braziliaskincare.com, 1
+brazillens.com, 1
 brazoriacountyclerktx.gov, 1
 brazzers.com, 1
 brazzersnetwork.com, 1
@@ -24713,6 +24817,7 @@ breakinoutpr.com, 1
 breakofdawn.tk, 1
 breaksome.tech, 1
 breakthroughapparel.com, 1
+breakthrought1d.org.il, 1
 breakwall.ml, 1
 breard.tf, 1
 breastaugmentationky.com, 1
@@ -24901,7 +25006,6 @@ bridalweddingshow.ga, 1
 bridebook.com, 1
 bridesbouquet.ml, 1
 bridesforacause.com, 1
-bridestarco.com, 1
 bridge-online.cloud, 1
 bridge-to-knowledge.nl, 1
 bridge.casa, 1
@@ -24927,6 +25031,7 @@ bridgescourtreporting.com, 1
 bridgesem.com, 1
 bridgesofcolorado.gov, 1
 bridgestudios.com, 1
+bridgesync.io, 1
 bridgethailand28chidlom.com, 1
 bridgetmcauliffe.ie, 1
 bridgetonmo.gov, 1
@@ -25000,6 +25105,7 @@ brillie.tk, 1
 brillio.com, 1
 brillionwi.gov, 1
 brillionworks.com, 1
+brim.pk, 1
 brimfinancial.com, 1
 brimspark.com, 1
 brinavkuhni.com, 1
@@ -25036,6 +25142,7 @@ brisignshop.com.au, 1
 briskteaching.com, 1
 brisp.nl, 1
 bristlecone.com, 1
+bristol-stairlifts.co.uk, 1
 bristol-taxi.com, 1
 bristolandwestonsuperbounce.com, 1
 bristolctwatersewer.gov, 1
@@ -25127,10 +25234,12 @@ broadcastlistingest.ga, 1
 broadcastrealtimeest.ga, 1
 broadcasttowerers.ga, 1
 broadfoundation.org, 1
+broadhub.com, 1
 broadjournalest.ga, 1
 broadleft.org, 1
 broadlytour.com, 1
 broadwayfamilydentalpc.com, 1
+broadwayplatform.com, 1
 broadwaytravel.com, 1
 broadwayva.gov, 1
 broadwayvets.co.uk, 1
@@ -25148,7 +25257,6 @@ brodahose.com.au, 1
 broder.fun, 1
 broderieml.ca, 1
 broderieml.com, 1
-brodiegraphics.com, 1
 brodies.com, 1
 brodowski.cc, 1
 brody.digital, 1
@@ -25171,6 +25279,7 @@ brokenbowokpd.gov, 1
 brokencityllc.ga, 1
 brokendollsmuseum.com, 1
 brokenhands.io, 1
+brokenlinkchecker.live, 1
 brokenminds.tk, 1
 brokenneckgang.com, 1
 brokenrevolution.com, 1
@@ -25220,6 +25329,7 @@ brooklynboyblues.ml, 1
 brooklyncentermn.gov, 1
 brooklyndecker.tk, 1
 brooklynparkmn.gov, 1
+brooklynsigns.com, 1
 brooklyntheborough.com, 1
 brooklyntownwashburnwi.gov, 1
 brookscountyga.gov, 1
@@ -25403,6 +25513,7 @@ bryanquigley.com, 1
 bryansk-news.net, 1
 bryansk-news.ru, 1
 bryanski.tk, 1
+bryanstoncc.co.za, 1
 bryantluk.com, 1
 bryceml.us, 1
 bryggebladet.dk, 1
@@ -25714,6 +25825,7 @@ budscope.com, 1
 budsforbuddies.com, 1
 budsmelim.ee, 1
 budtraffic.net, 1
+buecherheldenchemnitz.de, 1
 buejagt.dk, 1
 bueltge.de, 1
 buenavistadelrincon.com, 1
@@ -25721,7 +25833,6 @@ buenavistava.gov, 1
 buenavistava.org, 1
 buendnis-deutschland.de, 1
 buenosairesconnect.com, 1
-buentaller.com, 1
 bueny.com, 1
 bueny.net, 1
 buergerinitiative-pronatur.de, 1
@@ -25760,6 +25871,7 @@ bug321.com, 1
 bugabond.bg, 1
 bugaim.com, 1
 bugalert.org, 1
+bugalou.com, 1
 bugbounty.ch, 1
 bugbounty.fail, 1
 bugburn.com.br, 1
@@ -26135,6 +26247,7 @@ burunucu.ga, 1
 buryat-mongol.cf, 1
 buryatia.tk, 1
 burybox.co.uk, 1
+burz.ai, 1
 burz.net, 1
 burz.one, 1
 burz.ro, 1
@@ -26217,6 +26330,7 @@ businesscollect.ga, 1
 businesscollections.ga, 1
 businesscolor.ga, 1
 businesscommission.ga, 1
+businessconnect.com.tr, 1
 businessconnect.ml, 1
 businesscorp.tk, 1
 businesscorporation.ga, 1
@@ -26247,6 +26361,7 @@ businesselectra.ga, 1
 businessepic.ga, 1
 businessethics.ml, 1
 businessetmarketing.com, 1
+businesseventstokyo.org, 1
 businessexcel.ga, 1
 businessfactors.de, 1
 businessfalcon.ga, 1
@@ -27162,6 +27277,7 @@ cadynce.com, 0
 cadyreporting.com, 1
 caedea.com, 1
 caedea.net, 1
+caek.net, 1
 caelandrayer.ca, 1
 caerdav.com, 1
 caesar.me.uk, 1
@@ -27192,6 +27308,7 @@ cafecentral.tk, 1
 cafechesscourt.com, 1
 cafechroma.tk, 1
 cafecobus.tk, 1
+cafedari.ir, 1
 cafedelcielo.co, 1
 cafedesignbooks.com, 1
 cafedospescadores.tk, 1
@@ -27238,6 +27355,7 @@ cageworld.tk, 1
 cagi.org, 1
 cagir.eu, 1
 cagivaclub.tk, 1
+cagliarinews24.com, 1
 cagranollers.tk, 1
 cagrierdogdu.com, 1
 cagrimerkezinumarasi.com, 1
@@ -27341,11 +27459,13 @@ calcioragusa.tk, 1
 calcioweb.eu, 1
 calcoolator.pl, 1
 calcsoft.tk, 1
+calcstructcost.com, 1
 calcsub.net, 1
 calculadora-de-derivadas.com, 1
 calculadora-de-integrales.com, 1
 calculadoraconversor.com, 1
 calculadoratrabalhista.com, 1
+calculafin.com.br, 1
 calcularis.ch, 1
 calculate-vat.uk, 1
 calculate.co.kr, 1
@@ -27613,12 +27733,14 @@ camilat.tk, 1
 camileonline.tk, 1
 camilia.io, 1
 camilla-rena.com, 1
+camilosolutions.com, 1
 caminominimalista.com, 1
 caminoneocatecumenal.tk, 1
 caminosalavida.com, 0
 caminreal.tk, 1
 camionerosdecoslada.tk, 1
 camipress.ga, 1
+camis.ovh, 1
 camisado.tk, 1
 camisantiago.tk, 1
 camisetasmalwee.com.br, 1
@@ -27815,6 +27937,7 @@ cancer.gov, 0
 cancerdata.nhs.uk, 1
 cancerrxgene.org, 1
 cancertherapy.tk, 1
+cancioc.com, 1
 cancitiprep.ca, 1
 cancomputers.hn, 1
 cancomputers.shop, 1
@@ -27999,6 +28122,7 @@ caos.ch, 0
 caostura.com, 1
 cap-study.com, 1
 cap.gov, 1
+cap.mil, 1
 cap21-lrc.fr, 1
 cap50.be, 1
 cap73.fr, 1
@@ -28107,7 +28231,6 @@ caprigo.ru, 1
 capris.cr, 0
 caps-hats.tk, 1
 caps.equipment, 1
-caps.is, 1
 caps.solutions, 1
 caps.systems, 1
 capseo.id, 1
@@ -28124,6 +28247,7 @@ capsule.org, 0
 capsulekitchen.co, 1
 capsulezone.tk, 1
 captain-dandelion.com, 1
+captain-droid.com, 1
 captainark.net, 1
 captainchef.net, 1
 captainclaw.tk, 1
@@ -28181,6 +28305,7 @@ caralarm.tk, 1
 caralegal.de, 1
 caraliadeluxe.net, 1
 caramellespinell.tk, 1
+carappraisal.ai, 1
 caratennison.net, 1
 carauctionnetwork.com, 1
 carauctionsalabama.com, 1
@@ -28367,6 +28492,7 @@ caret.be, 1
 caretogether.coop, 1
 carevic.eu, 1
 carey.cl, 1
+careycustomhomes.com, 1
 careyohio.gov, 1
 careyolsen.com, 1
 carezza.net, 1
@@ -28611,6 +28737,7 @@ carriedin.com, 1
 carrier.tools, 1
 carrieunderwood.tk, 1
 carrigansliffordgreenway.ie, 1
+carrington.edu, 1
 carrinhocheiooanointeiro.com.br, 1
 carrion.tk, 1
 carrnorthamerica.com, 1
@@ -29088,6 +29215,8 @@ casinoreal.com, 1
 casinoreviews.nl, 1
 casinorewards.info, 1
 casinorobots.com, 1
+casinorocket.com, 1
+casinorocket4.com, 1
 casinosanalyzer.com, 1
 casinosblockchain.io, 1
 casinoscout.ca, 1
@@ -29148,6 +29277,7 @@ castaneatownshippa.gov, 1
 castaneda.tk, 1
 castecnologia.com.br, 1
 castedart.com, 1
+castela.fr, 1
 castella.tk, 1
 castellet.tk, 1
 castelletto.tk, 1
@@ -29265,7 +29395,7 @@ catcatnya.com, 1
 catchall.tw, 1
 catchers.cc, 1
 catchhimandkeephim.com, 0
-catchief.com, 1
+catchief.com, 0
 catchook.com, 1
 catchteamca.gov, 1
 catchthestars.org, 1
@@ -29643,6 +29773,7 @@ cdcpartners.gov, 1
 cdd.go.th, 1
 cdda.ch, 0
 cdeeply.com, 1
+cdf-harcigny.fr, 1
 cdf.fyi, 1
 cdf.wiki, 1
 cdfnature2019.fr, 1
@@ -29934,6 +30065,7 @@ centipedegraphics.com, 1
 centolos.tk, 1
 centr.dn.ua, 1
 central-apartman.tk, 1
+central-lascarisdeli.com, 1
 central4.me, 1
 centralbank.ae, 1
 centralbetsers.ga, 1
@@ -30189,6 +30321,7 @@ cesenatoday.it, 1
 cesibo.com, 1
 cesipagano.com, 0
 cesium.ml, 1
+cesjoinin.com, 1
 ceska-elita.cz, 1
 ceska-polygraficka.cz, 1
 ceska-polygraficka.eu, 1
@@ -30209,6 +30342,7 @@ cestujtenamiru.cz, 1
 cestunamiru.cz, 1
 cesurteknikservis.com, 1
 cesusc.edu.br, 1
+cesvotes.com, 1
 cetak.com.my, 1
 cetamol.com, 1
 cetangyuk.com, 1
@@ -30386,6 +30520,7 @@ chainex.io, 1
 chaingame.pro, 1
 chainge-re.com, 1
 chaingpt.org, 1
+chainpatrolstatus.com, 1
 chainsawprofessional.com, 1
 chainwhy.com, 0
 chainz.tk, 1
@@ -30414,7 +30549,6 @@ challenges.gov, 1
 challengeskins.com, 1
 chalons-agglo.fr, 1
 chalonsenchampagne.fr, 1
-chaloo.com.pk, 1
 chalov.ml, 1
 chama.gr, 0
 chamanga.store, 1
@@ -30471,6 +30605,7 @@ chandracenter.com, 1
 chandradeepdey.com, 1
 chandramani.tk, 1
 changdunovel.com, 1
+change-coaching-gmbh.ch, 1
 change10000lives.com.ph, 1
 changeactivation.com, 1
 changeanalytics.us, 1
@@ -30518,9 +30653,11 @@ chaoschemnitz.de, 1
 chaoscommunication.camp, 1
 chaoscycle.tk, 1
 chaosdorf.de, 1
+chaosengine.bounceme.net, 1
 chaosfield.at, 0
 chaosgenius.io, 1
 chaosme.su, 1
+chaospott.de, 1
 chaosprocess.com, 1
 chaoticevil.tk, 1
 chaoticgamers.net, 1
@@ -30607,6 +30744,7 @@ charliebighams.com, 0
 charlieblog.tk, 1
 charlieconstruction.com, 1
 charliedillon.com, 1
+charliedubovi.ch, 1
 charliegarrod.com, 1
 charlieharbourtattoos.tk, 1
 charliehr.com, 1
@@ -30946,6 +31084,7 @@ cheetham.me.uk, 1
 cheez.systems, 1
 cheezflix.uk, 1
 chefaa.com, 1
+chefcentral.co.uk, 1
 chefcuisto.com, 1
 chefdehome.com, 1
 chefforaday.it, 1
@@ -31354,6 +31493,7 @@ chirotestelt.tk, 1
 chirototem.tk, 1
 chirowij.tk, 1
 chirpset.com, 1
+chirpz.ai, 1
 chiru.no, 1
 chirurgoplastico.roma.it, 1
 chisagocountymn.gov, 1
@@ -31819,6 +31959,7 @@ churchsuite.com, 1
 churchthemes.com, 1
 churchwebcanada.ca, 1
 churchwebsupport.com, 1
+churchwoodvalley.com, 1
 churnfree.com, 1
 churrascariacampogrande.com.br, 1
 chuskocity.tk, 1
@@ -31977,6 +32118,7 @@ cinefilia.tk, 1
 cineforge.com, 1
 cinefun.net, 1
 cinegore.tk, 1
+cinejour.com, 1
 cinelandia.tk, 1
 cinema-rulem.tk, 1
 cinemaclub.co, 1
@@ -32080,6 +32222,7 @@ circlewelife.com, 1
 circoeia.com, 0
 circu.ml, 0
 circues.com, 1
+circuitcitydb.com, 1
 circuitcityelectricaladelaide.com.au, 1
 circuitclerkmarioncountyms.gov, 1
 circular-economy.earth, 1
@@ -32417,6 +32560,7 @@ ciudadrealtrabaja.com, 1
 ciulea.ro, 1
 civey.com, 1
 civia.com, 1
+civicaelectionservices.com, 1
 civicconnectiongroup.com, 1
 civicdigest.com.au, 1
 civicforum.pl, 1
@@ -32543,6 +32687,7 @@ clak.io, 1
 clalbit-checknet.co.il, 1
 clallamcountywa.gov, 1
 clamatohalloffame.com, 1
+clammert.net, 1
 clampgenerator.com, 1
 clan-afa.tk, 1
 clan-behh.tk, 1
@@ -33009,6 +33154,7 @@ cliffsidesecurity.com.au, 1
 cliffsnotes.com, 1
 clifresearch.com, 1
 cliftonaz.gov, 1
+cliftonpark.co.uk, 1
 clik.ga, 1
 clim-past-discuss.net, 1
 clim-past.net, 1
@@ -33592,6 +33738,7 @@ cmsprofessional.com.au, 1
 cmsprofessionals.com.au, 1
 cmsua.ca, 1
 cmt-france.org, 1
+cmtedu.com, 1
 cmtindia.com, 1
 cmtk.cloud, 1
 cmtportal.co.uk, 1
@@ -33624,6 +33771,7 @@ cnetion.com, 1
 cnetw.xyz, 1
 cnews.ru, 1
 cnfree.xyz, 0
+cng.com.au, 1
 cngf.com, 1
 cni-certing.it, 1
 cni.net.id, 1
@@ -33636,6 +33784,7 @@ cnmilaw.gov, 1
 cnnet.in, 1
 cnnumerique.fr, 1
 cnocsp.com, 1
+cnom.fr, 1
 cnopera.com, 1
 cnp.ovh, 1
 cnpkg.org, 1
@@ -33847,6 +33996,7 @@ codeeclipse.com, 1
 codefaq.org, 1
 codefather.ml, 1
 codefive.co.uk, 1
+codefor.food, 1
 codefordus.de, 1
 codefordus.nrw, 1
 codegen.ca, 1
@@ -33923,6 +34073,7 @@ codetheweb.blog, 1
 codetheworld.com, 1
 codetrack.se, 1
 codetripping.net, 1
+codetrustrategy.com, 1
 codeunderground.nl, 1
 codeupstudios.com, 1
 codeux.com, 1
@@ -34008,6 +34159,7 @@ coentropic.com, 1
 coequals.tk, 1
 cofense.at, 1
 cofetaria-narcisa.ro, 1
+coffa.gov, 1
 coffee-break.cc, 1
 coffee-like.com, 1
 coffee-webstore.com, 1
@@ -34100,6 +34252,7 @@ coinliq.com, 1
 coinloan.io, 1
 coinmama.com, 1
 coinmarketjob.com, 1
+coinmedium.com, 1
 coinmotion.com, 1
 coinnector.com, 1
 coinnewspulse.com, 1
@@ -34157,7 +34310,6 @@ coldfusion.co.jp, 1
 coldhak.ca, 0
 coldice.tk, 1
 coldjetconnect.com, 1
-coldlasers.org, 1
 coldmeat.se, 1
 coldpaste.com, 1
 coldraven.com, 1
@@ -34248,6 +34400,7 @@ collectif-laicite-yallah.be, 1
 collectif85.com, 1
 collectifpinceoreilles.com, 1
 collectiontardivel.com, 1
+collectionvillasstmartin.com, 1
 collective-conciousness.monster, 1
 collective-incubator.de, 1
 collectivecorruption.com, 1
@@ -34364,6 +34517,7 @@ colorblindprogramming.com, 1
 colorbond.vn, 1
 colorbrightongreen.org, 1
 colorcodedlyrics.com, 1
+colordetector.click, 1
 colorectalpractice.com, 1
 colorfularchive.eu.org, 1
 colorfulcloud.eu.org, 1
@@ -34408,6 +34562,7 @@ colquittga.gov, 1
 colson-occasions.be, 0
 coltellisurvival.com, 1
 colterris.com, 1
+coltography.ca, 1
 coltonrb.com, 1
 coluit.nl, 1
 columbiachronicle.com, 1
@@ -34526,7 +34681,6 @@ comfandivirtual.com.co, 1
 comff.net, 1
 comfinagro.com.co, 1
 comfintouch.com, 0
-comfipark.com, 1
 comfis.nl, 1
 comfitsweets.co.uk, 1
 comfort-place.com.ua, 1
@@ -34557,7 +34711,6 @@ comidasaludablehoy.com, 1
 comidasperuanas.net, 0
 comidina.com, 1
 comingto.icu, 1
-comiq.io, 1
 comistar.ee, 1
 comita.ru, 1
 comita.su, 1
@@ -34710,7 +34863,6 @@ companion-web.net, 1
 company-bike.com, 1
 company-info-plugins.nl, 1
 companyaneksta.tk, 1
-companycam.com, 0
 companyintranet.au, 1
 companyintranet.com.au, 1
 companywebcast.com, 0
@@ -34777,6 +34929,7 @@ compliance-risk.com, 1
 compliance-systeme.de, 1
 compliancebox.co, 1
 compliancecentral.org, 1
+compliancefox.io, 1
 compliancehome.com, 1
 complianceinsight.ca, 1
 compliancequest.com, 1
@@ -34936,6 +35089,7 @@ concept5.co.il, 1
 conceptatelier.de, 1
 conceptec.de, 1
 conceptfoundation.org, 1
+conceptluxury.it, 1
 conceptual.ga, 1
 concern.cloud, 1
 concert.ga, 1
@@ -35117,6 +35271,7 @@ connectedmind.me, 1
 connectfss.com, 1
 connectheor.com, 1
 connecticare.com, 1
+connecticutcourtreporter.com, 1
 connecticutnet.tk, 1
 connecticuttitlesearch.com, 1
 connectika.io, 1
@@ -35176,6 +35331,7 @@ conpunk.tk, 1
 conputant.co, 1
 conqi.net, 1
 conque.sk, 1
+conquestmuscleactivation.com, 1
 conquistar30dias.com.br, 1
 conrad-design.com, 1
 conrad-kostecki.de, 1
@@ -35188,6 +35344,7 @@ conrail.blue, 1
 conrasd.tk, 1
 conrazon.me, 1
 conroy.org, 1
+conroy4congress.com, 1
 consagracionamariasantisima.org, 1
 conscia.com, 1
 consciente.ch, 1
@@ -35285,6 +35442,7 @@ consult.eng.br, 1
 consultadepsicoterapia.com, 1
 consultancyistanbul.com, 1
 consultar-latam.com, 1
+consultar.io, 1
 consultation.ai, 1
 consultation.biz.tr, 1
 consultaveiculopelaplaca.com.br, 1
@@ -35349,6 +35507,7 @@ contempfleury.com, 1
 contemplativeeducation.org, 1
 contemptevoke.com, 1
 contenedoresdereciclaje.online, 1
+content.watch, 1
 contentcaching.com, 1
 contentpass.io, 1
 contentpass.net, 1
@@ -35446,6 +35605,7 @@ convert-fast.photos, 1
 convert.im, 1
 convert.io, 1
 convert2sql.com, 1
+converterkits.com, 1
 converting.click, 1
 convertire-documenti.it, 1
 convertr.io, 1
@@ -35653,6 +35813,7 @@ corbi.net.au, 1
 corbusier.gq, 1
 corcoranmn.gov, 1
 cord-blood.tk, 1
+cord.nyc, 1
 cordeirosolutions.ga, 1
 cordejong.nl, 0
 cordelia.tk, 1
@@ -35685,6 +35846,7 @@ core3k.info, 1
 core3k.mobi, 1
 core3k.org, 1
 core3k.us, 1
+core4-tech.com, 1
 coreapm.com, 1
 coreapm.org, 1
 corebit.nl, 1
@@ -35800,6 +35962,7 @@ coronavirusfortbend.gov, 1
 coronavirustesting.gov, 1
 coronersconnect.co.uk, 1
 cororocierodebelen.tk, 1
+corover.ai, 1
 corp.goog, 1
 corpconsulting.com, 1
 corpdocs.com.au, 1
@@ -35904,6 +36067,7 @@ corus-project.eu, 1
 corus-xuam.eu, 1
 corus.lt, 1
 corvaglia.com, 1
+corvalent.com, 1
 corvax.kiev.ua, 1
 corvel.com, 1
 corvettesalvage.com, 1
@@ -35978,6 +36142,7 @@ cosplaysr.com, 1
 cospol.ch, 0
 cosset.com.tw, 1
 costa-ballena.tk, 1
+costa-blanca.space, 1
 costalinux.tk, 1
 costaneranorte.cl, 1
 costaricadreamers.com, 1
@@ -36049,6 +36214,7 @@ coughlan.de, 1
 could.jp, 1
 couleur-lavande.com, 1
 couleursorgue.tk, 1
+couleva.ca, 1
 couliercreatures.com, 1
 coun.be, 1
 counseling4students.com, 1
@@ -36086,6 +36252,7 @@ countrybrewer.com.au, 1
 countryfunders.com, 1
 countrygrid.com, 1
 countryhearthbedandbreakfast.com, 1
+countryherald.com, 1
 countrymountaininn.com, 1
 countrymusicchart.net, 1
 countryoutlaws.ca, 1
@@ -36095,6 +36262,7 @@ countryshopradio.tk, 1
 countrysidebar.tk, 1
 countrysidemarquees.co.uk, 1
 countrysmile.org, 0
+countrysquyresantiques.com, 1
 county10.com, 1
 countyofbarton.gov, 1
 countyofcolusaca.gov, 1
@@ -36117,6 +36285,7 @@ courage-sachsen.org, 1
 courage.cf, 1
 couraqe.tk, 1
 courbis.fr, 1
+courbis.fr.eu.org, 1
 couriergrey.com, 1
 couriersrs.com, 1
 coursables.com, 1
@@ -36144,11 +36313,15 @@ courtonetickets.com, 1
 courtreporter-chicago.com, 1
 courtreporter-newyork.com, 1
 courtreporter.services, 1
+courtreporterct.com, 1
 courtreporterlosangeles.com, 1
 courtreporternet.com, 1
 courtreporterphiladelphia.com, 1
+courtreporters-il.com, 1
+courtreporters-in.com, 1
 courtreportersanfrancisco.com, 1
 courtreportersanjose.com, 1
+courtreporterslosangeles.com, 1
 courtreportersnet.com, 1
 courtreportersorangecounty.com, 1
 courtreporterssandiego.com, 1
@@ -36336,7 +36509,6 @@ cpsnap.org, 1
 cpsq.fr, 1
 cpstest.live, 1
 cpstest.org, 1
-cptcreative.com, 1
 cptoon.com, 1
 cpts-tdm16.fr, 1
 cptvl.de, 1
@@ -36416,6 +36588,7 @@ craftedcharmweddingplanning.com, 1
 crafterbase.de, 1
 crafters-room.com, 1
 crafters.co.jp, 1
+craftersrealty.com, 1
 craftfocus.com, 1
 craftgate.io, 1
 craftination.net, 1
@@ -36453,6 +36626,7 @@ craigwfox.com, 0
 crain.com, 1
 cramer-group.com, 1
 cramersoft.com, 1
+cramirez.cl, 1
 cran-automobiles.fr, 1
 cranecred.org, 1
 cranems.com.ua, 1
@@ -36471,6 +36645,7 @@ crapitalism.biz, 1
 crapmail.tk, 1
 crapouill.es, 1
 crash-de-1929-et-grande-depression.tk, 1
+crashchampions.com, 1
 crashcomputer.tk, 1
 crashcoursecenter.com, 1
 crashcrafter.de, 1
@@ -36678,6 +36853,7 @@ crecman.fr, 1
 crecycle.eco, 1
 credello.com, 1
 credemeuromobiliarepb.it, 1
+credencia.pe.gov.br, 1
 credex.bg, 1
 credfacilbeneficios.com.br, 1
 crediblemeds.org, 1
@@ -36721,10 +36897,10 @@ creditview.ai, 1
 creditxpert.com, 1
 crednox.com, 1
 credo.science, 1
+credzy.com, 1
 creekcountyonline.com, 1
 creekie.me, 1
 creeks-coworking.com, 1
-creekside.edu.in, 1
 creeksidebiblechurch.org, 1
 creeksidecentre.org.uk, 1
 creeksideduluth.com, 1
@@ -36904,6 +37080,7 @@ cristian-alexander.tk, 1
 cristiandumitru.tk, 1
 cristianhares.com, 1
 cristianonascimento.ml, 1
+cristicbz.eu, 1
 cristiengoller.ga, 1
 cristiengoller.gq, 1
 cristina.tk, 1
@@ -37084,6 +37261,7 @@ crownmazda.ca, 1
 crownmutual.com, 1
 crownmutualgroup.com, 1
 crownpeak.com, 1
+crownpenang.com, 1
 crownpoint.com, 0
 crownsterling.io, 1
 crownstone.rocks, 1
@@ -37108,7 +37286,6 @@ crsserviceogkloak.dk, 1
 crstat.ru, 1
 crt.sh, 1
 crt2014-2024review.gov, 1
-crtclaims.com, 1
 crtevents.co.uk, 1
 crtified.me, 1
 crucible.io, 1
@@ -37146,6 +37323,7 @@ crushxp.tk, 1
 crustytoothpaste.net, 1
 crute.me, 1
 crutic.gq, 1
+cruxreasoning.com, 1
 cruzadamorada.tk, 1
 crvenikrst.tk, 1
 cry-sys.de, 0
@@ -37184,6 +37362,7 @@ crypto-iptv.online, 1
 crypto-trade.org, 0
 crypto-wiki.tk, 1
 crypto.bzh, 1
+crypto.gov, 1
 crypto.graphics, 1
 cryptoagility.cloud, 1
 cryptoanarchist.tk, 1
@@ -37531,6 +37710,7 @@ ctyrisinkneri.cz, 1
 cu247secure.ie, 1
 cua911.gov, 1
 cuadrosblangar.es, 1
+cuantocuestauruguay.com, 1
 cuantusambiental.com, 1
 cuarentagrados.tk, 1
 cuaresmaysemanasanta.tk, 1
@@ -37737,6 +37917,7 @@ cuppen.support, 1
 cur.by, 1
 curacao.tk, 1
 curacaodiveguide.com, 0
+curakw.com, 1
 curamail.co.uk, 1
 curamcare.ml, 1
 curareldolordeespalda.com, 1
@@ -37767,6 +37948,7 @@ curiouscast.ca, 1
 curiousdaydreams.com, 1
 curiousduck.com, 1
 curiousmatrix.com, 1
+curiousozzy.com, 1
 curiousspoonfoods.com, 1
 curioustea.com, 1
 curiozitate.com, 1
@@ -37783,7 +37965,6 @@ curlyhumanhairextensions.tk, 1
 currency-one.com, 1
 currency-strength.com, 1
 currency-toolkit.com, 1
-currency.wiki, 1
 currencyfreaks.com, 1
 currencyreader.gov, 1
 currencyreaderapplication.gov, 1
@@ -37956,6 +38137,7 @@ cvj.me, 1
 cvjd.me, 0
 cvjm.rocks, 1
 cvlibrary.co.uk, 1
+cvlid.com, 1
 cvm.net.au, 1
 cvmatch.me, 1
 cvmu.jp, 1
@@ -38093,6 +38275,7 @@ cybercard.cz, 1
 cybercareers.gov, 1
 cybercat-tver.tk, 1
 cyberce.fr, 1
+cybercitadel.com, 1
 cyberclasse.ca, 1
 cyberclaw.tk, 1
 cybercloud.cc, 0
@@ -38157,6 +38340,7 @@ cybermatrixone.tk, 1
 cybermavi.com, 1
 cyberme.sh, 1
 cybermeldpunt.nl, 1
+cybermoov.com, 1
 cybermoov.eu, 1
 cybermotives.com, 1
 cybern.tk, 1
@@ -38308,6 +38492,7 @@ cynop.me, 1
 cynqx.com, 1
 cynrgie.fr, 1
 cynthiacherry.com, 1
+cyoa.com, 1
 cyon.ch, 1
 cyp.io, 1
 cype.dedyn.io, 1
@@ -38430,6 +38615,7 @@ d1zh9ivw96w8wn.cloudfront.net, 1
 d2.gg, 1
 d21laxujm54z8h.cloudfront.net, 1
 d24zgh0u05bzjw.cloudfront.net, 1
+d250.gov, 1
 d25n537guac4t4.cloudfront.net, 1
 d25sxbgdpzj1st.cloudfront.net, 1
 d25vkjbt1xiu01.cloudfront.net, 1
@@ -38467,6 +38653,7 @@ d6729.co, 1
 d6957.co, 1
 d6c5yfulmsbv6.cloudfront.net, 1
 d7031.de, 1
+d774.co.uk, 1
 d8.io, 1
 d8181.com, 1
 d82365.com, 1
@@ -38559,7 +38746,6 @@ dadrian.io, 1
 dadsarmy.tk, 1
 dadshoes.net, 1
 daduke.org, 1
-dadwhatcooks.com, 1
 daedalusdesigns.co, 1
 daemen.org, 1
 daemen.vlaanderen, 1
@@ -38705,6 +38891,7 @@ daja.ml, 1
 dajaks.tk, 1
 dajaskincare.nl, 0
 dajiale.org, 1
+dajiav.vip, 1
 dajjal.org, 1
 dajoose.com, 1
 dakcess.net, 1
@@ -38883,6 +39070,7 @@ daneshtools.tk, 1
 danfromit.co.uk, 1
 danfromit.com, 1
 dangarjim.com, 1
+dangeredwolf.net, 1
 dangerscience.com, 1
 dangersolutions.com.au, 1
 dangmai.tk, 1
@@ -38995,6 +39183,7 @@ danielstiner.me, 1
 danielt.co.uk, 0
 danielthompson.info, 1
 danieltollot.de, 0
+danieltoth.tech, 1
 danielvaduva.tk, 1
 danielve.ga, 1
 danielverlaan.nl, 1
@@ -39024,6 +39213,7 @@ dankeroni.de, 1
 dankim.de, 0
 dankojunasevic.tk, 1
 danla.nl, 1
+danlirette.ca, 1
 danlirette.com, 1
 danlockton.tk, 1
 danloona.nl, 1
@@ -39079,6 +39269,7 @@ danslan.org, 1
 danslavieyadescactus.ch, 1
 danstillman.com, 1
 danstoncu.be, 1
+dantaijimu.jp, 1
 dantana.de, 1
 dante.ms, 1
 dantesinferno.tk, 1
@@ -39120,6 +39311,7 @@ dappgambl.com, 1
 daprint.tk, 1
 dapss-ut.gov, 1
 dapursolo.tk, 1
+dar-agro.com.ua, 1
 daracokorilo.com, 1
 daralfajr.site, 1
 daramad-telegram.ga, 1
@@ -39312,6 +39504,7 @@ das-mediale-haus.de, 1
 das-sommercamp.de, 1
 dasabomobil.de, 1
 dasads.de, 1
+dasbaum.ch, 1
 dasble.com, 1
 dascan.com.br, 1
 dasdanny.de, 1
@@ -39339,7 +39532,6 @@ dasignsource.com, 1
 dasinternetluegt.at, 1
 daskirschhaus.com, 1
 dasler.eu, 1
-dasmailarchiv.ch, 1
 dasolindustrialpark.tk, 1
 dastchin.live, 1
 dastelefonbuch.de, 1
@@ -39534,7 +39726,6 @@ datenretter.tk, 1
 datenrettung360.at, 1
 datenrettung360.de, 1
 datenschutz-berlin.de, 1
-datenschutz-consult.de, 1
 datenschutz-gruenwald.de, 1
 datenschutz-individuell.de, 1
 datenschutz-isny.de, 1
@@ -39777,6 +39968,7 @@ davison.tech, 1
 davisontwp-mi.gov, 1
 davisrentacar.ro, 1
 davisvision.com, 1
+davmany.freeboxos.fr, 1
 davmimer-mercerie.ro, 1
 davorin.cf, 1
 davosalestax.com, 1
@@ -39869,6 +40061,7 @@ daywindrecordingstudio.com, 1
 daywindrecords.com, 1
 daywindworship.com, 1
 dayz.com, 1
+dazrik.com, 1
 dazz.io, 1
 dazzit.xyz, 1
 dazzledrive.tk, 1
@@ -39880,6 +40073,7 @@ db-sanity.com, 1
 db-works.nl, 1
 db.ci, 1
 db3archi.com, 1
+dbaasp.org, 1
 dbapress.org, 1
 dbaron.org, 1
 dbas.cz, 1
@@ -39905,6 +40099,7 @@ dbinderbilling.com, 1
 dbjc.tk, 1
 dbjg.com, 1
 dbkc.nl, 1
+dbl-action.com, 1
 dblabsite.net, 1
 dblcastles.co.uk, 1
 dbldub.net, 1
@@ -40080,6 +40275,7 @@ de-penaranda.be, 1
 de-pot.net, 1
 de-servers.de, 1
 de-spil.be, 1
+de-wikipedia.com, 1
 de.gt, 1
 de.ls, 1
 de.md, 1
@@ -40307,6 +40503,7 @@ deckfix.co.nz, 1
 deckingwollongong.com, 1
 deckshop.pro, 1
 declarando.es, 1
+declaration250.gov, 1
 declarativ.ga, 1
 declivitas.com, 1
 declutteringmymess.com, 1
@@ -40527,7 +40724,6 @@ degreeducation.tk, 1
 degreeverify.com, 1
 degreeverify.net, 1
 degreeverify.org, 1
-degressif.com, 1
 degroetenvanrosaline.nl, 1
 degrootenslot.nl, 0
 degroupnews.com, 1
@@ -40544,6 +40740,7 @@ dehopre.com, 1
 dehumanizer.com, 1
 dehuystandarts.nl, 1
 dehydrated.io, 1
+dei.gov, 1
 deiaprint.com, 1
 deidee.nl, 1
 deified.uk, 1
@@ -40622,6 +40819,7 @@ delavska-hranilnica.si, 1
 delavska.si, 1
 delawarehealth.tk, 1
 delawarenation-nsn.gov, 1
+delawaresolarinitiative.com, 1
 delawaretitlesearch.com, 1
 delawaretwpmi.gov, 1
 delay-dengi.cf, 1
@@ -40778,6 +40976,7 @@ deluxetransfers.co.uk, 1
 delvinoadegas.com.br, 1
 delycate.com, 1
 delycate.fr, 1
+delyfrut.cl, 1
 delzottolink.com, 1
 demaison.pro, 1
 demakkelijkevegan.nl, 1
@@ -40951,6 +41150,7 @@ denni-tisk.cz, 1
 denniksport.sk, 1
 denninger.jp, 1
 denningny.gov, 1
+dennino.gr, 1
 dennis-carpenter.com, 1
 dennis.reisen, 1
 dennis50jaar.nl, 1
@@ -41108,6 +41308,7 @@ deporeporters.info, 1
 deported.ml, 1
 deportescr.net, 1
 deportestalcahuano.tk, 1
+deporteubeda.com, 1
 deportivo-pasto.tk, 1
 depos.com, 1
 depos2go.com, 1
@@ -41115,6 +41316,7 @@ depositart.com, 1
 depositi.it, 1
 deposition.com, 1
 depositionreporters.com, 1
+depositionresources.com, 1
 deposito.it, 1
 depositomerci.it, 1
 depositomobili.it, 1
@@ -41184,6 +41386,8 @@ dergon.club, 1
 derguns.town, 1
 derhaeuptling.de, 0
 derhil.de, 1
+deria.it, 1
+deriaclean.it, 1
 deriheruhotel.com, 1
 derinforge.com, 1
 derinforge.com.au, 1
@@ -41250,6 +41454,7 @@ desakatorock.tk, 1
 desalas.org, 1
 desapego.com.br, 1
 desarrollamosweb.com, 1
+desarrollo-gl.space, 1
 desarrollosintecsa.com, 1
 descargapormega.ml, 1
 descobrim.com, 1
@@ -41531,6 +41736,7 @@ dev-academy.com, 1
 dev-advancedservicesportal.com, 1
 dev-amag.com, 1
 dev-brandywineglobal.com, 1
+dev-dojo.jp, 1
 dev-gutools.co.uk, 1
 dev-lab.net.pl, 1
 dev-ll-portal-app-euw.azurewebsites.net, 1
@@ -41694,6 +41900,7 @@ devrekarti.com, 1
 devries.frl, 1
 devries.one, 1
 devrijejansenist.nl, 1
+devs-env.com, 1
 devs-from.asia, 1
 devsectools.com, 1
 devsfield.com, 1
@@ -41711,6 +41918,7 @@ devtambayan.com, 1
 devtea.cz, 1
 devtechgroup.com, 1
 devtestfan1.gov, 1
+devtoolbox.in, 1
 devtty.org, 1
 devuan.org, 0
 devurandom.tk, 1
@@ -41730,6 +41938,7 @@ dewereldwerktthuis.org, 1
 dewerveling.tk, 1
 deweybeachpolice.gov, 1
 dewijkpraktijk.nl, 1
+dewikipedia.org, 1
 dewit-automatisering.nl, 1
 dewittcountyil.gov, 1
 dewittmi.gov, 1
@@ -41968,6 +42177,7 @@ diamond-hairstyle.dk, 1
 diamond-reporting.com, 1
 diamondbluffwi.gov, 1
 diamondcarpetcleaning.co.uk, 1
+diamonddelivers.com, 1
 diamondforms.net, 1
 diamondgoldmarkcity.cf, 1
 diamondgrid.ga, 1
@@ -42031,6 +42241,7 @@ diatomenterprises.com, 1
 diatr.us, 1
 diatrofi-ygeia.gr, 1
 diaweb.nl, 1
+diazmarco.me, 1
 diazmotorcycles.com, 1
 diazpubli.tk, 1
 diba.org.cn, 1
@@ -42168,6 +42379,7 @@ diegosalgado.tk, 1
 diegotoledo.com, 1
 diegotoledo.com.br, 1
 diegotoledo.eu, 1
+diegotoledo.it, 1
 diegovisual.tk, 1
 diehumanisten.de, 1
 diekleinekartenfabrik.de, 1
@@ -42721,6 +42933,7 @@ dipuleon.es, 1
 dipuma.com, 1
 dir2epub.com, 1
 dir2epub.org, 1
+dirayah.org, 1
 dirch.tk, 1
 dirdet.co.uk, 1
 dirdur.cf, 1
@@ -43139,6 +43352,7 @@ divegearexpress.net, 1
 diveidc.com, 1
 diveleasia.tk, 1
 divelement.ro, 1
+divelyon.fr, 1
 diveplan.org, 1
 divergences.eu.org, 1
 divernet.com, 1
@@ -43424,6 +43638,7 @@ djtourist.tk, 1
 djtrebol.cl, 1
 djurensvanner.tk, 1
 djurklinikenangelholm.se, 1
+djuz-buz.com, 1
 djvampire.tk, 1
 djviks-rap.tk, 1
 djvintagevinyl.com, 1
@@ -43519,6 +43734,7 @@ dlsmdportal.com, 1
 dlsolutions-inc.com, 1
 dlt.green, 1
 dlttrading.com, 1
+dlun.tk, 1
 dluxelab.com, 1
 dlv-registry.com, 1
 dlv-registry.net, 1
@@ -43603,6 +43819,7 @@ dmiaviation.com, 1
 dmilb.org, 1
 dmineiros.com.br, 1
 dmitaxapp.ca, 1
+dmitriylasarev.ru, 1
 dmitryg.name, 1
 dmitrykataev.ru, 1
 dmitrysnotes.ru, 1
@@ -43644,6 +43861,7 @@ dn9b1f9o30q82.cloudfront.net, 1
 dna-agency.it, 1
 dna-technology.ua, 1
 dna.li, 0
+dnadesigngroup.com, 1
 dnadk.com, 1
 dnaka91.rocks, 1
 dnalounge.com, 1
@@ -43699,6 +43917,7 @@ dnm-contracting.com, 1
 dnmlab.it, 1
 dnns.no, 1
 dnplegal.com, 1
+dnpp.co.kr, 1
 dnr-news.ru, 1
 dnrnews.ru, 1
 dns-check.nl, 0
@@ -43792,8 +44011,10 @@ dobrodruzi.tk, 1
 dobrorok.cz, 1
 dobrynyastyle.ru, 1
 dobryprezident.sk, 1
+dobrzechow.pl, 1
 dobusinessonline.com, 1
 doc-baza.tk, 1
+doc-reader-guide.com, 1
 doc-sign.fr, 1
 doc.ai, 1
 doc.ee, 0
@@ -43964,7 +44185,7 @@ dofus-aide.tk, 1
 dofus.market, 1
 dog-likeeyes.tk, 1
 dog-sounds.com, 0
-dog.systems, 1
+dog.systems, 0
 doga-osusume.jp, 1
 doga.tk, 1
 dogadostuambalaj.com, 1
@@ -44025,6 +44246,7 @@ doi.org, 1
 doihavetoputonpants.com, 1
 doineedanmdm.com, 1
 doinwp.com, 1
+doioig.gov, 1
 doist.com, 1
 doit-intl.com, 1
 doit.com, 1
@@ -44156,7 +44378,6 @@ domainexpress.de, 0
 domainforfree.gq, 1
 domainhostingcompany.tk, 1
 domainics.ml, 1
-domainlions.com, 1
 domainmaster.cz, 1
 domainmonitor.net, 1
 domainoo.com, 0
@@ -44325,6 +44546,7 @@ donate.lol, 1
 donateabox.org, 1
 donateaday.net, 1
 donateforcharity.com, 1
+donatefyra.ru, 1
 donatellapratas.com.br, 1
 donateway.com, 1
 donazione.it, 1
@@ -44352,6 +44574,7 @@ dongcdn.com, 1
 dongdaeyecenter.com.tw, 1
 donge.fr, 1
 dongen.me, 1
+dongfeng.com.pa, 1
 donggala.go.id, 1
 dongha.org, 1
 donghochinhhang.store, 1
@@ -44364,6 +44587,7 @@ doniramdoni.tk, 1
 donislawdev.com, 1
 donkerslootjes.nl, 1
 donkeytrekkingkefalonia.com, 1
+donmacleod.com, 1
 donnaandscottmcelweerealestate.com, 1
 donnabotanica.com.br, 1
 donnabrothers.com, 1
@@ -44448,6 +44672,7 @@ dooby.fr, 1
 doodle.com, 1
 doodlegames.tk, 1
 doodletips.com, 1
+doogbot.com, 1
 doogej.nl, 1
 doolac.com, 1
 dooleylabs.com, 1
@@ -44503,6 +44728,7 @@ dor-tak.ru, 1
 dora.moe, 1
 dorados.tk, 1
 doradoscampeon.tk, 1
+doradostrategic.com, 1
 doraemonchile.tk, 1
 dorama.gq, 1
 doramamusic.gq, 1
@@ -44601,6 +44827,7 @@ dotcommawards.com, 1
 dotcomtest02-single.azurewebsites.net, 1
 dotconnor.com, 0
 doterra.com, 1
+dotesports.com, 1
 dotfile.tk, 1
 dotgov.gov, 1
 dothaneagle.com, 1
@@ -44745,6 +44972,8 @@ downalarm.sk, 1
 downandouts.tk, 1
 downarea.com, 1
 downduvet.co.uk, 1
+downer.email, 1
+downer.info, 1
 downestan.ga, 1
 downfall-records.tk, 1
 downfreak.tk, 1
@@ -45091,6 +45320,8 @@ dreamdivers.com, 1
 dreamelegant.ml, 1
 dreamersgiftshopec.com, 1
 dreamexperience.tur.br, 1
+dreamflux.ai, 1
+dreamflux.xyz, 1
 dreamforcetv.pro, 1
 dreamhostremixer.com, 1
 dreamhotels.com, 1
@@ -45658,6 +45889,7 @@ dtnx.org, 1
 dtnx.social, 1
 dtnxny.com, 1
 dtrifonov.cf, 1
+dts-arabia.com, 1
 dtslab.bg, 1
 dtto.com, 1
 dtune.me, 1
@@ -45700,7 +45932,6 @@ dubbelmandesign-3d-banken.nl, 1
 dubboskills.com.au, 1
 dubcowa.tk, 1
 dubex.de, 1
-dubex.dk, 1
 dubielconsulting.de, 1
 dubiznes.ae, 1
 dubl.tk, 1
@@ -45711,6 +45942,7 @@ dublinseocompany.ie, 1
 duboisinternational.com, 0
 duboisinvestissements.com, 1
 dubolom.tk, 1
+dubovi.ch, 1
 dubrava.tk, 1
 dubreuilville.ca, 1
 dubrovnik.tours, 1
@@ -45871,6 +46103,7 @@ dungeon-bbs.de, 1
 dungeoncity.com, 1
 dungeonedraghi.it, 1
 dungeonfire.tk, 1
+dungeonlaundry.com, 1
 dunia-news.tk, 1
 dunkelmann.eu, 1
 dunkerhosting.nl, 1
@@ -46101,6 +46334,7 @@ dwwt.eu, 1
 dwwt.net, 1
 dwwt.nl, 1
 dwwt.org, 1
+dwz-shop.de, 1
 dwz-solutions.com, 1
 dwz-solutions.de, 0
 dwz-solutions.eu, 0
@@ -46305,6 +46539,7 @@ dzhypo.net, 1
 dzhypo.org, 1
 dziaduch.pl, 1
 dziankowski.pl, 1
+dziap.com, 1
 dziecismoka.pl, 1
 dziekonski.com, 1
 dziennikpress.pl, 1
@@ -46535,7 +46770,6 @@ e34club.com.ua, 1
 e365.vip, 1
 e36533.com, 1
 e3lan.net, 1
-e4.chat, 1
 e42.org, 0
 e4a.org, 0
 e4mc.link, 1
@@ -46715,6 +46949,7 @@ eastcottvets.co.uk, 1
 eastcyclehub.cz, 1
 eastdream.tk, 1
 eastendonline.tk, 1
+easternconvey.com.au, 1
 easternenterprise.com, 1
 easternliners.com, 1
 easternmontanafair.gov, 1
@@ -46852,6 +47087,7 @@ easyqr.codes, 0
 easyradio.gq, 1
 easyretro.io, 1
 easyrpg.org, 1
+easyseo.pro, 1
 easyshare.gq, 1
 easysignup.com, 1
 easyska.tk, 1
@@ -46970,7 +47206,6 @@ eberls.com, 1
 eberspacher-rus.ru, 1
 ebest.co.jp, 1
 ebetbananom.tk, 1
-ebeton.cz, 1
 ebeyan.name, 1
 ebeyanname.net.tr, 1
 ebics.cz, 1
@@ -47162,6 +47397,7 @@ eclipseinspectionservices.co.uk, 1
 eclipseservicehub.com, 1
 eclipsesource.com, 1
 eclipsestatus.io, 1
+eclipsesuite.com, 1
 eclixo.com, 1
 ecmx.eu, 1
 ecnetworker.com, 1
@@ -47196,6 +47432,7 @@ ecodesign-labo.jp, 1
 ecodesigns.nl, 1
 ecodrive.in.ua, 1
 ecoelectricsandiego.com, 1
+ecoelegance.com.au, 1
 ecoeuropa.cf, 1
 ecofinancing.com, 1
 ecofoolad.com, 1
@@ -47321,6 +47558,7 @@ ecoupakovka.ga, 1
 ecourbano.tk, 1
 ecourtdate.com, 1
 ecoute.tv, 1
+ecovadis.ltd, 1
 ecoventfix.com, 1
 ecowater.com, 1
 ecowoman-armenian.tk, 1
@@ -47373,6 +47611,7 @@ ed-medications.ml, 1
 ed-studios.tk, 1
 ed-w.de, 1
 ed.careers, 1
+ed.gov, 1
 ed.gs, 1
 ed.nl, 1
 ed394jed.fr, 1
@@ -47446,6 +47685,7 @@ edflex.com, 1
 edfoc.org.uk, 1
 edg.nl, 1
 edgar.mx, 1
+edgarbollow.com, 1
 edgarcountyillinois.gov, 1
 edgarphotography.net, 1
 edgarsmission.org.au, 1
@@ -47454,7 +47694,6 @@ edgartamarit.com, 1
 edgarwi.gov, 1
 edgarz.tk, 1
 edge-cloud.net, 1
-edgecase.ru, 1
 edgeconnectnj.net, 1
 edgecustomersportal.com, 1
 edgeinvestments.estate, 1
@@ -47487,6 +47726,7 @@ edilians-group.com, 1
 ediliovo.com, 1
 edilondon.com, 1
 edilservizivco.it, 1
+edilzanini.it, 1
 edinbric.scot, 0
 edinburghcastle.scot, 0
 edirnehaber.tk, 1
@@ -47530,7 +47770,7 @@ edlinger.at, 1
 edlinger.mobi, 1
 edlong.com, 1
 edman007.com, 1
-edmates.com, 1
+edmates.com, 0
 edmedications.tk, 1
 edmedsonline.tk, 1
 edmilia.tk, 1
@@ -47608,6 +47848,7 @@ educationdepartment.ml, 1
 educationet.tk, 1
 educationfinancenetwork.org, 1
 educationfirst.ml, 1
+educationforracialequity.com, 1
 educationgov.tk, 1
 educationhighquality.ml, 1
 educationism.tk, 1
@@ -47743,6 +47984,7 @@ eellak.gr, 1
 eelsden.net, 1
 eemcevn.com, 1
 een-eenvoudige-test-voor-de-maximum-lengte-van-een-nederlandse.nl, 1
+een.com, 1
 eenfotowaard.nl, 1
 eenmailsturen.nl, 0
 eentweevijf.be, 1
@@ -47931,6 +48173,7 @@ eglinlife.net, 1
 eglise-crc.be, 1
 egliseclichy92.fr, 1
 eglisedenantes.fr, 1
+egly.se, 1
 egm-sakura.com, 1
 egmbypga.com, 1
 ego4u.com, 1
@@ -47993,6 +48236,7 @@ ehcommerce.com, 1
 ehealth.gov.au, 1
 ehealth.kg, 1
 eheberg.com, 1
+eheberg.fr, 1
 eheliche-disziplin.schule, 1
 eheringe-shop24.de, 0
 eheya.net, 1
@@ -48064,6 +48308,7 @@ eijil.com, 1
 eijo.saarland, 1
 eijsink.nl, 1
 eikenskaden.tk, 1
+eikipedia.org, 1
 eiklandenergy.com, 1
 eiko-dch.ac.jp, 1
 eiko.moe, 1
@@ -48220,7 +48465,6 @@ ekonomska.tk, 1
 ekophone.bg, 1
 ekoport.ru, 1
 ekosaltis.lt, 1
-ekospajzka.cz, 1
 ekostecki.de, 1
 ekowibowo.com, 1
 ekpj.jp, 1
@@ -48243,10 +48487,12 @@ ekzcrosstour.ch, 1
 ekzotika.tk, 1
 el-akses.com, 1
 el-cell.com, 1
+el-d.in, 1
 el-hossari.com, 1
 el-jefe.me, 0
 el-masri.bg, 1
 el-mundo.tk, 1
+el-sale.ru, 1
 el-tatwer.tk, 1
 ela-lift.ru, 1
 ela-n.de, 1
@@ -48262,6 +48508,7 @@ elaegypt.org, 1
 elahejalilvand.com, 1
 elaheze.com, 0
 elahuehuete.art, 1
+elaine.is, 1
 elainerock.com, 1
 elakiri.cf, 1
 elalmibar.com, 1
@@ -48289,6 +48536,7 @@ elba-hotel.tk, 1
 elbaal.gov, 1
 elbaradei.com, 1
 elbattack-entruempelung.de, 1
+elbe-umzuege.de, 1
 elbelehmbau.de, 1
 elbersdometechniek.tk, 1
 elbetech.net, 1
@@ -48422,7 +48670,6 @@ electriciancenturion24hours.co.za, 1
 electriciannewburypark.com, 1
 electricianpacificpalisades.com, 1
 electricianpretoria24-7.co.za, 1
-electricians-roodepoort.co.za, 1
 electriciansportelizabeth.co.za, 1
 electricianthousandoaks.com, 1
 electricienasnieres.fr, 1
@@ -48462,9 +48709,11 @@ electromec.net, 1
 electromec.org, 1
 electromenager.tk, 1
 electromotor.tk, 1
+electron-switch.world, 1
 electronic-ignition-system.com, 1
 electronicafacil.net, 1
 electronicaripol.es, 1
+electronicfiddling.com, 1
 electronics.com.bd, 1
 electronicshelpcare.net, 1
 electronicssrit.tk, 1
@@ -48565,7 +48814,12 @@ elektrotechnik-schreck.de, 1
 elektrotechnik-schwab.de, 1
 elektrotechniker-beck.de, 1
 elektrownie-tanio.net, 1
+elektrum.lv, 1
+elektrumdrive.com, 1
+elektrumdrive.lt, 1
+elektrumdrive.lv, 1
 elektrumgroup.com, 1
+elektrumloterija.lv, 1
 elektryczka.pl, 1
 elelenin.cf, 1
 elemac.com.my, 1
@@ -48674,6 +48928,7 @@ elevenensemble.tk, 1
 eleventhhouraltar.com, 1
 eleventhhourwatch.com, 1
 elever-events.com, 1
+elevynglobal.com, 1
 elexel.ru, 1
 elexon.co.uk, 1
 elexprimidor.com, 1
@@ -48724,6 +48979,7 @@ eliassierra.pro, 1
 eliaswendt.com, 0
 eliaustvarjaspomine.si, 1
 eliav.tk, 1
+eliava-gartenbau.de, 1
 elibidore.ml, 1
 elicdn.com, 1
 elidiaz.com, 1
@@ -48986,6 +49242,7 @@ elpo.net, 1
 elpradopaloalto.com, 1
 elpreciosostud.com, 1
 elprincipevegeta.tk, 1
+elpro.bg, 1
 elprofeshows.com, 1
 elpromaucae.tk, 1
 elquintoas.tk, 1
@@ -49169,6 +49426,7 @@ embodied.vision, 1
 embonus.dk, 1
 emboque.tk, 1
 embotics.com, 1
+embouts-et-bouchons.fr, 1
 embracecontext.com, 1
 embracethedarkness.co.uk, 1
 embracezine.tk, 1
@@ -49267,6 +49525,7 @@ emily-website.tk, 1
 emily.moe, 1
 emilymarques.ga, 1
 emilysweet.com, 1
+emilytiffanyjoy.com, 1
 emilywufaith.tk, 1
 emina-arapovic.tk, 1
 eminafans.tk, 1
@@ -49320,6 +49579,7 @@ emmerdale.me.uk, 1
 emmetcountyia.gov, 1
 emmilein.com, 1
 emmiwelentain.com, 1
+emmynet.com, 1
 emmynet.de, 1
 emmyretreatapartments.com, 1
 emo-poris.com, 1
@@ -49715,6 +49975,7 @@ energygroup.tk, 1
 energyguru.tk, 1
 energyhomeservice.ca, 1
 energyhybrid.ga, 1
+energylab.com.ua, 1
 energylink.com, 1
 energylocals.au, 1
 energylocals.com, 1
@@ -49833,7 +50094,6 @@ english-community.com, 1
 english-to-russian-translation.tk, 1
 english-training.tk, 1
 english.events, 1
-english4oman.com, 1
 englishbulgaria.net, 1
 englishcast.com.br, 1
 englishclassworksheets.com, 1
@@ -49931,6 +50191,7 @@ enomada.net, 1
 enonvalleyboropa.gov, 1
 enoou.com, 0
 enorekcah.com, 1
+enosisbd.com, 1
 enosiseurotrade.com, 1
 enosistrade.com, 1
 enot32.ru, 1
@@ -50125,6 +50386,7 @@ enumasecurity.com, 1
 enuygun.com, 1
 enuygunaucakbileti.com, 1
 enuygunfinans.com, 1
+enuygunpaykwik.com, 1
 enuygunsigorta.com, 1
 envanature.com, 1
 envant.co.uk, 1
@@ -50225,6 +50487,7 @@ eostar.ro, 1
 eov2.com, 1
 ep-cortex.com, 1
 ep-plus.jp, 1
+epa.gov, 1
 epagos.com.ar, 1
 epagos.mx, 1
 epaoig.gov, 1
@@ -50500,6 +50763,7 @@ ergostoel.nl, 1
 ergotherapie-schaab.de, 1
 ergotherapie.fr, 1
 erguinsaat.com, 1
+erholungsrechner.de, 1
 erhvervsposten.dk, 1
 erhydro.com, 1
 eriandevan.com, 1
@@ -50609,6 +50873,7 @@ ero-like.online, 1
 ero-review.jp, 1
 ero.ink, 0
 erodvd.com, 0
+erogen.org, 1
 eroimatome.com, 1
 erokat.ga, 1
 erol.se, 1
@@ -50633,7 +50898,6 @@ erotikstahrtseite.gq, 1
 erotikstahrtseite.tk, 1
 erotismo.co, 1
 erozine.jp, 1
-erp-systems.ovh, 1
 erpcargo.com, 0
 erpcloud.systems, 1
 erpelstolz.at, 1
@@ -50736,7 +51000,6 @@ esb777.us, 1
 esb8886.com, 1
 esb999.com, 1
 esb999.info, 0
-esb999.us, 0
 esba11.cc, 1
 esba11.com, 1
 esbuilders.co.nz, 0
@@ -50840,6 +51103,7 @@ esgforum.com.br, 1
 esginnova.com, 1
 esginside.com.br, 1
 esgr.in, 1
+esgrevents.mil, 1
 esh.ink, 1
 eshaanya.us, 1
 esher.ac.uk, 1
@@ -50861,6 +51125,7 @@ esignandpay.net, 1
 esignering.se, 1
 esignprod.herokuapp.com, 1
 esigtorg.ru, 0
+esike.hu, 1
 esiliati.org, 1
 esilva.me, 1
 esilverstone.pl, 1
@@ -50948,6 +51213,7 @@ espass.gq, 1
 espci.fr, 1
 especes.org, 1
 especializasaudecursos.com.br, 1
+especiallysilver.com, 1
 especificosba.com.ar, 1
 espectro.tk, 1
 espejo.tk, 1
@@ -50956,6 +51222,7 @@ espeleogel.tk, 1
 espen.cz, 1
 espenandersen.no, 1
 espeo.eu, 1
+esperanceetvie.ca, 1
 esperantio.tk, 1
 esperanto.co, 1
 espgg.org, 1
@@ -51022,7 +51289,6 @@ essaywebsite.com, 1
 esse.tools, 1
 essecharlie.com, 1
 essenah.com, 1
-essence.com, 1
 essencesdeprana.org, 1
 essencespresso.es, 0
 essenciasparis.com.br, 1
@@ -51163,6 +51429,7 @@ esvc.co.uk, 1
 esverify.org, 1
 esw.com, 1
 eswaranthenellaicatering.in, 1
+eswikipedia.org, 1
 esy.com.br, 1
 esy.nl, 1
 esyoil.com, 1
@@ -51276,7 +51543,7 @@ ethicaltek.com, 0
 ethics.org, 1
 ethicsburg.gov, 1
 ethicsfirst.org, 0
-ethika.com, 1
+ethicsready.com, 1
 ethil-faer.fr, 1
 ethio-jobs.net.et, 1
 ethiqueadvisory.com, 1
@@ -51287,6 +51554,7 @@ ethnopsychoanalyse.tk, 1
 ethosinfo.com, 1
 ethotupala.tk, 1
 ethpool.org, 1
+ethternet.top, 1
 etialis.com, 1
 etialis.fr, 1
 eticket.cr, 1
@@ -51532,6 +51800,7 @@ european-hospital.ga, 1
 european-hospital.ml, 1
 european-hospital.tk, 1
 european-silk-road.eu, 1
+european-standards.com, 1
 europeananomalouswave.tk, 1
 europeanbcc.eu, 1
 europeancuisine.tk, 1
@@ -51684,6 +51953,7 @@ evelienstormzangcoach.nl, 1
 evelienuitvaartverzorging.nl, 1
 evelienzorgt.nl, 1
 evelin.tk, 1
+evelinalondon.nhs.uk, 1
 evelyndayman.com, 1
 evenbijproaten.online, 1
 evendesign.gq, 1
@@ -51825,6 +52095,7 @@ evertry.co, 1
 evertz.com, 1
 evertz.io, 1
 everwaking.com, 0
+everwelloh.com, 1
 everwinter.tk, 1
 every-day-life.com, 0
 every-day.nl, 1
@@ -51857,6 +52128,7 @@ everysaving.com, 1
 everysaving.com.au, 1
 everysaving.ie, 1
 everysaving.sg, 1
+everysk.com, 1
 everystudent.bg, 1
 everystudent.com.tw, 1
 everysync.co.jp, 1
@@ -51941,7 +52213,6 @@ evolution-host.ga, 1
 evolution-x.org, 1
 evolution.codes, 1
 evolutionbp.es, 1
-evolutionhomecorp.com, 1
 evolutioninflatables.co.uk, 1
 evolutionlife.za.com, 1
 evolutionmining.com, 1
@@ -51974,6 +52245,7 @@ evosyn.com, 1
 evote-ch.ch, 1
 evoting-test.ch, 1
 evoting.ch, 1
+evpitch.com, 1
 evrial.com, 1
 evromandie.ch, 1
 evronews.ga, 1
@@ -52077,6 +52349,7 @@ exarcheia.link, 1
 exarcheia.ru, 1
 exarius.org, 1
 exashop.tn, 1
+exaspace.de, 1
 exatmiseis.net, 0
 exatom.io, 1
 excaliburmatrix.tk, 1
@@ -52129,6 +52402,7 @@ exchangetrading.tk, 1
 exchangeview.ga, 1
 exchangevisits.tk, 1
 exchaser.com, 1
+excitech.co.uk, 1
 exciters.tk, 1
 excitoninteractive.com, 1
 exclaimer.com, 1
@@ -52159,6 +52433,7 @@ exegol.co.uk, 1
 exelonline.nl, 1
 exelreporters.com, 1
 exelreporting.com, 1
+exelya.fr, 1
 exemples-de-stands.com, 1
 exer.fr, 1
 exercise.com, 1
@@ -52191,7 +52466,6 @@ exiletower.tk, 1
 exip.ga, 1
 exira.com, 1
 exist.ru, 1
-exitbydeath.com, 1
 exito-e.com, 1
 exitoseguro.tk, 1
 exitreality.tk, 1
@@ -52199,7 +52473,6 @@ exits.partners, 1
 exizent.com, 1
 exizent.tk, 1
 exlibris.org, 1
-exmart.ng, 1
 exmoe.com, 1
 exo-chanyeol.tk, 1
 exoatlas.com, 1
@@ -52245,7 +52518,6 @@ expatmortgage.uk, 1
 expatriate.pl, 0
 expe.voyage, 1
 expectful.com, 0
-expectingplus.com, 1
 expediteplus-asia.com, 1
 expediteplus.biz, 1
 expediteplus.ca, 1
@@ -52279,6 +52551,7 @@ experiments.lv, 1
 experimetrix.com, 1
 experise.fr, 1
 experiumorocco.com, 1
+expero.ru, 1
 experpento.tk, 1
 expert-batiment-rouen.fr, 1
 expert-comptable-vichy-moulins-allier.fr, 1
@@ -52508,7 +52781,6 @@ extratext.at, 1
 extratv.com, 1
 extreme-addicts.tk, 1
 extreme.co.th, 1
-extremebaking.com, 1
 extremedialogue.org, 1
 extremeforces.tk, 1
 extremelawsers.ga, 1
@@ -52565,6 +52837,7 @@ eyescratch.tk, 1
 eyesee.fr, 1
 eyesfans.com, 1
 eyeshield-informatique.tech, 1
+eyesoneshot.fr, 1
 eyespecialistsofla.com, 1
 eyestrainexplained.com, 1
 eyesurgery.tk, 1
@@ -52629,6 +52902,7 @@ ezz-drops.tk, 1
 ezzarware.nl, 1
 ezzhole.net, 1
 f-401.com, 1
+f-almeida.group, 1
 f-centre.ru, 1
 f-droid.org, 0
 f-mall.jp, 1
@@ -52733,6 +53007,7 @@ fabbs.org, 1
 fabconvert.com, 1
 fabelturen.tk, 1
 faber.org.ru, 0
+fabercityshop.de, 1
 faberoclub.tk, 1
 fabfrenchinsurance.com, 1
 fabfrugalmama.com, 1
@@ -52792,6 +53067,7 @@ fabrik.de, 1
 fabrika-himchistki.ru, 1
 fabrika-jaluzi.ru, 1
 fabrikafilmes.com.br, 1
+fabrikhane.com, 1
 fabriknet.de, 1
 fabrilec.tk, 1
 fabrinet.co.th, 1
@@ -52857,6 +53133,7 @@ facepretty.com.tw, 1
 faces4watch.com, 1
 facescertification.com, 1
 facesdr.com, 1
+facetours.ma, 1
 facevietpro.tk, 1
 facevitalityers.ga, 1
 fachcar.ma, 1
@@ -53177,6 +53454,7 @@ famacweb.no, 1
 famainfo.com.br, 1
 famcloud.de, 1
 famdouma.nl, 1
+famelack.com, 1
 fameng.nl, 1
 famenneartmuseum.be, 1
 famep.gov, 1
@@ -53602,6 +53880,7 @@ fast-pro.co.jp, 1
 fast-silver.tk, 1
 fast.ly, 1
 fast4ever.tk, 1
+fast9.net, 1
 fastable.net, 1
 fastamundi.com, 1
 fastandtuning.tk, 1
@@ -53665,6 +53944,7 @@ fastphox.com, 1
 fastpresence.com, 1
 fastproxycat.ml, 1
 fastproxyforfree.gq, 1
+fastreact.pl, 1
 fastreel.com, 1
 fastrocket.pl, 1
 fastscanapp.com, 1
@@ -53915,7 +54195,6 @@ featherfan.io, 1
 feathermc.com, 1
 feathersbtq.com, 0
 featherwallet.org, 1
-feature-branch.nl, 1
 featured.tk, 1
 featuredcarders.ga, 1
 feb.gov, 1
@@ -54187,6 +54466,7 @@ femmesaupluriel.com, 1
 femncafe.com, 1
 femundo.de, 1
 fena.jp, 1
+fenacha.fr, 1
 fenagav.ga, 1
 fenalia.shop, 1
 fenatrigo.com.br, 1
@@ -54333,6 +54613,7 @@ ferronweb.org, 1
 ferrousmoon.com, 1
 ferrovial.com, 1
 ferrumformat.com, 1
+ferry.uk, 1
 ferrybig.me, 1
 ferrybig.nl, 1
 ferrynitzsche.nl, 1
@@ -54473,6 +54754,7 @@ fff-musique.fr, 1
 fffbhv.de, 1
 fffdm.com, 1
 ffhs.ch, 1
+ffi.lol, 1
 ffiec.gov, 1
 ffis.me, 0
 ffl123.com, 1
@@ -54576,8 +54858,8 @@ fi.search.yahoo.com, 0
 fiam.me, 1
 fianna.tk, 1
 fianoromano.news, 1
+fiaoakland.org, 1
 fiasgo.dk, 1
-fiataldivat.hu, 1
 fibank.bg, 1
 fiberoptikz.tk, 1
 fiberxl.com, 1
@@ -54751,6 +55033,7 @@ fileshare.party, 1
 fileshare.to, 1
 filesharing.to, 1
 filesharingshop.com, 1
+filesmp3.org, 1
 filesoup.io, 1
 filestar.io, 1
 filestartest.io, 1
@@ -55000,7 +55283,6 @@ findtreatment.gov, 1
 findyour.diet, 1
 findyourdreams.tk, 1
 findyourinfluence.com, 1
-findyourstores.com, 1
 findyourvoice.ca, 1
 fine-mach.com, 1
 fine-services.paris, 1
@@ -55014,7 +55296,6 @@ finefriends.nl, 1
 finehealth.ru, 0
 finehomesource.com, 1
 finenet.com.tw, 1
-fineopay.com, 1
 fines.vic.gov.au, 1
 fineshare.tk, 1
 finesio.sk, 1
@@ -55623,6 +55904,7 @@ flanderslaw.com, 1
 flanga.io, 0
 flangespreader.eu, 1
 flanigan.tk, 1
+flannel.co.jp, 1
 flanschspreizer.at, 1
 flapoverspeed.com, 1
 flapperistic.tk, 1
@@ -55654,6 +55936,10 @@ flashissue.com, 1
 flashkeysers.ga, 1
 flashlearners.com, 1
 flashpegasus.com.br, 1
+flashsale.com.pk, 1
+flashsale.pk, 1
+flashsale.store, 1
+flashsalepk.com, 1
 flashscores.tk, 1
 flashset.tk, 1
 flashuk.com, 1
@@ -55769,6 +56055,7 @@ flevodogs.nl, 1
 flevoland.nl, 1
 flevoscouts.nl, 1
 flex-one.fr, 1
+flex-port.net, 1
 flex1solutions.com, 1
 flexapplications.se, 0
 flexartsocial.com, 1
@@ -56116,6 +56403,7 @@ fluentu.com, 1
 fluessiggas.de, 1
 fluf.io, 1
 fluff.im, 1
+fluffi.es, 1
 fluffybottles.com, 1
 fluffycat.ga, 1
 fluffycloud.de, 1
@@ -56378,6 +56666,7 @@ fol.tf, 1
 folar.ga, 1
 folclore.tk, 1
 foldcle.com, 1
+folder.ro, 1
 foldnfly.com, 1
 folf.codes, 1
 folhageral.com, 1
@@ -56849,6 +57138,7 @@ formatsuite.com, 1
 formazione.roma.it, 1
 formbio.com, 1
 forme.nl, 1
+formedoor.it, 1
 formeras.com, 1
 formeras.tr, 1
 formidium.com, 1
@@ -56874,6 +57164,7 @@ formulastudent.de, 1
 formulatedby.com, 1
 formulaveevictoria.com.au, 1
 formweb.de, 1
+formyourcorp.com, 1
 fornarisandres.com, 1
 fornata.it, 1
 forneyplus.com, 1
@@ -56977,6 +57268,7 @@ fortunacigarettes.tk, 1
 fortunafinancial.ca, 1
 fortunahamburg.tk, 1
 fortune-healing.com, 1
+fortune.cards, 1
 fortunebazar.tk, 1
 fortunedoor.net, 1
 fortuneinvestments.ga, 1
@@ -57386,6 +57678,7 @@ framboise314.fr, 1
 framedog.tk, 1
 framegame.ch, 1
 framemo.org, 1
+framenails.fr, 1
 framer.ai, 1
 framer.com, 1
 framer.live, 1
@@ -57413,6 +57706,7 @@ franceactivetravel.cf, 1
 franceactivetravel.ml, 1
 francebattery.com, 1
 francedebosselage.com, 1
+francelab.hu, 1
 francelight.fr, 1
 francenum.gouv.fr, 1
 francepandi.fr, 0
@@ -57444,6 +57738,7 @@ francis.ph, 1
 franciscadelasllagasvirtual.com, 1
 franciscasacarneiro.pt, 1
 franciscoeduardocruz.tk, 1
+franciscojperez.com, 1
 franciscolapa.eu, 0
 franciscoperezyoma.com, 0
 francisfazzini.com, 1
@@ -58091,7 +58386,6 @@ friedberg2020.de, 1
 friedbergdirectfx.ca, 1
 friedenskirche-koeln.de, 1
 friedensteppich.de, 1
-friederes.lu, 0
 friederloch.de, 1
 friedhelm-wolf.de, 1
 friedhof-hohenlimburg.de, 1
@@ -58312,7 +58606,6 @@ frozendurian.club, 1
 frozenpennies.com, 1
 frp-roleplay.de, 1
 frpg.gov, 1
-frprn.com, 1
 frprn.es, 1
 frrfb.org.au, 1
 frsecure.com, 1
@@ -58404,6 +58697,8 @@ fsmi.in, 1
 fsnb.com, 1
 fspchile.org, 1
 fspk.cfd, 1
+fspk.club, 1
+fspk.fyi, 1
 fspk.pro, 1
 fspk.tech, 1
 fsrs.gov, 1
@@ -58438,6 +58733,7 @@ fsty.uk, 1
 fsub.de, 1
 fsvoboda.cz, 1
 ft.com, 0
+ft0.sh, 1
 ftang.de, 1
 ftc.gov, 1
 ftccomplaintassistant.gov, 1
@@ -58605,6 +58901,7 @@ fukui-dc.com, 1
 fukuiedu.com, 1
 fukuko.biz, 1
 fukuko.xyz, 1
+fukumoto.tokyo, 1
 fukushima-fun.com, 1
 fukushimacoffee.com, 1
 fulcrumanalytics.com, 1
@@ -58664,7 +58961,6 @@ fumify.tk, 1
 fumilink.com, 1
 fumotousa.com, 1
 fun-baby.ru, 1
-fun-bounce.co.uk, 1
 fun-day.tk, 1
 fun-life.com.tw, 0
 fun-tasia.co.uk, 1
@@ -58794,6 +59090,7 @@ funinthesunboating.com, 1
 funio.com, 1
 funk-austria.com, 1
 funk-gruppe.de, 1
+funk-gruppe.it, 1
 funk-gruppe.li, 1
 funk-stiftung.de, 1
 funk-stiftung.org, 1
@@ -58880,6 +59177,7 @@ furbooru.org, 1
 furca.ca, 1
 furcdn.net, 1
 furcity.me, 1
+fureal.net, 1
 furgetmeknot.co.za, 1
 furgetmeknot.org, 1
 furgetmeknot.org.za, 1
@@ -58937,6 +59235,8 @@ furrycon.top, 1
 furrycraft.ga, 1
 furryfandomclub.cn, 0
 furrytech.network, 1
+furrytrashsmash.com, 1
+furrytrashsmash2.com, 1
 furs.town, 1
 fursandfur.tk, 1
 furseo.co, 1
@@ -59345,6 +59645,7 @@ gabrielsteens.nl, 1
 gabrielvillarreal.com, 0
 gabrielyin.com, 0
 gabryjeluk.tk, 1
+gabskent.de, 1
 gabtitui.gov.au, 0
 gabucho.tk, 1
 gabyclark.com, 1
@@ -59506,6 +59807,7 @@ galerias-xamoralarte.ga, 1
 galeriavisol.com, 1
 galerie-claudia-walz-nagold.tk, 1
 galerie-com.com, 1
+galerie-montmartre.com, 1
 galerie-saintgermain.fr, 1
 galeries.photo, 0
 galexlee.com, 1
@@ -59658,6 +59960,7 @@ gamekeepers.cz, 1
 gamekeybox.tk, 1
 gamekiller.ga, 1
 gameking.com.au, 1
+gamelair.me, 1
 gameloft.ga, 1
 gamelok.ga, 1
 gamemakers.tk, 1
@@ -59805,6 +60108,7 @@ gammaphibeta.tk, 1
 gammonvillage.com, 1
 gamoloco.com, 0
 gamrenovation.ca, 1
+gamtosgidas.lt, 1
 gan.wtf, 1
 ganaha.org, 1
 ganardinerillo.tk, 1
@@ -59832,6 +60136,7 @@ ganoderma4in1coffee.com, 1
 ganodermacoffee.com, 1
 ganodermatiendaonline.com, 1
 gansevoorthotelgroup.com, 1
+gant.ninja, 1
 gant.tk, 1
 gantlaborde.com, 1
 gantt-chart.com, 1
@@ -59882,6 +60187,7 @@ garbuz.ga, 1
 garcia-leplus.com, 1
 garcialeplus.com, 1
 garciam.gt, 1
+garciastl.com, 1
 garco.co, 0
 gard.no, 1
 garda-see.mobi, 1
@@ -59984,6 +60290,7 @@ garudam.info, 1
 garwiniowa.gov, 1
 gary.gov, 1
 garycarmell.com, 1
+garycheathamart.com, 1
 garygreenbergonline.com, 1
 garyjones.co.uk, 1
 garyjones.io, 1
@@ -59993,6 +60300,7 @@ garywhittington.com, 0
 gas-boilers.tk, 1
 gas-online.cz, 1
 gas-proekt.tk, 1
+gas.gallery, 1
 gasb87leaseaccounting.com, 1
 gasbarkenora.com, 1
 gasenergy.kz, 1
@@ -60065,6 +60373,7 @@ gatewaytire.com, 1
 gatewaytrust.org.uk, 1
 gathegi.ga, 1
 gatherling.com, 1
+gathersouthwest.org, 1
 gatherthebride.com, 1
 gatherup.com, 1
 gathu.co.ke, 1
@@ -60107,6 +60416,7 @@ gavlix.se, 1
 gaw.sh, 1
 gawinex.com, 1
 gay-jays.com, 1
+gay.amsterdam, 1
 gay.systems, 1
 gayanalysing.co.uk, 1
 gayauthors.org, 1
@@ -60218,7 +60528,6 @@ gchq.wtf, 1
 gcja22.me, 1
 gclegal.com.au, 0
 gcmrc.gov, 1
-gcmsnotesrequest.ca, 1
 gcn.ie, 1
 gcode.space, 1
 gcoded.de, 1
@@ -60232,9 +60541,11 @@ gcrabtreespaces.com, 1
 gcrcollectif.ca, 1
 gcrm.jp, 1
 gcs-ventures.com, 1
+gcscheats.com, 1
 gcschool.tk, 1
 gcsm-qc.ca, 1
 gcso.gov, 1
+gcstats.org, 1
 gcstechnologies.com, 1
 gctdtx.gov, 1
 gcubedinc.com, 1
@@ -60373,6 +60684,7 @@ geekscircuit.com, 1
 geekshirts.cz, 1
 geeksontap.com.au, 1
 geekspace.gq, 1
+geekspy.net, 1
 geeksquadforums.tk, 1
 geekstreet.fr, 1
 geekstuff.tk, 1
@@ -60635,6 +60947,7 @@ genesisprize.org, 1
 genesistoday.org, 1
 genestho.lt, 1
 genetargetsolutions.com.au, 1
+genetco.live, 1
 geneticrescue.science, 1
 genetidyne.com, 1
 geneuse.ai, 1
@@ -60706,6 +61019,7 @@ genpathdiagnostics.com, 1
 genroe.com, 1
 gensenwedding.jp, 1
 genshiken-itb.org, 0
+gensi.pro, 1
 gensicke.de, 1
 gensleiten.de, 1
 genslerapps.com, 1
@@ -60831,6 +61145,7 @@ geonice.ga, 1
 geonot.es, 1
 geophysicsjournal.com, 1
 geopixeles.cl, 1
+geoplatform.gov, 1
 geopoetico.tk, 1
 georg-ledermann.de, 1
 georg-riepe.de, 1
@@ -60869,6 +61184,7 @@ georgewatson.me, 0
 georgewbushlibrary.gov, 1
 georgiaaccess.gov, 1
 georgiaautoglass.net, 0
+georgiaclean.com, 1
 georgiacollaborative.com, 1
 georgiacriminaldefense.com, 1
 georgiaglassrepair.com, 0
@@ -61023,9 +61339,11 @@ gestaoboa.com.br, 1
 gestaoclub.com.br, 1
 gestcoelho.com, 1
 gestion-optimum.com, 1
+gestion-verificaciones.com.ar, 1
 gestionaleamica.com, 1
 gestione-certificazioni.it, 1
 gestionth.com, 1
+gestor.co, 1
 gestorehotel.com, 1
 gestorestecnologicos.com, 1
 gestoriaycontratos.com, 1
@@ -61038,6 +61356,7 @@ get-a-wingman.com, 1
 get-asterisk.ru, 1
 get-baaam.com, 1
 get-file.eu, 1
+get-it.uk, 1
 get-maurice.com, 1
 get-my-report.com, 1
 get-quick-bits-fast-2018.pw, 1
@@ -61059,6 +61378,7 @@ getaskoll.at, 1
 getawaycab.tk, 1
 getawaycar.com, 1
 getawayline.com, 1
+getawikipedia.com, 1
 getback.ch, 1
 getbacktosport.com, 0
 getbalitour.com, 1
@@ -61096,6 +61416,7 @@ getcooltricks.com, 1
 getcryst.al, 1
 getcyber.me, 1
 getdash.io, 1
+getdiggit.com, 1
 getdinghy.com, 1
 getdirectcredit.com, 1
 getdishnow.tk, 1
@@ -61176,6 +61497,7 @@ getnexar.com, 1
 getnib.com, 1
 getnikola.com, 1
 getonlinecalculator.com, 1
+getonwikipedia.com, 1
 getoxley.com, 1
 getpagespeed.com, 1
 getpaidclub.tk, 1
@@ -61190,7 +61512,6 @@ getplus.com.au, 1
 getpro.plumbing, 1
 getprohealth.com, 1
 getpromo.cf, 1
-getpsolid.com, 1
 getpublii.com, 1
 getraenke-hoffmann.de, 1
 getready2dance.tk, 1
@@ -61345,7 +61666,6 @@ gg9297.co, 1
 gg9397.com, 1
 gg9728.co, 1
 ggaustraliagames.com, 1
-ggb.world, 1
 ggchamber.com, 1
 ggddrenthe.nl, 1
 ggdrop.com, 1
@@ -61554,6 +61874,7 @@ giftsholidays.tk, 1
 giftsofsquare.com, 1
 giftsofsquare.net, 1
 giftsofsquare.org, 1
+giftthatsong.com, 1
 giftvoucherbrilliance.co.uk, 1
 gifudodo.com, 1
 gifuxuk.tk, 1
@@ -61675,6 +61996,7 @@ ginza-viola.com, 1
 ginzaj.com, 1
 giochistars.it, 1
 giochistem.it, 1
+giocoso.dk, 1
 gioiellerialucchese.it, 1
 gioielleriamolena.com, 1
 gioielleriaregolini.it, 1
@@ -61916,6 +62238,7 @@ gladstonemi.gov, 1
 gladwellentertainments.co.uk, 1
 gladwork.tk, 1
 gladysstrickland.com, 1
+glaeser-it.de, 1
 glaesle.cloud, 1
 glahcks.com, 1
 glama.ai, 1
@@ -62051,6 +62374,7 @@ glit.sh, 1
 glitchcity.wiki, 1
 glitchcomic.tk, 1
 glitched.online, 1
+glitchtip.com, 1
 glitterblast.uk, 1
 glitteringmariah.tk, 1
 glitzerstuecke.de, 1
@@ -62162,6 +62486,7 @@ globalpediatriciansest.ga, 1
 globalperspectivescanada.com, 1
 globalpolarbear.com, 1
 globalpouchfactory.com, 0
+globalprivacyassembly.com, 1
 globalprocess.co.nz, 1
 globalproduction.ga, 1
 globalprojetores.com.br, 1
@@ -62233,7 +62558,6 @@ globifytalent.com, 1
 globit.com.tr, 1
 globoasiatico.com.ph, 1
 globologic.com, 1
-globotech.be, 1
 globotur.de, 1
 globowood.ml, 1
 globus-plus.ml, 1
@@ -62277,6 +62601,7 @@ gloucesterva.gov, 1
 glovementor.com, 1
 glowcdn.com, 1
 glowfic.com, 1
+glp1thailand.com, 1
 glpreparation.com, 1
 glreit.com, 1
 glsauto.com, 1
@@ -62537,6 +62862,7 @@ godrealms.com, 0
 godreamcast.com, 1
 godrive.ga, 1
 godruoyi.com, 1
+godsmercybookshop.com, 1
 godsofhell.com, 1
 godsofhell.de, 1
 godsowncountry.tk, 1
@@ -62725,6 +63051,7 @@ goldloeckchen159.net, 1
 goldmanpropertygroup.com, 1
 goldminer.ga, 1
 goldongrandsalon.com, 1
+goldonline.vn, 1
 goldpreisfinder.at, 1
 goldratex.com, 1
 goldregen.net, 1
@@ -62788,6 +63115,7 @@ golftournamentgifts.tk, 1
 golfturkey.com, 1
 golfwithdiscs.com, 0
 goliamo-vranovo.com, 1
+golift-sa.com, 1
 golikes.ml, 1
 golink.co, 0
 golkowreporters.com, 1
@@ -62851,6 +63179,7 @@ gonitro.com, 0
 gonoodle.com, 1
 gonortheast.co.uk, 1
 gontagro.com.ua, 1
+gontter.com, 1
 gonulyoluturizm.com.tr, 1
 gonumber.ga, 1
 gonvarri.com, 1
@@ -63595,6 +63924,7 @@ grasmark.com, 1
 grasp24.pl, 1
 grasrijk.tk, 1
 grass-haus.de, 1
+grass.markets, 1
 grassau.com, 1
 grassberry.in, 1
 grasscity.com, 0
@@ -63665,6 +63995,7 @@ graydaze.com, 1
 grayduck.mn, 1
 grayhatter.com, 1
 grayingrainbows.com, 1
+graymatter.ch, 1
 graymatter.news, 1
 grayowlworks.com, 1
 grayphics.com, 1
@@ -63702,6 +64033,7 @@ greatdayinamerica.com, 1
 greatepier.tk, 1
 greater.nl, 0
 greatergoods.com, 1
+greaterhawaiitours.com, 1
 greatertalent.com, 1
 greaterthanthesum.com, 1
 greaterzion.com, 1
@@ -63762,7 +64094,6 @@ green-anarchy.tk, 1
 green-aura.ru, 0
 green-bicycle.club, 1
 green-clean.at, 1
-green-cross.pro, 1
 green-factory.gq, 1
 green-factory.ml, 1
 green-finance.fr, 1
@@ -64097,6 +64428,7 @@ grnbank.com, 1
 groaccess.com, 1
 groben-itsolutions.de, 1
 grocerytv.com, 1
+grochow.cloudns.org, 1
 grockradio.ga, 1
 grocock.me.uk, 1
 grocy.info, 1
@@ -64133,6 +64465,7 @@ groomscroft.com, 1
 grooove.pl, 1
 groothagenbeek.nl, 1
 grootinadvies.nl, 1
+grootmoederswijze.be, 1
 groottuighuis.nl, 1
 groove3.com, 1
 grooveguard.tk, 1
@@ -64303,6 +64636,7 @@ grunammgames.com, 1
 grunammgames.de, 1
 grundig.co.uk, 1
 grundlage.fi, 1
+grundlagen-computer.de, 1
 grundrauschen-publishing.de, 1
 grundrauschen.pub, 1
 grundschulratgeber.de, 1
@@ -64784,10 +65118,12 @@ guogetv.com, 1
 guolaoban.xyz, 1
 guolaw.ca, 1
 guoman.com, 1
+guoyanfood.com.cn, 1
 guozeyu.com, 1
 guozhenhao.com, 0
 gupy.io, 1
 gura.moe, 1
+guralptechnic.com, 1
 gurbetilan.com, 0
 guri.ml, 1
 gurkantuna.com, 1
@@ -64889,7 +65225,6 @@ guysauto.com, 1
 guysroulette.com, 1
 guytarrant.co.uk, 1
 guzdek.co, 1
-guzek.uk, 1
 guzelforum.tk, 1
 guzelkadinlar.tk, 1
 guzellikmerkezleri.tk, 1
@@ -65200,6 +65535,7 @@ hackbubble.me, 1
 hackcess.net, 1
 hackclubmauritius.nl, 1
 hackcraft.net, 1
+hackdown.eu.org, 1
 hackdown.tech, 1
 hackdra.com, 1
 hackeado.tk, 1
@@ -65244,6 +65580,7 @@ hackforgood.com, 1
 hackfwd.com, 1
 hackgunny.tk, 1
 hackhouse.sh, 1
+hackimpott.de, 1
 hackingcult.de, 1
 hackingdh.com, 1
 hackingdumpdrive.org, 1
@@ -65295,6 +65632,7 @@ hadesblack.xyz, 1
 hadibut.fr, 1
 hadika.tk, 1
 hadin.tk, 1
+hadith.today, 1
 hadoora.hu, 1
 hadopi.fr, 1
 hadotifpc.in, 1
@@ -65322,6 +65660,7 @@ hafeoz.com, 1
 haferman.net, 1
 haferman.org, 1
 hafiz-alquran.com, 1
+hafizalquran.com, 1
 hafizkadir.tk, 1
 hafling.net, 1
 haflingers.tk, 1
@@ -65355,6 +65694,7 @@ haiduc.tk, 1
 haifaworld.tk, 1
 haifengz.com, 0
 haigle.com, 1
+haiglerliving.com, 1
 haihuan.com, 1
 haikunap.hu, 1
 haileybury.com.au, 1
@@ -65511,7 +65851,6 @@ halliday.work, 1
 halligan.tk, 1
 halligladen.de, 1
 hallmanmemorials.net, 1
-hallmarkbusiness.com, 1
 halloffameapartments.com, 1
 hallofoddities.tk, 1
 hallofworlds.online, 1
@@ -65810,6 +66149,7 @@ hansvaneijsden.nl, 1
 hant.se, 1
 hantera.fi, 1
 hantse.com, 0
+hanu.la, 1
 hanwhalife.com, 1
 hanxv.pw, 1
 hanys.xyz, 1
@@ -65819,6 +66159,7 @@ hanzoslot.com, 1
 hao-zhang.com, 1
 haokiettoanthu.org, 1
 haorenka.co, 1
+haos.hopto.org, 1
 haoskin.com.tw, 1
 haoskin.tw, 1
 haoyan.com, 1
@@ -65968,6 +66309,7 @@ hardeecountyfl.gov, 1
 hardeeflvotes.gov, 1
 hardeman.nu, 0
 hardenburghny.gov, 1
+hardened.com.br, 1
 hardenize.com, 1
 hardesec.com, 1
 hardfloorcleaninglondon.co.uk, 1
@@ -66066,6 +66408,7 @@ harmreductionwa.org, 1
 harms.io, 1
 harmsboone.org, 1
 harness.io, 1
+harnet.store, 1
 harnettcountync.gov, 1
 harneycountyor.gov, 1
 harno.ee, 0
@@ -66133,6 +66476,7 @@ harryxxjohnson.ga, 1
 harryyy.me, 0
 harshani.ga, 1
 harshee.ml, 1
+harshilkhimasia.com, 1
 hart.amsterdam, 1
 hartan.to, 1
 hartcountyky.gov, 1
@@ -66192,6 +66536,7 @@ hasas-cnc.ro, 1
 hasbara.tk, 1
 haschrebellen.de, 1
 hasdf.de, 1
+hasecic.de, 1
 haselsteiner.me, 1
 hasenmueller.de, 1
 hasgeek.com, 1
@@ -66569,6 +66914,7 @@ hdsengine.ml, 1
 hdsexxx.net, 1
 hdsi.io, 1
 hdsinemax.com, 0
+hdspot.org, 1
 hdtech.com.pl, 1
 hdtvblogsers.ga, 1
 hdtvblogsest.ga, 1
@@ -67094,6 +67440,7 @@ hebin.cf, 1
 hebmexico.tk, 1
 hebrew.ga, 1
 hebronnh.gov, 1
+hebru-kuechen.de, 1
 hec-espace-entreprise.ch, 0
 hec.global, 1
 hec.org.au, 1
@@ -67403,6 +67750,8 @@ hellonews.ga, 1
 helloo.com.br, 1
 hellopandaphoto.com, 1
 hellopowerserg.com, 1
+helloptimize.com, 1
+helloptimize.fr, 1
 hellorory.com, 1
 hellorussia.ga, 1
 hellosalmon.com, 1
@@ -67884,7 +68233,6 @@ hexatech.gq, 1
 hexatech.tk, 1
 hexaunits.com, 1
 hexaweb.tk, 1
-hexcel.com, 1
 hexcode.in, 1
 hexdatabase.com, 1
 hexed.it, 1
@@ -67960,7 +68308,6 @@ hfox.org, 1
 hfpatios.com, 1
 hfsctx.gov, 1
 hfsg-habicht.at, 1
-hfvuejq.pro, 1
 hfx405.de, 1
 hfxtwppa.gov, 1
 hg.eu, 1
@@ -68000,6 +68347,7 @@ hhhdb.com, 1
 hhk.my.id, 1
 hhkits.com, 1
 hhlandscape.com, 1
+hhnbsuperhustg.wpenginepowered.com, 1
 hhpcorp.org, 1
 hhristov.tk, 1
 hhs.gov, 1
@@ -68080,6 +68428,7 @@ hidrolimpiadorasprofesionales.org, 1
 hidromar.es, 1
 hidroshoping.com.br, 1
 hidupbisadiatur.com, 1
+hie.global, 1
 hieisuki.ga, 1
 hielscher.com, 1
 hien.cf, 1
@@ -68215,6 +68564,7 @@ hilarymundial.tk, 1
 hilbertwi.gov, 1
 hilde.link, 1
 hiledge.com, 1
+hilfiker.cloud, 1
 hilfikernet.ch, 1
 hilfikers.com, 1
 hilinecreators.tk, 1
@@ -68559,8 +68909,6 @@ hkedquity.org, 1
 hkengage.gov.hk, 1
 hkgix.net, 1
 hkl-gruppe.de, 1
-hkm-webdesign.ca, 1
-hkm-webdesign.com, 1
 hkmap.co, 1
 hkmap.com, 1
 hkmap.net, 1
@@ -68573,6 +68921,7 @@ hkr.at, 1
 hks.pw, 1
 hksapientia.org, 1
 hkscolorectal.com.sg, 1
+hksexdoll.com, 1
 hkskhf.dk, 1
 hktech.link, 1
 hktkl.com, 1
@@ -68621,6 +68970,7 @@ hmbana.org, 1
 hmcdj.cn, 1
 hmeonot.org.il, 1
 hmforces-railcard.co.uk, 1
+hmg-benelux-shop.com, 1
 hmka.com, 0
 hmnd.io, 1
 hmodapk.com, 1
@@ -68849,6 +69199,7 @@ holiy.jp, 1
 hollabanken.cf, 1
 holladayut.gov, 1
 holland-sailing.de, 1
+hollandandsherry.com, 1
 hollandbrowncountywi.gov, 1
 hollandco.au, 1
 hollandco.com, 1
@@ -68894,6 +69245,7 @@ holmium-laser.ru, 0
 holmq.dk, 1
 holmqvist.tk, 1
 holmr.eu, 1
+holobeam.tech, 1
 holocentric.com, 1
 holocron.one, 1
 holod-servis777.tk, 1
@@ -68973,6 +69325,7 @@ home-page.xyz, 1
 home-portal.tk, 1
 home-remedies.tk, 1
 home-sagita.tk, 1
+home.ch, 1
 home.saxo, 1
 home24bank.com, 1
 homeadore.com, 1
@@ -69240,6 +69593,7 @@ homerex.ga, 1
 homero.tk, 1
 homesafedryerventsac.com, 1
 homesbyayres.com, 1
+homeschoolhive.co, 1
 homeschoolinkorea.tk, 1
 homeseguridad.com, 1
 homeseller.com, 1
@@ -69284,6 +69638,7 @@ homewoodpathfinder.com, 1
 homeworld.ga, 1
 homexmortgage.com, 1
 homexpressdirect.com, 1
+homey.guide, 1
 homeyou.com, 1
 homeyx.cf, 1
 homezlog.com, 1
@@ -69379,6 +69734,7 @@ honkai.sr, 1
 honkion.net, 1
 honmoku-select-shika.com, 1
 honoka-seitai.jp, 1
+honoka.cafe, 1
 honolulubws.gov, 1
 honorpackages.com, 1
 honovere.de, 1
@@ -69476,6 +69832,7 @@ horcajadadelatorre.tk, 1
 horclan.tk, 1
 hord.ca, 1
 horde-entertainment.tk, 1
+horeca.pk, 1
 horecastaff.com.ua, 1
 horecatiger.eu, 1
 horefice.me, 1
@@ -69613,6 +69970,7 @@ host1oc.eu.org, 1
 host24.com.pk, 1
 host2be.com, 1
 host2do.com, 1
+host365.fi, 1
 hostadvice.com, 1
 hostalk.net, 1
 hostalog.com, 1
@@ -69794,6 +70152,7 @@ hotelitalia.tk, 1
 hotelite.tk, 1
 hotelizalde.com, 1
 hotelkeihan.co.jp, 1
+hotelkiara.mx, 1
 hotellamm.it, 1
 hotellocaldubai.com, 1
 hotelmap.com, 1
@@ -69813,6 +70172,7 @@ hotels-insolites.com, 1
 hotels-resorts-in-crimea.tk, 1
 hotels3d.com, 1
 hotels4teams.com, 1
+hotelsadultsonly.com, 1
 hotelsalzberg.ga, 1
 hotelsalzberg.gq, 1
 hotelsalzberg.ml, 1
@@ -69827,11 +70187,15 @@ hotelsrejber.cz, 1
 hotelsrit.tk, 1
 hotelsthisweekend.com, 1
 hotelsvetaekaterina.com, 1
+hotelswithallinclusive.com, 1
+hotelswithprivatepool.com, 1
+hotelswithwinery.com, 1
 hotelturbo.com, 1
 hotelv.com, 0
 hotelvalena.com, 1
 hotelvillafiorita.com, 1
 hotelvisegrad.hu, 1
+hotelylangylang.com, 1
 hotelylangylang.fr, 1
 hotelylangylang.re, 1
 hotelzapse-aurora.tk, 1
@@ -69936,6 +70300,7 @@ houseforce.biz, 1
 household-appliances.tk, 1
 householdjournalers.ga, 1
 householdjournalest.ga, 1
+householdresponse.com, 1
 houseinfonews.tk, 1
 housekeep.com, 1
 houselocal.co.uk, 1
@@ -70036,6 +70401,7 @@ howdidido.com, 1
 howdl.com, 1
 howdoesmycode.work, 1
 howdy.fr, 1
+howdymassage.com, 1
 howeda.de, 1
 howellaccounts.co.uk, 1
 howellcountymo911.gov, 1
@@ -70096,6 +70462,7 @@ hoyer-group.com, 1
 hoyerfamilysaffron.com, 1
 hoyosdelespino.tk, 1
 hoz-pack.com.ua, 1
+hoz.land, 1
 hozana.si, 0
 hozinga.de, 1
 hozio.com, 1
@@ -70132,6 +70499,7 @@ hpthealing.com, 1
 hpvtimmerwerken.nl, 1
 hqblog.cn, 0
 hqcdn.com, 1
+hqproductionaudio.com, 1
 hqsy.net, 1
 hqteas.com, 1
 hqtrannytube.com, 1
@@ -70204,6 +70572,7 @@ hrpage.ml, 1
 hrpayhub.com, 1
 hrprofessionals.tk, 1
 hrreporter.com, 1
+hrrpnepal.org, 1
 hrsa.gov, 1
 hrseoservice.com, 1
 hrstapps-dev.com, 1
@@ -70238,6 +70607,7 @@ hseal.co.uk, 1
 hselectricalservices.com, 1
 hsg-lumdatal.de, 1
 hsi.gov, 1
+hsia1stg.wpenginepowered.com, 1
 hsiot.com.au, 1
 hsivonen.com, 1
 hsivonen.fi, 1
@@ -70253,6 +70623,7 @@ hsn.com, 1
 hso.com, 1
 hsog.tk, 1
 hsorganics.pk, 1
+hsp-software.de, 1
 hsr.gov, 1
 hsreformas.es, 1
 hsselite.com, 1
@@ -70447,6 +70818,7 @@ hubspot.de, 1
 hubspot.es, 1
 hubspot.fr, 1
 hubspot.jp, 1
+hubtransporteselogistica.com.br, 1
 hubux.tk, 1
 hubx.co, 1
 huchet.me, 0
@@ -70585,6 +70957,7 @@ humanidad.tk, 1
 humaninterest.com, 1
 humaniora.com, 1
 humanistgruppen.tk, 1
+humanities.gov, 1
 humanitiesacademicpublishers.com, 1
 humanitiesnebraska.org, 1
 humanity.com, 1
@@ -70707,6 +71080,7 @@ hunhold.org, 1
 hunngard.com, 1
 hunqz.com, 1
 hunstoncanoeclub.co.uk, 1
+huntcam.ai, 1
 hunter-read.com, 1
 hunter.io, 1
 hunter32.ru, 1
@@ -70898,6 +71272,7 @@ hydraulikbutiken.se, 1
 hydrazin.pw, 1
 hydrique.ch, 1
 hydro-pool.org, 1
+hydro.group, 1
 hydro17.com, 1
 hydroagro.pl, 1
 hydrochlorothiazide.gq, 1
@@ -71058,6 +71433,8 @@ hysh.net, 1
 hysh.org, 1
 hystats.net, 1
 hysupchile.cl, 1
+hytaleid.com, 1
+hytaletrack.com, 1
 hytravel.it, 1
 hytzongxuan.com, 1
 hytzongxuan.top, 1
@@ -71132,6 +71509,7 @@ i00228.com, 1
 i0day.com, 1
 i18nweave.com, 1
 i24.host, 1
+i2c.alwaysdata.net, 1
 i2capmark.com, 1
 i2forensicmasters.com, 1
 i2pc.es, 1
@@ -71183,6 +71561,7 @@ iafda.org, 1
 iafisgroup.com, 1
 iafss2023.com, 1
 iageengineering.net, 1
+iagsecured.com, 1
 iainsimms.co.uk, 1
 iainsimms.com, 1
 iainsimms.me, 1
@@ -71259,6 +71638,7 @@ iav.com, 1
 iav.de, 1
 iava.ind.br, 1
 iavalley.edu, 1
+iawg.gov, 1
 iawx.net, 1
 iaxx.eu, 1
 ib-batereau.de, 1
@@ -71354,6 +71734,7 @@ ibvv.cz, 1
 ibwc.gov, 1
 ibwil.com, 1
 ibz.be, 1
+ic.edu, 1
 ic3.gov, 1
 ica.coop, 1
 ica.org, 1
@@ -71657,6 +72038,7 @@ ideashop.com, 1
 ideasinlab.com, 1
 ideasledgrowth.com, 1
 ideasroom.eu.org, 1
+ideatrade.com.pl, 1
 ideawake.com, 1
 ideaweb.de, 1
 idec.com, 1
@@ -71947,6 +72329,7 @@ ignet.gov, 1
 ignite-reading.com, 1
 ignite.cz, 1
 igniteautomotive.co.uk, 1
+ignitedfire.eu, 1
 ignitedmindz.in, 1
 igniteenergy.co.uk, 1
 igniteheatcool.com.au, 1
@@ -72003,6 +72386,7 @@ ih8sn0w.com, 1
 iha6.com, 1
 ihacares.com, 1
 ihakkitekin.com, 1
+ihatebackground.com, 0
 ihatethissh.it, 1
 ihaunt.co.uk, 1
 ihazurip.com, 1
@@ -72139,6 +72523,7 @@ ikimo9.com, 1
 ikinogo.com, 0
 ikinogo.zone, 1
 ikinokori-marketing.com, 1
+ikipedia.org, 1
 ikisser.de, 1
 ikiteker.org.tr, 1
 ikk-classic.de, 0
@@ -72202,6 +72587,7 @@ ildomani.it, 1
 ile-kalorii.pl, 1
 ile-sapporo.jp, 1
 ilearned.eu, 0
+ilearnromanian.com, 1
 ileci.de, 1
 ileduguesclin.fr, 1
 ilektronika-farmakeia-online.gr, 1
@@ -72334,7 +72720,6 @@ iltze.fr, 1
 ilug-ktm.tk, 1
 iluman.tk, 1
 ilumantio.tk, 1
-ilumina2photo.es, 1
 iluminatia.com, 1
 ilunion.tk, 1
 ilusionistas.tk, 1
@@ -72370,7 +72755,6 @@ image4arab.tk, 1
 imagealbums.tk, 1
 imagebin.ca, 1
 imagecom.tk, 1
-imageconsultingmalta.com, 1
 imagecurl.com, 0
 imagelr.com, 1
 imagen891.tk, 1
@@ -72394,6 +72778,7 @@ imaginationpathway.com, 1
 imagindairy.com, 1
 imagine-programming.com, 1
 imagineata.ro, 1
+imagineberks.org, 1
 imaginefamilychiropractic.com, 1
 imaginelab.club, 1
 imaginenewcastle.net.au, 1
@@ -72477,6 +72862,7 @@ imgg.es, 1
 imgmodels.com, 0
 imgo.ga, 1
 imgo.tk, 1
+imgossip.com, 1
 imgossip.net, 1
 imgup.co, 1
 imguploaden.nl, 1
@@ -72587,7 +72973,6 @@ immobilienmakler-berlin-mahlsdorf.de, 1
 immobiliensachverstaendiger-ludwigsburg.de, 1
 immobiliensachverstaendiger-waiblingen.de, 1
 immobilienservice-website.de, 1
-immobilienverwaltung-winterfeldt.de, 1
 immobilier-realiste.fr, 1
 immobilier-swiss.ch, 1
 immobilier.org.il, 1
@@ -72639,6 +73024,7 @@ immospezial.eu, 1
 immospezial.info, 1
 immospezial.net, 1
 immospezial.org, 1
+immostreet.ch, 1
 immowot.de, 1
 immtel.co, 1
 immtel.com, 1
@@ -72985,6 +73371,7 @@ ind.ie, 1
 indamail.hu, 1
 indata42.nl, 1
 indatable.com, 1
+indebuurt.nl, 1
 indecente.tk, 1
 indeco.com.ec, 1
 indecomm.com, 1
@@ -73038,6 +73425,7 @@ indiafoss.net, 1
 indiainvestments.wiki, 1
 indiamistress.tk, 1
 indianacareerconnect.com, 1
+indianaffairs.gov, 1
 indianahealth.tk, 1
 indianajail.gov, 1
 indianapolismet.org, 1
@@ -73079,6 +73467,7 @@ indiatravel.ml, 1
 indiatrotter.com, 1
 indiaviral.ga, 1
 indiavotekar.com, 1
+indiawikipedia.com, 1
 indiawise.co.uk, 1
 indiaworlddigital.tk, 1
 indicana.pl, 1
@@ -73103,6 +73492,7 @@ indigo.pet, 1
 indigo.tk, 1
 indigoblack.com.au, 1
 indigobooks.gq, 1
+indigodergisi.com, 1
 indigojewelers.com, 1
 indigosakura.com, 1
 indigterms.com, 1
@@ -73119,6 +73509,7 @@ indirimlim.com, 1
 indironline.com, 1
 inditip.com, 1
 indivicloud.me, 0
+individualizedshirts.com, 1
 individualobligation.com, 1
 individuals.tk, 1
 indiwebawards.tk, 1
@@ -73229,6 +73620,7 @@ infanziaeadolescenza.it, 1
 infarktniki.ru, 1
 infarmbureau.com, 1
 infcloud.com, 1
+infected.systems, 1
 infectedvoice.tk, 1
 infecyon.tk, 1
 infeedo.com, 1
@@ -73770,7 +74162,6 @@ innovativebuildingsolutions.co.za, 1
 innovativeglass.co.nz, 1
 innovativeideaz.org, 1
 innovativeplumbingpros.com, 1
-innovativetrials.com, 1
 innovativeunderwriters.com, 1
 innovatopia.jp, 1
 innovent.com, 1
@@ -73839,6 +74230,8 @@ inquant.de, 1
 inquestconsulting.com, 0
 inquisicion.tk, 1
 inquisition.is, 1
+inquoctuan.com, 1
+inquoctuan.vn, 1
 inregistrar.com, 1
 inrilan.tk, 1
 ins-kreativ.de, 1
@@ -74153,6 +74546,7 @@ intelec.co.cr, 1
 intelekta.es, 1
 intelhost.com.br, 1
 intelics.com, 1
+intelics.com.au, 1
 intelius.cf, 1
 intellar.agency, 1
 intellect-ls.com, 0
@@ -74170,6 +74564,7 @@ intellicus.com, 1
 intellicyb.com, 1
 intelligence-explosion.com, 1
 intelligence-privee.com, 1
+intelligencia.ai, 1
 intelligentglo.fi, 1
 intelligentgo.org, 1
 intelligentnegotiator.com, 0
@@ -74537,7 +74932,7 @@ invantive.eu, 1
 invantive.net, 1
 invantive.nl, 1
 invantive.org, 1
-invariax.com, 1
+invariax.com, 0
 invata-ma.ro, 1
 invenio.software, 1
 invenpro.tech, 1
@@ -74823,6 +75218,7 @@ ipadizate.es, 1
 ipadkaitori.jp, 0
 ipadr.is, 1
 ipadresse.de, 1
+ipafricatv.online, 1
 ipal.im, 1
 ipal.name, 1
 ipal.tel, 1
@@ -74880,6 +75276,8 @@ ipioneer.ga, 1
 ipirangaparafusos.com.br, 1
 ipl.my.id, 1
 ipl.pt, 1
+iplabs.com, 1
+iplabs.de, 1
 iplayradio.net, 0
 ipleak.net, 1
 ipledgeonline.org, 0
@@ -74890,6 +75288,7 @@ ipmotion.ca, 1
 ipms.nl, 1
 ipmscorp.com, 1
 ipmsdeutschland.de, 1
+ipn.cloud, 1
 ipnoze.com, 1
 ipnrt.net, 1
 ipo.inf.br, 1
@@ -74945,10 +75344,12 @@ iptor.com, 1
 iptv-best.com, 1
 iptv-luxury.com, 1
 iptv.ge, 1
+iptvanbieter4k.com, 1
 iptvcanada.biz, 1
 iptvfriend.ga, 1
 iptvmasters.fr, 1
 iptvmiro.com, 1
+iptvtoucan.com, 1
 iptvzoom.xyz, 1
 ipty.de, 1
 ipuservicedesign.com, 1
@@ -74971,6 +75372,7 @@ ipv6ioffentligsektor.se, 1
 ipvbook.com, 0
 ipview.tk, 1
 ipwho.site, 1
+ipwhoischeck.com, 1
 ipy.org, 1
 iq-robot.com, 1
 iqbeauty.pl, 1
@@ -75006,6 +75408,7 @@ irandroid.ml, 1
 iranfilmcity.tk, 1
 iranfreshfruit.cf, 1
 irangeodesy.tk, 1
+iranhrs.org, 1
 irani.im, 1
 iranianpack.com, 1
 iranjeunesse.com, 1
@@ -75230,6 +75633,7 @@ isaacscience.org, 1
 isaaczais.com, 1
 isaaya.com, 1
 isab.run, 1
+isabel.org, 1
 isabellainlove.com, 1
 isabellamelodia.com, 1
 isabellas.dk, 1
@@ -75663,6 +76067,7 @@ italianpillow.com, 1
 italianracingteam.tk, 1
 italiansrent.com, 1
 italiansrit.tk, 1
+italiantravelexperience.it, 1
 italianweddingmusicians.com, 1
 italianweddingvideographers.com, 1
 italiasera.it, 1
@@ -75846,6 +76251,7 @@ its-not-your.business, 1
 its-schindler.de, 1
 its-taxi.nl, 1
 its-v.de, 1
+its.ax, 1
 its.gov, 1
 its420somewhere.com, 1
 its5oclock.eu, 1
@@ -75957,6 +76363,7 @@ itxnorge.no, 1
 itxuc.com, 1
 ity.moe, 1
 ityco.com, 1
+ityrecare.com, 1
 ityug247.com, 1
 itzahammer.tk, 1
 itzamnaxelahomestay.tk, 1
@@ -75967,6 +76374,7 @@ itzine.ru, 1
 itzkavin.tk, 1
 itzlive.tk, 1
 iubuniversity.tk, 1
+iufun.com, 1
 iuniverse.com.au, 1
 iupibaby.pt, 1
 iuppiter-ssd.it, 1
@@ -75985,12 +76393,14 @@ ivan1874.dynu.net, 1
 ivan770.me, 1
 ivana-models-escortservice.de, 0
 ivanbenito.com, 1
+ivanblatter.com, 1
 ivancacic.com, 0
 ivandafish.net, 1
 ivanderevianko.com, 1
 ivanesalud.com, 1
 ivaniglesias.es, 1
 ivanilla.org, 1
+ivankochura.com, 1
 ivankuchin.tk, 1
 ivanmeade.com, 1
 ivanov.icu, 1
@@ -76004,6 +76414,7 @@ ivanwolf.ga, 1
 ivanya.tk, 1
 ivanzorin.cf, 1
 ivarfinance.com, 1
+ivdda.com, 1
 ivdnt.org, 1
 iveaghgardenhotel.ie, 1
 ivelop.me, 0
@@ -76340,6 +76751,7 @@ jackmcgregor.uk, 1
 jacknicholson.org, 1
 jackob.tk, 1
 jackops.com, 1
+jackpearce.co.uk, 1
 jackpothappy.com, 1
 jackpotinsight.com, 1
 jackripper.tk, 1
@@ -76422,6 +76834,7 @@ jadox.com, 1
 jaduniv.cf, 1
 jae.su, 1
 jae.zone, 1
+jaecoo.pk, 1
 jaeger.link, 1
 jaeli.com, 1
 jaenparaisointerior.es, 1
@@ -76477,6 +76890,7 @@ jakarta.ee, 1
 jakartaee.org, 1
 jakartaone.org, 1
 jake.ac, 1
+jakefieldhouse.co.uk, 1
 jakegines.in, 1
 jakegyllenhaal.ga, 1
 jakemansfield.com, 1
@@ -76994,6 +77408,7 @@ jboho.com, 1
 jbond.tk, 1
 jbookforum.com, 1
 jbootsma.com, 1
+jbot9000.com, 1
 jbradaric.me, 1
 jbs-jardins.ch, 0
 jbshop.ie, 1
@@ -77246,6 +77661,7 @@ jehende.fr, 1
 jehjf.com, 1
 jehovahsays.net, 1
 jeij.nl, 1
+jeiskauda.lt, 1
 jej.cz, 1
 jej.sk, 1
 jejakdieng.com, 1
@@ -77536,7 +77952,6 @@ jezero.tk, 1
 jezura.cz, 1
 jezykoteka.pl, 1
 jezzicat.org, 1
-jf-fotos.de, 1
 jf-igrejanovadosobral.pt, 0
 jf-madalena.tk, 1
 jf-sulpice.notaires.fr, 1
@@ -77618,6 +78033,8 @@ jiai.ml, 1
 jiai.tk, 1
 jialiangkang.com, 1
 jiami.dog, 0
+jianaiwl.com, 1
+jianaiwl.org, 1
 jianbin.wang, 1
 jiangmei.ml, 1
 jiangmen.tk, 1
@@ -77793,6 +78210,7 @@ jis.school, 1
 jisai.net.cn, 1
 jischool.org, 1
 jisnashville.gov, 1
+jisulife.pk, 1
 jitendrapatro.me, 1
 jitkamahdalova.cz, 1
 jitprod.com, 1
@@ -77842,7 +78260,6 @@ jkessen.de, 1
 jkest.cc, 0
 jkfasham.com.au, 1
 jkg.tw, 1
-jkimdds.com, 0
 jkinteriorspa.com, 1
 jkjpm.com, 1
 jkloli.tk, 1
@@ -77902,6 +78319,7 @@ jmb-jetshades.com, 1
 jmb.lc, 1
 jmbaxi.com, 1
 jmbaxico.com, 1
+jmbaxigroup.com, 1
 jmbaximarineservices.com, 1
 jmbcorpcell.com, 1
 jmbfe.com, 1
@@ -78013,6 +78431,7 @@ jobflyapp.com, 0
 jobformore.com, 1
 jobfresh.ga, 1
 jobfury.com, 1
+jobgether.com, 1
 jobhouse.jp, 1
 jobie.tk, 1
 jobindex.dk, 1
@@ -78073,6 +78492,7 @@ jocomo911.gov, 1
 jocuri-noi.tk, 1
 jocurionline.eu, 1
 jodaviesscountyil.gov, 1
+joder.li, 1
 jodhpurwindfarms.com, 1
 jodlajodla.si, 1
 jodyboucher.com, 0
@@ -78167,6 +78587,7 @@ johanpeeters.com, 1
 johego.org, 1
 johjohannsonkaffe.no, 1
 johlmike.com, 1
+john-cap.com, 1
 john2point0.com, 1
 johnabraham.net, 1
 johnagreager.com, 1
@@ -78175,6 +78596,7 @@ johnathanhasty.com, 1
 johnbaldry.com, 1
 johnball.co, 1
 johnbeil.com, 1
+johnbelthoff.com, 1
 johnblackbourn.com, 0
 johnblotsky.tk, 1
 johnbratus.com, 1
@@ -78204,6 +78626,7 @@ johnlewis.com, 1
 johnload.tk, 1
 johnlockepainting.com, 1
 johnlowryspartancapital.com, 0
+johnluke.com, 1
 johnmalloneemd.com, 0
 johnmcc.net, 1
 johnmcintosh.pro, 1
@@ -78254,6 +78677,7 @@ johnwinter.tk, 1
 johny.tv, 1
 johnyytb.be, 1
 joho.se, 1
+johub.de, 1
 johutha.ch, 1
 joi-dhl.ch, 0
 join-aomori.jp, 1
@@ -78312,6 +78736,7 @@ jomactransport.com, 1
 jomagus.de, 1
 jomblee.com, 1
 jomibe.de, 1
+jomipsa.com, 1
 jomjohor.my, 1
 jomla.ae, 1
 jomo.tv, 1
@@ -78380,9 +78805,11 @@ jonfor.net, 1
 jong030.nl, 1
 jongbloed.nl, 1
 jongcaxent.tk, 1
+jongcs.com, 1
 jongenstromp.tk, 1
 jongenwijs.gent, 1
 jongerenkring.tk, 1
+jonginkoksijde.be, 1
 jongminlab.com, 1
 jongpay.com, 1
 jongstit.co.th, 1
@@ -78539,6 +78966,7 @@ joshgibneyphoto.com, 1
 joshgroban.tk, 1
 joshharmon.me, 1
 joshking.com, 1
+joshozuna.com, 1
 joshparker.uk, 1
 joshs.domains, 1
 joshs.guide, 1
@@ -79092,8 +79520,8 @@ juneis.dog, 1
 juneis.pet, 1
 juneiscute.pet, 1
 junethack.net, 1
+junews.it, 1
 junfk.shop, 1
-jungamer.uk, 1
 junge-linke.tk, 1
 jungefreiheit.de, 1
 jungelinke.tk, 1
@@ -79353,6 +79781,7 @@ jwr.me, 1
 jwroberts.com, 1
 jwz.org, 1
 jxcad.com.cn, 1
+jxcjwlgs.com, 1
 jxdsp.com, 1
 jxir.de, 1
 jxl.tf, 1
@@ -79374,6 +79803,7 @@ jzuwork.lt, 1
 jzwebdesign.ie, 1
 jzz.cool, 1
 jzzfyw.com, 1
+k-45.ru, 1
 k-amenix.co.jp, 1
 k-den.com, 1
 k-homes.net, 1
@@ -79637,6 +80067,7 @@ kaiserburg-nuernberg.de, 1
 kaiserinformativo.com, 1
 kaisev.net, 1
 kaishi009.com, 1
+kaisla.ai, 1
 kaisto.net, 0
 kaisyo.co.jp, 1
 kaitol.click, 1
@@ -79660,6 +80091,7 @@ kajasafe.fi, 1
 kajavandor.hu, 1
 kajirakuda.com, 1
 kajlovo.cz, 1
+kajotte-studio.com, 1
 kajzonnebeke.tk, 1
 kak-pohudet-legko.ml, 1
 kak.ao, 1
@@ -79730,6 +80162,8 @@ kalimantan.tk, 1
 kalimari.tk, 1
 kalimat.gq, 1
 kalimba-hangszerbolt.hu, 1
+kalimojo.fr, 1
+kalin.eu.org, 1
 kalina.ml, 1
 kaliningrad-news.net, 1
 kaliningrad.gq, 1
@@ -80047,6 +80481,7 @@ karaodesign.fr, 1
 karaoglanis-info.tk, 1
 karaoglanis.tk, 1
 karaokeyboards.tk, 1
+karaonow.com, 1
 karapatan.org, 1
 karapuzz.tk, 1
 karasev-stroy.ru, 1
@@ -80190,6 +80625,7 @@ kas.ie, 1
 kasad.com, 1
 kasamatsu-sogo-hoken.com, 1
 kasanikares.com, 1
+kasapreko.com, 1
 kasasaprotect.com, 1
 kasaysayan.tk, 1
 kasc.finance, 1
@@ -80474,7 +80910,6 @@ kb35.net, 1
 kb38.net, 1
 kb5050.com, 0
 kb5757.com, 1
-kb7070.com, 1
 kb82.net, 1
 kb88dc05.com, 1
 kb88dc12.com, 1
@@ -80560,6 +80995,7 @@ kdramaholic.com, 1
 kdrive.tk, 1
 kdt-lille.com, 1
 kduggan.net, 1
+kduworld.com, 1
 kdw.cloud, 1
 kdyby.org, 0
 kdyzvodanekdevytecemusidotectnekamjinam.cz, 1
@@ -80737,6 +81173,7 @@ kellyskastles.co.uk, 1
 kellysspa.com, 1
 kellyvoice.tk, 1
 kellywebcam.tk, 1
+kelmia.com, 1
 keln.net, 1
 kelp.agency, 1
 kelsa.io, 0
@@ -81042,6 +81479,7 @@ kevinvermassen.be, 1
 kevinwoodphotography.com, 1
 kevyn.lu, 1
 kewauneeco.gov, 1
+kexec.io, 1
 kexingqing.com, 1
 kexino.com, 1
 key-tracker.de, 1
@@ -81134,6 +81572,7 @@ kfz-hantschel.de, 1
 kfz-premiumteile24.de, 1
 kfz-sachverstand.de, 1
 kfz-service-wachtmann.de, 1
+kfz-serviceschmidt.de, 1
 kfz.nl, 1
 kfzjeugd.nl, 1
 kg-regenbogen.de, 1
@@ -81217,6 +81656,7 @@ khoury-dulla.ch, 0
 khouryalexandre.com, 0
 khoxuongchothuegiare.vn, 1
 khramtsov.org, 1
+khro.me, 1
 khs1994.com, 1
 khste-ceciliamoorsel.tk, 1
 khtt.net, 1
@@ -81371,6 +81811,7 @@ kiezlerovi.cz, 1
 kif.rocks, 0
 kiffmarks.com, 1
 kifid.nl, 1
+kigermap.com, 1
 kihi.news, 1
 kiinanharjakoirat.tk, 1
 kiind.com.au, 1
@@ -81611,6 +82052,7 @@ kingofthecastlesouthwales.co.uk, 1
 kingofthecastlesrhyl.co.uk, 1
 kingpin.pro, 1
 kingpincages.com, 1
+kingroot.com, 1
 kings-potong.com, 1
 kings-world.net, 1
 kingsaft.net, 1
@@ -81620,6 +82062,7 @@ kingseletronicos.com.br, 1
 kingsfoot.com, 1
 kingsfordmi.gov, 1
 kingshome.gr, 1
+kingshousesportsground.co.uk, 1
 kingsicecream.com, 1
 kingsley.cc, 1
 kingsolomoncages.com, 1
@@ -81647,6 +82090,8 @@ kini24.ru, 1
 kinichi.com, 1
 kinison.com, 1
 kinjerboerebroelof.tk, 1
+kink.bio, 1
+kinkcheck.top, 1
 kinkenonline.com, 1
 kinklist.me, 0
 kinksecrets.ga, 1
@@ -82180,6 +82625,7 @@ klokkenluidersvg.nl, 1
 kloop.kg, 1
 klop.info, 1
 klos-kremperler.at, 1
+klose-besser.com, 1
 klose.family, 1
 klosetestumgebungnextcloud.de, 1
 klosko.net, 1
@@ -82374,6 +82820,7 @@ knulla.me, 1
 knulle.me, 1
 knurps.de, 1
 knurses.com, 1
+knutas.de, 1
 knuterikskare.no, 1
 knuthildebrandt.de, 0
 knutton.org, 1
@@ -82434,7 +82881,6 @@ kochadaiyaan.tk, 1
 kochamkoszalin.pl, 1
 kochbar.de, 1
 kochcommunity.com, 1
-kochdigital.dk, 1
 kochen-und-design.de, 1
 kochereva.com, 1
 kocheshkov.cf, 1
@@ -82540,6 +82986,7 @@ kokonetworks.com, 1
 kokoroheart.cf, 1
 kokoronomori.jp, 1
 kokos.pl, 1
+koksijde.be, 1
 kokteili.tk, 1
 koktelparty.tk, 1
 kokumoto.com, 1
@@ -82985,6 +83432,7 @@ kotobox.net, 1
 kotobuki-healing.com, 1
 kotoishihear.tk, 1
 kotok.tk, 1
+kotonekonokai.com, 1
 kotonoha.cafe, 1
 kotonozaka.xyz, 1
 kotoopros.tk, 1
@@ -83201,6 +83649,7 @@ kreativoweb.tk, 1
 kreativstrecke.de, 1
 kreatura.tk, 1
 kreatywni.co, 1
+kreazdesserts.com, 1
 kredi-hesaplama.com, 1
 kredibanka.net, 1
 kredigram.com, 1
@@ -83295,6 +83744,7 @@ krisstarkey.co.uk, 1
 krist.club, 1
 kristall-energie.at, 0
 kristall.tk, 1
+kristen-cooper.com, 1
 kristenpaigejohnson.com, 1
 kristianperak.com, 1
 kristiescholten.com, 1
@@ -83426,13 +83876,13 @@ kryptomodkingz.com, 1
 kryptorebels.com, 1
 kryptosekken.no, 1
 kryptoslogic.com, 1
+kryptostern.de, 1
 kryptux.xyz, 1
 krysecu.com, 1
 kryshodel.ml, 1
 krystal-framework.ml, 1
 krytykawszystkiego.com, 1
 krytykawszystkiego.pl, 1
-kryx.de, 1
 krzysiamrozinska.pl, 1
 krzysztofzaleski.com, 1
 ks-19.com, 1
@@ -83828,6 +84278,7 @@ kurserne.dk, 1
 kursk-news.net, 1
 kursk-news.ru, 1
 kursk.cf, 1
+kurssertifikasi.com, 1
 kurswahl-online.de, 1
 kursy-sep.com.pl, 1
 kursy-zawodowe24.pl, 1
@@ -83991,6 +84442,7 @@ kyber.consulting, 1
 kyber.network, 1
 kyberna.xyz, 1
 kybi.sk, 1
+kyblik.fun, 1
 kycisrael.com, 1
 kydara.com, 0
 kyivparts.com, 1
@@ -84109,6 +84561,7 @@ l36533.com, 1
 l3limo.com, 1
 l3t.com, 1
 l4s.me, 1
+l50.top, 1
 l51365.com, 0
 l5197.co, 1
 l6729.co, 1
@@ -84191,6 +84644,7 @@ lablue.ch, 1
 lablue.de, 1
 labmanager-lis.com, 1
 labogue.info, 1
+laboheme.bg, 1
 laboiteafred.fr, 1
 laboiteanem.fr, 1
 laboiteare.fr, 0
@@ -84499,6 +84953,7 @@ lahoguera.tk, 1
 lahoratunante.tk, 1
 lahstalon.org, 1
 lai.is, 1
+laidingyi.com, 1
 lailabanx.org, 1
 lain.la, 1
 lain.wiki, 1
@@ -84529,6 +84984,7 @@ lakashirdetes.com, 1
 lakashirdetesek.com, 1
 lakatnik.org, 1
 lakatos.tk, 1
+lakatosalex.hu, 1
 lakatrop.com, 1
 lake-baikal.ml, 1
 lakeandriverrestoration.com, 1
@@ -84692,7 +85148,6 @@ lampreylabs.com, 1
 lampsh.ml, 1
 lamsa.com.mx, 1
 lamsa.tk, 1
-lamscommunity.org, 1
 lamudi.ga, 1
 lamuixeranga.tk, 1
 lamula.com, 1
@@ -85077,6 +85532,7 @@ lasallecountyil.gov, 1
 lasandwicheriamedellin.com, 1
 lasavonnerieducroisic.fr, 1
 lascana.co.uk, 1
+lascarisdeli.com, 1
 laschimeneas.com, 1
 laschoolpolice.gov, 1
 lascimmiapensa.com, 1
@@ -85191,6 +85647,8 @@ latelierdeletice.com, 1
 latemarch.com, 1
 laten.tk, 1
 latenitefilms.com, 0
+latentlens.co, 1
+latentview.com, 1
 lateral.dog, 1
 lateralsecurity.com, 0
 laterna.cz, 1
@@ -85269,6 +85727,7 @@ laughlinfss.marketing, 1
 laukstein.com, 1
 laulina.fr, 1
 laultimaestacion.tk, 1
+launch.ci, 1
 launchconsulting.com, 1
 launchfinderers.ga, 1
 launchfinderest.ga, 1
@@ -85437,6 +85896,7 @@ lawrenceks.gov, 1
 lawrencemurgatroyd.com, 1
 lawrencewhiteside.com, 1
 lawrencewi.gov, 1
+lawsight.ai, 1
 lawson.bot, 1
 lawsoner.tk, 1
 lawstudio.com, 1
@@ -85478,6 +85938,7 @@ laymans911.info, 1
 layoutsatzunddruck.de, 1
 layt.org, 1
 layxw.com, 1
+lazada.pk, 1
 lazarev.agency, 1
 lazarusalliance.com, 1
 lazell.de, 1
@@ -85500,6 +85961,7 @@ lazowik.pl, 1
 lazownik.pl, 1
 lazuardy.tech, 0
 lazudi.com, 1
+lazyempire.site, 1
 lazyhelp.com, 1
 lazyhomer.pl, 1
 lazynap.com, 1
@@ -85649,6 +86111,7 @@ ldiesel.ca, 1
 ldlorangecountylocksmith.com, 1
 ldm-systems.ru, 1
 ldm2468.com, 1
+ldnio.pk, 1
 ldoe-grantprogram.com, 1
 lds52mm.com, 1
 ldsvoicesoftherestoration.com, 1
@@ -85693,6 +86156,7 @@ leabythehills.com.my, 1
 lead2022.academy, 1
 leadbook.ru, 1
 leadbox.cz, 1
+leader.co.jp, 1
 leader.net, 1
 leaderbg.net, 1
 leadercreative.ga, 1
@@ -85811,6 +86275,7 @@ learnpedestal.com, 1
 learnpki.au, 1
 learnplayground.com, 1
 learnsafe.com, 1
+learnspanishinandalusia.com, 1
 learntamil.tk, 1
 learnthetruth.tk, 1
 learntobeonline.com, 1
@@ -85823,7 +86288,6 @@ learnupon.com, 1
 learnwelsh.cymru, 1
 learnwisego-stage.com, 1
 learnwith.cc, 0
-leasecar.uk, 1
 leaseit24.com, 1
 leaselink.pl, 1
 leasenow.tk, 1
@@ -86158,6 +86622,7 @@ legba.in, 1
 legeamed.ru, 1
 legeaz.net, 1
 legend-of-pirates.tk, 1
+legendas.net, 1
 legendblogers.ga, 1
 legendblogest.ga, 1
 legendesdechine.ch, 0
@@ -86193,6 +86658,7 @@ legko-pohudet.ml, 1
 legko-pohudet.tk, 1
 legna.roma.it, 1
 legnami24.it, 1
+lego-ostergewinnspiel.de, 1
 legoktm.com, 0
 legoutcheznous.com, 1
 legow.tk, 1
@@ -86290,13 +86756,13 @@ leliveld.org, 1
 lellek.at, 1
 lellikellyshop.bg, 1
 lellyboi.ml, 1
-lelo.com.pl, 1
 lelubre.info, 1
 lelulove.net, 1
 lelux.net, 1
 lelystadairport.nl, 1
 lem0n.cc, 1
 lem0n.eu.org, 1
+lemaldive.eu, 1
 lemanbleu.ch, 1
 lemarcheelagrandeguerra.it, 1
 lemasdupalus.com, 1
@@ -86415,6 +86881,7 @@ lenuagebauche.org, 1
 lenumerozero.info, 1
 lenyip.com, 1
 lenyip.works, 1
+lenyoleny.ru, 1
 leo-boutique.fr, 1
 leo-deville.fr, 1
 leo-music.tk, 1
@@ -86502,11 +86969,13 @@ leplus.org, 1
 leporem.com.br, 1
 leppis-it.de, 1
 lepraconsf.com, 1
+leprechauntechnicalservices.com, 1
 leprekon.tk, 1
 lepressoir-info.org, 1
 leps.fr, 1
 leptitbaltar.com, 1
 leptotrichia.tk, 1
+lepuslupus.com, 1
 lepuyenvelay-tourisme.fr, 1
 lequerceagriturismo.com, 1
 lequest.dk, 1
@@ -86538,6 +87007,7 @@ les-plus.com, 1
 les-pros-du-drone.com, 1
 les-universalistes.be, 1
 les.cx, 1
+les.net.au, 1
 lesa-kiev.biz.ua, 1
 lesa.biz.ua, 1
 lesa.boutique, 1
@@ -86552,6 +87022,7 @@ lesas.tk, 1
 lesbea.com, 1
 lesbellesdenuit.ch, 1
 lesbi-porno-video.ru, 1
+lesbian.fish, 1
 lesbianlovers.tk, 1
 lesbicas.com.pt, 1
 lesblogueuses.fr, 1
@@ -86671,6 +87142,7 @@ letsbrand-holding.com, 1
 letsbrand-holding.nl, 1
 letsbrandholding.com, 1
 letsbrandholding.nl, 1
+letscahoot.net, 1
 letscleanlaundry.in, 1
 letsclimact.com, 1
 letscrackit.ml, 1
@@ -86708,6 +87180,7 @@ letterrill.gq, 1
 letters.nl, 1
 lettersblogatory.com, 1
 lettings101.org, 0
+letto.ru, 1
 lettori.club, 1
 lettragetattoo.tk, 1
 lettrefrancophile.ga, 1
@@ -87100,6 +87573,7 @@ libraryofcode.us, 1
 librarytapes.tk, 1
 librarytools.com, 1
 libravatar.org, 1
+librazy.org, 1
 libre-innovation.org, 1
 libre.cr, 1
 libre.net.au, 1
@@ -87464,7 +87938,7 @@ lilai6688.com, 0
 lilai777.com, 1
 lilai9966.com, 1
 lilawadee.tk, 1
-lile.cl, 1
+lile.cl, 0
 liliahnaraynephotography.com, 1
 lilianejuchli.ch, 1
 liliang.moe, 1
@@ -88192,6 +88666,7 @@ littlesblog.de, 1
 littlescallywagsplay.co.uk, 1
 littleservice.cn, 1
 littlesilvernj.gov, 1
+littlesk.in, 1
 littleskin.cn, 1
 littlesouls.ml, 1
 littlesouthafrica.co.uk, 1
@@ -88406,6 +88881,7 @@ lizkimball.com, 1
 liznewton.com.au, 1
 liztattoo.se, 1
 lizteacher.com, 1
+lizthegrey.com, 1
 lizufyr.eu, 1
 lizzandra.tk, 1
 lizzaran.io, 1
@@ -88435,6 +88911,7 @@ lkj.im, 1
 lklyrics.com, 1
 lkmt.us, 1
 lknw.de, 1
+lkobiz.in, 1
 lkp111138.me, 1
 lksoft.cz, 1
 lkw-faehren-buchen.de, 1
@@ -88573,6 +89050,7 @@ localbandz.com, 1
 localbiketrader.com, 1
 localbitcoins.com, 1
 localblitz.com, 1
+localbox.net, 1
 localcdn.org, 1
 localcryptos.com, 1
 locald.at, 1
@@ -88691,6 +89169,7 @@ locksmithmissouricity.com, 1
 locksmithsammamishwa.com, 1
 locksmithsanantonio-247.com, 1
 locksmithsanantoniotexas.com, 1
+locksmithsbuda.com, 1
 locksmithscottsdaleaz.com, 1
 locksmithservice-houston.com, 1
 locksmithsinsanantoniotx.com, 1
@@ -88702,6 +89181,7 @@ locksmithstaffordtx.com, 1
 locksmiththewoodlands.com, 1
 locksport.org.nz, 1
 lockwoodonlinejournals.com, 1
+loco-concepts.nl, 1
 loco-creations.nl, 1
 locomediagroep.nl, 1
 locomotiv.tk, 1
@@ -88745,6 +89225,7 @@ loftyideas.ml, 1
 loftymedia.ca, 1
 lofw.tk, 1
 log.ac, 1
+log.edu.kg, 1
 log.moe, 0
 log.pw, 0
 log4shell.org, 1
@@ -88855,6 +89336,7 @@ logopedischcentrum.nl, 1
 logopedista.roma.it, 1
 logopedistalanni.it, 1
 logoprofi.tk, 1
+logosautomations.com, 1
 logosnet.com.br, 1
 logosradio.tk, 1
 logostock.jp, 1
@@ -88996,6 +89478,8 @@ lolis.stream, 1
 lolis3.com, 1
 lolitalechat.com, 1
 lolivpn.com, 1
+lolkmal.myaddr.io, 1
+lolkmal.myaddr.tools, 1
 lolkot.ru, 1
 lollipopo69.net, 1
 lollypop.tk, 1
@@ -89731,6 +90215,7 @@ ltailshort.tk, 1
 ltb.chat, 1
 ltba.org, 1
 ltcfeds.com, 1
+ltcfeds.gov, 1
 ltcwaterwijk.nl, 1
 ltdev.im, 1
 ltecode.com, 1
@@ -89827,7 +90312,6 @@ lucidya.com, 0
 lucie-parizkova.cz, 1
 lucielavickova.com, 1
 lucieradosinska.cz, 1
-luciezimmerova.cz, 1
 luciferblog.tk, 1
 luciferianism.tk, 1
 lucille-thomas.fr, 1
@@ -89871,6 +90355,7 @@ lucorautopartes.com, 1
 lucrar.pt, 1
 lucschiltz.com, 0
 luctam.com, 1
+lucy.bg, 1
 lucy.sex, 1
 lucychan.tk, 1
 lucym.co.nz, 1
@@ -89899,7 +90384,6 @@ ludum-polus.xyz, 1
 ludum.pl, 1
 ludunwayoo.com, 1
 ludwig.im, 1
-ludwiggrill.de, 1
 ludwigjohnson.se, 1
 ludwigpro.net, 1
 ludwigsburger-brauhaus.de, 1
@@ -89927,6 +90411,7 @@ lugros.tk, 1
 lugui.in, 1
 luhkultour.de, 1
 lui.vn, 1
+luigipinedo.com, 1
 luinonotizie.it, 1
 luis-portfolio.es, 1
 luisa-birkner.de, 1
@@ -90032,6 +90517,7 @@ lumentell.us, 1
 lumer.tech, 1
 lumi.com, 1
 lumi.pw, 1
+lumicloud.my.id, 1
 lumien.net, 1
 lumieredesoy.com, 1
 luminabh.com.br, 1
@@ -90113,6 +90599,7 @@ luniak.net, 1
 lunight.ml, 1
 lunite.net, 1
 lunite.tk, 1
+luniversdelacapsule.fr, 1
 lunivertdelyne.fr, 1
 lunk.it, 1
 lunlixiaozhan.icu, 1
@@ -90175,6 +90662,7 @@ lusnic.org, 1
 luso-livros.net, 1
 lusoft.cz, 1
 lusosider.pt, 1
+lusrodri.me, 1
 lusson.fr, 0
 lust.works, 1
 lustanslakejer.tk, 1
@@ -90235,6 +90723,7 @@ luxhair.com.ua, 1
 luxhome.tk, 1
 luxinfine.su, 1
 luxmedprotez.com, 0
+luxmerchants.com, 1
 luxoestates.com, 1
 luxonengineering.com, 1
 luxonmx.com, 1
@@ -90370,8 +90859,6 @@ lyngvaer.no, 1
 lynho.com.br, 1
 lynk.hopto.org, 1
 lynkmi.com, 1
-lynkr.org, 1
-lynkrtech.com, 1
 lynnco.com, 1
 lynndye.com, 0
 lynnejeancleaning.com, 1
@@ -90470,6 +90957,7 @@ m-strana.com.ua, 1
 m-team.cc, 1
 m-tower.nl, 1
 m-warrior.tk, 1
+m-wikipedia.org, 1
 m.ac, 1
 m.bo, 1
 m.facebook.com, 1
@@ -90514,6 +91002,7 @@ m7info.com, 1
 m7kni.com, 1
 m7mzo.com, 1
 m7worknow.com, 1
+m9.is, 1
 m9297.co, 1
 m9728.co, 1
 ma-bimbo.com, 1
@@ -90549,6 +91038,7 @@ maartenderaedemaeker.be, 1
 maaspoortsportsenevents.nl, 1
 maasstaddinerexpres.nl, 1
 maat.pt, 1
+maatimpact.com, 1
 maatt.ch, 1
 maatt.fr, 1
 maatwerkopruimcoaching.nl, 1
@@ -90878,6 +91368,7 @@ mafiatown.pl, 1
 mafondue.ch, 0
 mafworld.com, 1
 mafy.fi, 1
+magachou.com, 1
 magadan-news.net, 1
 magadan.ga, 1
 magadan.gq, 1
@@ -90923,6 +91414,7 @@ magenkompass.de, 0
 magentacares.com, 1
 magentazorg.nl, 1
 magento-ecommerce.it, 1
+magento2.hu, 1
 magentodevelopment.co.uk, 1
 magentrix.com, 0
 magepro.fr, 1
@@ -91072,6 +91564,7 @@ magwin.co.uk, 1
 magyarepitok.hu, 1
 mah-nig.ga, 1
 mah24.com, 1
+maha.gov, 1
 mahabharat.tk, 1
 mahadhanconnect.com, 1
 mahadihasan.cf, 1
@@ -91345,9 +91838,11 @@ majstorov.rs, 1
 majtkomat.pl, 1
 makaleci.com, 1
 makanj.tk, 1
+makar.rzeszow.pl, 1
 makariza.com.co, 1
 makasetesan.com, 1
 makatala.com, 1
+makca.co, 1
 make-a-difference-daily.com, 1
 make-my-link-longer.ml, 1
 make-tatsuta.co.jp, 0
@@ -91569,7 +92064,6 @@ malphisruul.de, 1
 malscan.com, 0
 malsignature.com, 1
 malta-firma.com, 1
-maltaphotographyacademy.com, 1
 maltarugs.com, 1
 maltasite.tk, 1
 maltaultrastifo.tk, 1
@@ -91979,6 +92473,7 @@ map.fund, 1
 map4erfurt.de, 1
 map4jena.de, 1
 mapa-airsoft-akci.cz, 1
+mapa1.com, 1
 mapadados.com, 1
 mapadoacolhimento.org, 1
 mapailytics.com, 1
@@ -92005,6 +92500,7 @@ mapletonmn.gov, 1
 maplevalleytwpmi.gov, 1
 maplewood.tk, 1
 maplewoodnj.gov, 1
+mapmatix.com, 1
 mappinandwebb.com, 1
 mappingspaceperu.com, 1
 maprao.xyz, 1
@@ -92031,7 +92527,6 @@ maquinariaspesadas.org, 0
 maquinasperfectas.tk, 1
 maquinasquepiensan.tk, 1
 mar-eco.no, 1
-mar-zyg.pl, 1
 mar.pt, 1
 marabook.fr, 1
 maracarlinicourses.com, 1
@@ -92066,6 +92561,7 @@ marblenexus.de, 1
 marbogardenlidkoping.se, 1
 marbree.eu, 1
 marbriers4.ch, 1
+marburg-frieden.de, 1
 marc-beninca.fr, 1
 marc-hammer.de, 0
 marc-hoffrichter.de, 1
@@ -92080,6 +92576,7 @@ marcbeije.com, 1
 marcberndtgen.de, 1
 marcdietschi.com, 1
 marcel-preuss.de, 1
+marcel.info.pl, 1
 marcelabarrozo.tk, 1
 marcelheemels.org, 1
 marcelhencke.de, 1
@@ -92152,6 +92649,7 @@ marcus-mueller.info, 1
 marcus-scheffler.com, 1
 marcus.pw, 0
 marcusb.org, 1
+marcusberley.com, 1
 marcusburghardt.tk, 1
 marcusds.ca, 1
 marcusporter.tk, 1
@@ -92335,6 +92833,7 @@ marismenos.tk, 1
 maritiemshertogenbosch.nl, 1
 maritime-mea.com, 1
 maritimehistory.org.uk, 1
+maritimeinfosec.org, 1
 maritlarsen.ml, 1
 maritlarsen.tk, 1
 mariupol-news.ru, 1
@@ -92455,12 +92954,14 @@ markocloud.com, 1
 markoglou.com.gr, 1
 markoheijnen.com, 1
 markov.com.ru, 1
+markovonline.ru, 1
 markovowest.bg, 1
 markpostmanrenovations.ca, 1
 markpulido.net, 1
 markri.nl, 1
 markridgwell.co.uk, 1
 markridgwell.com, 1
+marks-lawfirm.com, 1
 marks.sa, 1
 marksclassicautos.com, 1
 marksm.it, 1
@@ -92800,6 +93301,7 @@ mascarillas.blog, 1
 maschine.email, 1
 maschinen.email, 1
 mascotarios.org, 1
+mascotavineyards.com, 1
 masdemariette.com, 1
 masdemexico.com, 1
 masdr.sa, 1
@@ -92900,6 +93402,7 @@ massfone.com, 0
 masshelpline.com, 1
 masshost.tk, 1
 masshpc.gov, 1
+massimoturella.it, 1
 massindia.in, 1
 massive.tk, 1
 massiveanalyser.com, 1
@@ -92928,6 +93431,7 @@ master-tmb.ru, 1
 master-zone.com, 1
 master.shop, 1
 masteranimal.tk, 1
+masterassignmentwriter.com, 1
 mastercardpac.com, 1
 mastercareplus-demo.com, 1
 mastercareplus-staging.com, 1
@@ -93105,7 +93609,6 @@ mathieu-oriol.com, 1
 mathieu42.com, 1
 mathieuchollet.eu, 1
 mathieugrant.com, 1
-mathieuguimond.com, 1
 mathieui.net, 1
 mathisadler.com, 1
 mathiveri.tk, 1
@@ -93357,12 +93860,14 @@ mauboussin.ma, 1
 maudfourier.com, 0
 mauditeboisson.tk, 1
 maudok.gov, 1
+maudynetwork.id, 1
 mauhalito.tk, 1
 mauicharm.com, 1
 maukenyang.com, 1
 mauldincookfence.com, 1
 mauletsmallorca.tk, 1
 maumovie.ml, 1
+maunayogastudio.com, 1
 maunder.ru, 1
 maunium.net, 1
 maurice-walker.com, 0
@@ -93385,7 +93890,6 @@ mauriziofaldi.com, 1
 mauroalejandro.co, 1
 mauronovellas.es, 1
 maurrikone.com, 1
-maury-moteurs.com, 1
 mausbike.ro, 1
 maushabitos.com, 1
 mausmani.tk, 1
@@ -93531,6 +94035,7 @@ maxopen.cf, 1
 maxopolyworldnews.com, 1
 maxostapenko.com, 1
 maxp.info, 0
+maxpapildai.lt, 1
 maxpoint.it, 1
 maxportal.tk, 1
 maxr1998.de, 0
@@ -93540,6 +94045,7 @@ maxrider.tk, 1
 maxroganov.tk, 1
 maxs.com, 1
 maxschleiffer.com, 1
+maxthoene.de, 1
 maxtire.com, 1
 maxtransport.az, 1
 maxtruxa.com, 1
@@ -93551,6 +94057,7 @@ maxuniverse.de, 1
 maxus.tk, 1
 maxval.com, 1
 maxvaluecleaners.com, 1
+maxvibe.rocks, 1
 maxwaellenergie.de, 1
 maxweiss.io, 1
 maxwell-english.co.jp, 0
@@ -93610,6 +94117,7 @@ mazartdesign.tk, 1
 mazavto.ml, 1
 mazda-mps.de, 1
 mazda-thermote.com, 1
+mazdabongocentre.co.uk, 1
 mazdel.tk, 1
 maze.com.br, 1
 maze.fr, 0
@@ -93710,6 +94218,7 @@ mcaz.nl, 1
 mcb-bank.com, 1
 mcba.com.br, 1
 mcc.edu.ph, 1
+mcc.gov, 1
 mccabes.com.au, 1
 mccallkulak.org, 1
 mccannhealth.com, 1
@@ -93749,6 +94258,7 @@ mcduff.ga, 1
 mce.eu, 1
 mce55.eu, 1
 mcea-hld.jp, 1
+mcead.com, 1
 mceconferencecentre.eu, 1
 mceducation.com, 1
 mcelebi.net, 1
@@ -93926,6 +94436,7 @@ mdek.at, 1
 mdewendt.de, 1
 mdf-bis.com, 0
 mdf-nakladki.kiev.ua, 1
+mdgrok.com, 1
 mdgsocialmediasecurity.com, 1
 mdgx.com, 1
 mdigital.lt, 1
@@ -93985,7 +94496,6 @@ meals.lv, 1
 meamod.com, 1
 meandliora.com, 1
 meandmyemotions.org, 1
-meangreenjunk.com, 1
 meaningfulbits.io, 1
 meanit.ie, 1
 meanjstraininginstitute.com, 1
@@ -94217,6 +94727,7 @@ medex.health, 1
 medfind.link, 1
 medfordoregon.gov, 1
 medfordwi.gov, 1
+medgetech.com, 1
 medguide-bg.com, 1
 medgyd.lt, 0
 medhacooks.com, 1
@@ -94475,6 +94986,7 @@ medtankers.management, 0
 medtech-jp.net, 1
 medtechedge.com.au, 1
 medtehnika.ua, 1
+medtown.cloud, 1
 medtronicpain.com, 1
 meduna.org, 1
 medunovi.com, 1
@@ -94623,6 +95135,7 @@ megatyumen.ru, 1
 megauction.tk, 1
 megavasoc.com.ar, 1
 megaviews.tk, 1
+megawatt.news, 1
 megawebsite.tk, 1
 megaxchange.cash, 1
 megayachts.world, 1
@@ -94705,6 +95218,7 @@ meinauslandspraktikum.de, 1
 meinbargeld.at, 1
 meinbaustoffversand.de, 1
 meinbetriebsrat24.de, 1
+meincasinoportalcheck.com, 1
 meincenter-meinemeinung.de, 1
 meincoach.at, 1
 meindm.at, 1
@@ -94875,6 +95389,7 @@ melissaadkins.com, 1
 melissadeluxe.com, 1
 melissageorge.tk, 1
 melissalb.tk, 1
+melissatani.com, 1
 melitopol-news.ru, 1
 melitopolnews.ru, 1
 meliyb.ga, 1
@@ -94978,6 +95493,7 @@ memphisrap.com, 1
 mempoo.space, 1
 mempool.chat, 1
 mempool.de, 1
+mempool.holdings, 1
 mempool.ninja, 1
 mempool.space, 1
 memrise.com, 1
@@ -95182,12 +95698,8 @@ mercadopago.com.mx, 1
 mercadopago.com.pe, 1
 mercadopago.com.uy, 1
 mercadopago.com.ve, 1
-mercadoshops.cl, 1
 mercadoshops.com, 1
 mercadoshops.com.ar, 1
-mercadoshops.com.br, 1
-mercadoshops.com.co, 1
-mercadoshops.com.mx, 1
 mercadoshops.com.ve, 1
 mercanix.co.uk, 1
 mercans.co, 1
@@ -95244,6 +95756,7 @@ meribook.com, 1
 meridanas.de, 1
 meridanas.me, 1
 meridia.co, 1
+meridianatech.com, 1
 meridiangroup.ml, 1
 meridianproductscorp.com, 1
 meridianrhum.com, 0
@@ -95252,7 +95765,6 @@ merikserver.tk, 1
 merisia.ca, 1
 merisratings.com, 1
 meritadvisor.com, 1
-meritcb.eu, 1
 meritcourtreportingandvideo.com, 1
 meritreporting.com, 1
 meritsol.com, 1
@@ -95293,6 +95805,7 @@ mertalisahin.com, 1
 mertcangokgoz.com, 1
 mertonapp.com, 1
 mertonapprentice.com, 1
+mertotomasyon.com, 1
 mertuslu.com, 1
 meruhealth.com, 0
 mervetekinmimarlikinsaat.com.tr, 1
@@ -95381,6 +95894,7 @@ meta4.be, 1
 meta48.live, 1
 metablog.xyz, 1
 metabolicmenu.com, 1
+metabolicnutritionpro.com, 1
 metabound.co.uk, 1
 metabox.io, 1
 metacareers.com, 1
@@ -95511,6 +96025,7 @@ metex.exchange, 1
 metformin365.tk, 1
 method.com, 0
 methoddemo.com, 0
+methode-bioscore.com, 1
 methode.com, 1
 methodist.com.tr, 1
 methodisthealth.com, 1
@@ -96149,6 +96664,7 @@ midville-ga.gov, 1
 midwaycitysanitaryca.gov, 1
 midwest-hidta.gov, 1
 midwest737simulations.com, 1
+midwestapologetics.org, 1
 midwestbloggers.org, 1
 midwestern.edu, 1
 midwesternpsych.org, 1
@@ -96342,6 +96858,7 @@ mijntrined.nl, 1
 mijnvogaanvraag.nl, 1
 mijnwefact.nl, 1
 mika.moe, 1
+mikaconor-schneider.de, 1
 mikado-rybak.ru, 1
 mikadoe.nl, 0
 mikaelf.com, 1
@@ -96409,6 +96926,7 @@ mikino.cf, 1
 mikino.ga, 1
 mikino.gq, 1
 mikino.ml, 1
+mikizol.ru, 1
 mikkei.space, 1
 mikkel.cc, 1
 mikkelscheike.com, 1
@@ -96418,6 +96936,7 @@ mikkonen.bio, 1
 mikkonen.com, 1
 miklcct.com, 1
 miklima.pl, 1
+miklus.pl, 1
 mikodojo.tk, 1
 mikonmaa.fi, 1
 mikori.sk, 1
@@ -96429,6 +96948,7 @@ mikrokosmos.tk, 1
 mikropixel.de, 1
 mikroskopmedia.com, 1
 mikrotech.co.za, 1
+mikrotest.com.tr, 1
 mikrotike.tk, 1
 mikrozajmy-na-kartu.cf, 1
 miku-doujin.com, 1
@@ -96456,6 +96976,7 @@ milani.io, 1
 milania.de, 1
 milanm.org, 1
 milanmi.gov, 1
+milannews24.com, 1
 milannooptical.com, 1
 milano-web.it, 1
 milano.law, 1
@@ -96580,6 +97101,7 @@ millhousen.tech, 1
 milliarden-liste.de, 1
 millibirlik.tk, 1
 millibitcoin.jp, 1
+millida.net, 1
 milliegrace.org, 1
 millikart.az, 1
 millionaireclub.tk, 1
@@ -96781,6 +97303,7 @@ minelucky.net, 1
 minepack.net, 1
 mineralhottub.com, 1
 mineralnibani.bg, 1
+mineraluterapeutai.lt, 1
 minered.org, 0
 minerstat.com, 0
 minersvillepa.gov, 1
@@ -96951,6 +97474,7 @@ minsterbank.com, 1
 mint-frauen-bw.de, 1
 mintal.is, 1
 mintblau.com, 1
+mintbuilder.com, 1
 mintcast.org, 1
 mintclass.com, 1
 mintdsmile.com.au, 1
@@ -96980,7 +97504,6 @@ minutamody.cz, 1
 minutashop.ru, 1
 minuteflightdeals.com, 1
 minuten-drogentests.de, 1
-minutepunchline.com, 1
 minuterice.com, 1
 minutoscomdeus.com.br, 1
 minux.info, 1
@@ -97056,7 +97579,6 @@ mirazperu.tk, 1
 mircreditov.tk, 1
 mircsohbet.tk, 1
 mirdetaley.tk, 1
-mirdukkkkk.space, 1
 mireiaseuba.com, 1
 mireillewendling.com.br, 1
 miremedio.cl, 1
@@ -97085,6 +97607,7 @@ mironized.com, 1
 mironov.tk, 1
 miroslav.ca, 1
 miroslav.id, 1
+mirotakampus.com, 1
 mirprav.tk, 1
 mirri.net, 1
 mirrordream.net, 1
@@ -97141,6 +97664,7 @@ miskatonic.org, 1
 misoji-resist.com, 1
 misol.kr, 1
 mispelis.tk, 1
+misr-alalmanya.com, 1
 misreflexiones.tk, 1
 misreports.in, 1
 miss-inventory.co.uk, 1
@@ -97364,6 +97888,7 @@ mix-it.net, 1
 mix-recruit.jp, 1
 mix.my, 1
 mixandplay.tk, 1
+mixedbypaulboutin.com, 1
 mixedrecipe.com, 1
 mixer.cz, 1
 mixerfestival.com.br, 1
@@ -97386,6 +97911,7 @@ mixpanel.com, 0
 mixposure.com, 1
 mixtapesammelstelle.de, 1
 mixxie.moe, 1
+mixyero.online, 1
 miyagi-ctr.com, 1
 miyagi-r.com, 1
 miyajima-ken.jp, 1
@@ -97513,7 +98039,10 @@ mkt.com, 1
 mkt.cx, 1
 mkt7.de, 1
 mktcoral.com, 1
+mktest.com, 1
+mktzap.com.br, 1
 mkultraclean.com.au, 1
+mkw-grossefehn.de, 1
 mkw.st, 1
 mkws.sh, 1
 ml.tax, 1
@@ -97568,7 +98097,6 @@ mlshh.pp.ua, 1
 mlstav.sk, 1
 mlstverse.org, 1
 mltrade.ml, 1
-mlukas.xyz, 1
 mlv-psychosomatik.de, 1
 mlv.me, 1
 mlytics.com, 1
@@ -97780,6 +98308,7 @@ mobilis.dz, 1
 mobilisation-generale.org, 0
 mobility-events.ch, 1
 mobility-services.eu, 1
+mobilityworks.eu, 1
 mobilityworld.tk, 1
 mobilize.us, 1
 mobilizon.fr, 1
@@ -97800,6 +98329,7 @@ mobiotics.com, 1
 mobiride.co, 1
 mobistartv.ml, 1
 mobius.network, 1
+mobiusnetworks.co.uk, 1
 mobizent.com, 1
 mobmp4.info, 1
 mobobe.com, 1
@@ -97902,12 +98432,14 @@ moderaterna.se, 1
 moderatoren.org, 1
 modern-gaming.ga, 1
 modern-metal-solutions.com, 1
+modern-networks.co.uk, 1
 modernapprenticeships.org, 1
 modernautorepairs.com, 1
 modernbank.com, 1
 moderncat.com, 1
 moderncommercialrealestate.com, 0
 moderndayprepping.com, 1
+moderndeck.org, 1
 moderndogmagazine.com, 1
 moderndukes.tk, 1
 modernestimates.com, 1
@@ -97944,7 +98476,6 @@ modpop.se, 1
 modrynstudio.com, 1
 modscrew.com, 1
 modsecurity.net, 1
-modstumblguys.com, 1
 modszombies.com, 1
 modul21.eu, 1
 modul8r.com, 1
@@ -97993,6 +98524,7 @@ moelten.org, 1
 moenew.us, 1
 moenjodaro.tk, 1
 moensnatuursteen.be, 1
+moenviron.com, 1
 moerugomi.com, 1
 moesborg.dk, 1
 moescat.xyz, 0
@@ -98123,6 +98655,7 @@ mokum-organics.com, 0
 mokutovo.tk, 1
 molaclothing.pt, 0
 mold-tech.com, 1
+mold.world, 1
 molddesigner.com, 1
 moldova-online.ml, 1
 moldovanka.tk, 1
@@ -98408,9 +98941,9 @@ monopolyjuegos.com, 1
 monorail.cf, 1
 monorail.ga, 1
 monorail.gq, 1
-monordibogue.com, 1
 monorthopedagogue.ca, 1
 monosecurity.se, 1
+monoseis-monotica.gr, 1
 monosis.net, 1
 monoskop.org, 1
 monospazzole.roma.it, 1
@@ -98493,6 +99026,7 @@ monteurzimmerfrei.de, 1
 monteurzimmerking.deals, 1
 montevista.co.nz, 1
 montevue.co.za, 1
+montfranc.com, 1
 montgenevre.com, 0
 montgomeryboroughpa-police.gov, 1
 montgomerycountyal.gov, 1
@@ -98623,7 +99157,6 @@ mooreautoglass.com, 1
 moorelife.cn, 1
 mooremi.gov, 1
 mooremillerinvestmentgroup.ca, 1
-mooremoney.co, 1
 mooresvilletribune.com, 1
 mooretownrancheria-nsn.gov, 1
 moorfunevents.co.uk, 1
@@ -99007,7 +99540,7 @@ motorslopers.tk, 1
 motorspeed.de, 1
 motorsport-passion.com, 1
 motorst.dk, 1
-motortg.it, 0
+motortg.it, 1
 motorways.tk, 1
 motorwrappen.nl, 1
 motorz.ca, 1
@@ -99191,6 +99724,7 @@ movingtonewcastle.com.au, 1
 movio.ga, 1
 moviro.net, 1
 movlib.org, 1
+movneo.com, 1
 movnest.com, 1
 mowercountymn.gov, 1
 mowsey.org, 1
@@ -99225,6 +99759,7 @@ mozzak.tk, 1
 mozzez.de, 1
 mozzi.online, 1
 mozzilla.cz, 1
+mp-bank.ru, 1
 mp-bln.de, 1
 mp.gov.in, 1
 mp.org, 1
@@ -99233,6 +99768,7 @@ mp3.tj, 1
 mp3cut.net, 1
 mp3gratuiti.com, 0
 mp3musicfind.ga, 1
+mp3noi.com, 1
 mp3skull.cf, 1
 mp4.tf, 1
 mpa-pro.fr, 1
@@ -99398,6 +99934,7 @@ mrmad.com.tw, 1
 mrmanson.tk, 1
 mrmarcie.com, 1
 mrmasaleh.com, 1
+mrmave.work, 1
 mrmeeb.co.uk, 1
 mrmemory.co.uk, 1
 mrmeomeo.xyz, 1
@@ -99522,6 +100059,7 @@ msmaxfac.cz, 1
 msmaxfax.cz, 1
 msmeble.pl, 1
 msmetana.cz, 1
+msmt.cz, 1
 msn.cn, 1
 msn.com, 1
 msnarzedzia.pl, 1
@@ -99542,6 +100080,7 @@ mspatexas.com, 1
 mspcc.org, 1
 msphotographics.de, 0
 mspnocsupport.com, 1
+mspredict.com, 1
 mspsocial.net, 1
 mspvendors.com, 1
 msquadrat.de, 0
@@ -100098,6 +100637,7 @@ musicaporbolivia.tk, 1
 musicarenagh.com, 1
 musicbox.party, 1
 musicboxx.cz, 1
+musicbymelanie.dk, 1
 musicc.net, 1
 musicchris.de, 1
 musicfactory.ml, 1
@@ -100110,6 +100650,7 @@ musicfromgod.com, 1
 musicgamegalaxy.de, 1
 musicgeek.ga, 1
 musicgivesmelife.com, 0
+musicgivesmelife.gay, 1
 musichiphop.ga, 1
 musichome.tk, 1
 musicinsiderdigest.com, 1
@@ -100211,6 +100752,7 @@ mutahar.me, 0
 mutantmonkey.in, 1
 mutantmonkey.info, 1
 mutantmonkey.sexy, 1
+mutex.co.za, 1
 mutex.ru, 1
 muthai.in.th, 1
 muthamagazine.com, 1
@@ -100250,6 +100792,7 @@ muzeumkomiksu.eu, 0
 muzi-tips.tk, 1
 muzi.cz, 1
 muzicamp3.org, 1
+muzicamp3.top, 1
 muzicari.tk, 1
 muziekluisteren.eu, 1
 muziekschatten.nl, 1
@@ -100750,6 +101293,7 @@ mygadgetguardian.lookout.com, 0
 mygallery.homelinux.net, 1
 mygameconsole.tk, 1
 mygaming.news, 1
+mygardendays.com, 1
 mygate.at, 0
 mygaysitges.com, 1
 mygd.org, 1
@@ -100774,7 +101318,6 @@ mygirlfriendshouse.com, 1
 myglobalnews.net, 1
 myglobalopti.nl, 1
 mygnmr.com, 0
-mygo.pw, 1
 mygobelin.tk, 1
 mygolfsimulator.com, 1
 mygolod.com, 1
@@ -100932,6 +101475,8 @@ mymkphotography.com, 1
 mymlshouselisting.com, 1
 mymo.in.th, 1
 mymobilexpert.com, 1
+mymodernoffice.co.uk, 1
+mymojo.com, 1
 mymoneycoin.ml, 1
 mymoranguito.com, 1
 mymoretrip.com, 0
@@ -101125,6 +101670,7 @@ myreviews.ga, 1
 myrewardspoints.com, 1
 myria.com, 1
 myriad.com, 1
+myriadgroup.com, 1
 myriadlex.com.tw, 1
 myriadof.com, 1
 myriation.xyz, 1
@@ -101192,14 +101738,15 @@ mysoftebelge.com, 1
 mysoftlonca.com, 1
 mysorry.com, 1
 mysoundtalks.com, 0
+mysourcebank.com, 1
 mysourceofhealth.com, 0
 myspicer.com, 1
 mysports.com, 1
+mysproutsite.com, 1
 mysql-real-escape-string.xyz, 1
 mysqldump-secure.org, 1
 myssl.com, 0
 mystaffonline.com, 1
-mystd.io, 1
 mysteriouscode.com, 1
 mysteriouscode.io, 1
 mystery-box.cf, 1
@@ -101409,6 +101956,7 @@ n.tt, 1
 n0.be, 1
 n0099.net, 1
 n03.top, 1
+n0t404.com, 1
 n0v1.com, 1
 n1.homes, 1
 n15.org, 1
@@ -101437,7 +101985,6 @@ n8.gay, 1
 n854.com, 1
 n87pedia.tk, 1
 n8ch.net, 1
-n8mgt.com, 1
 n8n-alix.com, 1
 n8nvi.com, 1
 n8pjl.ca, 1
@@ -101464,6 +102011,7 @@ naap.tk, 1
 naarenaa.tk, 1
 naaronstoe.nl, 1
 nab-services.ml, 1
+nabard.xyz, 1
 nabc.au, 1
 nabchelny-news.ru, 1
 nabeer.ga, 1
@@ -101787,8 +102335,10 @@ nannatextiles.de, 1
 nannostomus.com, 1
 nannyandhousekeeper.uk, 1
 nannydream.com, 1
+nano.gov, 1
 nano.voting, 1
 nanobattle.com, 1
+nanocard.co, 1
 nanodgx.com, 1
 nanodynelabs.com, 1
 nanofate.tk, 1
@@ -101829,6 +102379,7 @@ napavalleyregister.com, 1
 napc.kr, 1
 napcabs.com, 1
 napcae.de, 1
+napfmomente.de, 1
 naphex.rocks, 1
 napi.edu.ee, 1
 napikuponok.hu, 1
@@ -101899,6 +102450,7 @@ naris-grc.com, 1
 narko-stop.org, 1
 narkocenter116.ru, 1
 narmafzar.tk, 1
+naro-np.jp, 1
 naro-oh.jp, 1
 narod-sobe.cz, 1
 narodnaya-medizina.tk, 1
@@ -102067,6 +102619,7 @@ nathanielparker.info, 1
 nathanielparker.net, 1
 nathanielparker.org, 1
 nathanielsigal.com, 1
+nathanieltammer.com, 1
 nathankonopinski.com, 1
 nathanmfarrugia.com, 1
 nathanphoenix.com, 1
@@ -102106,6 +102659,7 @@ nationalmap.gov, 1
 nationalmattressday.com, 1
 nationalmemorialdayparade.com, 1
 nationalmower.com, 1
+nationalnursinghomelawyers.com, 1
 nationalopera.ml, 1
 nationalpeanutboard.org, 1
 nationalpriorities.org, 1
@@ -102200,6 +102754,7 @@ natureaction100.org, 1
 natureandculture.org, 0
 natureartns.ru, 1
 natureclaim.com, 1
+naturecoaster.com, 1
 naturedao.hk, 1
 natureisland.tk, 1
 naturel.tk, 1
@@ -102272,6 +102827,7 @@ navegantesdelcosmos.ec, 1
 navegarea.tk, 1
 naveka.ga, 1
 navenlle.com, 1
+naviate.com, 1
 navidarian.tk, 1
 navienna.com, 1
 navientagsettlement.com, 1
@@ -102445,6 +103001,7 @@ nci.com.es, 1
 nci.systems, 1
 ncic.gg, 1
 ncionline.co.uk, 1
+ncirc.gov, 1
 ncjdigital.com, 1
 ncjrs.gov, 1
 ncksrv.com, 1
@@ -102597,6 +103154,7 @@ necronomusick.tk, 1
 necropolis-online.tk, 1
 necta.go.tz, 1
 nectar.co.nz, 1
+nectardaamazonia.com.br, 1
 nectere.ca, 1
 nectir-staging.com, 1
 nectir.co, 1
@@ -102682,6 +103240,7 @@ negociemos.com.co, 1
 negocios-imatore.com, 1
 negociosparaoptimistas.com, 1
 negociosurbanos.net, 1
+negoya-shokai.info, 1
 negozimoda.it, 1
 negoziointimo.com, 1
 negr.gay, 1
@@ -102944,6 +103503,7 @@ neptunenavigate.com, 1
 neptunenow.com, 1
 neptunosrefugio.tk, 1
 nepu.tk, 1
+nerazzurrisiamonoi.it, 1
 nerba.net, 1
 nerd.gallery, 1
 nerdalert.dk, 1
@@ -103002,6 +103562,7 @@ nerven.se, 0
 nervi.ga, 1
 nesabamedia.com, 1
 nesaltin.com, 1
+nesec.nl, 1
 nesheims.com, 1
 nesheimswaterrestoration.com, 1
 neshkorowi.gov, 1
@@ -103064,6 +103625,7 @@ netbsd.fi, 1
 netbuzz.ru, 1
 netcake.in, 1
 netcapital.com, 1
+netcat.ovh, 1
 netcattle.com, 1
 netcd.tk, 1
 netcenteret.tk, 1
@@ -103214,6 +103776,7 @@ netsec.cloud, 1
 netsecma.com, 1
 netsensai.pl, 1
 netsensor.com.br, 1
+netservice.co.uk, 1
 netshopgarden.com.br, 1
 netsite.dk, 1
 netslum.tk, 1
@@ -103825,6 +104388,7 @@ nexacu.com.au, 1
 nexadevs.com, 1
 nexafuze.com, 1
 nexarda.com, 1
+nexarigroup.com, 1
 nexbone.com, 1
 nexcoda.io, 1
 nexd.com, 1
@@ -103979,7 +104543,6 @@ nflchan.org, 1
 nfls.io, 1
 nfmhof.com, 1
 nfo.co.il, 1
-nfobar.com, 1
 nforto.com, 1
 nfpib.com.au, 1
 nfpors.gov, 1
@@ -104102,7 +104665,6 @@ ni-s.de, 1
 ni.sb, 1
 ni.search.yahoo.com, 0
 niaa.gov.au, 1
-niadd.com, 1
 niagara.ru, 0
 niagaraconstruction.org, 1
 niagarafalls.ca, 1
@@ -104208,6 +104770,7 @@ nichyaforum.tk, 1
 nicic.gov, 1
 niciunde.ro, 1
 nick-black.com, 1
+nick-cloud.net, 1
 nick-slowinski.de, 0
 nick-stone.com, 1
 nickbrookes.co.uk, 1
@@ -104441,6 +105004,7 @@ nigmapictures.tk, 1
 nigt.cf, 1
 nih.ao, 1
 nihaarpstars.com, 1
+nihao-server.com, 1
 nihaoma.cn.eu.org, 1
 nihaoonline.tk, 1
 nihilistan.tk, 1
@@ -104455,7 +105019,6 @@ niid.lv, 1
 niinaratsula.com, 1
 niit-mts.com, 1
 niit.com, 1
-niiteducation.com, 1
 niitfoundation.org, 1
 niituniversity.in, 1
 niituva.ga, 1
@@ -104520,6 +105083,7 @@ nikolaipribylski.tk, 1
 nikolaj-platoshkin.cf, 1
 nikolajmackowski.dk, 1
 nikolasbradshaw.com, 1
+nikolayiliev.bg, 1
 nikon-photocontest.com, 1
 nikoniko-dental-izumichuo.jp, 1
 nikoniko-dental-izumigaoka.jp, 1
@@ -104843,6 +105407,7 @@ nmaedu.org, 1
 nmb.gov, 1
 nmbhgc.org, 1
 nmbtc.com, 1
+nmcae.com, 1
 nmcep.net, 0
 nmd.so, 1
 nmdoj.gov, 1
@@ -104936,6 +105501,7 @@ noahjacobson.com, 1
 noahmodas.com.br, 1
 noahs.com, 1
 noahsaso.com, 1
+noajoder.ch, 1
 noangel.tk, 1
 noart.tk, 1
 noatec.eu, 0
@@ -105277,7 +105843,6 @@ nordseeblicke.de, 1
 nordstarfossils.com, 1
 nordvestkysten.dk, 1
 nordvpn.com, 1
-nordwal.de, 1
 nordwaldzendo.de, 0
 nordwind-umzuege.de, 1
 norebase.com, 1
@@ -105302,6 +105867,7 @@ noritakechina.com, 1
 noriva.com.mt, 1
 norlink.ca, 1
 normaculta.com.br, 1
+normahana.com, 1
 normalady.com, 0
 normalil.gov, 1
 normalinlinden.de, 1
@@ -105631,6 +106197,7 @@ nottawatwpisabellami.gov, 1
 nottinghammd.com, 1
 nottinghammoneyman.com, 1
 nottinghilleditions.com, 1
+notto.ovh, 1
 notube.cc, 1
 notube.io, 1
 notube.net, 1
@@ -105665,6 +106232,7 @@ novacoaching.nl, 1
 novacustomboxes.com, 1
 novadir.com, 1
 novafreixo.pt, 1
+novagym.berlin, 1
 novak.cf, 1
 novakola.bg, 0
 novalevante.info, 1
@@ -105718,6 +106286,7 @@ noveltydoorest.ga, 1
 novelvyretraite.fr, 1
 novema.jp, 1
 novenopiso.tk, 1
+noventiq.co.uk, 1
 novento.bg, 1
 novezamky.tk, 1
 novgorod-news.net, 1
@@ -105739,7 +106308,6 @@ novinsource.ir, 1
 novinvisa.com, 1
 noviny.sk, 1
 novip.tk, 1
-noviyan.com, 1
 novo.media, 1
 novobi.com, 1
 novobudowa.pl, 0
@@ -105754,6 +106322,7 @@ novojet.cl, 1
 novokurovka.tk, 1
 novokuznetsk.tk, 1
 novomatic.com, 1
+novomedia.ch, 1
 novonegoc.io, 1
 novonordiskfonden.dk, 1
 novoodesabibl.tk, 1
@@ -105924,6 +106493,7 @@ nscdegreeverify.org, 1
 nscoot.au, 1
 nscorporation.co.jp, 1
 nscresearchcenter.com, 1
+nscresearchcenter.org, 1
 nscsd.jp, 1
 nscverifications.com, 1
 nscverifications.net, 1
@@ -105941,6 +106511,7 @@ nsfwph.com, 1
 nsfwph.org, 1
 nsglamm.com, 1
 nshipster.co.kr, 1
+nsic.mil, 1
 nsics.co.jp, 1
 nsikakimoh.com, 1
 nsimobilewatersolutions.com, 1
@@ -105949,6 +106520,7 @@ nsinternational.com, 1
 nsinternational.nl, 1
 nsjbio.com, 1
 nskarate.tk, 1
+nsknox.net, 1
 nsl.co.nz, 1
 nslacandelaria.com, 1
 nslc.com, 1
@@ -106068,7 +106640,6 @@ nucleuscore.org, 1
 nucleuspanel.com, 1
 nucoplus.com, 1
 nudaveritas.tk, 1
-nudeai.com, 1
 nudeandfresh.tk, 1
 nudegirlphotos.com, 1
 nudegirls.tv, 1
@@ -106112,6 +106683,7 @@ nukeportal.ml, 1
 nukeportal.tk, 1
 nukeshop.tk, 1
 nukleoti.de, 1
+nukta.pk, 1
 nul20.nl, 1
 null-d.com, 1
 null-life.com, 1
@@ -106382,7 +106954,6 @@ nyac.at, 1
 nyadisk.net, 1
 nyahururu.tk, 1
 nyaken.tk, 1
-nyallpurposepaving.com, 1
 nyan.it, 0
 nyan.kim, 1
 nyangasm.com, 0
@@ -106859,6 +107430,7 @@ ochranaprirody.cz, 1
 ochrepoint.com.au, 1
 ochsenfeld-fotografie.de, 1
 ochsenfeld.co, 1
+ochsner.org, 1
 ochsundjunior.ch, 1
 ochsundjunior.swiss, 1
 ochutnejitalii.cz, 1
@@ -106874,6 +107446,7 @@ ocloudhost.com, 1
 oclube.online, 1
 ocni-ambulance-most.cz, 1
 ocnjapartment.com, 1
+ocnr.org, 1
 ocodo.ru, 1
 ocolere.ch, 1
 oconlakewi.gov, 1
@@ -106962,6 +107535,7 @@ oday.org, 1
 odbierzspozywke.pl, 1
 odbtomsk.ru, 1
 odd17.org, 1
+oddetall.no, 1
 oddfellowwellness.com, 1
 oddformrecords.tk, 1
 oddintely.com, 1
@@ -107167,6 +107741,7 @@ officina.roma.it, 1
 officina.tk, 1
 offis.de, 0
 offlineauthentication.com, 1
+offload.so, 1
 offnet.ie, 1
 offpages.cf, 1
 offpages.gq, 1
@@ -107276,6 +107851,7 @@ ohioago.gov, 1
 ohiobrewweek.com, 1
 ohiobusinesscentral.gov, 1
 ohioflockcote.com, 1
+ohioshedsolutions.com, 1
 ohiosnowpatrol.com, 1
 ohiosos.gov, 1
 ohiostateparks.gov, 1
@@ -107432,6 +108008,7 @@ okrexperten.de, 1
 okrodrigo.com, 1
 oksafe-t.org, 1
 oksanakazakova.tk, 1
+oksentiuk.pp.ua, 1
 oksichemk.com, 0
 okskoleni.cz, 1
 oksystem.cz, 1
@@ -107443,6 +108020,7 @@ oktayincesuturizm.com, 1
 oktime.cz, 1
 oktober.no, 1
 oktober.tk, 1
+oktoo.link, 1
 oktoplus.com.br, 1
 oktos.tk, 1
 oktransportation.gov, 1
@@ -107871,6 +108449,7 @@ on-targettrainingcourses.com, 1
 on-tech.co.uk, 1
 on-tv.tk, 1
 on-ze.com, 1
+on.com, 1
 on2.li, 1
 on2it.net, 1
 on3.com, 1
@@ -108003,6 +108582,7 @@ onehost.kz, 0
 oneidacityny.gov, 1
 oneidacountywi.gov, 1
 oneindex.tk, 1
+oneinsix.nz, 1
 oneinternetamerica.com, 1
 oneiroi.co.uk, 1
 oneirosociety.tk, 1
@@ -108202,6 +108782,7 @@ onlinecarstyling.nl, 0
 onlinecashloanz.com, 0
 onlinecasino.amsterdam, 1
 onlinecasinoerdk.com, 1
+onlinecasinofriend.com, 1
 onlinecasinoground.nl, 1
 onlinecasinoknowhow.com, 1
 onlinecasinoselite.org, 1
@@ -108559,6 +109140,7 @@ opencartvip.com, 1
 openchipplatform.com, 1
 opencircuit.nl, 1
 opencity.spb.ru, 1
+opencl.aw, 1
 openclima.com, 1
 openclub24.ru, 1
 openconf.uk, 1
@@ -108883,7 +109465,6 @@ optimumwebdesigns.com, 1
 optimus.io, 1
 optimuscrime.net, 1
 optimusprime.pl, 1
-optinetconsulting.com, 1
 optinf.ca, 1
 optinf.com, 1
 optionsfund.cn, 1
@@ -109012,6 +109593,7 @@ orbits.ga, 1
 orbitum.fr, 1
 orbsl.com, 1
 orca-software.com, 1
+orca.pet, 1
 orcada.co, 1
 orcahq.com, 1
 orcamais.com.br, 1
@@ -109140,6 +109722,7 @@ organizasyonbul.com, 1
 organization-of-holidays.tk, 1
 organizedrhyme.tk, 1
 organizewithmarie.com, 1
+organo.pk, 1
 organspende-register.de, 1
 orgasmium.com, 1
 orged.de, 1
@@ -109250,6 +109833,7 @@ oroeditions.com, 1
 orologeria.roma.it, 1
 orologi.roma.it, 1
 oronomn.gov, 1
+oropm.com, 1
 oroshikikin.jp, 1
 orpheus.network, 1
 orpheus2.com.ec, 1
@@ -109462,6 +110046,7 @@ osrdmo.gov, 1
 osrs.wiki, 1
 osrsmap.net, 1
 osrsplugins.xyz, 1
+oss.zone, 1
 ossdiabolo.tk, 1
 osservatorionessuno.it, 1
 osservatorionessuno.org, 1
@@ -109571,6 +110156,7 @@ otoplenie-ufa.ml, 1
 otorino.tk, 1
 otorium.gq, 1
 otorrino.pt, 0
+otowui.com, 1
 otoy.com, 1
 otp24hr.com, 1
 otpbd.xyz, 1
@@ -109753,6 +110339,7 @@ outreach.studio, 1
 outrider.ai, 1
 outshinesolutions.nl, 1
 outsize.tk, 1
+outskirt-clans.com, 1
 outskirtspress.com, 1
 outsourced-payroll.com.au, 1
 outsourcify.net, 1
@@ -110293,6 +110880,7 @@ pactf-flag-4boxdpa21ogonzkcrs9p.com, 1
 pactf.com, 1
 pactnetwork.com.au, 1
 pactum.com, 1
+pactumdr.com.au, 1
 pacxodka.ru, 1
 paczkadlawieznia.pl, 1
 paczkahigieniczna.pl, 1
@@ -110453,6 +111041,7 @@ paipuman.jp, 1
 paireepinart.com, 1
 pairsclassifiedads.tk, 1
 paisa-dev.azurewebsites.net, 1
+paisagia.com.br, 1
 paisano-online.com, 1
 paisley.is, 1
 paisleyandsparrow.com, 1
@@ -110588,6 +111177,8 @@ palmmedia.de, 0
 palmofinfinity.tk, 1
 palmyramo.gov, 1
 palner.eu, 1
+palo-santo.tech, 1
+palo-santo.technology, 1
 paloalto.gov, 1
 paloma.tk, 1
 palomadefert.com, 1
@@ -110691,6 +111282,7 @@ pandit.tech, 1
 pandithaya.tk, 1
 pandkonijn.nl, 1
 pandn-bulgaria.com, 1
+pandn.uk, 1
 pando-market.com, 1
 pandopia.com, 1
 pandora-prestige.ru, 1
@@ -111092,6 +111684,7 @@ parkcountyco.gov, 1
 parkcountysheriff-wy.gov, 1
 parkderm.com, 1
 parkdworski.pl, 1
+parked.com.br, 1
 parkeer.nl, 1
 parkeergaragesintjan.nl, 1
 parkeergaragestjan.nl, 1
@@ -111157,7 +111750,6 @@ parleu2017.ee, 1
 parleur.net, 1
 parliament.gov.to, 1
 parliamentcamp.com, 1
-parmacityfutsal.it, 1
 parmartecultura.it, 1
 parmatoday.it, 1
 parmatwp.gov, 1
@@ -111226,6 +111818,7 @@ partido-libertario.tk, 1
 partidolibertario.tk, 1
 partigetir.com, 1
 partigoldendoodle.com, 1
+partigranskaren.se, 1
 partii.tk, 1
 partijtjevoordevrijheid.nl, 0
 partijvoordedieren.nl, 1
@@ -111283,6 +111876,7 @@ party-time-inflatables-durham.co.uk, 1
 partyaccommodationsers.ga, 1
 partyaccommodationsest.ga, 1
 partyausstatter24.de, 1
+partyblitzsimi.com, 1
 partybutlers.co.uk, 1
 partyclub.tk, 1
 partycoin.ga, 1
@@ -111667,6 +112261,7 @@ paulshir.is, 1
 paulsinternet.com, 1
 paulsitarz.com, 1
 paulsnar.lv, 1
+paulstahl.com, 1
 paulstamatiou.com, 1
 paulstarosta.com, 1
 paulswartz.net, 1
@@ -111751,37 +112346,58 @@ paxwinkel.nl, 1
 pay.accountant, 1
 pay.apartments, 1
 pay.basketball, 1
+pay.bike, 1
 pay.business, 1
 pay.catering, 1
 pay.cleaning, 1
+pay.codes, 1
+pay.com.au, 1
 pay.condos, 1
 pay.construction, 1
 pay.contractors, 1
 pay.dance, 1
+pay.dental, 1
 pay.dentist, 1
 pay.dog, 1
+pay.energy, 1
 pay.equipment, 1
 pay.faith, 1
+pay.fitness, 1
 pay.football, 1
 pay.gallery, 1
+pay.gifts, 1
 pay.gov, 0
 pay.hockey, 1
 pay.hospital, 1
 pay.insure, 1
+pay.jewelry, 1
 pay.kitchen, 1
 pay.lawyer, 1
+pay.luxury, 1
+pay.marketing, 1
 pay.mg, 0
+pay.parts, 1
 pay.photography, 1
+pay.pizza, 1
 pay.plumbing, 1
 pay.rent, 1
 pay.repair, 1
+pay.report, 1
 pay.sb, 1
 pay.school, 1
+pay.ski, 1
 pay.storage, 1
 pay.surf, 1
 pay.taipei, 1
+pay.technology, 1
+pay.tennis, 1
+pay.theater, 1
+pay.town, 1
+pay.training, 1
 pay.ubuntu.com, 1
 pay.university, 1
+pay.vacations, 1
+pay.vin, 1
 pay.wedding, 1
 pay2keep.com, 1
 pay8522.com, 1
@@ -111934,6 +112550,7 @@ pbrb.gov, 1
 pbrumby.com, 1
 pbsrmoto.com.au, 1
 pbsuite.com, 1
+pbsvectors.com, 1
 pbtc.org, 1
 pbwebdev.com, 1
 pbx75.ru, 1
@@ -111999,6 +112616,7 @@ pcisecuritystandards.org, 1
 pcissc.org, 1
 pcivellophotography.com, 1
 pclgroup.co.nz, 1
+pclob.gov, 1
 pcloud.com, 1
 pcmania.tk, 1
 pcmaw.com, 1
@@ -112322,6 +112940,7 @@ pelican.ie, 1
 pelicanbaytx.gov, 1
 pelicanconveyancing.co.uk, 1
 pelicanottertailmn.gov, 1
+pelicanparty.games, 1
 pelicans.tk, 1
 peliculaonline.tk, 1
 peliculaslatino.tk, 1
@@ -112395,7 +113014,6 @@ penguindominatrix.com, 1
 penguindrum.moe, 1
 penguingogo.com, 1
 penguinos.tk, 1
-penguinprotocols.com, 1
 penguinrandomhousegrupoeditorial.com, 1
 penguins.ca, 1
 penguinshome.tk, 1
@@ -112511,7 +113129,6 @@ peopleandchange.nl, 1
 peopleanswers.com, 1
 peopleblankets.com, 1
 peoplecareeyesandteeth.com.au, 1
-peoplecareopticalanddental.com, 1
 peoplecareopticalanddental.com.au, 1
 peoplecert.org, 1
 peoplecheck.co.uk, 1
@@ -112778,6 +113395,7 @@ perseo.tk, 1
 persey-ssm.com.ua, 1
 persey.tk, 1
 persian-clan.tk, 1
+persianasmodernasluxury.com, 1
 persiandating.tk, 1
 persianmassagetherapy.com, 1
 persianpool.ir, 1
@@ -113298,6 +113916,7 @@ pharmasyncers.ga, 1
 pharmasyncest.ga, 1
 pharmatender.cl, 1
 pharmgkb.org, 1
+pharmica.uk, 1
 pharosconsulting.com, 1
 pharosiq.com, 1
 pharside.dyndns.org, 1
@@ -113807,6 +114426,7 @@ pickswapers.ga, 1
 pickswapest.ga, 1
 picksygirl.com, 1
 picktablet.com, 1
+pickulsky.com, 1
 pickupenc.ru, 1
 picloudedge.com, 1
 picme.tk, 1
@@ -114064,6 +114684,7 @@ pinesol.com, 0
 pinetreeadvisors.us, 1
 pinfong.com, 1
 ping-books.cf, 1
+ping6.it, 1
 pingnp.me, 0
 pingodoce.pt, 1
 pingperfect.com, 1
@@ -114230,7 +114851,6 @@ piratepay.io, 0
 pirates-comic.com, 1
 piratesbrewcoffee.net, 1
 pirateserp.com, 1
-piratesforums.co, 1
 piratesofthewadden.tk, 1
 piratez.tk, 1
 pircher.co.uk, 1
@@ -114461,6 +115081,7 @@ pk678.com, 1
 pk8k.com, 1
 pkautodesign.com, 0
 pkb.shop, 1
+pkctrading.com, 1
 pkd.pl, 1
 pkeus.de, 1
 pkf-attest.es, 1
@@ -114613,6 +115234,7 @@ planisanin.tk, 1
 planiserin.tk, 1
 planisware.academy, 1
 planisware.cn, 1
+planisware.io, 1
 planisys.net, 1
 planit-inc.com, 1
 planitz.com, 1
@@ -114903,6 +115525,7 @@ plexiglasssheetscuttosize.com, 1
 plexion.cf, 1
 plexion.ga, 1
 plexion.gq, 1
+plexlibrary.com, 1
 plexmark.net, 1
 plexmark.tk, 1
 plexnet.cz, 1
@@ -115030,6 +115653,7 @@ plymouthrockwi.gov, 1
 plymouthshawneeindians.org, 1
 plymouthtownshippa.gov, 1
 plymouthwi.gov, 1
+plytkarzrzeszow.pl, 1
 plyuk.site, 1
 plz.report, 1
 plzen-sadrokarton.cz, 1
@@ -115455,6 +116079,7 @@ pokeridioters.ga, 1
 pokeridiotest.ga, 1
 pokerigrach.com, 1
 pokernyheder.io, 1
+pokerology.com, 1
 pokerreligioners.ga, 1
 pokerreligionest.ga, 1
 pokerslab.com, 1
@@ -116139,7 +116764,6 @@ posleinsulta.ee, 1
 posluhy-asenizatora.com.ua, 1
 posoco.in, 1
 pospisilik.eu, 1
-pospisilikovi.cz, 1
 possible11.com, 1
 possiblefutures.earth, 1
 post-anon.tk, 1
@@ -116912,8 +117536,6 @@ pressreleasecentral.tk, 1
 pressreleasepedia.tk, 1
 pressride.jp, 1
 pressrush.com, 1
-pressspace2hack.com, 1
-pressspacetohack.com, 1
 pressup.it, 1
 pressureradio.com, 1
 pressurewashers.ml, 1
@@ -117371,7 +117993,6 @@ prizehometickets.com.au, 1
 prizelink.com.au, 1
 prizkod.ru, 1
 prizrak-v-dospehah.ga, 1
-prizzlys.com, 1
 prjktruby.com, 0
 prkn.je, 1
 prlved.co.uk, 1
@@ -117826,6 +118447,7 @@ promethen.com, 1
 prometheus.cf, 1
 prometteur.com, 1
 promiflash.de, 1
+promin.ua, 1
 promina.ai, 1
 promisedland.tk, 1
 promisesaplus.com, 1
@@ -117851,7 +118473,7 @@ promodoble.com, 1
 promods.net, 1
 promods.store, 1
 promofirstmedia.co.id, 1
-promohulp.nl, 1
+promohulp.nl, 0
 promohunt.ru, 0
 promokodi.tk, 1
 promolife.be, 1
@@ -118057,7 +118679,7 @@ protectoraircare.com.au, 1
 protectsaladokids.org, 1
 protectwrap.ml, 1
 protege.moi, 1
-proteinreport.org, 1
+proteinreport.org, 0
 protek.si, 1
 protek.tk, 1
 proteka.com.tr, 1
@@ -118554,7 +119176,6 @@ publicagent.com, 1
 publicamenucards.com, 1
 publicare-gmbh.de, 1
 publiccarauctionscalifornia.com, 1
-publicdatafiles.com, 1
 publicdatalibrary.org, 1
 publicdelivery.org, 1
 publicdomainartwork.com, 0
@@ -118674,6 +119295,7 @@ pulsnitzer-lebkuchen.shop, 0
 pulsnitzer-pfefferkuchen.shop, 0
 pulsr.ml, 1
 pulsus.mobi, 1
+pulviscard.it, 1
 pulvislab.it, 1
 pumarin.tk, 1
 pumascan.com, 1
@@ -119377,6 +119999,7 @@ qrcodewiz.com, 1
 qrcontagion.com, 0
 qrish.live, 1
 qristianuli.com, 0
+qriveo.com, 1
 qrlfinancial.com, 0
 qrma.com.au, 1
 qrmagic.com, 1
@@ -119430,7 +120053,6 @@ quadrantrd.com, 1
 quadratimkreis.tk, 1
 quadreon.com, 1
 quadriga-hochschule.com, 1
-quadroadvertising.it, 1
 quadron.hu, 1
 quadros.shop, 1
 quaedam.org, 1
@@ -120381,6 +121003,7 @@ radwebhosting.com, 1
 radyabkhodro.net, 1
 radyn.com, 1
 radyogemisi.com, 1
+radzimowice.pl, 1
 raeder-test.azurewebsites.net, 1
 raeu.me, 1
 raeven.nl, 1
@@ -120969,6 +121592,7 @@ rattanfurniturefairy.co.uk, 1
 rattattees.com, 1
 rattenkot.io, 1
 rattohnos.com.ar, 1
+ratujemystopy.pl, 1
 ratujemyzwierzaki.net, 1
 ratujmydzikiekoty.org, 1
 ratusha.ml, 1
@@ -120981,7 +121605,6 @@ raumgestaltung-reeh.de, 1
 raumgestaltung-sassermann.de, 1
 raumkontakt.de, 1
 rauros.net, 1
-rauschenbach.de, 1
 rauserv.de, 1
 rautarutto.tk, 1
 rauw.art, 1
@@ -121561,6 +122184,7 @@ rechtschreibpruefung24.de, 1
 rechtsschutz-onlineshops.de, 1
 rechtwijzer.nl, 1
 recidivism.com, 1
+recifal-must.com, 1
 recifaliste.fr, 1
 recipea.com, 1
 recipekensaku.com, 1
@@ -121628,6 +122252,7 @@ recruitsecuritytraining.com, 1
 recruitskill.cf, 1
 recruitskill.ga, 1
 recruitskill.gq, 1
+recruitwithclutch.com, 1
 rectale.co, 1
 rectale.com, 1
 rectale.xyz, 1
@@ -121637,6 +122262,8 @@ rectoverso61.fr, 1
 rectus.co.jp, 1
 recuperation-essaim-abeille.fr, 1
 recuperation-points.fr, 1
+recuperationsaguenay.ca, 1
+recuperationsaguenay.com, 1
 recuperatucuentaya.com, 1
 recupero.it, 1
 recurly.com, 1
@@ -121765,6 +122392,7 @@ redhottube.ml, 1
 redi.tk, 1
 rediazauthor.com, 1
 redid.com.au, 1
+redington-bizapp.com, 1
 redington-bizboard.com, 1
 redingtongroup.com, 1
 redion.me, 1
@@ -121806,6 +122434,7 @@ redmejoracontinua.com, 1
 redmondoregon.gov, 1
 redmore.me, 1
 redneck-radio.tk, 1
+rednegocios.cl, 1
 redneragenturen.org, 1
 rednex.tk, 1
 rednsx.org, 0
@@ -122213,6 +122842,7 @@ reinhardtsgrimma.de, 1
 reinhart-auto.cz, 1
 reinheft.de, 0
 reinierjonker.nl, 1
+reinigung-wetterau.de, 1
 reinodemurcia.tk, 1
 reinoldus.ddns.net, 1
 reinotools.com, 0
@@ -122223,6 +122853,7 @@ reinventersontravail.com, 1
 reirei.cc, 1
 reisdemuthwiltgen.com, 1
 reisebuero-baader.de, 1
+reisekostenabrechnung.online, 1
 reisen.ga, 1
 reisenbauer.ee, 0
 reisespill.no, 1
@@ -122475,6 +123106,7 @@ renalco.ch, 1
 renard-pierne-avocats.fr, 1
 renascercorretora.com.br, 1
 renascerstp.org, 0
+renataginecologista.com.br, 1
 renate-kretschmer.de, 1
 renate-lietz.de, 1
 renateonline.tk, 1
@@ -122680,7 +123312,6 @@ repeatresponse.com.au, 1
 repertuarim.com.tr, 1
 repettoshoes.tk, 1
 repin.in.ua, 1
-repinger.com, 1
 repinger.my.id, 1
 repintadoautomotriz.com, 1
 repl.ga, 1
@@ -123079,6 +123710,7 @@ retrohousewifegoesgreen.com, 1
 retrojar.top, 1
 retrojugo.tk, 1
 retropack.org, 1
+retropasjonaci.pl, 1
 retropedal.tk, 1
 retrophoto.fr, 0
 retropixel.ga, 1
@@ -123266,6 +123898,7 @@ rexcutty.com, 1
 rexdf.net, 1
 rexel.fr, 1
 rexeldvf.nl, 1
+rexenergy.fi, 1
 rexeroofing.com, 1
 rexo.ch, 1
 rexograph.com, 1
@@ -123449,6 +124082,7 @@ ric-rac.org, 1
 ricarama.com, 1
 ricardo.nu, 0
 ricardobaptistaleite.pt, 1
+ricardodevries.io, 1
 ricardojsanchez.com.ar, 1
 ricardopq.com, 1
 ricardoquaresma.tk, 1
@@ -123558,7 +124192,7 @@ rickscastles.co.uk, 1
 rickthad.com, 1
 rickvandenbosch.net, 1
 rickvanderzwet.nl, 1
-ricky.photos, 1
+ricky.photos, 0
 rickyips.tk, 1
 rickyromero.com, 1
 rickysgames.tk, 1
@@ -123617,6 +124251,7 @@ riepe-mail.de, 1
 riepe.cc, 0
 riesenweber.id.au, 1
 riesheating.com, 1
+rieskaniemi.com, 1
 rieslingtrailclarecottages.ga, 1
 riess-ambiente.net, 0
 rietspoppen.tk, 1
@@ -123980,6 +124615,7 @@ rjfedor.com, 1
 rjfedor.ddns.net, 1
 rjia.gq, 1
 rjltimmerwerken.nl, 1
+rjwhitworth.com, 1
 rk-box.ru, 1
 rk-links.ml, 1
 rk-mediawork.de, 0
@@ -124178,6 +124814,7 @@ robinsremembered.tk, 1
 robintimmers.nl, 0
 robinvanpersie.tk, 1
 robinvdmarkt.nl, 1
+robinvieregge.de, 1
 robinwill.de, 1
 robinwinslow.uk, 1
 robinzorg.nl, 1
@@ -124399,6 +125036,7 @@ rodosto.com, 1
 rodpenroseracing.com.au, 1
 rodrigamer.com, 1
 rodrigoacevedo.com.uy, 1
+rodrigoalmeida.net, 1
 rodrigocarvalho.blog.br, 1
 rodrigodematos.tk, 1
 rodrigosa.lu, 1
@@ -124553,6 +125191,8 @@ romadiluna.band, 0
 romadprojects.com.au, 1
 romagnaoggi.it, 1
 romail.ml, 1
+romaindelfosse.fr, 1
+romainemurray.org, 1
 romainlapoux.com, 1
 romainlapoux.fr, 1
 roman-pavlik.cz, 1
@@ -124565,6 +125205,7 @@ romanglos.de, 1
 romania-film.ml, 1
 romaniacompany.com, 1
 romanian.cam, 1
+romanistaweb.it, 1
 romank.com.np, 1
 romankondratev.com, 1
 romankozak.cz, 1
@@ -124586,7 +125227,6 @@ romantik.tk, 1
 romantischetuin.nl, 1
 romanusmart.ro, 1
 romanywg.com, 1
-romanzolotarev.com, 1
 romapk.tk, 1
 romarin.es, 1
 romaservicegroup.it, 1
@@ -124768,6 +125408,7 @@ rosabellas.co.uk, 1
 rosabrasiv.ga, 1
 rosacosmos.tn, 1
 rosaflorbijoux.com.br, 1
+rosakkreditatsiya-forum.ru, 1
 rosalinda.cl, 1
 rosalindturner.co.uk, 1
 rosalopezcortes.tk, 1
@@ -124831,6 +125472,7 @@ roskillcv.org.nz, 1
 roslagenshiss.se, 1
 roslagensmansjour.tk, 1
 roslynpad.net, 1
+rosmalen.nl, 1
 rosme.it, 1
 rosoft.tk, 1
 rosolioitalicus.com, 1
@@ -124853,6 +125495,7 @@ rossiyskaja.cf, 1
 rosskingbooks.com, 1
 rosslug.org.uk, 1
 rossome.org, 1
+rossonerisiamonoi.it, 1
 rossparker.org, 1
 rossstores.com, 1
 rosstownshipmi.gov, 1
@@ -124954,6 +125597,7 @@ roussosmanos.gr, 1
 rout0r.org, 1
 route-flex.com, 1
 route-wird-berechnet.de, 1
+route360.ai, 1
 route66smiles.com, 1
 routeassess.com.au, 1
 routechoices.com, 1
@@ -124964,6 +125608,7 @@ routerclub.ru, 1
 routeto.com, 1
 routevanverzoening.nl, 1
 rouwcentrumterheide.be, 1
+rouxb.in, 1
 rouyt.com, 1
 rovatronic.tk, 1
 roverglobal.ga, 1
@@ -125097,6 +125742,7 @@ royger.tk, 1
 royoy.com, 1
 royrevell.com, 1
 royveenendaal.com, 1
+roywang.com, 1
 roywater.gov, 1
 royxiang.me, 1
 royzez.com, 1
@@ -125133,7 +125779,6 @@ rpm-oldtimer-events.ch, 1
 rpmdrivingschool.com.au, 1
 rpmglobal.com, 1
 rpmrecords.dk, 0
-rpn-sfera.ru, 1
 rpora.co, 1
 rpower.com, 1
 rpowerpos.com, 1
@@ -125160,6 +125805,7 @@ rrbt.eu, 1
 rrbt.net, 1
 rrbts.com, 1
 rrdtool.com, 1
+rrgsuisse.ch, 1
 rrgtampa.com, 1
 rrke.cc, 0
 rrmac.ml, 1
@@ -125456,6 +126102,7 @@ rugspa.ie, 1
 rugugu.jp, 1
 ruha.co.in, 1
 ruhdental.com, 1
+ruhi.pk, 1
 ruhigehand.de, 1
 ruhimustafa.tk, 1
 ruhnke.cloud, 0
@@ -125676,7 +126323,6 @@ russianbristol.tk, 1
 russiancrimes.in.ua, 1
 russianews.cf, 1
 russianews.ga, 1
-russianflora.com, 1
 russianflora.ru, 1
 russianpostcalc.ru, 1
 russianpunkrock.tk, 1
@@ -125740,6 +126386,7 @@ rutlandma.gov, 1
 rutlandvets.co.uk, 1
 rutoki.com, 1
 rutorka.tk, 1
+rutorrent.net, 1
 ruttenadvocaat.be, 1
 ruttentuttels.nl, 1
 ruud-online.tk, 1
@@ -125904,6 +126551,7 @@ s-finance.eu, 1
 s-geiser.de, 1
 s-gong.com, 1
 s-he.at, 1
+s-hertogenbosch.nl, 1
 s-hertogenbosch.tech, 0
 s-i-m.tk, 1
 s-kaupat.fi, 1
@@ -126044,6 +126692,7 @@ sabians.tk, 1
 sabiasque.pt, 1
 sabine-forschbach.de, 1
 sabine-heber.de, 1
+sabine-ziemke.de, 1
 sabinearendt.de, 0
 sabineforschbach.de, 1
 sabinehorelt.de, 1
@@ -126116,6 +126765,7 @@ sacrome.com, 1
 sacrosanctus.tk, 1
 sacscoc.org, 1
 sacwellness.com, 1
+sadalestikls.lv, 1
 sadecegundem.net, 1
 sadeedos.systems, 1
 sadeem.space, 1
@@ -126187,6 +126837,7 @@ safecircuitelectric.com, 1
 safeclima.com, 1
 safecode1.com, 1
 safecoin.tech, 1
+safecom.gov, 1
 safecso.cf, 1
 safedrivepod.com, 1
 safeers.tk, 1
@@ -126206,6 +126857,7 @@ safeinfra.nl, 1
 safejourney.education, 1
 safekidney.com.tw, 1
 safelink.asia, 1
+safemailer.org, 1
 safeme.ga, 1
 safeme.gq, 1
 safemt.gov, 1
@@ -126245,6 +126897,7 @@ safetrax.in, 1
 safety-in-construction.tk, 1
 safety.co.nz, 1
 safety360elite.co.za, 1
+safetyact.gov, 1
 safetycomply.ca, 1
 safetydrivessuccess.com, 1
 safetymeasuresas.com, 1
@@ -126275,6 +126928,8 @@ safkgroup.com, 1
 safleo.org, 1
 safor-sante-formation.com, 1
 safquh.com, 1
+safranarea.com, 1
+safranarea.eu, 1
 sag-consultores.com, 1
 sagacioussuricata.com, 1
 sagagardencentre.co.uk, 1
@@ -126393,6 +127048,7 @@ saint-peterburg.tk, 1
 saint-petersburg.cf, 1
 saint-petersburg.gq, 1
 saint-petersburg.ml, 1
+saint.pt, 1
 saintaardvarkthecarpeted.com, 1
 saintalthegreat.org, 1
 saintanthonylakin.org, 1
@@ -126447,6 +127103,7 @@ sairlerimiz.tk, 1
 sairus.fr, 1
 saisecure.net, 1
 saiserve.xyz, 1
+saiserver.online, 1
 saisons-fruits-legumes.fr, 1
 saisyuusyou-ikebukuro.com, 1
 saisyuusyou-omiya.com, 1
@@ -126465,11 +127122,13 @@ sajabesaya.tk, 1
 sajbersove.rs, 1
 sajetekengineering.com, 1
 sajter.ga, 1
+sak.pt, 1
 sakac.cz, 1
 sakainvest.com, 1
 sakaki.anime.my, 0
 sakamichi.moe, 1
 sakaritsa-residence.com, 1
+sakaryafestivali.com, 1
 sakaryahaberi.tk, 1
 sakder.com, 1
 sakellariadis.gr, 1
@@ -126483,6 +127142,7 @@ sakitama-shika.com, 1
 sakiyamagumi.com, 1
 saklad5.com, 1
 sakostacloud.de, 1
+sakra.xyz, 1
 sakrajda.eu, 1
 sakraworldhospital.com, 0
 saksham.org, 1
@@ -126804,6 +127464,7 @@ samlaw.co.nz, 0
 sammich.eu, 1
 sammich.social, 1
 sammichscripts.com, 1
+sammutsw.com, 1
 sammyservers.com, 1
 samoagovt.ws, 1
 samodel.ml, 1
@@ -126824,6 +127485,7 @@ sampatjewelers.com, 1
 samplechapterpodcast.com, 1
 samplefashion.nl, 1
 samplehc.com, 1
+sampnews24.com, 1
 sampsoncountync.gov, 1
 sampsonplumbing.com, 0
 samquick.me.uk, 1
@@ -126941,6 +127603,7 @@ sandetailing.ru, 1
 sandfield.co.nz, 1
 sandfloor.com, 1
 sandgatebaysidedental.com.au, 1
+sandgaterealestate.com.au, 1
 sandhillspet.com, 1
 sandhitransformer.xyz, 1
 sandholt.is, 1
@@ -126960,6 +127623,7 @@ sandmarc.cz, 1
 sandokan.cat, 1
 sandokan.tk, 1
 sandor.wtf, 1
+sandowngardenclub.org, 1
 sandownpolicenh.gov, 1
 sandpaper.com, 1
 sandplane.com, 1
@@ -127181,6 +127845,7 @@ santmark.org, 1
 santo.fi, 1
 santodelgiorno.it, 1
 santong.tk, 1
+santons-fouque.fr, 1
 santorinidress.com, 1
 santoscarmelitas.tk, 1
 santosdecordoba.tk, 1
@@ -127346,6 +128011,7 @@ sariyer.bel.tr, 1
 sarjakuvakauppa.fi, 1
 sarjas.tk, 1
 sarkarinaukriworld.net, 1
+sarkaripixel.in, 1
 sarkariresultz.in, 1
 sarkazam.ml, 1
 sarkchat.cf, 1
@@ -127637,7 +128303,6 @@ saxophone.tk, 1
 saxotrader.com, 1
 saxynele.tk, 1
 saxysensations.com, 1
-say-it-loud.com, 1
 sayansamanta.com, 0
 sayany.tk, 1
 sayax.com.tr, 1
@@ -127657,6 +128322,7 @@ sayprepay.com, 1
 sayura.net, 1
 sayuricane.net, 1
 sayver22.com, 1
+sayyoyo.com, 1
 saz-it.de, 1
 saz.sh, 1
 sazan-clinic.jp, 1
@@ -127698,7 +128364,6 @@ sbf888.com, 1
 sbgcred.com, 1
 sbgg.sch.id, 1
 sbhscotland.org.uk, 1
-sbidah.com, 1
 sbiewald.de, 1
 sbimtopografos.com, 1
 sbin.pt, 1
@@ -127767,7 +128432,7 @@ scalecalculation.ml, 1
 scalemodeling.tk, 1
 scalesbiolab.com, 1
 scalextric.com, 1
-scaligerorooms.it, 1
+scaligerorooms.it, 0
 scaling.solutions, 0
 scalive.tv, 1
 scallywagsbouncycastles.co.uk, 1
@@ -127812,6 +128477,7 @@ scansnus.com, 1
 scantower.io, 1
 scanutracker.com, 1
 scanyachat.cf, 1
+scape.pt, 1
 scape.sg, 1
 scapin.dk, 1
 scapp9565.xyz, 1
@@ -128158,6 +128824,7 @@ schreibers.ca, 1
 schreilechner.tk, 1
 schreinerei-jahreis.de, 1
 schreinerei-schweikl.de, 1
+schreinerei-wiesbaden.de, 1
 schreinert.com, 1
 schrijnwerkerij-deconinck.be, 1
 schrijnwerkerij-deconinck.com, 1
@@ -128367,7 +129034,6 @@ scorch.cc, 1
 scorch.me, 1
 scorchers.tk, 1
 scorebet24.com, 1
-scores24.live, 1
 scoresabermemes.com, 1
 scoreup.pl, 1
 scoringandsounddesign.com, 1
@@ -128533,6 +129199,7 @@ scrumstack.co.uk, 1
 scrumteamsurvey.org, 1
 scryfall.com, 1
 scrylytics.com, 1
+scrypro.com, 1
 scs-technik.de, 1
 scsd.si, 1
 scservis.cz, 1
@@ -128590,7 +129257,6 @@ sdbehavioralhealth.gov, 1
 sdc-uae.ae, 1
 sdcardrecovery.de, 1
 sdcargo.net, 1
-sdcitytimes.com, 1
 sdeb.org, 1
 sdebitati.it, 1
 sdeu.fr, 1
@@ -128936,6 +129602,7 @@ secundity.com, 1
 secundity.nl, 1
 secunm.org, 1
 securai.de, 1
+securapilot.com, 1
 secure-automotive-cloud.com, 1
 secure-automotive-cloud.org, 1
 secure-client-area.com, 1
@@ -129223,7 +129890,7 @@ seiryokuzai-ch.com, 1
 seiservices.com, 1
 seishinan.xyz, 1
 seishinchuo-lawoffice.com, 1
-seismas1.com, 1
+seismas1.com, 0
 seisthewaytobe.com, 1
 seistolzaufdich.de, 1
 seistrup.dk, 0
@@ -129261,6 +129928,7 @@ sekshikayeler.tk, 1
 sektor-news.tk, 1
 sektor.ro, 1
 sektorgaza.su, 1
+sekundadosetki.pl, 1
 sekurak.pl, 1
 sekuremerchants.com, 1
 sekuro.io, 1
@@ -129369,6 +130037,7 @@ selma.com, 1
 selman-marrakech.com, 1
 selmatownship-mi.gov, 1
 selmec.com.mx, 1
+selmecziklima.hu, 1
 selmer-tn.gov, 1
 selmer.gov, 1
 selmon.ru, 1
@@ -129611,7 +130280,6 @@ senzoripresiune.com, 1
 seo-analyse.com, 1
 seo-blog12.tk, 1
 seo-dr-it.com, 1
-seo-dvizh.ru, 1
 seo-forum.nu, 1
 seo-inc.ru, 1
 seo-linz.at, 1
@@ -129671,6 +130339,7 @@ seojuice.it, 1
 seokatka.tk, 1
 seolabuitest.azurewebsites.net, 1
 seoline.cf, 1
+seoline.ro, 1
 seolinkstore.com, 1
 seolister.cf, 1
 seolisting.cf, 1
@@ -129727,6 +130396,7 @@ seoteam.tk, 1
 seotec.com.br, 1
 seotesty.cz, 1
 seotip.top, 1
+seotologie.de, 1
 seotoolset.tk, 1
 seotrainingcamp.com, 1
 seoturkey.tk, 1
@@ -129952,6 +130622,7 @@ serverion.ga, 1
 serverka.tk, 1
 serverlauget.no, 1
 serverlein.com, 1
+serverlisten.dk, 1
 serverlog.net, 1
 serverlounge.eu, 1
 serverninja.tk, 1
@@ -129997,12 +130668,14 @@ servicedesk.ath.cx, 1
 serviceexpress.com, 1
 servicefish.tk, 1
 serviceforge.com, 1
+serviceglobal.info, 1
 serviceland.am, 1
 servicemanagerpro.com, 1
 servicemasterbyzaba.com, 1
 servicemembers.gov, 1
 servicenow.com, 1
 servicepclaptop.com, 1
+servicepuntsportenbewegen.nl, 1
 services-etatcivil.gov.bf, 1
 servicesforfree.com, 1
 serviceslotenmaker.nl, 0
@@ -130037,6 +130710,7 @@ servingseniors.org, 1
 servingupsouthern.com, 1
 servipizza.com, 1
 servis-azd.cz, 1
+servis.in.net, 1
 servis4u.top, 1
 servisebi.ge, 1
 servisibursa.net, 1
@@ -130075,6 +130749,7 @@ serworkribeirao.com.br, 1
 serx.cf, 1
 seryovpn.com, 1
 ses-offshore.com, 1
+ses-sandmann.de, 1
 sesa.org, 1
 sesam-biotech.com, 1
 sesamomusical.tk, 1
@@ -130110,6 +130785,7 @@ seteampty.net, 1
 setenforce.one, 1
 setesat.com.br, 1
 setevik.tk, 1
+setgmt.com, 1
 sethcorker.com, 1
 sethcurry.ga, 1
 sethforprivacy.com, 1
@@ -130138,6 +130814,7 @@ setuid.io, 1
 setuid0.kr, 1
 setun.tk, 1
 setuplog.io, 1
+setuprig.com, 1
 setupstreamers.com, 1
 setur.com.tr, 1
 setxxxtube.com, 1
@@ -130145,6 +130822,7 @@ seu.edu.sa, 1
 seucreditodigital.com.br, 1
 seutens.be, 1
 seutens.eu, 1
+sevaro.com, 1
 sevastopol-news.com, 1
 sevastopol-news.ru, 1
 sevastopol.tk, 1
@@ -130199,6 +130877,7 @@ sexblag.club, 1
 sexcamexpert.com, 1
 sexcamsbay.com, 1
 sexdocka.nu, 1
+sexdollg.com, 1
 sexedquickies.com, 1
 sexedrescue.com, 1
 sexfirehub.com, 1
@@ -130231,7 +130910,6 @@ sexologist.cf, 1
 sexolviv.com, 1
 sexonsight.com, 1
 sexonwax.com, 0
-sexopolis.gr, 1
 sexorzn.red, 1
 sexorzn.xyz, 1
 sexosintabues30.com, 1
@@ -130382,6 +131060,7 @@ sfslashing.com, 1
 sftool.gov, 1
 sfumusic.com, 1
 sfvonline.nl, 1
+sfw.bot, 1
 sfweef.gq, 1
 sfxmedina.com, 1
 sfxmr.de, 1
@@ -130651,6 +131330,7 @@ sharedgoals.co, 1
 sharedhealthmb.ca, 1
 sharedhost.de, 0
 sharedreview.com, 1
+shareforcelegal.com, 1
 sharefox.eu, 0
 sharefunfacts.com, 1
 sharegate.tk, 1
@@ -131006,6 +131686,7 @@ shinshu.id, 1
 shinsyo.com, 1
 shinta.ro, 1
 shintoism.com, 1
+shiny.gg, 1
 shinycleankitchen.com, 1
 shinyhappydoggy.com, 0
 shinyoko-saisyuusyou.com, 1
@@ -131177,6 +131858,7 @@ shop-eldorado.tk, 1
 shop-hellsheadbangers.com, 1
 shop-lingerie.tk, 1
 shop-ok.tk, 1
+shop-on-the-internet.com, 1
 shop-s.net, 1
 shop-slivki.tk, 1
 shop-trapezbleche.de, 1
@@ -131456,6 +132138,7 @@ shortwave.tk, 1
 shoruihokan.com, 1
 shory.sa, 1
 shoshonecityid.gov, 1
+shoshovis.com, 1
 shossain.tk, 1
 shost.ga, 1
 shota-sekkotsuin.com, 1
@@ -131509,6 +132192,7 @@ showpassword.net, 0
 showroom.uk, 1
 showroom113.ru, 1
 showroombarral.com, 1
+shows.pk, 1
 showslot.com, 1
 showsonar.com, 1
 shoyuf.top, 1
@@ -131525,6 +132209,7 @@ shrapnel.ga, 1
 shraymonks.com, 1
 shred.ch, 0
 shredder.tk, 1
+shreditme.ae, 1
 shredoptics.ch, 0
 shreesatya.org, 1
 shrej.cz, 1
@@ -131576,6 +132261,7 @@ shugua.com.tw, 1
 shuhacksoc.co.uk, 1
 shui.ga, 0
 shuishou.com, 1
+shuixx.com, 1
 shuiyu.com, 1
 shuizilan.com, 1
 shukatsu-ichiba.com, 1
@@ -131609,6 +132295,7 @@ shushuwoa.com, 1
 shutdowntimer.com, 1
 shuttelportal.nl, 1
 shutter-shower.com, 1
+shutteringsystems.com, 1
 shuttersandshadesnearme.com, 1
 shutts.com, 1
 shutupbabyiknowit.party, 1
@@ -131701,6 +132388,7 @@ sicksadworld.space, 1
 sicomasp.com, 1
 sicurezza24.info, 1
 sicurezzasud.it, 1
+sid-solutions.de, 1
 sid500.com, 1
 sidari.tk, 1
 sidatbacklink.tk, 1
@@ -131736,6 +132424,7 @@ sidomulyo.tk, 1
 sidomunculstore.com, 1
 sidorovich.tk, 1
 sidpod.ru, 1
+sidr.pk, 1
 sidrodrigues.com, 1
 sidrona.co, 1
 siduga.com, 1
@@ -131787,6 +132476,7 @@ sife.jp, 1
 sifecs.ml, 1
 siffron.com, 0
 sifnosguide.dk, 1
+sifr.pk, 1
 sifreuret.com, 0
 sift.com, 1
 sig-io.nl, 1
@@ -131798,6 +132488,7 @@ sigedtour.gov.bf, 1
 sigep.org, 1
 sigfridlinden.se, 1
 siggi.io, 1
+siggnal.io, 1
 sight-restoration.tk, 1
 sight-sound.com, 1
 sightandsound.co.uk, 1
@@ -131852,7 +132543,6 @@ signaturecrs.com, 1
 signaturedallas.com, 0
 signatureplants.co.nz, 1
 signaturereport.org, 1
-signatureresolution.com, 1
 signaturerx.co.uk, 1
 signaturesmilesstudio.com, 1
 signaturewindowstexas.com, 1
@@ -131884,6 +132574,7 @@ signs4vehicles.co.uk, 1
 signsatelier.com, 1
 signsdance.uk, 1
 signsforhope.org, 1
+signsny.com, 1
 signtourshungary.com, 1
 signtul.com, 0
 signup.ly, 1
@@ -131915,7 +132606,6 @@ sikayetvar.com, 0
 sike.org, 1
 sikevux.se, 1
 sikhmissionarysociety.org, 1
-sikisi.com, 1
 sikkasoft.com, 1
 sikkind.com, 0
 siku-shop.ch, 1
@@ -131929,6 +132619,7 @@ silashes.com, 1
 silatdefense.fr, 1
 silbercloud.com, 1
 silberkiste.com, 1
+silbermann.ch, 1
 silbox.ch, 1
 sildenafilcitrate.cf, 1
 sildenafilcitrate100mg.ga, 1
@@ -132129,7 +132820,9 @@ simeam-frank.de, 1
 simeam.cloud, 1
 simeam.de, 1
 simelek.com, 1
+simen.co, 1
 simenak.com, 1
+simenask.com, 1
 simeononsecurity.ch, 1
 simeononsecurity.com, 1
 simetal.ch, 0
@@ -132309,6 +133002,7 @@ simplyowners.net, 1
 simplyplans.co.uk, 1
 simplyregister.net, 1
 simplysmartgardening.com, 1
+simplythebestevents.co.uk, 1
 simplytiles.com, 0
 simplytime.co.uk, 1
 simplyuniforms.com.au, 1
@@ -132393,6 +133087,7 @@ sincemydivorce.com, 1
 sincerely.com, 1
 sincityfan.tk, 1
 sinclairinat0r.com, 1
+sincronismo.com.br, 1
 sincrotools.com.br, 1
 sindacato.it, 1
 sindarina.com, 1
@@ -132781,6 +133476,7 @@ sjdma.de, 1
 sjede.cz, 1
 sjeverni.info, 1
 sjfss.marketing, 1
+sjg.us, 1
 sjid.co.uk, 1
 sjleisure.co.uk, 1
 sjlrc.com, 1
@@ -132805,6 +133501,7 @@ sjtpo.org, 1
 sjtravel.guru, 1
 sjuhawknews.com, 1
 sjukom.net, 1
+sjvc.edu, 1
 sjwheel.net, 1
 sk-ii.com, 1
 sk.tl, 1
@@ -132966,7 +133663,6 @@ skinews.tk, 1
 skinexpert.ml, 1
 skinfoodpeachcotton.tk, 1
 sking.io, 1
-skinkits.com.ua, 1
 skinlogic.org, 1
 skinlords.com, 1
 skinmarket.co, 1
@@ -133128,7 +133824,6 @@ sky-driver.ch, 1
 sky-live.fr, 1
 sky-motion.de, 1
 sky-music.tk, 1
-sky-of-use.net, 1
 sky-os.ru, 1
 sky-wap.cf, 1
 sky2tours.com, 0
@@ -133154,6 +133849,7 @@ skycert.co.nz, 1
 skycert.nz, 1
 skychan.org, 1
 skyclinic.ua, 0
+skycomcallcenter.com, 1
 skyder.com.mx, 0
 skyder.mx, 0
 skydivegeronimo.com.au, 1
@@ -133483,6 +134179,7 @@ sloeproeienalmere.nl, 0
 sloepverhuur-roggebroek.nl, 1
 slogan.tk, 1
 slogancreator.com.au, 1
+slogiker.si, 1
 slogix.in, 1
 sloneczni.pl, 1
 slonko.net, 1
@@ -133537,6 +134234,7 @@ slrealty.ru, 1
 slrie.de, 1
 sls.ltd, 1
 slt24.de, 1
+slubzcharakterem.pl, 1
 sluciaconstruccion.com, 1
 sluderno.org, 1
 sludge.tk, 1
@@ -133756,6 +134454,7 @@ smartmoney.com.ni, 1
 smartnanny.cf, 1
 smartnews-smri.com, 1
 smartnoob.de, 1
+smartnotify.ca, 1
 smartoctopus.art, 1
 smartology.net, 1
 smartoneclub.com, 1
@@ -134048,10 +134747,10 @@ smtenants.cn, 1
 smtji.com, 1
 smtnet.com, 1
 smtouseef.com, 1
-smtparish.org, 1
 smtpdev.com, 1
 smtpserver.dk, 1
 smuc-koca.si, 1
+smucraiova.ro, 1
 smudailycampus.com, 1
 smudge.ai, 1
 smuncensored.com, 1
@@ -134286,6 +134985,7 @@ sobakoh-nyc.com, 1
 sobatkaos.biz.id, 1
 sobchak.ga, 1
 sobieray.dyndns.org, 1
+sobkite.com, 1
 soblaznenie.ru, 1
 soblaznenie2.ru, 1
 sobre.tk, 1
@@ -134375,6 +135075,7 @@ socialtactics.ga, 1
 socialtactics.gq, 1
 socialtactics.ml, 1
 socialtick.club, 1
+socialtide.ai, 1
 socialtournaments.com, 0
 socialtranslation.ga, 1
 socialtrends.pl, 1
@@ -134847,6 +135548,7 @@ somewherenews.cf, 1
 somewherenews.ga, 1
 somewherenews.gq, 1
 somewherenews.ml, 1
+somfa-liget.hu, 1
 somi.nl, 1
 somix.com, 1
 soml.best, 1
@@ -135057,6 +135759,7 @@ sorincocorada.ro, 1
 sormatrus.ru, 1
 sorn.service.gov.uk, 1
 sornyaki.tk, 1
+soro.co.il, 1
 sorotankata.com, 1
 sorpresashop.nl, 1
 sorrentofc.com.au, 1
@@ -135220,6 +135923,7 @@ soundersmusic.com, 1
 soundersu23.com, 1
 soundexclusive4ever.tk, 1
 soundfingers.com, 1
+soundfuntech.com, 1
 soundgasm.net, 1
 soundgo.gq, 1
 soundinthesignals.tk, 1
@@ -135345,7 +136049,6 @@ southpeacearchives.org, 1
 southphoenixair.tk, 1
 southportland.gov, 1
 southridgeservices.com, 1
-southrock.com, 1
 southsands.com, 1
 southshoreautowash.com, 1
 southside-crew.com, 1
@@ -135370,7 +136073,6 @@ soutien-naissance.com, 1
 souto.eu, 1
 souvenir-fashion.com, 1
 souvenirs-gifts.tk, 1
-souxiu.com, 1
 souzanabellydance.com, 1
 sova.cc, 1
 sova.st, 1
@@ -135566,6 +136268,7 @@ spandaubau.de, 1
 spandrusyszyn.com, 1
 spanglishls.com, 1
 spanien.guide, 1
+spaningseksperten.com, 1
 spanischunterricht.tk, 1
 spanishclub.blog, 1
 spanishdogs.tk, 1
@@ -135628,6 +136331,7 @@ sparkplug.tk, 1
 sparkpluguniversity.com, 1
 sparkresearch.net, 1
 sparkresto.com, 1
+sparkseo.com.br, 1
 sparksfoundation.net, 1
 sparksga.gov, 1
 sparkweld.biz, 1
@@ -135855,7 +136559,6 @@ speztech.ru, 1
 spf.gov.sg, 1
 spheraes-amc.it, 1
 spheraes-bme.it, 1
-spheraes.com, 1
 sphereblur.com, 1
 spherefluidics.com, 1
 spherejoias.com.br, 1
@@ -135966,6 +136669,7 @@ spiritdesigns.tk, 1
 spiritedengineers.tk, 1
 spiritgruppen.no, 1
 spiritindia.com, 1
+spiritlakehealthcenter.com, 1
 spiritous.cf, 1
 spiritscorp.ddns.net, 1
 spiritslovenia.si, 1
@@ -136084,6 +136788,7 @@ sportcompactwarehouse.com, 1
 sportcucc.hu, 1
 sportda.tk, 1
 sportedy.com, 1
+sportellocafpatronato.com, 1
 sportencultuurintrobreda.nl, 0
 sportfair.it, 1
 sportfits.at, 1
@@ -136151,6 +136856,7 @@ sportspeople.com.au, 1
 sportssurfaces.com.au, 1
 sportstips.tk, 1
 sportstreetstyle.com, 1
+sportsupports-hertogenbosch.nl, 1
 sportsxplay.com, 1
 sportsyou.com, 1
 sporttomorrow.com, 1
@@ -136170,6 +136876,7 @@ sportztalk.com, 1
 spot-cleaner.tk, 1
 spot-pro.jp, 1
 spotblue.com, 1
+spotguard.de, 1
 spotifycodes.com, 1
 spotifyfreetrial.co.uk, 1
 spotifytop.me, 1
@@ -136373,6 +137080,7 @@ sqrl.ch, 1
 sqroot.eu, 1
 sqsd.xyz, 1
 sqtelcrm.ua, 1
+sqtele.com, 1
 squad.fr, 1
 squadco.com, 1
 squadcoders.com, 1
@@ -136523,7 +137231,6 @@ sroturkey.tk, 1
 srp.gov, 1
 srpcleanenergy.org, 1
 srpx.de, 1
-srq.nu, 1
 srqpedals.com, 1
 srroddy.com, 1
 srs.sg, 0
@@ -136570,7 +137277,6 @@ ssab.gov, 1
 ssatpa.com, 1
 ssatripura.com, 1
 ssb.ee, 1
-ssbljk.com, 1
 ssbrm.ch, 1
 ssbwanamingo.com, 1
 ssbwiki.com, 1
@@ -136704,6 +137410,7 @@ stackery.io, 1
 stackhub.cc, 1
 stacklasvegas.com, 1
 stackpay.li, 1
+stackradar.com, 1
 stackroute.com, 1
 stackroute.in, 1
 stackstartup.com, 1
@@ -136971,7 +137678,6 @@ starcitywv.gov, 1
 starcoachservices.ca, 1
 starcomproj.com, 1
 starcraftsource.tk, 1
-starcroisieres.com, 1
 starcubix.com, 1
 starcys.xyz, 1
 stardanceacademy.net, 1
@@ -136990,7 +137696,6 @@ starfm.gq, 1
 starfm.ml, 1
 stargarder-jungs.de, 1
 stargate.gq, 1
-stargate.how, 1
 stargazer.de, 1
 stargift.ch, 1
 starglancer.ddns.net, 1
@@ -137095,6 +137800,7 @@ startpage4u.tk, 1
 startplats.tk, 1
 startplaying.games, 1
 startpoint.tk, 1
+startrackevecorp.org, 1
 starts.sh, 1
 startup-house.com, 1
 startup-stack.com, 1
@@ -137286,6 +137992,7 @@ ste2.de, 1
 stea-web.com, 1
 steacy.tech, 1
 steadfastcontent.com, 1
+steadytao.com, 1
 steak-kojiro.com, 1
 steakovercooked.com, 1
 stealingheather.com, 1
@@ -137297,6 +138004,7 @@ stealthmodel.fi, 1
 stealthseminar.com, 1
 steam-rewards.tk, 1
 steam-route-saxony.com, 1
+steamanalyst.com, 1
 steamcarddelivery.com, 1
 steamcardexchange.net, 1
 steamcars.be, 1
@@ -137369,6 +138077,7 @@ stefan.network, 1
 stefanbayer.de, 1
 stefandesign.tk, 1
 stefanfriedli.ch, 1
+stefangroenveld.de, 1
 stefangroothuis.tk, 1
 stefania.tk, 1
 stefaniedworschak.de, 1
@@ -137414,7 +138123,6 @@ steinmetz.cloud, 1
 stek-usa-shop.com, 1
 stek-usa.com, 1
 stekelenburg.me, 1
-steklein.de, 1
 stelcomp.com, 1
 stelcron.com, 1
 steldingreporters.com, 1
@@ -137480,6 +138188,7 @@ stening.co, 1
 steno.nl, 1
 stenographers.online, 1
 stenstromen.se, 1
+stentijhuis.nl, 1
 stentzel.de, 1
 stenvallmcclain.tk, 1
 stenzhorn-cloud.de, 1
@@ -137833,6 +138542,7 @@ stlouisparkmn.gov, 1
 stlouisstabilizing.com, 1
 stlpassports.com, 1
 stlpoolattendants.com, 1
+stltacticals.com, 1
 stlu.de, 1
 stlucieclerk.gov, 1
 stluciesheriff.gov, 1
@@ -137902,6 +138612,7 @@ stocktonengineering.co.uk, 1
 stocktout.info, 1
 stocktrader.com, 1
 stocktradersalmanac.com, 1
+stockus.net, 1
 stockway.tk, 1
 stockx.com, 1
 stockx.io, 1
@@ -137917,6 +138628,7 @@ stoffkontor-wennigsen.de, 1
 stohrm.com, 1
 stoianlawfirm.com, 1
 stoicadarius.com, 1
+stoicadarius.de, 1
 stoicatedy.ovh, 1
 stoicnotaries.com, 1
 stoicus.com.br, 1
@@ -138026,6 +138738,7 @@ stoplossoff.tk, 1
 stopmetbellen.be, 1
 stopmoustic.fr, 0
 stopmozgas.org, 1
+stopndrop.de, 1
 stopoverconnections.com, 1
 stoppage.cf, 1
 stopransomware.gov, 1
@@ -138077,6 +138790,7 @@ storepaperoomates.net, 1
 storephotovoltaique.com, 1
 storeplus.ml, 1
 storesonline.fr, 1
+storestdigital.com, 1
 storewebshop.com, 1
 storex.storage, 1
 storgaarddieu.com, 1
@@ -138247,6 +138961,7 @@ strappazzon.xyz, 1
 strashtrading.com, 1
 strass-sur-mesure.fr, 1
 strassberger.tk, 1
+strasserhaustechnik.de, 1
 strasweb.fr, 1
 stratagemlabs.tech, 1
 stratahealth.com, 1
@@ -138263,6 +138978,7 @@ strategicmind.com, 1
 strategicstorytelling.co.za, 1
 strategie-zone.de, 1
 stratego-belgie.tk, 1
+strategy-lens.com, 1
 strategy.it, 1
 strategy66.com, 1
 strategybusiness.ga, 1
@@ -138612,6 +139328,7 @@ studenti.tk, 1
 studentinaneta.com, 1
 studentite.bg, 1
 studentjournalist.ml, 1
+studentkhata.online, 1
 studentklinikk.no, 1
 studentloans.gov, 1
 studentnep.tk, 1
@@ -138685,6 +139402,7 @@ studiokaczmarek.pl, 1
 studiolegalemarchi.tk, 1
 studiolegalepaternostro.it, 1
 studiolegalesinigaglia.it, 1
+studiolegaleslawitz.it, 1
 studiolive.club, 1
 studiolu.tk, 1
 studiolupotti.it, 1
@@ -138696,6 +139414,7 @@ studionowystyl.pl, 1
 studioocasp.com.br, 1
 studiopanamaitalia.com, 1
 studiopirrate.com, 1
+studiopoen.com.br, 1
 studioshiftup.net, 1
 studiosql.ml, 1
 studiostawki.com, 1
@@ -138974,7 +139693,6 @@ sucro.us, 1
 sucsses.cf, 1
 sucsses.ga, 1
 sucsses.gq, 1
-sucyshop.fr, 1
 sudabaus.com, 1
 sudafri.net, 1
 sudak-turizm.tk, 1
@@ -139069,8 +139787,8 @@ suicidepreventioncenter.tk, 1
 suicidology.org, 1
 suidouraku.com, 1
 suigen.jp, 1
+suigenerisakademi.com, 1
 suijo-bus.osaka, 1
-suike.com, 1
 suikerspinnetje.nl, 1
 suitcompany.com, 1
 suite.li, 1
@@ -139426,7 +140144,6 @@ superaficionados.com, 1
 superalem.org, 1
 superannrte.com, 1
 superannrte.ie, 1
-superb.net, 1
 superbart.nl, 1
 superbaskirskij-med.tk, 1
 superbdistribute.com, 1
@@ -139657,7 +140374,7 @@ surest.com, 0
 surestartblanks.com, 1
 surf1969.tk, 1
 surfacespots.ga, 1
-surfbluewave.com, 1
+surfbluewave.com, 0
 surfduck.cfd, 0
 surfduck.club, 0
 surfduck.co, 1
@@ -139670,7 +140387,6 @@ surfingshare.com, 0
 surfkath.de, 1
 surflessonslisbon.com, 1
 surfly.com, 1
-surfocal.com, 1
 surfocal.net, 1
 surfoleon.tk, 1
 surfseo.ml, 1
@@ -139970,7 +140686,6 @@ svseglobal.com, 1
 svsewerut.gov, 1
 svsg.co, 1
 svswebmarketing.com, 1
-svtemplemn.org, 1
 svtl.ch, 1
 svtr.de, 1
 svtv.org, 1
@@ -140059,6 +140774,7 @@ sweep-me.net, 1
 sweep-staging.com, 0
 sweep.net, 0
 sweeppeasweeps.com, 1
+sweepstate.com, 1
 sweering.com, 1
 sweet-spatula.com, 0
 sweet64.fr, 1
@@ -140177,6 +140893,8 @@ swiss-export-compliance.com, 1
 swiss-spectator.ch, 1
 swiss-vanilla.ch, 1
 swiss-vanilla.com, 1
+swiss-watch.com.ua, 1
+swiss404.net, 1
 swissaquashop.ch, 1
 swissbearfoodservices.com, 0
 swissbit.com, 1
@@ -140291,6 +141009,7 @@ sybelles.ski, 1
 sybersense.com, 1
 syc-rotterdam.tk, 1
 sychov.pro, 1
+sycleareyes.com, 1
 sycorr.com, 1
 sycuan.gov, 1
 syd.catholic.edu.au, 1
@@ -140360,6 +141079,13 @@ symbols.gov, 1
 symcare.com.au, 0
 symend.com, 0
 symeonchen.com, 1
+symetri.co.uk, 1
+symetri.com, 1
+symetri.fi, 1
+symetri.ie, 1
+symetri.no, 1
+symetri.se, 1
+symetrigroup.com, 1
 symetrix.tk, 1
 symetryk.tk, 1
 symfony.com, 1
@@ -140546,6 +141272,7 @@ systemd.eu.org, 1
 systemd.info, 0
 systemerka.pl, 1
 systemerr.tk, 1
+systemhaus-ehst.de, 1
 systeminformer.com, 1
 systeminformer.io, 1
 systemintegra.ru, 0
@@ -140692,12 +141419,14 @@ t2-sit-test.tk, 0
 t2000headphones.com, 1
 t2000laserpointers.com, 1
 t22.uk, 1
+t23a.eu, 1
 t2informatik.de, 1
 t2tea.com, 1
 t33.eu, 1
 t36533.com, 1
 t3concrete.my, 1
 t3hty.fr, 1
+t3n.cx, 1
 t3rror.net, 1
 t4-wiki.de, 1
 t404.de, 1
@@ -140772,6 +141501,7 @@ tabbo.site, 1
 tabbo.xyz, 1
 tabby.cz, 1
 tabclassics.tk, 1
+tabcode.net, 1
 tabe.cn, 1
 tabegamisama.com, 1
 tabelaci.tk, 1
@@ -141172,6 +141902,7 @@ talos-staging.io, 1
 talpurwadalions.tk, 1
 taltech.ee, 1
 talusan.tk, 1
+talxis.com, 1
 tam-moon.com, 1
 tam-safe.com, 1
 tam7t.com, 0
@@ -141234,6 +141965,7 @@ tamracapital.sa, 1
 tamriel-rebuilt.org, 1
 tamrielcraft.tk, 1
 tamronhallshow.com, 1
+tamsuite.cl, 1
 tamsulosin.gq, 1
 tamylove.net, 1
 tan90.tw, 1
@@ -141391,6 +142123,7 @@ tappea.me, 0
 tappezzeria.roma.it, 1
 tappezziere.milano.it, 0
 tappezziere.roma.it, 1
+tapphosting.com, 1
 tappy.com.br, 1
 tapquad.com, 1
 taprix.org, 1
@@ -141420,6 +142153,7 @@ tarcode.ru, 1
 tardics.com, 1
 tardis.cloud, 1
 tardis.io, 1
+tardisec.com, 1
 tardishomelab.com, 1
 tarekfadel.com, 1
 tarence.com, 1
@@ -141505,6 +142239,7 @@ taskhorizon.audio, 1
 taskido.pl, 1
 taskin.me, 1
 taskman.london, 1
+taskmo.de, 1
 taskotron.fedoraproject.org, 1
 taskotron.stg.fedoraproject.org, 1
 taskrunnr.com, 1
@@ -141520,6 +142255,7 @@ tasogarenoinori.net, 1
 tasonoken.tk, 1
 tasports.com.au, 1
 tasports2043.com.au, 1
+tassilitravailaerien.dz, 1
 tassweb.com.au, 1
 taste2travel.com, 1
 tastedrecipes.com, 1
@@ -141801,6 +142537,7 @@ tcbdarts.nl, 1
 tccc.org.tw, 1
 tcckonsult.com, 1
 tccportal.com, 1
+tccturkiye.com, 1
 tcddtrensaatleri.com, 1
 tcdn.tech, 1
 tcdww.cn, 1
@@ -141840,7 +142577,6 @@ tcproducer.xyz, 1
 tcptun.com, 1
 tcr-ees.com, 1
 tcrecord.org, 1
-tcrid.com, 1
 tcspartner.eu, 1
 tcttire.com, 1
 tcuprs.com, 1
@@ -142312,6 +143048,7 @@ techniqueelevage.ddns.net, 1
 techniquetechs.com, 1
 techno-utopia.com, 1
 technoairlines.com, 0
+technoartstone.bg, 1
 technocast.dz, 1
 technochat.in, 1
 technocracy.works, 1
@@ -142390,6 +143127,7 @@ technowiz.tk, 1
 technoyl.com, 1
 technubis.com, 1
 techodesign.pro, 1
+techopr.com, 1
 techpartes.com.br, 1
 techpartneralliance.com, 1
 techpeer.al, 1
@@ -142548,6 +143286,7 @@ teddykatz.com, 1
 teddyss.com, 0
 teddywayne.com, 1
 teddywp.com, 1
+tedgautsch.com, 1
 tedhardy.com, 1
 tedirgin.tk, 1
 tedroche.com, 1
@@ -142690,7 +143429,6 @@ teko.se, 1
 tekpon.com, 1
 tekshrek.com, 1
 teksnologi.com, 1
-tekson.com, 1
 tekstover.tk, 1
 tekstpesni.tk, 1
 tektuts.com, 1
@@ -142977,6 +143715,7 @@ tengodetodo.tk, 1
 tenhourguy.com, 1
 tenibac.com, 1
 tenibacgraphion.com, 1
+teniro.no, 1
 tenismare.si, 1
 tenispopular.com, 1
 tenjou-tenge.tk, 1
@@ -143004,6 +143743,7 @@ tennisschoolchallenge.nl, 1
 tennistalk.tk, 1
 tennisweb.cf, 1
 tenno.tools, 1
+tenoftheday.de, 1
 tenon-backup.com, 1
 tenrod.com.au, 1
 tenryo.work, 0
@@ -143033,12 +143773,14 @@ tenzan.com, 1
 tenzer.dk, 1
 tenzorpro.com, 0
 teoassessoria.com.br, 1
+teoitaly.com, 1
 teoletextsq.tk, 1
 teologia.promo, 0
 teomahk.de, 1
 teoria.com, 1
 teoriespiknuti.cz, 1
 teoskanta.fi, 1
+teouk.com, 1
 tep.com, 1
 tepautotuning.com, 1
 tepco2021.com, 1
@@ -143246,6 +143988,7 @@ test-privacyportal-ui.azurewebsites.net, 1
 test-ravkavonline.co, 1
 test-regressplattform.ch, 1
 test-school.ml, 1
+test-sdbidentity.nl, 1
 test-software.net, 1
 test-textbooks.com, 1
 test-verz.online, 1
@@ -143429,6 +144172,7 @@ texnotroniks.tk, 1
 texosmotr.tk, 1
 text-to-video.ir, 1
 text.is, 1
+text2html.pro, 1
 textadventure.tk, 1
 textamig.se, 1
 textassistant.ga, 1
@@ -144149,7 +144893,6 @@ thefairytale.tk, 1
 thefallen.tk, 1
 thefamilygarrison.com, 1
 thefamilyhelpnetwork.ca, 1
-thefancho.com, 1
 thefandomshow.com, 1
 thefanscotian.com, 1
 thefantasyrooms.com, 1
@@ -144190,6 +144933,7 @@ thefox.com.fr, 1
 thefoxai.com, 1
 thefoxblog.net, 1
 thefoxmagazine.com, 1
+thefragranceshop.ca, 1
 thefranchiseking.com, 1
 thefranklinnewspost.com, 1
 thefreebay.tk, 1
@@ -144245,7 +144989,6 @@ thegioicovua.com, 1
 thegioidulich.com.vn, 1
 thegioigheluoi.vn, 1
 thegioinguyenlieuphache.vn, 1
-theglencoetorah.com, 0
 theglobalwin.com, 1
 theglowclinic.nl, 1
 thego2swatking.com, 1
@@ -144350,6 +145093,7 @@ thehumanizer.tk, 1
 thehumanjoint.com, 1
 thehumorist.tk, 1
 thehustle.co, 1
+thei.rs, 1
 theia-ide.com, 1
 theia-ide.eu, 1
 theiaglasses.com, 1
@@ -144440,6 +145184,7 @@ theleadleft.com, 1
 theleafletdesign.com, 1
 theleaksbay.com, 1
 thelearninggardener.com, 1
+theleasebureau.com.au, 1
 theleaves.tk, 1
 thelegionshirley.co.uk, 1
 thelematics.com, 1
@@ -144768,7 +145513,6 @@ theprojectx.tk, 1
 thepromenadeshopsatsauconvalley.com, 1
 theprospectordaily.com, 1
 theprowlernews.org, 1
-thepsi.com, 0
 theptclist.tk, 1
 thepulicegroup.com, 1
 thepulpit.tk, 1
@@ -144804,7 +145548,6 @@ therapiepraxis-westbezirk.de, 1
 therapyclient.com, 1
 therapyequipment.co.uk, 1
 therapyforblackmen.org, 0
-therapyglobe.com, 1
 therapynotes.com, 1
 therapypartner.com, 1
 therapyportal.com, 1
@@ -144883,6 +145626,7 @@ therohotel.com, 1
 therokasshow.tk, 1
 theroks.com, 1
 theromexchange.com, 1
+theronx.com, 1
 therootdental.com, 1
 theros.org.uk, 1
 theroyal.tk, 1
@@ -144938,6 +145682,7 @@ theseymourowl.com, 1
 theshahnameh.com, 1
 theshaker.com.au, 1
 thesharedbrain.ch, 0
+theshedgamer.com, 1
 theshesuite.com, 1
 theshopally.com, 1
 theshots.cz, 1
@@ -144983,6 +145728,7 @@ thesouthfirst.com, 1
 thespacegame.tk, 1
 thespanishcollection.com, 1
 thespanishcollection.es, 1
+thespcc.org.uk, 1
 thespiritfm.tk, 1
 thespittake.com, 1
 thespoiler.co.il, 1
@@ -145150,12 +145896,10 @@ theweddingfit.com, 1
 theweed.tk, 1
 theweightlossmedics.co.uk, 1
 thewellbeingarchitect.ie, 1
-thewellblog.com, 1
 thewest.tk, 1
 thewhiteboxxx.com, 1
 thewhitedog9487.xyz, 1
 thewhitehorses.tk, 1
-thewhiterabbit.space, 1
 thewhitneypaige.com, 1
 thewhitonline.com, 1
 thewhy.dk, 1
@@ -145214,6 +145958,7 @@ theyearinpictures.co.uk, 1
 theyellow.fish, 1
 theyellowsub.org, 1
 theyosh.nl, 1
+theysay.me, 1
 theysocial.tk, 1
 thezillersathenshotel.com, 1
 thezimbabwean.co, 1
@@ -145458,7 +146203,6 @@ thoxyn.com, 1
 thpatch.net, 1
 thpay.com, 0
 thprd.gov, 1
-thqgame.jp, 1
 thr-kurd.tk, 1
 thrallingpenguin.com, 1
 threadabead.com, 1
@@ -145537,6 +146281,7 @@ threefantasy.com, 1
 threefisheswebdesign.com, 1
 threefoldtransformations.com, 1
 threefours.net, 0
+threelayerhoodies.co.za, 1
 threelayers.co.za, 1
 threelions.ch, 1
 threeloudcrows.ca, 1
@@ -145565,6 +146310,7 @@ thrillkill.tk, 1
 thrillng.com, 1
 thrillux-event-hire.co.uk, 1
 thriva.co, 1
+thrive-fl.org, 1
 thrive-gyms.co.za, 1
 thrivefostering.com, 1
 thriveondev.com, 1
@@ -145601,6 +146347,7 @@ thumbnails.jp, 1
 thumbsupcandy.com, 1
 thumbzilla.com, 1
 thummer.net, 1
+thunder-samp.com, 1
 thunderbase.tk, 1
 thunderbolt.tk, 1
 thunderclient.com, 1
@@ -145759,6 +146506,7 @@ tid.jp, 1
 tida.ge, 1
 tidal.ninja, 1
 tidal.zone, 1
+tidalru.sh, 1
 tide-the-knot.com, 1
 tide.co, 1
 tide.com, 1
@@ -145776,6 +146524,7 @@ tidy.chat, 1
 tidych.at, 1
 tidycustoms.net, 1
 tidydiary.com, 1
+tidyweather.com, 1
 tie.pub, 1
 tiekoetter.com, 1
 tielsebakkers.tk, 1
@@ -145984,6 +146733,7 @@ time-business.tk, 1
 time-hotel.cf, 1
 time-killers.tk, 1
 time-pro.de, 1
+time.am, 1
 time.cy, 1
 time.ge, 1
 time.gov, 1
@@ -146068,6 +146818,7 @@ timich.ga, 1
 timilion.tk, 1
 timing.com.br, 1
 timjk.de, 0
+timknipper.com, 1
 timm-fensterbau.de, 1
 timm404.de, 1
 timmcclure.ca, 1
@@ -146286,6 +147037,7 @@ tit-dns.de, 1
 tit-mail.de, 1
 tit.systems, 1
 titanandco.com, 0
+titanbuild.bg, 1
 titanchannel.com, 1
 titandirect.co.uk, 1
 titanfile.com, 1
@@ -146336,6 +147088,7 @@ tixil.net, 1
 tixtips.com, 1
 tiyee.net, 1
 tizen-ru.tk, 1
+tizianalotto.it, 1
 tizimin.tk, 1
 tizreu.xyz, 1
 tjebben.tech, 1
@@ -146347,12 +147100,12 @@ tjongeling.tk, 1
 tjpiezo.com, 1
 tjplabs.com, 1
 tjrapid.sk, 1
+tjsecured.com, 1
 tjsky.net, 0
 tjtechofficial.ga, 1
 tju.me, 1
 tjupt.org, 1
 tjurun.ga, 0
-tjxcanada.ca, 1
 tjxxzy.com, 1
 tjzzz.com, 1
 tk-its.net, 1
@@ -146694,6 +147447,7 @@ toileobscure.fr, 1
 toilestas.ca, 1
 toilestci.com, 1
 toilet-guru.com, 1
+toilville.com, 1
 toimitaax.fi, 1
 toio.io, 1
 toitjob.com, 1
@@ -146848,6 +147602,7 @@ tomcort.com, 1
 tomd.ai, 0
 tomdapice.com, 1
 tomdougiamas.com, 1
+tomdubovich.com, 1
 tomdudfield.com, 1
 tome.ae, 1
 tome.ru, 1
@@ -146871,6 +147626,10 @@ tomiler.com, 1
 tominysun.com, 1
 tomisha.com, 1
 tomisha.jobs, 1
+tomjames.ca, 1
+tomjames.com, 1
+tomjames.com.au, 1
+tomjameseurope.com, 1
 tomjepp.uk, 1
 tomjn.com, 1
 tomkempers.nl, 1
@@ -147584,6 +148343,7 @@ touchmark.tk, 1
 touchoflife.in, 1
 touchspeak.nl, 0
 touchstoneelectrical.com, 1
+touchstoneenergy.co.uk, 1
 touchtable.nl, 1
 touchweb.be, 1
 touchweb.ch, 1
@@ -147794,6 +148554,7 @@ townofevansny.gov, 1
 townofexcelsiorwi.gov, 1
 townofexeterny.gov, 1
 townoffairfieldwi.gov, 1
+townoffarmington.org, 1
 townoffonddulacwi.gov, 1
 townofforestvernonwi.gov, 1
 townoffreedomnh.gov, 1
@@ -148072,6 +148833,8 @@ traceroute.guru, 1
 traceroute.link, 1
 traceroute.network, 1
 tracery.jp, 1
+traces.group, 1
+traces.services, 1
 tracesteps.ga, 1
 tracetracker.com, 1
 traceur-france-rhone-alpes.com, 1
@@ -148112,6 +148875,7 @@ trackshun.tk, 1
 tracksideintelligence.com, 1
 tracksideintelligence.com.au, 1
 trackstaging.io, 1
+tracktunnel.com, 1
 trackura.com, 1
 trackyourlogs.com, 1
 tractareautocluj.ro, 1
@@ -148157,6 +148921,7 @@ traderinside.ga, 1
 tradernet.com, 1
 tradernew.pro, 1
 tradernws.com, 1
+traderruarte.com, 1
 traders-mag.it, 1
 tradersgate.eu, 1
 tradersport.tk, 1
@@ -148250,6 +149015,7 @@ trailblazers.tk, 1
 trailcloud.ink, 1
 trailerparty.com, 1
 trailforks.com, 1
+trailheadlines.com, 1
 traillcountynd.gov, 1
 trailofbits.com, 1
 trailrider.tk, 1
@@ -148347,6 +149113,7 @@ tranquillity.se, 1
 tranquillum.tk, 1
 tranquiloweb.com, 1
 trans-aliyans.tk, 1
+trans-atlantik.com, 1
 trans-tema.org, 1
 trans.eu, 1
 transacid.de, 0
@@ -148363,6 +149130,7 @@ transbella.com, 1
 transbordosarmada.cl, 1
 transcarent.com, 1
 transcend.org, 1
+transcend.pk, 1
 transcendconsultoriarh.com.br, 1
 transcendentmotherfuckingwebsite.com, 1
 transcendmotor.sg, 1
@@ -148756,6 +149524,7 @@ trazpraca.ninja, 1
 trazpracaclub.com.br, 1
 trazs.com, 1
 trbanka.com, 1
+trbn.me, 1
 trctaborda.com.br, 1
 trdepoist.net, 1
 tre-sp.jus.br, 1
@@ -148945,6 +149714,7 @@ tribaldos.com, 0
 tribaljusticeandsafety.gov, 1
 tribalwarsstyles.tk, 1
 tribalzone.tk, 1
+tribe-watersports.com, 1
 tribe.rs, 1
 tribeaura.com, 1
 tribeca-it.com, 1
@@ -148980,6 +149750,7 @@ trickey.io, 1
 trickle.works, 1
 trico-pigmentazione.it, 1
 tricolortotal.tk, 1
+triconinfotech.com, 1
 tricordmedia.ca, 1
 tricotserragaucha.com.br, 1
 tricountyathome.com, 1
@@ -149076,6 +149847,7 @@ triomoda.com.br, 1
 trionyx.ph, 1
 triop.se, 1
 triopsys.nl, 1
+triozon.hu, 1
 trip.my, 1
 tripadvicestore.tk, 1
 tripanimal.tk, 1
@@ -149224,6 +149996,7 @@ tronox.com, 1
 troomcafe.com, 1
 troopers.de, 1
 trootech.com, 1
+tropetrove.com, 1
 trophcomplewin.ml, 1
 trophies.de, 1
 trophykoi.tk, 1
@@ -149351,6 +150124,7 @@ trueminecraft.com, 1
 truenorthartcollektive.com, 1
 truenorthtalk.ca, 1
 truenorthtalk.com, 1
+truenorthvip.com, 1
 truentumvet.it, 1
 truepartner.academy, 1
 truepartner.capital, 1
@@ -149606,6 +150380,7 @@ tsentrobuv.tk, 1
 tserverhq.com, 1
 tsf.fyi, 1
 tsfempleos.com, 1
+tsg-kit.de, 1
 tsg0o0.com, 1
 tsgbcs.org, 1
 tsgbit.net, 1
@@ -149750,6 +150525,7 @@ tty.space, 1
 tty1.net, 1
 tty12.org, 1
 ttyystudio.com, 1
+tu-com.es, 1
 tu-muenchen.de, 1
 tu6.pm, 1
 tuaflor.com.br, 1
@@ -149843,6 +150619,7 @@ tukan.hu, 1
 tukangroup.com, 1
 tukiart.tk, 1
 tukihenkilotyo.fi, 1
+tukki.ai, 1
 tula-city.tk, 1
 tula-health.com, 1
 tula-news.ga, 1
@@ -149855,10 +150632,10 @@ tulanehillel.org, 1
 tulanehullabaloo.com, 1
 tuleap-enterprise.com, 1
 tuleap.cloud, 1
+tuleap.com, 1
 tuleap.net, 1
 tuleap.org, 1
 tulevaisuusdemarit.fi, 1
-tulibowo.pl, 1
 tuliha.ga, 1
 tulika.space, 1
 tulikajain.cf, 1
@@ -150094,6 +150871,7 @@ turretlabs.io, 1
 tursiae.org, 1
 turtle.ai, 0
 turtle.ky, 1
+turtlecomputers.net, 1
 turtleduckstudios.com, 1
 turtlehead.tk, 1
 turtleinfra.net, 1
@@ -150343,6 +151121,7 @@ twerk.tk, 1
 twerking.porn, 1
 twfier.com, 1
 twfwd.email, 1
+twg2029.com, 1
 twhc.org.au, 1
 twidy.jp, 0
 twidy.uk, 1
@@ -150659,6 +151438,7 @@ u2croatia.tk, 1
 u2fanlife.com, 1
 u2galicia.tk, 1
 u2hosting.net, 1
+u2l.ai, 1
 u2y.io, 1
 u32i64.cf, 1
 u36533.com, 1
@@ -150823,6 +151603,7 @@ ucybodyinc.com, 1
 udahni.com, 1
 udb.kr, 1
 udbina.tk, 1
+uddataplus.dk, 1
 uddate-linthdcp-567app.com, 1
 uddi.ng, 1
 uddin.io, 1
@@ -150864,7 +151645,6 @@ ueberdosis.io, 0
 uebersetzungscenter.ch, 1
 uebertragungsnetz.de, 1
 ueberwachungspaket.at, 1
-uedaviolin.com, 1
 uefeng.com, 0
 uefs.eu, 1
 ueken-ob.com, 1
@@ -150961,6 +151741,7 @@ uintah.gov, 1
 uinvest.ml, 1
 uinvest.tk, 1
 uiop.link, 1
+uiquipedia.org, 1
 uisd.net, 1
 uitdeoudekoektrommel.com, 1
 uiterwijk.org, 1
@@ -150990,6 +151771,7 @@ ukbc.london, 1
 ukbusinessbrokers.com, 1
 ukc2.com, 1
 ukcarers.tk, 1
+ukde.berlin, 1
 ukdefencejournal.org.uk, 1
 ukdri.ac.uk, 1
 ukem.co.uk, 1
@@ -151064,6 +151846,7 @@ uli-eckhardt.de, 1
 ulibro.com, 1
 ulickaprozivot.cz, 1
 ulitroyo.com, 1
+uliwestphal.de, 1
 ullah.se, 1
 ulli.ml, 1
 ullorix.ch, 1
@@ -151076,6 +151859,7 @@ ulobby.eu, 0
 ulog.ba, 1
 uloztoasdilej.cz, 1
 ulprospector.com, 1
+ulric-saiz.fr, 1
 ulrik.moe, 1
 ulrikethiele.de, 1
 ulrum1834.nl, 1
@@ -151221,6 +152005,7 @@ unai-yus.tk, 1
 unaidesarrolladorweb.com, 1
 unalma.com, 1
 unanaciounaseleccio.tk, 1
+unanalog.com, 1
 unangelturbio.tk, 1
 unaone.net, 1
 unapp.me, 1
@@ -151479,6 +152264,7 @@ unionlacalera.tk, 1
 unionlife-net.com, 1
 unionmagdalena.tk, 1
 unionmissouri.gov, 1
+unionone.com, 1
 unionplat.ru, 1
 unionreports.gov, 1
 unionstreetskateboards.com, 0
@@ -151752,6 +152538,7 @@ unsigcrazy.art, 1
 unsourirealecole.fr, 1
 unstable.systems, 1
 unstablewormhole.ltd, 1
+unstartdev.eu.org, 1
 unstockd.org, 1
 unstoppable.money, 1
 unstoppabledomains.com, 1
@@ -151823,6 +152610,7 @@ upbeatrobot.net, 1
 upbeatrobot.nl, 1
 upbeatrobot.org, 1
 upbeatrobot.social, 1
+upbit.com, 1
 upbtrbt.com, 1
 upbtrbt.eu, 1
 upbtrbt.net, 1
@@ -152027,6 +152815,7 @@ urbangaming.tk, 1
 urbangardening.ga, 1
 urbangymfirenze.com, 1
 urbanhabitats.org, 1
+urbanhome.jp.net, 1
 urbanhost.tk, 1
 urbanhotbed.eu, 1
 urbanhub.lt, 1
@@ -152106,6 +152895,7 @@ urlaub-busreisen.de, 1
 urlaub-fuerteventura.info, 1
 urlaub-leitner.at, 1
 urlaub.de, 1
+urlaubshighlights.de, 1
 urlaubsziele.com, 1
 urlbox.tk, 1
 urlcitr.us, 1
@@ -152174,6 +152964,7 @@ usa-greencard.eu, 1
 usa-reisetipps.net, 1
 usa.gov, 1
 usa250.gov, 1
+usa2me.com, 1
 usaa.com, 0
 usabackground.com, 1
 usabilis.com, 0
@@ -152269,6 +153060,7 @@ user-daitron.jp, 1
 userbase.com, 1
 usercentrics.com, 1
 usercompare.tk, 1
+userguide.digital, 1
 userhelp.tk, 1
 userjs.org, 1
 username.nz, 1
@@ -152432,6 +153224,7 @@ utilitiesconstructionsettlement.com, 1
 utilitronium-shockwave.com, 1
 utilitronium.com, 1
 utilityapi.com, 1
+utilizaciya.com, 1
 utko12.ru, 1
 utleg.gov, 1
 utloperadora.com.br, 1
@@ -152602,6 +153395,7 @@ v2generalcontractors.com, 1
 v2x.sk, 1
 v2xtls.org, 1
 v36533.com, 1
+v4itservices.com.au, 1
 v51365.com, 1
 v5197.co, 1
 v55565.com, 0
@@ -152637,9 +153431,11 @@ vaanivarta.com, 1
 vaartjesboten.nl, 1
 vaartuighuren.nl, 1
 vaat.io, 1
+vaayaa.com, 1
 vabusinesses.org, 1
 vacaf.org, 1
 vacances-ideales.top, 1
+vacansier.com, 1
 vacanze-in-montagna-dolomiti.com, 1
 vacanze-merano.org, 1
 vacatecleaning.melbourne, 1
@@ -152918,6 +153714,7 @@ valuskills.co.za, 1
 valuta-tools.nl, 1
 valuuttamuunnin.com, 1
 valvulasvaneo.com, 1
+valyrsec.com, 1
 vam-podarok.tk, 1
 vam3.com, 1
 vamaplatform.com, 1
@@ -153006,6 +153803,7 @@ vangest.com, 1
 vangoghcoaching.nl, 1
 vanguards.tk, 1
 vanhatten.com, 1
+vanheede.com, 1
 vanhelsing.ml, 1
 vanhelsing.tk, 1
 vanherle-dakdichting.be, 1
@@ -153372,7 +154170,6 @@ veethi.com, 1
 veeva.link, 1
 veg-leiden.nl, 0
 veg.lv, 0
-vega-is.com, 1
 vega-rumia.com.pl, 1
 vegaforeducation.com, 0
 vegalanguageacademy.ca, 1
@@ -153478,7 +154275,6 @@ velosae.gr, 1
 velosipedi.tk, 1
 velosrealestate.gr, 1
 velossa.gr, 1
-velostudio.com.ua, 1
 velotours.ga, 1
 velovelo.gq, 1
 velozavr.ru, 1
@@ -153486,6 +154282,8 @@ veloztaxi.com, 1
 velpak21.com, 1
 velpay.io, 1
 velthuysemulder.nl, 1
+veltrissolutions.com, 1
+velu.cc, 1
 velutina.ovh, 1
 veluwegroenonderhoud.nl, 1
 veluwerally2002.tk, 1
@@ -153520,6 +154318,7 @@ vendi.it, 1
 vendingmachines.tk, 1
 vendingsierra.com, 1
 vendiot.com, 1
+vendis.ai, 1
 vendiscapital.com, 1
 vendisrls.it, 1
 venditorepoa.com.br, 1
@@ -154005,6 +154804,7 @@ vetinte.eu, 1
 vetitus-teatro.tk, 1
 vetlanda.se, 1
 vetnet.info, 1
+vetocaller.com, 1
 vetofish.com, 1
 vetosh.tk, 1
 vetpraxis.de, 1
@@ -154051,6 +154851,7 @@ vfk-goh.de, 1
 vfn-nrw.de, 1
 vfnm.de, 1
 vfree.org, 0
+vfsglobal.com, 1
 vfu.cz, 1
 vfxstudy.com, 1
 vg-resource.com, 1
@@ -154176,6 +154977,7 @@ victorcanera.com, 1
 victorcarrasco.tk, 1
 victorcarwasher.com, 1
 victorcatalin.ro, 1
+victordiaz.me, 1
 victoreriksson.ch, 1
 victoreriksson.co, 1
 victoreriksson.es, 1
@@ -154306,6 +155108,7 @@ videt-son.ml, 1
 videt-son.tk, 1
 vidhaatha.com, 1
 vidimte.eu, 1
+vidiproject.com, 1
 vidispine.com, 1
 vidister.de, 0
 viditour-golf.nl, 1
@@ -154746,6 +155549,7 @@ vingugaas.ee, 0
 vinhomes.tv, 1
 vinicius.sl, 1
 viniciuscosta.tk, 1
+vinigrandi.de, 1
 vinihk.com, 0
 vinilart.com, 1
 vinilosdecorativos.net, 1
@@ -154843,6 +155647,7 @@ vipmdh.com.ua, 1
 vipmercedes.by, 1
 viporiflame.tk, 1
 vippclub.be, 1
+vipps.no, 1
 viprow.live, 1
 viprsolutions.com, 0
 vipsauna.gq, 1
@@ -154905,10 +155710,12 @@ virgosecurity.com.au, 1
 virgulazero.com.br, 1
 viridis-milites.cz, 1
 viridismep.com, 1
+viridya.com, 1
 virima.com, 1
 virimatech.com, 1
 viris.si, 1
 virkhost.com, 1
+virlan.tech, 1
 virnuls.co.uk, 1
 virot.eu, 1
 virt.dedyn.io, 1
@@ -154941,10 +155748,12 @@ virtuality4d.com, 1
 virtualization-online.org, 1
 virtuallanding.com, 1
 virtuallife.tv, 1
+virtualmachine.digital, 1
 virtualmachine.tk, 1
 virtualmemento.tk, 1
 virtualmt2.pl, 1
 virtualnet.ec, 1
+virtualox.io, 1
 virtualpavilion.co, 1
 virtualprom.tk, 1
 virtualqatar.net, 1
@@ -155016,6 +155825,7 @@ visforvaccinated.gov, 1
 vishenka.tk, 1
 vishnujyothi.co.uk, 1
 vishumin.pl, 1
+vishvam.cloud, 1
 vishwashantiyoga.com, 1
 visibilitygurus.com, 1
 visiblethoughts.co.uk, 1
@@ -155082,6 +155892,7 @@ visiter-tunis.tk, 1
 visitfegen.se, 1
 visitgaribaldi.gov, 1
 visithuntingtonwv.org, 1
+visitkoksijde.be, 1
 visitmo.com, 1
 visitmontgomerycountyny.com, 1
 visitmorelos.mx, 1
@@ -155654,6 +156465,8 @@ voidscrawl.com, 1
 voidwalkerproductions.com, 1
 voigt-analytics.de, 1
 voigt-it.solutions, 0
+voigt-owschlag.de, 1
+voigtarchitects.co.uk, 1
 voileux.org, 1
 voimix.ee, 1
 voinikoo.ee, 1
@@ -155665,6 +156478,7 @@ voipreviews.com, 1
 voiretmanger.fr, 1
 voiretrevu.ca, 1
 voirie-suresnes.fr, 1
+voiser.ai, 1
 voitolla.com, 1
 voix-bien-etre.com, 0
 vojenshandicap.dk, 1
@@ -155832,6 +156646,7 @@ volusiasheriff.gov, 1
 volusiavotes.gov, 1
 volvo-klub.cz, 1
 volvo1800es.tk, 1
+volvoconnect.com, 1
 volvoklub.cz, 1
 volyn-news.ru, 1
 vomitoxin.ga, 1
@@ -155877,6 +156692,7 @@ voprosnik.gq, 1
 voprosownet.tk, 1
 voquent.com, 1
 vorandor.com, 1
+vorbatec.de, 1
 vorbis.cz, 1
 vorbrodt.blog, 1
 vorderklier.de, 1
@@ -155925,6 +156741,7 @@ vosser.de, 1
 vostok-zapad54.ru, 1
 vostronet.com, 1
 vostrov.cz, 1
+vosz.ro, 1
 vot-tak-vot.tk, 1
 votajeffcoco.gov, 1
 votan.cf, 1
@@ -156195,6 +157012,7 @@ vr-realestate.info, 1
 vr-realestate.net, 1
 vr-realestate.org, 1
 vr-rudi.de, 1
+vr0.fr, 1
 vrac-drive.ch, 1
 vracdrive.ch, 1
 vrachi.online, 1
@@ -156336,6 +157154,7 @@ vrzl.pro, 1
 vs603.com, 1
 vs6060.com, 0
 vsactivity.com, 1
+vsafe.gov, 1
 vsamsonov.com, 1
 vsaratove.tk, 1
 vsatke.tk, 1
@@ -156593,6 +157412,7 @@ w.st, 1
 w.wiki, 1
 w0.pw, 1
 w00228.com, 1
+w00f.net, 1
 w03.cn, 1
 w0arr.com, 1
 w10club.com, 0
@@ -156714,6 +157534,7 @@ waffle-backend-sanggyu.shop, 1
 waffle-sanggyu.tk, 1
 wafflehacks.org, 1
 wafflemakers.ca, 1
+waflow.com.br, 1
 wafreight.com, 1
 wage-feeg.gc.ca, 1
 wagener-gmbh.com, 1
@@ -156925,7 +157746,7 @@ wanda97.com, 1
 wanda98.com, 1
 wandel.nl, 1
 wandelreizen.eu, 1
-wander.al, 1
+wander.al, 0
 wander.tk, 1
 wanderaura.com, 1
 wanderersfc.tk, 1
@@ -156967,6 +157788,7 @@ wangzuan168.cc, 1
 wanicki.pl, 1
 wanilia.pl, 1
 wanjuhui.com, 1
+wank.party, 1
 wannabfit.nl, 1
 wannaknow.tk, 1
 wannapopularnews.cf, 1
@@ -157189,6 +158011,8 @@ wassermair.net, 1
 wassermanx.com, 1
 wassim.is, 1
 waste.domains, 1
+waste.gov, 1
+wasteindustrytraining.com, 1
 wastelinq.com, 1
 wastewaterservicesltd.co.uk, 0
 wastewise.com, 0
@@ -157213,6 +158037,27 @@ watchdogs.tk, 1
 watchdreamer.com, 1
 watchersrealm.tk, 1
 watches-of-switzerland.co.uk, 1
+watchfinder.at, 1
+watchfinder.au, 1
+watchfinder.be, 1
+watchfinder.co.uk, 1
+watchfinder.com, 1
+watchfinder.com.de, 1
+watchfinder.cy, 1
+watchfinder.cz, 1
+watchfinder.ee, 1
+watchfinder.es, 1
+watchfinder.gr, 1
+watchfinder.hr, 1
+watchfinder.hu, 1
+watchfinder.ie, 1
+watchfinder.is, 1
+watchfinder.lt, 1
+watchfinder.pt, 1
+watchfinder.ro, 1
+watchfinder.se, 1
+watchfinder.si, 1
+watchfinder.sk, 1
 watchfreeonline.co.uk, 1
 watchful.net, 1
 watchgeneration.fr, 1
@@ -157222,7 +158067,6 @@ watchparts-and-tools-okayama.co.jp, 1
 watchpeopledie.tv, 1
 watchstyle.com, 1
 watchthedot.com, 1
-watchthis-svp.com, 1
 watchtogether.ch, 1
 watchtolearn.co, 1
 watchtower.pm, 1
@@ -157505,6 +158349,7 @@ we-run-linux.de, 1
 we-use-linux.de, 1
 we.serveftp.net, 1
 we168168.com, 1
+we6k.com, 1
 weacceptbitcoin.gr, 1
 weakinreview.org, 1
 weakspots.com, 1
@@ -157778,7 +158623,6 @@ webeast.eu, 1
 webelement.sk, 0
 webemployed.com, 1
 webencrypt.org, 1
-webengage.com, 1
 webepc.it, 1
 weber-immobilienberatung.de, 1
 weber.com, 1
@@ -157788,6 +158632,7 @@ webera.pro, 1
 weberbasin.gov, 1
 weberbasinut.gov, 1
 weberelections.gov, 1
+webers-testseite.de, 1
 webers-webdesign.de, 1
 webescucha.tk, 1
 webest.pl, 1
@@ -158350,6 +159195,7 @@ wellness-alto-adige.net, 1
 wellness-bonbon.de, 0
 wellness-gutschein.de, 1
 wellness-kobata-dc.com, 0
+wellness-massage-portal.de, 1
 wellness-spa-suedtirol.com, 1
 wellnessandco.com.au, 1
 wellnesscheck.net, 1
@@ -158719,6 +159565,7 @@ wfh.ovh, 1
 wfh.se, 1
 wfigueiredo.com.br, 1
 wforum.nl, 1
+wfrlee.com, 1
 wfuogb.com, 1
 wfxs.com.tw, 1
 wg-smue.de, 1
@@ -158860,6 +159707,7 @@ whenondigital.com, 1
 whentowork.com, 1
 whenwe.me, 1
 wheon.com, 1
+where2travel.nl, 1
 wherearethosemorgans.com, 1
 wherecaniwatchanime.com, 1
 wheredoi.click, 1
@@ -158903,7 +159751,6 @@ whiskey.money, 1
 whiskeytech.org, 1
 whisky.com.my, 1
 whisky.money, 1
-whisky.my, 1
 whiskydb.de, 1
 whiskydrivers.tk, 1
 whiskymy.com, 1
@@ -158952,6 +159799,8 @@ whitefordtownshipmi.gov, 1
 whitehallal.gov, 1
 whitehartdartmoor.co.uk, 1
 whitehartgreatyeldham.co.uk, 1
+whiteharttherapies.co.uk, 1
+whitehat.ee, 1
 whitehat.vn, 1
 whitehatbrokers.com, 1
 whitehathackers.com.br, 1
@@ -159082,7 +159931,7 @@ whosoldmyemail.ca, 1
 whosoldmyemail.com, 1
 whosyourdaddy.ml, 1
 whowherewhen.net, 1
-whpctx.com, 1
+whpctx.com, 0
 whqmeps.org, 1
 whqqq.com, 1
 wht.one, 1
@@ -159210,9 +160059,11 @@ wihiki.org, 1
 wiiaam.com, 1
 wiidatabase.de, 1
 wiikipedia.com, 1
+wiikpedia.org, 1
 wiimotion.de, 1
 wiin.co, 1
 wiingy.com, 1
+wiipedia.com, 1
 wiire.me, 0
 wijaya.net, 1
 wijaya2u.com, 1
@@ -159248,6 +160099,7 @@ wikicooking.tk, 1
 wikicuida.pt, 1
 wikidata.org, 1
 wikidpedia.org, 1
+wikiedia.org, 1
 wikiepdia.com, 1
 wikiepdia.org, 1
 wikifactory.com, 1
@@ -159309,7 +160161,14 @@ wikinews.com, 1
 wikinews.de, 1
 wikinews.org, 1
 wikinews.pt, 1
+wikioedia.org, 1
+wikiopedia.org, 1
 wikipaedia.net, 1
+wikipdeia.org, 1
+wikipdia.org, 1
+wikipeda.org, 1
+wikipedai.org, 1
+wikipedi.org, 1
 wikipedia.bg, 1
 wikipedia.co.il, 1
 wikipedia.co.uk, 1
@@ -159324,14 +160183,28 @@ wikipedia.info, 1
 wikipedia.is, 1
 wikipedia.lt, 1
 wikipedia.net, 1
+wikipedia.or.id, 1
 wikipedia.org, 1
 wikipedia.org.il, 1
 wikipedia.sk, 1
+wikipedia.xyz, 1
+wikipedia25.com, 1
+wikipedia25.org, 1
+wikipediacn.info, 1
 wikipediafoundation.org, 1
 wikipedial.org, 1
+wikipedias.org, 1
 wikipediazero.org, 1
+wikipediia.com, 1
+wikipeedia.com, 1
+wikipeia.org, 1
+wikiperia.org, 1
 wikipeter.nl, 1
+wikipewdia.org, 1
+wikipidia.com, 1
+wikipidia.org, 1
 wikipiedi.it, 1
+wikipoedia.com, 1
 wikiquote.com, 1
 wikiquote.net, 1
 wikiquote.org, 1
@@ -159354,6 +160227,7 @@ wikitech.ga, 1
 wikitech.gq, 1
 wikitech.tk, 1
 wikitechsolutions.com, 1
+wikitolica.com, 1
 wikitransporte.tk, 1
 wikiutah.tk, 1
 wikiversity.com, 1
@@ -159374,6 +160248,8 @@ wikixchange.com, 1
 wikizip.ga, 1
 wikjpedia.org, 1
 wikkelweb.nl, 1
+wikkipedia.com, 1
+wikpedia.com, 1
 wikpedia.org, 1
 wikproduccions.tk, 1
 wiktionary.com, 1
@@ -159383,6 +160259,7 @@ wiktionary.pl, 1
 wiktionary.pt, 1
 wiktor-imbierski.com, 1
 wiktoriaflis.com, 1
+wikuipedia.org, 1
 wilane.org, 1
 wilbergs.de, 1
 wilburyvets.co.uk, 1
@@ -159416,6 +160293,7 @@ wildfireseomarketing.com, 1
 wildflowers5.com, 1
 wildfoerster.org, 1
 wildfortune8.io, 1
+wildfurloweenwest.org, 1
 wildglass.nl, 1
 wildhealth.lu, 1
 wildheavenbeer.com, 1
@@ -159458,6 +160336,7 @@ wilhelm-sattler-realschule.de, 1
 wilhelmhansenfonden.dk, 0
 wilhelmsfeld.de, 1
 wili.li, 1
+wilipedia.com, 1
 wiliquet.net, 1
 wilk.tech, 1
 wilkens.be, 1
@@ -159527,7 +160406,6 @@ willowpassdentalcare.com, 1
 willowpf.com, 1
 willows.uk.net, 1
 wills.co.tt, 1
-willsey.cloud, 1
 willship.co.nz, 0
 willsigal.com, 1
 willspointtx.gov, 1
@@ -159618,6 +160496,7 @@ windirect.tk, 1
 windjetboats.com, 1
 windmillart.net, 1
 windmusic.org, 1
+windoof.net, 1
 windota.com, 1
 windowbuilderpro.com, 1
 windowcleaningexperts.net, 1
@@ -159647,7 +160526,7 @@ windsorhoteis.com, 1
 windsorite.ca, 1
 windsornc.gov, 1
 windsorrslsubbranch.com.au, 1
-windstreamhosting.com, 0
+windstreamhosting.com, 1
 windsurfercrs.com, 1
 windturbine.tk, 1
 windvanetech.com, 1
@@ -159684,6 +160563,7 @@ wing-tsun.tk, 1
 wingchun.edu.au, 1
 wingchunboxtribe.com, 1
 wingechr.de, 1
+wingenbach-aesthetics.de, 1
 wingie.ae, 1
 wingie.co.in, 1
 wingie.co.uk, 1
@@ -159814,6 +160694,7 @@ wirelessleeuwarden.tk, 1
 wirelesslogic.com, 0
 wirelesslogicnordic.com, 1
 wirelessthief.ga, 1
+wiremaze.com, 1
 wires.co.uk, 1
 wireshark.org, 1
 wireshocks.com, 1
@@ -159880,6 +160761,7 @@ wisereshape.com, 1
 wisers.com.tw, 1
 wisersp.com, 1
 wisertp.com, 1
+wisestatus.info, 1
 wisetechglobal.cn, 1
 wisetechglobal.com, 1
 wisetoken.net, 1
@@ -159990,6 +160872,7 @@ wizardmeow.xin, 1
 wizardschool.tk, 1
 wizardshop.cz, 1
 wizardswebs.com, 1
+wizart-studio.pl, 1
 wizathon.com, 1
 wizink.pt, 1
 wizyheal.com, 1
@@ -160033,6 +160916,7 @@ wlbank.de, 1
 wlbank.eu, 1
 wlci.gov, 1
 wlcmedical.com.au, 1
+wlf.is, 1
 wlg.city, 1
 wlitwie.pl, 1
 wlmq10086.cn, 1
@@ -160136,7 +161020,7 @@ woh.org, 0
 woheni.de, 1
 wohlgefuehl-massagen.de, 1
 wohlpa.de, 0
-wohnbau-mobilitaet.ch, 1
+wohnbau-mobilitaet.ch, 0
 wohnberatung-wien.at, 1
 wohnsitz-ausland.com, 1
 wohnungsaufloesung-berlin.net, 1
@@ -160185,6 +161069,7 @@ wolfgang-ziegler.com, 1
 wolfgangdigital.com, 1
 wolfgangkowar.de, 1
 wolfgrowth.com, 1
+wolfia.com, 1
 wolflambert.tk, 1
 wolfsburgwest.com, 1
 wolfsense.nl, 1
@@ -160400,6 +161285,7 @@ wordbits.net, 0
 wordcounter.net, 1
 worddunk.com, 1
 wordfast.com, 1
+wordmon.net, 1
 wordmon.site, 1
 wordnietvindbaar.nl, 1
 wordops.io, 1
@@ -160560,6 +161446,7 @@ worldclassfriend.com, 1
 worldconsultingchile.tk, 1
 worldcrunch.com, 1
 worldcup-odds.com, 1
+worldcup.pk, 1
 worlddataexchange.au, 1
 worlddataexchange.com, 1
 worlddataexchange.com.au, 1
@@ -160608,7 +161495,7 @@ worldjobs.tk, 1
 worldjusticeproject.org, 1
 worldlandtrust.org, 1
 worldlanguage.tk, 1
-worldline.com, 1
+worldline.com, 0
 worldluxuryhome.tk, 1
 worldmarathons.tk, 1
 worldnewsinbox.ga, 1
@@ -160738,7 +161625,6 @@ wowlegacy.ml, 1
 wowlifedesignandco.jp, 1
 wowlove.tk, 1
 wownskportal.tk, 1
-wowowow.com, 1
 wowpilates.com, 1
 wowra.net.pl, 1
 wows-mods.tk, 1
@@ -160858,6 +161744,7 @@ wpspeedcare.com, 1
 wpspeedking.com, 1
 wpspeedmatters.com, 1
 wpstaq.com, 1
+wpsupportlab.com, 1
 wptests.tk, 1
 wpthemearchive.com, 1
 wpthemesbox.com, 1
@@ -160884,6 +161771,7 @@ wrc-results.com, 1
 wrd48.net, 1
 wrdcfiles.ca, 1
 wrdf.org, 0
+wreckadvisors.com, 1
 wrecked.cf, 1
 wrecked.tk, 1
 wreckeroo.com.au, 1
@@ -160910,6 +161798,7 @@ wrighttownshippa.gov, 1
 wringer.ga, 1
 wristler.eu, 1
 write-right.net, 1
+writeaboutgaza.com, 1
 writeandedit-for-you.com, 1
 writeaword.tk, 1
 writebrigade.com, 1
@@ -161088,6 +161977,7 @@ wvbold.gov, 1
 wvbvm.gov, 1
 wvdnr.gov, 1
 wvg.myds.me, 1
+wvm.edu, 1
 wvmb.com, 1
 wvpbs.ml, 1
 wvpbs.tk, 1
@@ -161234,6 +162124,7 @@ www.tiaa.org, 1
 www.tl, 1
 www.torproject.org, 0
 www.tumblr.com, 0
+www.twitter.com, 1
 www.united.com, 1
 www.usaa.com, 0
 www.vino.com, 0
@@ -161709,6 +162600,7 @@ xiaojicdn.com, 1
 xiaojiyoupin.com, 1
 xiaolong.link, 1
 xiaomao.tk, 1
+xiaomi.pk, 1
 xiaomi.rocks, 1
 xiaomibarato.com, 1
 xiaomiev.com.ua, 1
@@ -161948,6 +162840,7 @@ xmnr.net, 1
 xmodels.com, 1
 xmpp.beer, 1
 xmpp.party, 1
+xmrcat.org, 1
 xmv.cz, 1
 xmyy.com, 1
 xmzq.com, 1
@@ -162042,6 +162935,7 @@ xn--4gq45ay49m.com, 1
 xn--4gq62f52gdss.com, 1
 xn--4kro7fswi.xn--6qq986b3xl, 1
 xn--4qs85t91oq9e.com, 1
+xn--52-dlcmpf1aagymm6ivb.xn--p1ai, 1
 xn--57h.ml, 0
 xn--5dbkjqb0d.com, 1
 xn--5dbkjqb0d.net, 1
@@ -162152,6 +163046,7 @@ xn--arelektrbunerisk-4bc73b.lv, 1
 xn--aurdumeti-cmd.ro, 1
 xn--autoschlssel-wesel-t6b.de, 1
 xn--avocai-timioara-kmf1a.ro, 1
+xn--b1a.cc, 1
 xn--b1aa9b.tk, 1
 xn--b1ab6abhfh.xn--p1ai, 1
 xn--b1ag9a.xn--p1ai, 1
@@ -162210,7 +163105,6 @@ xn--circul-u3a.cc, 1
 xn--cisowcy-pjb5t.pl, 1
 xn--cm-portimo-n5a.pt, 1
 xn--cmc-grn-s2a.de, 1
-xn--contrasea-s6a.cl, 1
 xn--creatuasociacin-8rb.es, 1
 xn--crystal-9e7ua.icu, 1
 xn--d1aca2a5al.tk, 1
@@ -162240,6 +163134,7 @@ xn--e--4h4axau6ld4lna0g.com, 1
 xn--e--ig4a4c3f6bvc5et632i.com, 1
 xn--e--k83a5h244w54gttk.xyz, 1
 xn--e1aa7abbg.xn--p1ai, 1
+xn--e1aaaqmz6c.xn--p1ai, 1
 xn--e1aaavheew.xn--p1ai, 1
 xn--e1aaavheewr.xn--p1ai, 1
 xn--e1aahuqbk6f.tk, 1
@@ -162261,6 +163156,7 @@ xn--eglujemy-23b.net, 1
 xn--ehqw04eq6e.jp, 1
 xn--elsignificadodesoar-c4b.com, 1
 xn--eluprastinsulti-3kb.ee, 1
+xn--entreprise-dmolition-m2b.be, 1
 xn--erban-e9b.ro, 1
 xn--ertvg-pra.no, 1
 xn--et8h.cf, 0
@@ -162619,6 +163515,7 @@ xoutpost.com, 1
 xoxo.news, 1
 xp-ochrona.pl, 1
 xp.nsupdate.info, 1
+xparts.com.tr, 1
 xpd.se, 1
 xpendustries.com, 1
 xpenology-fr.net, 1
@@ -162657,7 +163554,6 @@ xpsauto.com, 1
 xpsautomation.com, 1
 xpsfactory.com, 1
 xpsinnovation.com, 1
-xpsnow.net, 1
 xpsrobotics.com, 1
 xptrack.com, 1
 xptrackstaging.com, 1
@@ -162686,6 +163582,7 @@ xsauto.pt, 1
 xscancun.com, 1
 xsden.info, 1
 xsec.me, 1
+xselldev.pl, 1
 xsenya74hram.tk, 1
 xserownia.cloud, 0
 xserownia.com.pl, 1
@@ -162712,9 +163609,11 @@ xt177.com, 1
 xt71uc.top, 1
 xtaboo3d.com, 1
 xtarget.ru, 1
+xtdowner.com, 1
 xtec.eu.org, 1
 xtechtecnologia.tec.br, 1
 xtendafin.com, 1
+xtexx.eu.org, 1
 xtianhe.com, 0
 xtime.com, 1
 xtips.us, 1
@@ -163049,7 +163948,6 @@ ya-madina.tk, 1
 ya-radio.tk, 1
 ya-stroynaya.tk, 1
 ya-zdorova.tk, 1
-yaateens.org, 1
 yaaw.de, 1
 yaay.com.br, 1
 yaay.today, 1
@@ -163141,7 +164039,6 @@ yamal159263.ml, 1
 yamanami.tokyo, 1
 yamanobe-taro.jp, 1
 yamasa-kanten.com, 1
-yamasi.com, 1
 yamatonetwork.com, 1
 yamazaki-automotive.co.jp, 1
 yamei1.com, 1
@@ -163244,7 +164141,6 @@ yaren-it.de, 1
 yaren.it, 1
 yarlesac.com, 1
 yarmarka-megamarket.ru, 1
-yarmuthforcongress.com, 1
 yarnandy.com, 1
 yarno.com.au, 1
 yarogneva.ru, 1
@@ -163260,6 +164156,7 @@ yarravilletownhouses.com.au, 1
 yaru.one, 1
 yarygin.tk, 1
 yasamkocluguegitimi.com.tr, 1
+yasar.edu.tr, 1
 yasarteknik.com.tr, 1
 yaseen.ae, 1
 yaseiblog.org, 1
@@ -163377,6 +164274,7 @@ yeditepehastaneleri.com, 1
 yeechie.nl, 1
 yeecord.com, 1
 yeecord.tk, 1
+yeezy.sa.com, 1
 yekaterinburg-city.tk, 1
 yellcosheriffar.gov, 1
 yellcountyar.gov, 1
@@ -163388,6 +164286,7 @@ yellowcar.website, 1
 yellowfolder.com, 1
 yellowmessenger.com, 1
 yellowpages.ee, 1
+yellowribbon.mil, 1
 yellowshow.com, 1
 yellowsource.org, 1
 yellowsprings.gov, 1
@@ -163690,6 +164589,7 @@ yohannberger.com, 1
 yohannes.tk, 1
 yoim.cc, 1
 yoitsu.org, 1
+yokaiispirit.ddns.net, 1
 yokefood.com, 1
 yokefood.com.my, 1
 yokocho373.com, 1
@@ -163916,6 +164816,7 @@ yourbusinessblueprint.com, 1
 yourcareerhost.com, 1
 yourcause.digital, 1
 yourcheshiremerseyside.wedding, 1
+yourchoice.in.net, 1
 yourchoicematters.ca, 1
 yourcomputer.expert, 1
 yourcomputer.tk, 1
@@ -164009,11 +164910,13 @@ yoursmartfirm.com.au, 1
 yoursmartschool.au, 1
 yoursmartschool.com, 1
 yoursmartschool.com.au, 1
+yoursoft.pl, 1
 yoursoul.gq, 1
 yoursoulmate.tk, 1
 yoursouthwales.wedding, 1
 yourstake.org, 1
 yourstart.tk, 1
+yourstorebridgwater.co.uk, 1
 yourstoreexeter.co.uk, 1
 yourstruly.co.th, 1
 yourstruly.yt, 1
@@ -164127,6 +165030,7 @@ yt629.com, 1
 yt675.com, 1
 yt972.com, 1
 ytcodecs.com, 1
+ytconvertpro.net, 1
 ytec.ca, 1
 ytexa.tk, 1
 ytpak.pk, 1
@@ -164280,12 +165184,13 @@ yuucchi.com, 1
 yuuki0xff.jp, 1
 yuumari.com, 1
 yuuta.moe, 1
-yuvagalam.com, 1
 yuvaskillfoundation.org, 1
 yuweetek.com, 0
 yuwei.org, 1
 yuweiji.com, 1
 yuweiyang.xyz, 1
+yuwell.com.pk, 1
+yuwell.pk, 1
 yux.fr, 1
 yuxiaoyu.me, 1
 yuxuan.org, 1
@@ -164434,6 +165339,7 @@ z8219.com, 0
 z8226.com, 0
 z8232.com, 0
 z82365.com, 1
+z830.net, 1
 z8817.com, 0
 z8865.com, 1
 z8876.com, 0
@@ -164501,6 +165407,7 @@ zafrani.ga, 1
 zafrasa.com.ar, 1
 zaftigpress.com, 1
 zagadki-cosmosa.tk, 1
+zageron.com, 1
 zagi.net, 1
 zagis.nl, 0
 zagorod.spb.ru, 1
@@ -164523,6 +165430,7 @@ zahnarzt.se, 1
 zahnarztpraxis-cevikel.de, 1
 zahnarztpraxis-schaerding.at, 1
 zahnarztpraxis-simone-koch.de, 1
+zahnarztpraxis-ural.de, 1
 zahrowski.com, 1
 zaija.tk, 1
 zaiko.io, 1
@@ -164767,6 +165675,7 @@ zbib.org, 1
 zbieram-medaily.sk, 1
 zbigatron.com, 1
 zbnr-hp.com, 1
+zbotic.in, 1
 zbrain.ml, 1
 zbrane-doplnky.cz, 0
 zbrsk.ru, 1
@@ -164897,6 +165806,7 @@ zeedroom.be, 1
 zeeg.me, 1
 zeegers.family, 1
 zeekajakvaren.tk, 1
+zeekr.pk, 1
 zeel.com, 1
 zeelandbrug.tk, 1
 zeeloo.us, 1
@@ -164930,6 +165840,7 @@ zeilenvoorondernemers.nl, 1
 zeilinstructeurs.tk, 1
 zeilles.nu, 1
 zeit.co, 1
+zeit.com.br, 1
 zeit.sh, 1
 zeitoununiversity.org, 1
 zeitpunkt-kulturmagazin.de, 1
@@ -164954,8 +165865,10 @@ zelkor.ml, 1
 zelle.com, 1
 zellusservices.com.br, 1
 zelong.tk, 1
+zelotech.com.br, 1
 zeloz.xyz, 1
 zelt.in, 1
+zelta.space, 1
 zelvar.cz, 1
 zemanta.com, 1
 zemli.tk, 1
@@ -165121,6 +166034,7 @@ zetapp.in, 1
 zetasystem.jp, 1
 zeteomail.com, 1
 zetflix.pro, 1
+zetland.biz, 1
 zetokatowice.pl, 1
 zetsubou.games, 1
 zettaplan.ru, 1
@@ -165289,6 +166203,7 @@ ziaulnmonzur.tk, 1
 ziegler-heizung-frankfurt.de, 1
 ziemlich-zackig.de, 1
 ziemlichzackig.de, 1
+ziffdigital.com, 1
 zifoapptest.com, 1
 ziftone.com, 1
 zigao.info, 1
@@ -165367,6 +166282,7 @@ zip, 1
 zip4.pl, 1
 zipalerts.com, 1
 zipanguelike.com, 1
+zipanguelike.run, 1
 ziparcfhive.ga, 1
 ziphealthy.com, 1
 zipjobs.com, 1
@@ -165385,6 +166301,7 @@ zira.pl, 1
 ziraatweb.com, 1
 zirbelino.at, 1
 zirbenprodukte.at, 1
+zirconfusion.com, 1
 zireon.tk, 1
 zirka24.net, 1
 ziroh.be, 1
@@ -165423,6 +166340,7 @@ zjy7722.ml, 1
 zjyoulian.cn, 1
 zk.gd, 1
 zk9.nl, 1
+zkb.ch, 1
 zkbitcoin.com, 1
 zking.ga, 1
 zklcdc.top, 0
@@ -165442,7 +166360,6 @@ zl-89.com, 1
 zl.lv, 1
 zl071.com, 1
 zl0909.com, 1
-zl1212.com, 1
 zl1515.com, 1
 zl2020.com, 1
 zl2020.vip, 1
@@ -165558,6 +166475,7 @@ zoepolitics.cf, 1
 zoepolitics.ga, 1
 zoepolitics.gq, 1
 zoepolitics.ml, 1
+zoetanxuanyo.com, 1
 zoeyvid.de, 1
 zof.kh.ua, 1
 zoflora.co.uk, 1
@@ -165816,6 +166734,7 @@ zpapieru.pl, 1
 zpasathagroup.com, 1
 zpatkynavrchol.cz, 1
 zpaulreviews.com, 1
+zpbettertogether.com, 1
 zpc.st, 1
 zphmetalus.pl, 1
 zpider.cloud, 1
@@ -165827,7 +166746,6 @@ zq.com.sg, 1
 zqcollection.com, 1
 zqwqz.org, 1
 zr.si, 1
-zrali.com, 1
 zrampage.com, 1
 zravyobrazky.cz, 1
 zravypapir.cz, 1
@@ -165915,6 +166833,7 @@ zumba-oostende.be, 1
 zumba.com, 1
 zumberak.tk, 1
 zumdrucksach.de, 1
+zumkleinenhut.de, 1
 zumtaedanceschool.co.za, 1
 zumtobel.com, 1
 zumtobelgroup.com, 1
@@ -165931,6 +166850,7 @@ zur.ru, 1
 zurgl.com, 1
 zurich.co.uk, 1
 zurl.co, 1
+zurl.to, 1
 zurmas-design.tk, 1
 zuru.ml, 1
 zuru.tk, 1
diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json
index 8af1296fc3dbd..b118f196ab9fb 100644
--- a/services/settings/dumps/blocklists/addons-bloomfilters.json
+++ b/services/settings/dumps/blocklists/addons-bloomfilters.json
@@ -1,5 +1,2543 @@
 {
   "data": [
+    {
+      "stash": {
+        "blocked": [
+          "{ff68a51d-37b7-42a9-81e1-dbd85e078d4b}:2.0.9",
+          "{ff68a51d-37b7-42a9-81e1-dbd85e078d4b}:2.0.10",
+          "init@addon.org:0.2.1",
+          "{16237e0d-7d7f-4645-9273-30e5eec92e77}:1.5.4",
+          "{16237e0d-7d7f-4645-9273-30e5eec92e77}:1.5.5",
+          "{16237e0d-7d7f-4645-9273-30e5eec92e77}:1.5.6",
+          "{6b182547-353c-4248-8ebb-bf98db0eaee3}:5.7.2",
+          "{6b182547-353c-4248-8ebb-bf98db0eaee3}:5.7.3",
+          "{6b182547-353c-4248-8ebb-bf98db0eaee3}:13.18.0",
+          "{6b182547-353c-4248-8ebb-bf98db0eaee3}:13.18.1"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "video-downloader@ai-assistant.local:1.6",
+          "book-more@yourdomain.com:1.2.12",
+          "wpcommand@wpcommand.com:1.0.0",
+          "wpcommand@wpcommand.com:1.0.1",
+          "orgcommand-sync@orgcommand.app:1.0.2",
+          "orgcommand-sync@orgcommand.app:1.0.1",
+          "4pda-live@brantx:1.6.1.1",
+          "multi-scrape@example.local:1.25",
+          "pl-en@magnus:1.2.8",
+          "pl-en@magnus:1.3.0",
+          "{13e58ca8-b3b8-453c-8760-7206de3cd9af}:1.0",
+          "{6feb8625-dfba-4dbb-9422-063a329f61bd}:1.0",
+          "{6feb8625-dfba-4dbb-9422-063a329f61bd}:1.1",
+          "{6feb8625-dfba-4dbb-9422-063a329f61bd}:1.2",
+          "autoretry@yourproxyfix.local:1.5",
+          "casb-connector@iboss.com:0.0.2",
+          "raikey@raigaa.dev:1.0.0",
+          "taskflow@extension.local:1.4.2",
+          "{8f3c2b6e-9c4a-4b0d-9e2d-6a7f1c4e52a9}:1.2.10",
+          "{8f3c2b6e-9c4a-4b0d-9e2d-6a7f1c4e52a9}:1.2.10b",
+          "{6eb5bc38-8139-4589-81fb-e8abfe1bd52e}:4.7.3",
+          "{6eb5bc38-8139-4589-81fb-e8abfe1bd52e}:4.7.4",
+          "title@url:0.5",
+          "zhihu-blocker@local:1.0.0",
+          "nextcloud-markdown-switcher@gfz.de:1.0.1"
+        ]
+      },
+      "schema": 1770381397550,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770402906807,
+      "id": "289eb128-760d-4e01-83c2-0e657c6a4b25",
+      "last_modified": 1770402993501
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "realnamewidget@apoveda:1.0",
+          "{c7e0b5c0-b927-4f5b-8ab2-3bcd44b879df}:1.0.1",
+          "{c7e0b5c0-b927-4f5b-8ab2-3bcd44b879df}:1.0.3",
+          "{c7e0b5c0-b927-4f5b-8ab2-3bcd44b879df}:1.0.4",
+          "{c7e0b5c0-b927-4f5b-8ab2-3bcd44b879df}:1.0.5",
+          "{c7e0b5c0-b927-4f5b-8ab2-3bcd44b879df}:1.0.54",
+          "{53647674-e77b-4f02-b62f-7e9cc030402b}:1.0",
+          "{53647674-e77b-4f02-b62f-7e9cc030402b}:1.1",
+          "{53647674-e77b-4f02-b62f-7e9cc030402b}:1.2",
+          "{53647674-e77b-4f02-b62f-7e9cc030402b}:1.4",
+          "better-time-cockpit@dynatrace.com:1.0.0",
+          "weibo-cookie-helper@example.com:1.0.1",
+          "weibo-cookie-helper@example.com:1.0.2",
+          "weibo-cookie-helper@example.com:1.0.3",
+          "weibo-cookie-helper@example.com:1.0.4",
+          "weibo-cookie-helper@troray.github.io:1.0.5"
+        ]
+      },
+      "schema": 1770359792915,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770381306458,
+      "id": "44c12581-927c-4480-8ea4-738f8fd29eef",
+      "last_modified": 1770381397398
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "@webdevelopersidekick:0.0.26",
+          "@webdevelopersidekick:0.0.28",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:5.1",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:5.0",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:4.5",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:4.2",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:4.1",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:4.0",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:3.5",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.5.2",
+          "{72cecf13-9c76-4c72-a670-2cf9ff77eec6}:0.1.0",
+          "sat-web-record@beyondsoft.com:2.1.20",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.5.3",
+          "favory@sp4ce.pw:2.9.1",
+          "company-registration-tool@yourdomain.com:1.5.0"
+        ]
+      },
+      "schema": 1770338191556,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770359706124,
+      "id": "3bc86f61-5636-4eab-958a-c25c24680515",
+      "last_modified": 1770359792597
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{e58ea576-2661-4612-ae4b-1c8d3b7baac8}:2.4.8",
+          "{e58ea576-2661-4612-ae4b-1c8d3b7baac8}:2.4.7"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "us-timezone-spoofer-pro@extension:3.0.0",
+          "media-dl@barahmand.com:2.0",
+          "dynamic-text-copier@example.com:1.1",
+          "borderify@aashay.com:1.2",
+          "{25fc87fa-4d31-4fee-b5c1-c32a7844c063}:8.11.18.2491",
+          "{25fc87fa-4d31-4fee-b5c1-c32a7844c063}:8.11.18.2501",
+          "add-to-notebooklm@ff.local:1.1.0",
+          "favory@sp4ce.pw:2.8.9"
+        ]
+      },
+      "schema": 1770316591919,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770338106333,
+      "id": "fc1efb8d-fdde-4e04-8a96-cf1421a8c6bb",
+      "last_modified": 1770338191246
+    },
+    {
+      "stash": {
+        "blocked": [
+          "comprehensive-enhance-7961f55a@firefox.extension:4.2.6",
+          "comprehensive-enhance-7961f55a@firefox.extension:4.2.7",
+          "color-flow-a1506ded@firefox.extension:2.3.4",
+          "color-flow-a1506ded@firefox.extension:2.3.5",
+          "enhanced-browser-master-b8uienik@firefox.extension:2.1.4",
+          "enhanced-browser-master-b8uienik@firefox.extension:2.1.5",
+          "build-clipboard-h1-8c9a050b@firefox.extension:3.0.5",
+          "{e58ea576-2661-4612-ae4b-1c8d3b7baac8}:2.4.9"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "devfred886@gmail.com:1.0.9",
+          "052dacf5-2638-4086-8165-8373e9c21e4e@example.com:0.2.1",
+          "multi-scrape@example.local:1.23",
+          "tracking-lbc-extension-filler@nemesis-studio.com:1.0.0",
+          "tracking-lbc-extension-filler@nemesis-studio.com:1.0.1",
+          "{4cd11f8b-8c33-472d-a725-f8bc4469328b}:0.0.4",
+          "fukushima-haccp-record-only@local:1.0.0",
+          "fukushima-haccp-record-only_v2@local:1.0.0",
+          "bearerbox@bearerbox.dev:1.0",
+          "{670390bb-e4e6-4394-932d-1e5cb87c77c0}:1.0",
+          "favory@sp4ce.pw:2.8.7",
+          "favory@sp4ce.pw:2.8.6",
+          "favory@sp4ce.pw:2.8.5",
+          "favory@sp4ce.pw:2.8.8",
+          "{ff68a51d-37b7-42a9-81e1-dbd85e078d4b}:2.0.6",
+          "{ff68a51d-37b7-42a9-81e1-dbd85e078d4b}:2.0.5",
+          "{ff68a51d-37b7-42a9-81e1-dbd85e078d4b}:2.0.8"
+        ]
+      },
+      "schema": 1770294989969,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770316506516,
+      "id": "76c453e6-6c20-4700-b049-ce6a2004dd2f",
+      "last_modified": 1770316591483
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "mute-cricket-ads@iShibi:0.1.0",
+          "mute-cricket-ads@firefox:0.1.0",
+          "invidious-saver@osamaserverhome.duckdns.org:1.0",
+          "endfield-checkin@example.com:0.3.0",
+          "endfield-checkin@example.com:0.2.0",
+          "jid1-Sr1xtqTx9MX0Aw@jetpack:4.1.0.0",
+          "print-robust@example.com:4.0",
+          "print-as-is@example.com:4.0",
+          "print-as-is@example.com:0.1",
+          "devfred886@gmail.com:1.0.8"
+        ]
+      },
+      "schema": 1770273386752,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770294906343,
+      "id": "82c5c79f-5bcb-4135-9ebe-0f0e14708128",
+      "last_modified": 1770294989666
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{382d1804-eb88-4cd4-bdf2-d70df4a937d2}:4.0",
+          "custom-newtab@local:1.0"
+        ]
+      },
+      "schema": 1770251784217,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770273305697,
+      "id": "11c677c5-d5d0-4d04-aae6-fd00a23931d8",
+      "last_modified": 1770273386464
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "endfield-checkin@example.com:0.1.0",
+          "portforward@polderman.it:1.0.0",
+          "{0108d417-b00d-4699-b264-f192a615d235}:3.0",
+          "{2d8139d2-21ba-4b65-93f0-7a2e9e8a51c6}:3.0",
+          "Test@Window:1.0",
+          "Test@Window:1.1",
+          "Test@Window:1.2",
+          "Test@Window:1.3",
+          "Test@Window:1.4",
+          "{e58ea576-2661-4612-ae4b-1c8d3b7baac8}:2.4.8",
+          "{e58ea576-2661-4612-ae4b-1c8d3b7baac8}:2.4.7",
+          "{25fc87fa-4d31-4fee-b5c1-c32a7844c063}:8.11.18.2421",
+          "{25fc87fa-4d31-4fee-b5c1-c32a7844c063}:8.11.18.2411",
+          "Test@Window:1.5",
+          "Test@Window:1.6",
+          "Test@Window:1.7",
+          "favory@sp4ce.pw:2.8.2",
+          "{5f8d9e2a-1b3c-4d5e-6f7a-8b9c0d1e2f3a}:2.63",
+          "Test@Window:1.8",
+          "Test@Window:1.9",
+          "Test@Window:1.10",
+          "{47299dc5-bc1a-4a7b-a84a-540335e008ad}:1.0",
+          "Test@Window:1.11",
+          "favory@sp4ce.pw:2.8.3",
+          "favory@sp4ce.pw:2.8.4",
+          "Test@Window:1.12",
+          "Test@Window:1.13"
+        ]
+      },
+      "schema": 1770230191478,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770251705532,
+      "id": "83808ded-a1b4-4c8a-8be5-7cb0e3cde874",
+      "last_modified": 1770251784014
+    },
+    {
+      "stash": {
+        "blocked": [
+          "super-browser-pro-j017x4xv@firefox.extension:1.8.2",
+          "super-browser-pro-j017x4xv@firefox.extension:1.8.5",
+          "quick-schedule-d13d0971@firefox.extension:5.3.5",
+          "quick-schedule-d13d0971@firefox.extension:5.3.6",
+          "quick-helper-ovlniqie@firefox.extension:3.7.3",
+          "quick-helper-ovlniqie@firefox.extension:3.7.5",
+          "pro-debug-df9e4821@firefox.extension:1.4.8",
+          "{a70d97a6-1b18-4fa3-bc91-17c7a796c49d}:5.9.8",
+          "{a70d97a6-1b18-4fa3-bc91-17c7a796c49d}:5.9.9"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "stud-ip-teilnehmenden-addon@uni-hannover.de:1.0",
+          "studip-teilnehmer-abgleich@uni-hannover.de:2",
+          "yt-path-picker@local:1.0",
+          "msloginautofill@example.com:1.0.0",
+          "pixtab@pixtab.extension:1.8",
+          "jahid@doc.pro:1.0.69",
+          "contact@mehmetsalihk.fr:2.6",
+          "gblock@example.com:1.2",
+          "redirectlinktest@fluks1:5.7.0",
+          "redirectlinktest@fluks:5.7.0",
+          "favory@sp4ce.pw:2.8.1"
+        ]
+      },
+      "schema": 1770208583232,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770230106131,
+      "id": "fa516345-4ef2-4e38-8055-53e6b9ebc181",
+      "last_modified": 1770230191230
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd6}:1.7.33",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd6}:1.7.34",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd6}:1.7.35",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd6}:1.7.36",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd6}:1.7.37",
+          "line@myself.com:1.1",
+          "yt-idm-turbo@cargan.com:1.1",
+          "yt-idm-turbo@cargan.com:1.2",
+          "octoplus@octoplushate.dev:4.0",
+          "pdfsigner@gov.fehd.cfs.fiecs.pdfsigner:3.0.0",
+          "octoplus@octoplusliv.dev:6.0",
+          "nextcloud-markdown-switcher@gfz.de:1.0",
+          "{56fb8b56-6b8a-4e0e-8313-0d0d84b959b1}:1.0",
+          "{6670bfd4-da4f-41c3-b52a-0dd3397f5a08}:1.0",
+          "{c583906d-755c-41d8-b077-454765d58ae7}:1.0",
+          "{ad7ae3fb-4144-48ce-84a5-a155a5097711}:1.0",
+          "maispje@justica.digital:2.1.2",
+          "auto-clicker@openclaw.extension:1.0.0",
+          "{fdfe0604-8e24-4e78-bef3-191c648bbbdd}:0.0.5",
+          "{fdfe0604-8e24-4e78-bef3-191c648bbbdd}:0.0.7",
+          "{fdfe0604-8e24-4e78-bef3-191c648bbbdd}:0.0.8",
+          "vpn-wildcard@fazee.custom:1.2.16",
+          "vpn-wildcard@fazee.custom:1.2.17",
+          "vpn-wildcard@fazee.custom:1.2.18",
+          "vpn-wildcard@fazee.custom:1.2.19",
+          "vpn-wildcard@fazee.custom:1.2.20",
+          "vpn-wildcard@fazee.custom:1.2.21",
+          "youtube-scheduler@yourdomain.com:1.5.1",
+          "youtube-scheduler@yourdomain.com:1.5.2",
+          "youtube-scheduler@yourdomain.com:1.5.3",
+          "youtube-scheduler@yourdomain.com:1.5.4",
+          "{aa2b2cb5-d290-4335-808c-560ed769018f}:1.0.3",
+          "video-controller@ronin-ck.com:2.0.0",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.0.1",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.0.2",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.0.3",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.0.4",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.1.0",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.1.1",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.1.2",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.1.3",
+          "{670b659f-089c-4fe0-928a-b8b6839b44de}:1.1.4",
+          "favory@sp4ce.pw:2.7.9"
+        ]
+      },
+      "schema": 1770186996110,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770208505578,
+      "id": "067ae88d-7a17-4871-8aeb-fea346ee0895",
+      "last_modified": 1770208583018
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{60beab6d-17bb-411a-a55e-ed09f487ec1e}:5.6.9",
+          "mrm-downloader@nyt92.eu.org:1.3.4",
+          "mrm-downloader@nyt92.eu.org:1.3.3",
+          "restaurant-filter@example.com:1.0",
+          "support@timocom.com:0.1.4",
+          "vocab-collector@local:0.1.0",
+          "vocab-collector@local:0.1.1",
+          "vocab-collector@local:0.1.2",
+          "vocab-collector@local:1.0.0"
+        ]
+      },
+      "schema": 1770165384966,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770186906659,
+      "id": "886769bc-6042-45d7-81df-7caeef62b66c",
+      "last_modified": 1770186995971
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "boost-monitor-converter-2fcac563@firefox.extension:5.8.5",
+          "boost-monitor-converter-2fcac563@firefox.extension:5.9.6",
+          "{d6f1dbe3-1238-47ff-ab3e-3451baac8e69}:2.5.0",
+          "{9ed2a9a5-a0fe-40d5-8836-0008249fe28b}:1.3.2.1",
+          "{9ed2a9a5-a0fe-40d5-8836-0008249fe28b}:2.3",
+          "{9ed2a9a5-a0fe-40d5-8836-0008249fe28b}:2.4.2",
+          "{9ed2a9a5-a0fe-40d5-8836-0008249fe28b}:2.4.3",
+          "{9ed2a9a5-a0fe-40d5-8836-0008249fe28b}:2.4.4",
+          "suspo-collector@example.com:1.0",
+          "suspo-collector@example.com:1.1",
+          "suspo-collector@example.com:1.2.1",
+          "{6f4156b8-4e01-4137-adad-e7aa28ce1707}:1.0",
+          "{6f4156b8-4e01-4137-adad-e7aa28ce1707}:1.1",
+          "{6f4156b8-4e01-4137-adad-e7aa28ce1707}:1.1.1",
+          "{6f4156b8-4e01-4137-adad-e7aa28ce1707}:1.4",
+          "shortkeys-custom-build@example.com:4.1.4",
+          "weather-buster-9000-xxx@extension.local:2.0.0",
+          "{f4a0e6b1-8c3a-4f2d-9e1a-7b5c2d8f3a4e}:1.0.1",
+          "{b2649c46-4196-42a1-bcff-da172f5bd9ec}:2.3.0",
+          "soft-gray-pdf-inveerter@usefull-tools:1.0"
+        ]
+      },
+      "schema": 1770143792382,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770165305367,
+      "id": "50c4df6b-071e-4008-b2fb-997a39d77212",
+      "last_modified": 1770165384642
+    },
+    {
+      "stash": {
+        "blocked": [
+          "packagetracking@livepackagetracking.com:1.0",
+          "packagetracking@livepackagetracking.com:1.1",
+          "packagetracking@livepackagetracking.com:1.2",
+          "maps@mapsdrivingdirections.com:1.0",
+          "maps@mapsdrivingdirections.com:1.1",
+          "maps@mapsdrivingdirections.com:1.2",
+          "maps@mapsdrivingdirections.com:1.3",
+          "earth@earthsatellite3d.com:1.0",
+          "earth@earthsatellite3d.com:1.1",
+          "earth@earthsatellite3d.com:1.2",
+          "earth@earthsatellite3d.com:1.3",
+          "earth@earthsatellite3d.com:1.4",
+          "{4aa8f833-0066-42e1-ba07-13e4b5fc3599}:1.0",
+          "{ec9cb034-58f8-4fb9-ae28-8240899a9da2}:1.0",
+          "{ffe1ffe4-603f-44c0-9770-06ac793366d7}:1.0",
+          "{89f4a5dc-9574-43d6-8eed-2a6b02df2dfe}:1.0",
+          "{db69bc71-48d6-4033-a6c9-dc08d3c5f880}:1.0",
+          "prime-watcher-kradk5oa@firefox.extension:1.1.5",
+          "prime-watcher-kradk5oa@firefox.extension:1.2.7"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "techpriest@gurglorium.com:0.9.0",
+          "psydez@gmail.com:1.0",
+          "article-search@example.com:1.0.4",
+          "octoplus@octopluswin.dev:8.0",
+          "octoplus@octoplusbad.dev:3.0",
+          "octoplus@octoplusthree.dev:5.0",
+          "octoplus@octopluswell.dev:7.0",
+          "ai-tab-organizer@example.com:1.0.1",
+          "octoplus@octopluslove.dev:4.0",
+          "drag_to_privew@uxer:0.0.81",
+          "kurabu-ausweis@bremen1860.de:2.0.6",
+          "@minimalist-dev-build:8.7",
+          "@giseo-helper:1.1",
+          "{9fec991b-50db-4848-ad4e-beebf328c94b}:2.5.2",
+          "{9fec991b-50db-4848-ad4e-beebf328c94b}:2.5.4",
+          "{9fec991b-50db-4848-ad4e-beebf328c94b}:2.5.6",
+          "@giseo-helper:1.2",
+          "{77666993-534b-4850-bd76-63762591d6cb}:1.0",
+          "{1509130c-27fb-47a8-a04f-d75e3449ace9}:1.0",
+          "{613dc4be-da76-4e1a-9221-4e70cb5f3118}:1.0",
+          "drag_to_privew@uxer:0.0.82"
+        ]
+      },
+      "schema": 1770122181689,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770143707307,
+      "id": "1297d5f2-c123-4a08-bde7-09f225b89b34",
+      "last_modified": 1770143792077
+    },
+    {
+      "stash": {
+        "blocked": [
+          "john.harris26092001rz@outlook.com:1.0.8",
+          "{fc8e9751-4550-40e1-9bcf-1478088b9743}:3.9.4",
+          "secure-browse-emgwlkdx@firefox.extension:1.8.9",
+          "secure-browse-pqniu8vs@firefox.extension:3.2.7",
+          "power-cookie-master-hnye61ye@firefox.extension:3.9.0",
+          "power-cookie-master-hnye61ye@firefox.extension:4.1.0",
+          "zen-amplify-json-d7262187@firefox.extension:2.8.3",
+          "zen-amplify-json-d7262187@firefox.extension:2.8.5",
+          "smart-bookmarks-63gfz33o@firefox.extension:1.2.6",
+          "improved-tab-manager-2f4gskrh@firefox.extension:2.3.4",
+          "{cee33d67-2e65-4625-97a3-bf3496a4f1e6}:5.5.1"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "robin.zhuang@sap.com:0.0.1",
+          "{fc8e9751-4550-40e1-9bcf-1478088b9743}:3.9.3",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.5.1",
+          "medminutes@imperialHealthtech.com:1.5.0",
+          "{80c8dd42-6c4a-44da-a29c-e4f54c296a50}:1.0",
+          "{80c8dd42-6c4a-44da-a29c-e4f54c296a50}:2.0",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.0",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.1",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.2",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.3",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.1",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.2",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.3",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.4",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.5",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.6",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.7",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.8",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.9",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.10",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.11",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.12",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.13",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.14",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.15",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.16",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.17",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.18",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.19",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.20",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.21",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.22",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.23",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.24",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.25",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.26",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.27",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.28",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.29",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.30",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.31",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.32",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.33",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.34",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.35",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.36",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.37",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.38",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.39",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.40",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.41",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.42",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.43",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.44",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.45",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.46",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.47",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.48",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.49",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.50",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.51",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.52",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.53",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.54",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.55",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.56",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.57",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.58",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.4.59",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.1",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.2",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.3",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.4",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.41",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.42",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.43",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.44",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.46",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.47",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.50",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.51",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.52",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.53",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.54",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.55",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.56",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.57",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.58",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.59",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.60",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.61",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.62",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.63",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.64",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.65",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.66",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.67",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.68",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.5.69",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.1",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.11",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.12",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.13",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.14",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.15",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.16",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.17",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.18",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.19",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.20",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.21",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.22",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.24",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.25",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.26",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.27",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.28",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.29",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.30",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.31",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.32",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.33",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.34",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.35",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.36",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.37",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.38",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.39",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.40",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.41",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.42",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.43",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.44",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.45",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.46",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.47",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.48",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.49",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.50",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.51",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.52",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.53",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.54",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.55",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.56",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.57",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.58",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.64",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.65",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.66",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.67",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.68",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.69",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.70",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.71",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.73",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.74",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.75",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.76",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.77",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.78",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.79",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.80",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.81",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.82",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.83",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.84",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.85",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.86",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.87",
+          "{1a1275a1-6e24-4788-8ec2-2cd5e98c9cd5}:1.6.88",
+          "endpoint-shield@adlibo.com:1.5.0",
+          "agent@blowtorch.local:1.0.0",
+          "octoplus@octoplusexe.dev:6.0",
+          "octoplus@octoplusend.dev:1.0",
+          "inist.users@gmail.com:3.19.3",
+          "inist.users@gmail.com:3.19.4",
+          "inist.users@gmail.com:3.19.5",
+          "inist.users@gmail.com:3.27.0",
+          "inist.users@gmail.com:3.19.6",
+          "inist.users@gmail.com:3.19.7",
+          "inist.users@gmail.com:3.19.8",
+          "inist.users@gmail.com:3.20.0",
+          "inist.users@gmail.com:3.21.0",
+          "inist.users@gmail.com:3.22.0",
+          "inist.users@gmail.com:3.22.1",
+          "inist.users@gmail.com:3.23.0",
+          "inist.users@gmail.com:3.23.1",
+          "vulcan-export-final@feature-adder.it:1.0.4",
+          "vulcan-export-final@feature-adder.it:1.0.5",
+          "vulcan-export-final@feature-adder.it:1.0.6",
+          "vulcan-export-final@feature-adder.it:1.1.0",
+          "my_extension_id@example.com:1.0",
+          "{95ccf8ff-7b52-49b6-9319-cbca4bcc7677}:1.0.1",
+          "{95ccf8ff-7b52-49b6-9319-cbca4bcc7677}:1.0.4",
+          "recipe-scraper@tailscale.local:1.0"
+        ]
+      },
+      "schema": 1770100592617,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770122105209,
+      "id": "e94dc20f-cd74-416f-ba75-268a2a06277f",
+      "last_modified": 1770122181361
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "stereotweet@bjaxqq.com:1.0.0",
+          "{1ca57218-5c75-4941-ade2-05e1bc956cd9}:1.0",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.8.3",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.8.2",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.8.1",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.8",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.7.1",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.7",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.6",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.5",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.4",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.3",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.2",
+          "{4e03803e-a6d4-4bd5-9bf3-8bd52e0fdf5a}:1.1",
+          "claude-export-tool@example.com:1.0.0",
+          "claude-export-tool@example.com:1.0.1",
+          "grok-export-tool@example.com:1.0.0",
+          "chatgpt-export-tool@example.com:1.0.0"
+        ]
+      },
+      "schema": 1770078991811,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770100506656,
+      "id": "fb083e71-9608-4a67-b0e1-cc4fc70c08b3",
+      "last_modified": 1770100592401
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{e1f404e8-db13-4a8d-a21a-75bcf87fa619}:2.6.5",
+          "{e1f404e8-db13-4a8d-a21a-75bcf87fa619}:2.6.8",
+          "{ab2c6387-bfcd-4c64-8cbb-2514b321385d}:1.0",
+          "{5d686bd0-460d-48a5-b13e-eccaebe5b4c4}:4.2.4",
+          "hnlghhimlfidcnmaimhmmjkhmofolnpl@integralbiometrics.com:2026.2.2.16223",
+          "schmidts_katz@cubimon.org:1.5",
+          "schmidts_katz@cubimon.org:1.3",
+          "schmidts_katz@cubimon.org:1.1",
+          "schmidts_katz@cubimon.org:1.4",
+          "schmidts_katz@cubimon.org:1.0",
+          "cubimmon93@gmail.com:1.8.0",
+          "streamkeys@streamkeys.com:1.8.0",
+          "streamkeys@streamkeys.com:1.8.1",
+          "{21c0c650-2c28-4102-a546-5349cd4048f3}:0.0.1"
+        ]
+      },
+      "schema": 1770057395832,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770078907123,
+      "id": "4dff0afd-1619-4a85-a3bc-7f08fec889a8",
+      "last_modified": 1770078991338
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{ad370ce4-47b7-4f4f-b891-25576784af1d}:5.6.6",
+          "{ad370ce4-47b7-4f4f-b891-25576784af1d}:5.6.7",
+          "{ad370ce4-47b7-4f4f-b891-25576784af1d}:5.6.8",
+          "tab-alarm@extension.com:1.0.0",
+          "tab-alarm@extension.com:1.1.0",
+          "ultra-utility-abnla0so@firefox.extension:2.4.6",
+          "turbo-browser-helper-rbmi4mdi@firefox.extension:2.9.4",
+          "turbo-browser-helper-rbmi4mdi@firefox.extension:2.9.5",
+          "smart-keeper-6i4vcsgy@firefox.extension:1.3.6",
+          "smart-keeper-6i4vcsgy@firefox.extension:1.3.7",
+          "best-tab-organizer-7fr4n7ka@firefox.extension:2.9.7",
+          "best-tab-organizer-7fr4n7ka@firefox.extension:13.16.1",
+          "{b4a5b1b6-6225-40db-977f-41c107b04f19}:1.0",
+          "{71070de4-6220-496b-adc5-aa1931a63f6a}:1.0",
+          "{71070de4-6220-496b-adc5-aa1931a63f6a}:3.15.3",
+          "{78962e30-ef60-45ef-ad55-9949e497c554}:1.0",
+          "{78962e30-ef60-45ef-ad55-9949e497c554}:1.1.3"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "r-helper@astralinux.ru:1.3.0",
+          "r-helper@astralinux.ru:1.3.1",
+          "octoplus@octoplustry.dev:4.0",
+          "swift-bookmark-manager-kxkejsbl@firefox.extension:3.5.2",
+          "{118beff8-a383-4cbe-9e02-1623f0cb1280}:1.0.4",
+          "tebex-autofill@local:1.0.0",
+          "admin-jkfix@torata.ch:1.0",
+          "secure-browse-emgwlkdx@firefox.extension:1.7.9",
+          "contact@bulenox.codes:4.3.23",
+          "{8fdea742-9b86-4c1f-a79b-e8b5c6aa21e7}:7.7",
+          "{e35301ab-9443-4437-aedb-81b3c2f9ef76}:1.0",
+          "smart-justify-v3@clean-fix:1.0",
+          "{71d7d949-a04e-4925-aef6-3b1730982a3c}:1.0",
+          "{95fd1cd9-1f2d-46ce-9dbe-6a954b59a315}:1.0",
+          "{d9e6daa5-40e2-4210-b333-3023a8256ec3}:1.1",
+          "{c22b3ac9-da98-467c-9d62-cbd20d1cff65}:2.1.5",
+          "{c22b3ac9-da98-467c-9d62-cbd20d1cff65}:2.1.9",
+          "cookie-cliker-tools@local:0.5"
+        ]
+      },
+      "schema": 1770035790698,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770057306508,
+      "id": "6154dea9-e9df-412e-94ae-fa3f614c43b8",
+      "last_modified": 1770057395700
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "octoplus@octoplusmultib.dev:1.0",
+          "visited-links-colorizer@ngothang2805.github.io:1.2.7",
+          "octoplus@octoplusbeggin.dev:1.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.5.0",
+          "withdrawal-extractor@paynexbot.com:1.0.2",
+          "endpoint-shield@adlibo.com:1.4.0",
+          "endpoint-shield@adlibo.com:1.3.0",
+          "{49d75de4-60d6-4173-bd01-e355c78c5306}:1.0.0",
+          "jira-copy-button@extension.local:1.0.0",
+          "octoplus@octoplusend.dev:2.0",
+          "info1@latynka.pp.ua:0.0.1",
+          "octoplus@octoplusreal.dev:3.0",
+          "nord-paper-theme@dotfiles:1.0.0",
+          "nord-paper-theme@dotfiles:1.0.1",
+          "nord-paper-theme@dotfiles:1.0.2",
+          "nord-paper-theme@dotfiles:1.0.3",
+          "nord-paper-theme@dotfiles:1.0.4",
+          "nord-paper-theme@dotfiles:1.0.5"
+        ]
+      },
+      "schema": 1770014195563,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770035706705,
+      "id": "368277b4-3d4f-46fc-89c9-5fc718756a0f",
+      "last_modified": 1770035790495
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.3.9",
+          "favory@sp4ce.pw:2.7.7",
+          "favory@sp4ce.pw:2.7.8",
+          "@confluence-style-fix:1.1",
+          "@confluence-style-fix:1.2",
+          "@confluence-style-fix:1.3",
+          "@confluence-style-fix:1.31"
+        ]
+      },
+      "schema": 1769992580511,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1770014106635,
+      "id": "96129b93-6844-4cb3-8b29-4a2ea1b27d26",
+      "last_modified": 1770014195250
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "screen-res-spoofer@example.com:5.0",
+          "stevereis93@gmail.com:0.2.9",
+          "octoplus@sakhiwo.dev:1.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.3.8",
+          "octoplus@mydomain.com:1.0",
+          "{54be7a61-d6aa-4938-b496-c1c986fd8af3}:0.1",
+          "{54be7a61-d6aa-4938-b496-c1c986fd8af3}:0.1.1",
+          "{54be7a61-d6aa-4938-b496-c1c986fd8af3}:0.1.2",
+          "twoje-id-rozszerzeniav2@example.com:1.0.0",
+          "twoje-id-rozszerzeniav2@example.com:1.0.1",
+          "container-automator-dev@local.local:1.0",
+          "sekercancepni@hotmail.com:1.0.0",
+          "{9fc10399-ff0d-41c1-9e84-5df6bea8d7c9}:1.0"
+        ]
+      },
+      "schema": 1769970979264,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769992505540,
+      "id": "f2fab369-878d-40f9-968e-46d7f858a8e4",
+      "last_modified": 1769992580374
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{92409c9f-a7c8-44f2-ab96-57cf56b32f1c}:2.0",
+          "{92409c9f-a7c8-44f2-ab96-57cf56b32f1c}:1.0",
+          "{92409c9f-a7c8-44f2-ab96-57cf56b32f1c}:2.1",
+          "{92409c9f-a7c8-44f2-ab96-57cf56b32f1c}:2.2",
+          "{7c7038b0-6f45-4a8f-bc05-8aed4598765e}:1.0",
+          "{7c7038b0-6f45-4a8f-bc05-8aed4598765e}:2.0",
+          "{7c7038b0-6f45-4a8f-bc05-8aed4598765e}:1.5",
+          "{7c7038b0-6f45-4a8f-bc05-8aed4598765e}:1.1",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:3.2",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:3.1",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:2.0",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:1.3",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:1.4",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:1.1",
+          "{d6aa6b3b-749f-4f84-855e-fa709b733b2a}:1.0",
+          "endpoint-shield@adlibo.com:1.2.1",
+          "endpoint-shield@adlibo.com:1.1.0",
+          "endpoint-shield@adlibo.com:1.2.0",
+          "@link-collector:1.0",
+          "cool-bookmark-master-b7xmf65w@firefox.extension:2.1.4",
+          "pocket-csv@iamtrazy.dev:1.0.0",
+          "bright-extension-pyaz9dyg@firefox.extension:2.7.8",
+          "ultimate-cookie-manager-vd23jzmo@firefox.extension:2.1.8",
+          "elite-tool-ydbvn7i8@firefox.extension:1.5.4",
+          "elite-tool-ydbvn7i8@firefox.extension:1.5.6",
+          "saver-your-tabs@firefox.extension:1.2.0",
+          "saver-your-tabs@firefox.extension:1.3.0",
+          "saver-your-tabs@firefox.extension:1.5.0",
+          "{662917d2-f7ef-466a-8e95-37d46e528557}:1.5.2",
+          "{662917d2-f7ef-466a-8e95-37d46e528557}:1.5.3"
+        ]
+      },
+      "schema": 1769949390781,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769970905254,
+      "id": "89eadc17-3193-4bd8-89ab-b245464d7aa1",
+      "last_modified": 1769970979102
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{3f7a0d32-bb7d-4f4b-99c9-bb58e1a9129a}:0.5",
+          "{3f7a0d32-bb7d-4f4b-99c9-bb58e1a9129a}:0.4",
+          "image-downloader@ozler365:15.5",
+          "{9d1d71e5-6e31-4499-a97e-35c8daa13f1b}:1.3.3",
+          "arc@dobybaxter.dev:1.0.1"
+        ]
+      },
+      "schema": 1769927793759,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769949306304,
+      "id": "f7b22f4d-c422-437f-b244-ed69dfb1dfdc",
+      "last_modified": 1769949390564
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "tfs-extension@indra.com:1.0.0",
+          "ultimate-browser-pro-zup14ejf@firefox.extension:3.1.7",
+          "google-account-switcher@antigravity.ai:1.3",
+          "ultimate-browser-pro-zup14ejf@firefox.extension:13.16.0",
+          "ultimate-browser-pro-zup14ejf@firefox.extension:13.16.1",
+          "best-history-manager-eaypj5m4@firefox.extension:1.8.5",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.3.4",
+          "dynamic-text-copier@example.com:1.0",
+          "enhanced-add-on-8x946rbl@firefox.extension:1.0.7",
+          "enhanced-add-on-8x946rbl@firefox.extension:1.0.8",
+          "enhanced-add-on-8x946rbl@firefox.extension:1.0.9",
+          "awesome-history-viewer-s9c279wa@firefox.extension:1.1.4",
+          "awesome-history-viewer-s9c279wa@firefox.extension:1.1.5",
+          "awesome-history-viewer-s9c279wa@firefox.extension:1.1.6",
+          "awesome-history-viewer-s9c279wa@firefox.extension:1.1.7",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.3.6",
+          "steamgifts-region-helper@example.com:1.1",
+          "steamgifts-region-helper@example.com:1.2",
+          "steamgifts-region-helper@example.com:1.3",
+          "steamgifts-region-helper@example.com:1.4",
+          "steamgifts-region-helper@example.com:1.5",
+          "steamgifts-region-helper@example.com:1.6"
+        ]
+      },
+      "schema": 1769906196355,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769927707268,
+      "id": "6ba66930-dd03-4420-b0aa-18422fa94991",
+      "last_modified": 1769927793499
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "microslop-to-microslop@wxn0.xyz:1.0",
+          "auto-justify-text-v6@yourname.com:6.1",
+          "steamgifts-region-paster@example.com:1.0",
+          "{44df8213-a17e-4915-a006-187d6d34bd95}:1.1.0",
+          "{44df8213-a17e-4915-a006-187d6d34bd95}:1.2.0",
+          "amazon_such_filter@example.com:1.0",
+          "amazon-such-filter@example.com:1.0",
+          "image-downloader@ozler365:15.4",
+          "{55990d14-944c-4462-863c-595fbbf51dbc}:1.0",
+          "gemini-stats@ardaemrekececioglu.com.tr:1.0.0",
+          "gemini-stats@ardaemrekececioglu.com.tr:2.2.0",
+          "gruung-assistant@contrib.lustgoddess.com:0.7",
+          "gruung-assistant@contrib.lustgoddess.com:0.9",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.3.3",
+          "tfs-connector@indra.com:1.0.0"
+        ]
+      },
+      "schema": 1769884597838,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769906107107,
+      "id": "6cbfa66a-6581-4e53-aa91-2c200041763c",
+      "last_modified": 1769906196025
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "Movie.NoAds@vxh.io:1.0",
+          "Movie.NoAds@vxh.io:1.1",
+          "Movie.NoAds@vxh.io:1.2",
+          "Movie.NoAds@vxh.io:1.3",
+          "Movie.NoAds@vxh.io:1.4",
+          "Movie.NoAds@vxh.io:1.5",
+          "Movie.NoAds@vxh.io:1.6",
+          "VXH.NoAds@vxh.io:2.1",
+          "VXH.NoAds@vxh.io:2.2",
+          "VXH.NoAds@vxh.io:2.3",
+          "VXH.NoAds@vxh.io:2.4",
+          "VXH.NoAds@vxh.io:2.5",
+          "VXH.NoAds@vxh.io:2.6",
+          "VXH.NoAds@vxh.io:2.7",
+          "VXH.NoAds@vxh.io:2.8",
+          "VXH.NoAds@vxh.io:2.9",
+          "VXH.NoAds@vxh.io:2.10",
+          "VXH.NoAds@vxh.io:2.11",
+          "VXH.NoAds@vxh.io:2.12",
+          "VXH.NoAds@vxh.io:4.0",
+          "VXH.NoAds@vxh.io:4.1",
+          "VXH.NoAds@vxh.io:4.2",
+          "VXH.NoAds@vxh.io:4.3",
+          "VXH.NoAds@vxh.io:4.4",
+          "VXH.NoAds@vxh.io:4.5",
+          "VXH.NoAds@vxh.io:4.6",
+          "VXH.NoAds@vxh.io:4.7",
+          "VXH.NoAds@vxh.io:4.8",
+          "VXH.NoAds@vxh.io:4.9",
+          "VXH.NoAds@vxh.io:4.10",
+          "VXH.NoAds@vxh.io:4.11",
+          "VXH.NoAds@vxh.io:4.12",
+          "VXH.NoAds@vxh.io:4.13",
+          "VXH.NoAds@vxh.io:4.14",
+          "VXH.NoAds@vxh.io:4.15",
+          "jira-kanban-exporter@local:0.1.0",
+          "{46ac2b73-7f98-481d-bf46-d9ea9956665e}:2026.1.31.13310",
+          "hls@localhost:1.2",
+          "hls@localhost:1.1",
+          "{8e60c975-8458-461a-b2fe-86ce81dd71c4}:1.0",
+          "justifyarticles@technology:4.0",
+          "justifyarticles@technology:6.1",
+          "hls@localhost:1.0",
+          "hls@localhost:1.1.1",
+          "alon11559@gmail.com:2.5",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:4.4",
+          "{22dad1ca-b26d-4dde-afb5-e7494bba6831}:1.0",
+          "hls@localh:1.0",
+          "hls@localh:1.0.1",
+          "hls@localh:1.0.2",
+          "{3f7a0d32-bb7d-4f4b-99c9-bb58e1a9129a}:0.3",
+          "amazon-search-filter@mo-projects.de:3.1",
+          "mosa.albedre1@gmail.com:2.1",
+          "{7930e9e1-4a45-4ea1-875c-112453bcf1af}:1.0",
+          "{7930e9e1-4a45-4ea1-875c-112453bcf1af}:1.1",
+          "video-downloader-pro-7oj22vhx@firefox.extension:2.7.0",
+          "video-downloader-pro-7oj22vhx@firefox.extension:2.7.1",
+          "amazon-search-filter@example.com:3.2",
+          "{9f2b2c14-240a-4918-a37b-4bf90e31469b}:241029.1",
+          "n-a.addon@example.com:1.4",
+          "web-extension-history@firefox.extension:1.1.0",
+          "web-extension-history@firefox.extension:1.2.0",
+          "web-extension-history@firefox.extension:1.3.0",
+          "web-extension-history@firefox.extension:1.4.0"
+        ]
+      },
+      "schema": 1769862993166,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769884506957,
+      "id": "44931076-37f3-4fbc-b5ac-208396377aec",
+      "last_modified": 1769884597635
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "image-grabber@euan.dev:1.0.0",
+          "instadownloaderv1@euan-dev.local:1.0.2",
+          "instadownloaderv1@euan-dev.local:1.0.3",
+          "instadownloaderv1@euan-dev.local:1.0.5",
+          "deep-scroll@euan.dev:1.0.0",
+          "{9fb30f92-e12d-44f2-aeb7-2a905bd4ec09}:1.0",
+          "{9a0338d6-8002-4727-9422-6a22531e1bbf}:1.0",
+          "ticketnotifier@mustafashakir.dev:13.2.16",
+          "mc@209.128.213.133:3.0.2",
+          "ticketnotifier@mustafashakir.dev:1.0.2",
+          "ticketnotifier@mustafashakir.dev:10.0",
+          "ticketnotifier@mustafashakir.dev:12.0",
+          "ticketnotifier@mustafashakir.dev:13.0",
+          "ticketnotifier@mustafashakir.dev:13.1",
+          "ticketnotifier@mustafashakir.dev:13.2",
+          "ticketnotifier@mustafashakir.dev:13.2.13",
+          "ticketnotifier@mustafashakir.dev:13.2.14",
+          "ticketnotifier@mustafashakir.dev:17.0.0",
+          "ticketnotifier@mustafashakir.dev:17.1",
+          "ticketnotifier@mustafashakir.dev:17.2",
+          "onepassword4x@agilebits.com:4.7.5.90",
+          "onepassword4x@agilebits.com:4.7.5.91"
+        ]
+      },
+      "schema": 1769841392328,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769862907057,
+      "id": "d89b80a4-a1d1-404c-bcf6-435bdae87c3f",
+      "last_modified": 1769862992967
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "simple-snip-pinboard@example.com:5.2",
+          "{9a11ee2d-5441-425e-b358-ed9046ce0145}:1.0",
+          "simple-snip-pinboard@example.com:5.7",
+          "simple-snip-pinboard@example.com:5.6",
+          "simple-snip-pinboard@example.com:5.5",
+          "simple-snip-pinboard@example.com:5.3",
+          "simple-snip-pinboard@example.com:6.0",
+          "simple-snip-pinboard@example.com:4.7",
+          "simple-snip-pinboard@example.com:7.0",
+          "simple-snip-pinboard@example.com:6.5",
+          "simple-snip-pinboard@example.com:6.3",
+          "simple-snip-pinboard@example.com:6.1",
+          "youtube-mute-skip-kuromimi@github.io:1.0.0",
+          "simple-snip-pinboard@example.com:7.1",
+          "simple-snip-pinboard@example.com:6.4",
+          "lilin.shao@qq.com:3.0",
+          "reddit-removed-posts@extension.local:1.0.0",
+          "pinned-tabs-manager@yourname.com:1.0",
+          "pinned-tabs-manager@yourname.com:1.0.1",
+          "keyword-tab-cleaner@local:1.1"
+        ]
+      },
+      "schema": 1769819794834,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769841306347,
+      "id": "731d2337-1c62-4e8c-96f6-245da00c313c",
+      "last_modified": 1769841392102
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{48ea8e77-95af-4a41-8f4c-e451fc82116e}:1.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.1.3",
+          "test-au2tologin@luckyfurrex:1.0",
+          "{06d98d51-c130-4c86-9fb9-4eb8ac6f2761}:2.4.0",
+          "{06d98d51-c130-4c86-9fb9-4eb8ac6f2761}:2.4.1",
+          "{b1935acd-8857-485d-96ec-b593365bfa7b}:1.0",
+          "luna-adblock@sensortower.com:2.0.0",
+          "luna-adblock@sensortower.com:2.1.0",
+          "luna-adblock@sensortower.com:2.1.1",
+          "{6ab1a57b-2b1c-4c8f-a397-49ce2937d723}:4.64",
+          "TabActions@Window:1.0",
+          "TabActions@Window:1.1",
+          "TabActions@Window:1.2",
+          "ultra-utility-abnla0so@firefox.extension:2.4.3",
+          "ultra-utility-abnla0so@firefox.extension:2.4.4",
+          "ultra-utility-abnla0so@firefox.extension:2.4.5"
+        ]
+      },
+      "schema": 1769798196676,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769819707346,
+      "id": "84d79d63-c2d5-47d8-b961-8f1b0e82ece2",
+      "last_modified": 1769819794423
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{72956991-9a16-4b5d-b251-8970567cfc72}:3.53.2"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "futaba_log_viewer@my-local-extension:1.0.7",
+          "favory@sp4ce.pw:2.7.6",
+          "{6fcfbe86-e569-4247-be0a-2ad6cc70a59d}:11.6",
+          "{4a5782ca-23f4-47ee-a8a7-d34d9b1c5bba}:1.0",
+          "{4a5782ca-23f4-47ee-a8a7-d34d9b1c5bba}:2.0",
+          "news-republic-full-content@axeleroy.com:0.1.0",
+          "news-republic-full-content@axeleroy.com:0.1.1",
+          "news-republic-full-content@axeleroy.com:0.1.2",
+          "futaba_log_viewer@my-local-extension:1.0.6",
+          "futaba_log_viewer@my-local-extension:1.0.4",
+          "futaba_log_viewer@my-local-extension:1.0.3",
+          "futaba_log_viewer@my-local-extension:1.0.2",
+          "futaba_log_viewer@my-local-extension:1.0.1",
+          "futaba_log_viewer@my-local-extension:1.0.0",
+          "darkblank@yourname.local:2.0",
+          "pembina-menu@pembina.com:3.2.6",
+          "pembina-menu@pembina.com:2026.1.2",
+          "{0f605b76-4fc3-44ba-a7cb-543f561b972e}:1.0",
+          "futaba_log_viewer@my-local-extension:1.1.0",
+          "futaba_log_viewer@my-local-extension:1.0.9",
+          "{6255b202-0905-4a69-af48-491cf8f87f09}:1.0",
+          "cashbox@local:1.0.2",
+          "balbe@xoich:1.0",
+          "balbe@xoich:1.1",
+          "mrscrooge-local@example.com:1.0.0",
+          "rovalra@local:2.4.5.1"
+        ]
+      },
+      "schema": 1769776592327,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769798106275,
+      "id": "e0790068-70ee-4821-aeee-3222cfc5f249",
+      "last_modified": 1769798196545
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "youtube-prefetch-local@pc:1.3",
+          "youtube-prefetch-local@pc:1.3.1",
+          "{b06bd4b5-3c6b-42ca-b66f-b368d30857ce}:2.9.0",
+          "@hootly-ai:0.1.0",
+          "@hootly-ai:0.2.0",
+          "@hootly-ai:0.3.0",
+          "@hootly-ai:0.3.1",
+          "@hootly-ai:0.3.2",
+          "totp-generator-luca@example.com:1.0.2",
+          "nexus-marketing@at2.me:1.0.0",
+          "nexus-marketing@at2.me:1.1.0",
+          "nexus-marketing@at2.me:1.2.0",
+          "nexus-marketing@at2.me:1.11.2",
+          "nexus-marketing@at2.me:1.11.3",
+          "nexus-marketing@at2.me:1.11.1",
+          "nexus-marketing@at2.me:1.11.0",
+          "nexus-marketing@at2.me:1.10.0",
+          "nexus-marketing@at2.me:1.8.0",
+          "nexus-marketing@at2.me:1.7.0",
+          "nexus-marketing@at2.me:1.11.5",
+          "nexus-marketing@at2.me:1.6.1",
+          "nexus-marketing@at2.me:1.4.0"
+        ]
+      },
+      "schema": 1769754991626,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769776506349,
+      "id": "74f59786-b577-4755-94f8-ff5b80797dd6",
+      "last_modified": 1769776592189
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "futaba_log_refiner@my-local-extension:1.7.5",
+          "futaba_log_refiner@my-local-extension:1.7.6",
+          "futaba_log_refiner@my-local-extension:1.7.7",
+          "favory@sp4ce.pw:2.7.5",
+          "dutch-lens@yourname.com:3.0",
+          "{8b1c822a-085d-4db1-87e4-a067b42006a4}:1.2.5",
+          "{102357be-960d-477c-b84e-38715be2cbaa}:1.0",
+          "{a4037bdf-d553-4c38-9754-afc47b75588a}:1.6.1",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.1.2"
+        ]
+      },
+      "schema": 1769733391985,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769754906570,
+      "id": "5ae833b0-0af6-4b69-9d6a-d6fd9faacf0a",
+      "last_modified": 1769754991377
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{903f7f71-117b-4a69-aa2e-9f7350e535b7}:5.7.5",
+          "{903f7f71-117b-4a69-aa2e-9f7350e535b7}:5.7.6",
+          "futaba_log_refiner@my-local-extension:1.7.2",
+          "futaba_log_refiner@my-local-extension:1.7.1",
+          "futaba_log_refiner@my-local-extension:1.7.0",
+          "@aspire-scripts:0.42.0",
+          "custom-home@personal.extension:1.7.0",
+          "walfox@jade.local:1.3.1",
+          "{325a9de5-c38a-45ce-9b57-afe269690b09}:1.2",
+          "{325a9de5-c38a-45ce-9b57-afe269690b09}:1.1",
+          "{325a9de5-c38a-45ce-9b57-afe269690b09}:1.0",
+          "futaba_log_refiner@my-local-extension:1.7.3"
+        ]
+      },
+      "schema": 1769711792578,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769733306499,
+      "id": "57c4a9d3-36f4-4553-8a72-1f8bfaca89fc",
+      "last_modified": 1769733391843
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "container-opener@gemini.local:3.0.0",
+          "container-opener@gemini.local:1.0.0",
+          "container-opener@gemini.local:1.2.0",
+          "container-opener@gemini.local:1.3.0",
+          "container-opener@gemini.local:1.4.0",
+          "container-opener@gemini.local:1.5.0",
+          "futaba_log_refiner@my-local-extension:1.6.9",
+          "futaba_log_refiner@my-local-extension:1.6.8",
+          "futaba_log_refiner@my-local-extension:1.6.6",
+          "futaba_log_refiner@my-local-extension:1.6.5",
+          "rovalra@local:2.4.4.1",
+          "google-translate@nguyen-thai-nguyen:2.0.16",
+          "stream-check@panda-bro-use:1.2.2",
+          "jcpqdsad1AfrofavorityStripds@dsoteer.com:1.10",
+          "jcpqdsad1AfrofavorityStripds@dsoteer.com:1.8",
+          "{06f5465b-6db8-4a37-9c05-ed70dc04f0a4}:2.0",
+          "favory@sp4ce.pw:2.7.4",
+          "dmm-doujin-enhancer@example.com:1.4.3",
+          "dmm-doujin-enhancer@example.com:1.4.2",
+          "dmm-doujin-enhancer@example.com:1.4.1",
+          "{06f5465b-6db8-4a37-9c05-ed70dc04f0a4}:3.0",
+          "{06f5465b-6db8-4a37-9c05-ed70dc04f0a4}:1.0",
+          "rwhn.pvt@gmail.com:1.0",
+          "line@myself.com:1.0",
+          "{b4a5c6d7-e8f9-4a0b-1c2d-3e4f5a6b7c8d}:1.0",
+          "{47d74cbe-f177-43fa-b728-123c9f4a6b71}:2.8.6",
+          "{47d74cbe-f177-43fa-b728-123c9f4a6b71}:2.8.7",
+          "{5c2274dc-28f5-49f8-ad14-20230331bdfd}:1.8.6",
+          "{5c2274dc-28f5-49f8-ad14-20230331bdfd}:1.8.7",
+          "{0165b03b-e0a6-4be3-9898-e14e4937c4dc}:5.6.4"
+        ]
+      },
+      "schema": 1769690195284,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769711706546,
+      "id": "45d01bb8-6335-4f5a-b854-281db320a856",
+      "last_modified": 1769711792359
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{08a9b4e3-2128-47aa-852f-a473b9aaf914}:1.7.6",
+          "{08a9b4e3-2128-47aa-852f-a473b9aaf914}:1.7.7",
+          "{08a9b4e3-2128-47aa-852f-a473b9aaf914}:1.7.8",
+          "{03ac4746-b69a-485d-bd67-de1cd06c564c}:1.1.0",
+          "{ada077d6-d256-4536-9075-d7e014a2bb7c}:1.1.0"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "{bf1cf5c9-4773-4423-92c9-10ac63295e57}:1.0",
+          "Bazaar@nchoremiot.com:3.0.1",
+          "futaba_log_refiner@my-local-extension:1.6.0",
+          "futaba_log_refiner@my-local-extension:1.5.9",
+          "futaba_log_refiner@my-local-extension:1.5.8",
+          "futaba_log_refiner@my-local-extension:1.6.2",
+          "futaba_log_refiner@my-local-extension:1.6.3",
+          "IPFire_LegendFilter@example.com:0.0.16",
+          "fleyetrap@inimation.com:1.0",
+          "fleyetrap@inimation.com:1.1",
+          "futaba_log_refiner@my-local-extension:1.6.4",
+          "jira_auto@nfz-lublin.pl:0.0.2",
+          "tablefilters@example.com:1.2.4",
+          "aidenix-context-search@example.com:1.0",
+          "aidenix-context-search@example.com:2.0",
+          "dissatisfied@pronsh.dev:0.3.2",
+          "dissatisfied@pronsh.dev:0.3.1",
+          "dissatisfied@pronsh.dev:0.31",
+          "{269539ab-07f3-4964-ae47-7d4deb557320}:1.60",
+          "{269539ab-07f3-4964-ae47-7d4deb557320}:1.61"
+        ]
+      },
+      "schema": 1769668579022,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769690106952,
+      "id": "ab34abcb-a448-4405-a442-9153c1faa8b4",
+      "last_modified": 1769690195153
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:5.1",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:5.0",
+          "nuhuh-blocker@example.com:1.0",
+          "study-timerTEST2@local:1.0.0",
+          "study-timer@local:1.0.0",
+          "study-timer@local:1.1.0",
+          "study-timer@local:1.3.0",
+          "study-timer@local:1.5.0",
+          "study-timer@local:2.0.0",
+          "study-timer@local:2.1.0",
+          "study-timer@local:2.6.0",
+          "study-timer@local:3.0.0",
+          "study-timer@local:5.0.0",
+          "study-timerTEST@local:1.0.0",
+          "{314d4f37-f4e3-4ab5-92f2-995d9ea435cc}:3.0.11",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:5.3",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:5.2",
+          "futaba_log_refiner@my-local-extension:1.5.3",
+          "{5384b886-08a8-11f0-9f4f-af7f4c6512f7}:1.1.29",
+          "{5384b886-08a8-11f0-9f4f-af7f4c6512f7}:1.1.292",
+          "futaba_log_refiner@my-local-extension:1.5.5",
+          "futaba_log_refiner@my-local-extension:1.5.4",
+          "futaba_log_refiner@my-local-extension:1.5.7",
+          "{a030c6b5-b7e8-48e8-bfc9-88fa34d2fb82}:0.0.1",
+          "{9c0dbafb-e204-4223-9dec-f657b857f596}:0.0.1",
+          "{ae23403d-1852-4ae1-be1c-a8ffb12a76d8}:1.0",
+          "{52a3f112-8c8d-4515-b4c7-8a489da39240}:1.0",
+          "{5384b886-08a8-11f0-9f4f-af7f4c6512f7}:1.1.30"
+        ]
+      },
+      "schema": 1769646991834,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769668505190,
+      "id": "68ea8d35-95d9-4ca0-b950-bb567ebf1b0f",
+      "last_modified": 1769668578822
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{33aa6550-5171-482c-bb8d-676300689fad}:1.0",
+          "{8a2ab1ee-78de-4383-b616-4941eadbe791}:1.0",
+          "contact@bullshit-meter.xyz:1.0.2",
+          "contact@bullshit-meter.xyz:1.0.3",
+          "automation_toolkit@firefox:1.0.0",
+          "RemoveInitialTabFirstTab@Window:1.0",
+          "RemoveInitialTabFirstTab@Window:1.1",
+          "RemoveInitialTabFirstTab@Window:1.2",
+          "RemoveInitialTabFirstTab@Window:1.3",
+          "RemoveInitialTabFirstTab@Window:1.4",
+          "RemoveInitialTabFirstTab@Window:1.5",
+          "RemoveInitialTabFirstTab@Window:1.6",
+          "RemoveInitialTabFirstTab@Window:1.7",
+          "RemoveInitialTabFirstTab@Window:1.8",
+          "RemoveInitialTabFirstTab@Window:1.9",
+          "RemoveInitialTabFirstTab@Window:1.10",
+          "RemoveInitialTabFirstTab@Window:1.11",
+          "RemoveInitialTabFirstTab@Window:2.0",
+          "RemoveInitialTabFirstTab@Window:2.1",
+          "RemoveInitialTabFirstTab@Window:2.2",
+          "RemoveInitialTabFirstTab@Window:2.3",
+          "p0gy27dmo@mozmail.com:1.0.0",
+          "offlinenotes@philiplabs:1.1",
+          "offlinenotes@philiplabs:1.2",
+          "offlinenotes@philiplabs:1.3",
+          "gameurdev@gmail.com:1.0",
+          "favory@sp4ce.pw:2.7.3",
+          "fse-hours@aerofinancialfse.com:1.0",
+          "{c9be124c-ab87-4023-b56e-aabc041e52aa}:1.0"
+        ]
+      },
+      "schema": 1769625381856,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769646906785,
+      "id": "bd98d496-7f31-4213-8bfd-9a9956c40184",
+      "last_modified": 1769646991418
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{75bfc869-8d59-4540-8056-cb29dd196987}:1.0",
+          "{75bfc869-8d59-4540-8056-cb29dd196987}:2.0.16",
+          "{cb832a40-3ea6-4fe9-8b04-79cf1b84de2b}:1.0",
+          "{cb832a40-3ea6-4fe9-8b04-79cf1b84de2b}:21.0.15",
+          "{df2a20b6-9000-4260-bd8c-de886bb90c5d}:1.0",
+          "{df2a20b6-9000-4260-bd8c-de886bb90c5d}:2.0.19",
+          "{fb4a419f-9990-4c9c-81cb-3bc33f927e40}:1.0",
+          "{fb4a419f-9990-4c9c-81cb-3bc33f927e40}:2.0.16",
+          "{9b38720e-2f3f-4436-b259-11a19506e8dc}:1.0",
+          "{9b38720e-2f3f-4436-b259-11a19506e8dc}:1.2.3",
+          "{9b38720e-2f3f-4436-b259-11a19506e8dc}:1.2.4",
+          "AscaleIppin8829@outlook.com:1.0.2",
+          "{62bc4016-fc31-442f-9057-ce514ac92bae}:3.0.9",
+          "{62bc4016-fc31-442f-9057-ce514ac92bae}:3.1.1",
+          "{62bc4016-fc31-442f-9057-ce514ac92bae}:3.1.2",
+          "{62bc4016-fc31-442f-9057-ce514ac92bae}:3.1.3",
+          "{62bc4016-fc31-442f-9057-ce514ac92bae}:3.1.4"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "yahoo-realtime-filter@example.com:2.4.1",
+          "dom-diff-inspector@yourdomain.local:3.0.0",
+          "clipforge@paku.local:1.0.0",
+          "clipforge@paku.local:1.0.1",
+          "down-imgs@arket:1.0.5",
+          "down-imgs@arket:1.0.6",
+          "down-imgs@arket:1.0.7",
+          "a.roth@c10.de:1.0.6",
+          "favory@sp4ce.pw:2.7.2",
+          "favory@sp4ce.pw:2.7.1",
+          "mini-memo-base@example.com:0.0.0.1",
+          "{858d39b9-bbab-42fc-9e94-d96926989e41}:2.0.0.2",
+          "{858d39b9-bbab-42fc-9e94-d96926989e41}:2.0.4.0",
+          "rovalra@local:2.4.2",
+          "rovalra@local:2.4.2.4",
+          "rovalra@local:2.4.3.1"
+        ]
+      },
+      "schema": 1769603802914,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769625305205,
+      "id": "92510eba-4bb3-49eb-97d3-1f62c510325e",
+      "last_modified": 1769625381724
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{c98ffd67-a6fc-40fd-a851-97c2a35cc3a0}:1.0",
+          "healthorbit-ai@healthorbit.ai:1.0.0",
+          "lilin.shao@qq.com:1.0",
+          "{c3230521-365e-4340-9831-5079493630f9}:1.8.1.1",
+          "agregllm@fredb34670:1.1.4",
+          "jira_auto@nfz-lublin.pl:0.0.1",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.23.1",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.23.2",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.3",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.4",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.7",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.10",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.11",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.12",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.16",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.26.17",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.2",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.3",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.5",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.8",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.10",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.11",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.12",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.13",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.15",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.16",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:1.31.17",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.0",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.1",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.2",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.3",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.4",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.5",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.6",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.7",
+          "{ab3fd504-7947-4c15-a7cf-10181cc021ef}:2.0.8",
+          "CodeHSDelte@hacker-school.de:0.1.4"
+        ]
+      },
+      "schema": 1769582190676,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769603707055,
+      "id": "cdd92282-9db2-4204-a4d9-02a4f3e2f891",
+      "last_modified": 1769603802790
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "retail-sync@monarch.com:1.0.21",
+          "video-sharpener@harze2k.dev:1.2.6",
+          "video-sharpener@harze2k.dev:1.2.7",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:4.5",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:4.0",
+          "civitai-forge-connector@example.com:1.0.0",
+          "elevenlabs-worker-v3-simple@local:3.0.5",
+          "elevenlabs-worker-v3-simple@local:3.0.6",
+          "video-sharpener@harze2k.dev:1.2.8.2",
+          "video-sharpener@harze2k.dev:1.2.8.1"
+        ]
+      },
+      "schema": 1769560592238,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769582106629,
+      "id": "1c39327c-01b7-4379-b4da-e3f82789d67f",
+      "last_modified": 1769582190364
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "valra@media.recorder:1.0.10",
+          "valra@media.recorder:1.0.9",
+          "{ff5a5f54-4019-4be6-a1e4-60a9b6741da6}:1.0",
+          "multi-scrape@example.local:1.22",
+          "{7f2dc14a-2571-4296-a5aa-2fccc2aff852}:1.1",
+          "cotoit-suite@extension.local:1.2.0",
+          "flaggy@jnylen.nu:1.0",
+          "{a155b033-ec33-40d1-a9e1-3474b2f77f79}:1.0",
+          "video-sharpener@harze2k.dev:1.1.1",
+          "video-sharpener@harze2k.dev:1.0.6",
+          "rmftime-autofill@example.com:1.0.0",
+          "video-sharpener@harze2k.dev:1.2.1",
+          "video-sharpener@harze2k.dev:1.2.2",
+          "video-sharpener@harze2k.dev:1.2.5",
+          "video-sharpener@harze2k.dev:1.2.4",
+          "video-sharpener@harze2k.dev:1.2.3",
+          "{3ae78990-6037-4e52-b4f2-cb99ff072049}:1.0"
+        ]
+      },
+      "schema": 1769538981350,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769560506555,
+      "id": "31c535ee-7c18-45a6-ac7b-67d12e6dfaf3",
+      "last_modified": 1769560592034
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "@office365relogin:1.0.0",
+          "@office365relogin:1.1.0",
+          "{f3d1050f-a694-4ae2-bb17-6bf89c90afb9}:1.0",
+          "bga-gpor@netpigs.net:1.0",
+          "favory@sp4ce.pw:2.6.8",
+          "{bf656f3a-345b-42d7-be1d-1c1bb7947f4f}:1.0",
+          "{f61861e5-c5b0-46f9-bfea-0f5933fc3af8}:1.0",
+          "{3b14377a-198f-424b-9e54-d2653e8e4fb6}:1.0",
+          "eclipse-tab@encre.com:1.0.0",
+          "eclipse-tab@encre.com:1.0.1",
+          "eclipse-tab@encre.com:1.0.2",
+          "eclipse-tab@encre.com:1.0.3",
+          "eclipse-tab@encre.com:1.0.4",
+          "eclipse-tab@encre.com:1.0.5",
+          "info@medgyd.lt:1.0",
+          "info@medgyd.lt:1.1",
+          "info@medgyd.lt:1.2",
+          "{08c01a08-9619-44f8-8606-1080e9f521f2}:1.0",
+          "{08c01a08-9619-44f8-8606-1080e9f521f2}:1.1",
+          "{08c01a08-9619-44f8-8606-1080e9f521f2}:1.2",
+          "tarkov-map-arrow@my-custom-extension:1.9",
+          "pricegrabber@euzentra.com:1.0.4",
+          "proxy-by-sites@example.com:1.8",
+          "proxy-by-sites@example.com:1.7",
+          "copy-tab-urls@example.com:1.0",
+          "copy-tab-urls@example.com:1.1",
+          "copy-tab-urls@example.com:1.2",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:1.9",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:2.2",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:3.0.0",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:3.0.1",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:3.0.2",
+          "{d5aefdfe-c9be-41ca-a3ef-5a760871b5c3}:3.0.3"
+        ]
+      },
+      "schema": 1769517390477,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769538905446,
+      "id": "ec54b8a4-17bb-4815-90b8-6a14421e0036",
+      "last_modified": 1769538981110
+    },
+    {
+      "stash": {
+        "blocked": [
+          "sazalbep.a.ri.5.4.54@gmail.com:2.0",
+          "{a92b9d7e-5729-4a56-a48d-183fd6e8b950}:1.3",
+          "mdshamim.m.ia.j.o.b8@gmail.com:1.0.0",
+          "Palitra215@Palitra215.dev:0.1.1",
+          "Palitra214@Palitra214.dev:0.1.1",
+          "Palitra213@Palitra213.dev:0.1.1",
+          "Palitra212@Palitra212.dev:0.1.1",
+          "Palitra21@Palitra21.dev:0.1.1",
+          "Palitra21@Palitra21.dev:0.2.1",
+          "hashpac2k@hashpack2.dev:0.1.1"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "yet_another_speed_dial_rebuild@dudw:3.11.4",
+          "{525e49c2-aacd-4e6f-a1bf-c0ba2b283a60}:1.0",
+          "meediateek-allalaadija@example.com:1.1",
+          "{059ec54f-bd0d-4160-8215-a18e90d969b7}:1.0",
+          "{9fe3e3a9-ca0d-4c2f-ac16-1776f13ceb50}:1.0",
+          "{4bf6b62c-e62d-4f8e-aa42-e6e355137ee1}:1.0",
+          "{d402fb4e-06c6-44a2-8193-5fcd8b5807c1}:1.0",
+          "{e6935f70-4183-4fbb-9bb4-4c445c066b5b}:1.0",
+          "{ac2bdd16-8fc4-4a05-bfbc-075aefc9fd22}:1.0",
+          "quotr@eas-intl.com:1.1.7",
+          "{81c4a327-4188-45f7-8a4a-f1790a92d3b1}:2.1",
+          "{81c4a327-4188-45f7-8a4a-f1790a92d3b1}:2.2",
+          "address-autofiller@softwebtuts.com:0.0.9",
+          "address-autofiller@softwebtuts.com:0.1.4",
+          "address-autofiller@softwebtuts.com:0.1.5",
+          "address-autofiller@softwebtuts.com:0.1.7"
+        ]
+      },
+      "schema": 1769495790646,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769517306568,
+      "id": "0a51da97-4d3d-47e8-ad6f-ce7742b87aab",
+      "last_modified": 1769517390268
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "Eleg-Discipline@sganti.com:1.0",
+          "Eleg-Discipline@sganti.com:2.0",
+          "{3bc7cf23-ea16-4023-aae8-09ad45323285}:1.0",
+          "{f7e2cea3-5356-4a8f-bb91-ca372dc07b1d}:1.2",
+          "{f7e2cea3-5356-4a8f-bb91-ca372dc07b1d}:1.3",
+          "threadjumper@Luminaera.tech:1.82",
+          "{a5d26837-faf7-11f0-8792-98fa9b1e9040}:0.1.1"
+        ]
+      },
+      "schema": 1769474190691,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769495706324,
+      "id": "22f3a62c-1c15-4eb7-a79e-6a101b9f072f",
+      "last_modified": 1769495790445
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{95f1e97f-f924-4205-8ebf-a4e1a7a04daf}:1.0.2",
+          "twitch-adblock-remover@example.com:1.0",
+          "x-disable-recommend@example.com:1.0.0",
+          "x-disable-recommend-tab@example.com:1.0.1",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.5.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.6.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.7.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.7.1",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.7.2",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.8.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.9.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.10.0",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.10.1",
+          "{febb3170-32bb-4601-a3bf-92733e29fa4f}:0.10.2",
+          "{2f7e526d-acb5-4a91-b074-a6c41dad43c9}:0.10.0",
+          "{2f7e526d-acb5-4a91-b074-a6c41dad43c9}:0.10.1",
+          "{2f7e526d-acb5-4a91-b074-a6c41dad43c9}:0.11.0",
+          "{2f7e526d-acb5-4a91-b074-a6c41dad43c9}:0.11.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.5.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.6.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.6.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.6.2",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.7.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.7.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.7.2",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.8.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.8.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.8.2",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.9.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.9.2",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.9.3",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.9.4",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.12.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.13.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.14.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.15.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.16.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.16.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.17.0",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.17.1",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.17.2",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.17.3",
+          "{1a08c7c2-4277-4f54-83e6-cc89cc796d7b}:0.17.4"
+        ]
+      },
+      "schema": 1769452594932,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769474106452,
+      "id": "452f8f13-3533-47a9-b7c2-910ebc50f2d2",
+      "last_modified": 1769474190488
+    },
+    {
+      "stash": {
+        "blocked": [
+          "@750cc9e4-526e-4a0a-a943-f91f3baff918:1.7.5",
+          "@750cc9e4-526e-4a0a-a943-f91f3baff918:1.7.6",
+          "@aa339a7c-c7e0-4a05-b3ae-7c5b6bd3726d:2.8.7",
+          "@06363f8a-1b28-4aa1-a22e-4f3722ca2d99:5.3.0",
+          "@718418f6-2fbb-448a-b22e-3c6f01af5e96:3.0.0"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "messenger-privacy@example.com:1.0.1",
+          "kontenmanager@gmx.de:2025.1.2.6",
+          "fast-replies@mullvad.local:1.0.0",
+          "mosa.albedre1@gmail.com:2.0",
+          "mosa.allbedre0@gmail.com:1.2",
+          "mosa.allbedre0@gmail.com:1.3",
+          "mosa.allbedre0@gmail.com:1.9",
+          "mosa.allbedre0@gmail.com:1.8",
+          "mosa.allbedre0@gmail.com:1.7",
+          "mosa.allbedre0@gmail.com:1.5",
+          "mosa.allbedre0@gmail.com:2.0",
+          "watani-autofill@tabadul:1.2",
+          "watani-autofill@tabadul:1.1",
+          "ticket-helper@mosa.local:1.0",
+          "ticket-helper@mosa.local:1.1",
+          "ticket-helper@mosa.local:1.2",
+          "mosa.albedre9@gmail.com:2.3",
+          "tsundoku@local:0.1.0",
+          "tsundoku@local:0.1.1",
+          "tsundoku@local:0.1.2",
+          "tsundoku@local:0.1.3",
+          "tsundoku@local:0.1.4",
+          "tsundoku@local:0.1.5",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.1.1",
+          "cors-bypass-addon@nomail.com:1.0",
+          "cashbox@local:1.0.1",
+          "cashbox@local:1.0",
+          "cors-bypass-addon@nomail.com:1.2",
+          "gmail-priority-focus@steven.local:1.0.1"
+        ]
+      },
+      "schema": 1769430990205,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769452506231,
+      "id": "42a2494e-de80-4469-b6d4-c9824e72d23c",
+      "last_modified": 1769452594627
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{bb27358c-66c2-436f-ad90-edf5eaea1cef}:1.0",
+          "{bb27358c-66c2-436f-ad90-edf5eaea1cef}:372.6",
+          "{3fcb96bb-b010-4bcc-95a1-a99c92ad1a99}:1.0",
+          "{f857e801-4271-4bc0-a75e-749551f78cfc}:1.0",
+          "{cd4a0b36-1340-44a1-b52d-c80dcf29644b}:1.0",
+          "{f129a09e-50c2-4e0e-8ef9-c57729754eec}:1.0",
+          "{f129a09e-50c2-4e0e-8ef9-c57729754eec}:10921.4",
+          "{0ec8a631-2a6f-4b7f-9a04-d4a67b557359}:1.4.0",
+          "{0ec8a631-2a6f-4b7f-9a04-d4a67b557359}:1.4.1",
+          "{0ec8a631-2a6f-4b7f-9a04-d4a67b557359}:1.4.2",
+          "{88424a90-ce33-4d6d-a0f9-564de03d69d0}:1.0",
+          "{88424a90-ce33-4d6d-a0f9-564de03d69d0}:209.4",
+          "{088821a7-5835-4caa-8e65-4a8ac3f526c2}:1.0",
+          "{088821a7-5835-4caa-8e65-4a8ac3f526c2}:1.4",
+          "{bdd99b28-cec9-4835-b1f6-7f257841b2ac}:1.0",
+          "{bdd99b28-cec9-4835-b1f6-7f257841b2ac}:114.4",
+          "{e375b894-17f2-46d5-bae5-96fcfe1ac956}:1.0",
+          "{e375b894-17f2-46d5-bae5-96fcfe1ac956}:1.1.2",
+          "{1627bc55-6107-4da7-b621-8a2927585a9d}:1.0",
+          "{1627bc55-6107-4da7-b621-8a2927585a9d}:300929.15.2"
+        ],
+        "unblocked": [
+          "{46cc18f3-9054-4edd-9441-102a1021b5d0}:1.0.5"
+        ],
+        "softblocked": [
+          "{5dd08328-6a7a-4be4-82df-4b470c5d5314}:2.8.2",
+          "{5dd08328-6a7a-4be4-82df-4b470c5d5314}:2.8.3",
+          "{40420f6a-3aa4-4a54-8c97-41e46158a71e}:0.1.0",
+          "iam-cookies@education.lu:1.0",
+          "janssen-tarp@jans.io:1.16.0",
+          "{418c0307-f6d3-448d-8c2c-51a56e8d608d}:1.0",
+          "@4_in_1:1.0.0.0",
+          "{4e610dd0-f7d5-49fb-8e0c-ac254a263d03}:1.0",
+          "{4e610dd0-f7d5-49fb-8e0c-ac254a263d03}:2.0",
+          "mystartpage@local.dev:2.3",
+          "mystartpage@local.dev:2.4"
+        ]
+      },
+      "schema": 1769409388122,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769430906599,
+      "id": "cdc3a97b-d7a2-41a4-8449-f1545186e90e",
+      "last_modified": 1769430990006
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "wewe3r63@gmail.com:1.0.1",
+          "futaba_log_refiner@my-local-extension:1.2.1",
+          "futaba_log_refiner@my-local-extension:1.2.3",
+          "futaba_log_refiner@my-local-extension:1.2.4",
+          "web-memo@example.com:2.5",
+          "web-memo@example.com:2.5.1",
+          "{f5e07a44-b0c0-42df-8c6a-550cb17b37ad}:2.0",
+          "{f5e07a44-b0c0-42df-8c6a-550cb17b37ad}:2020.3.19b",
+          "{f5e07a44-b0c0-42df-8c6a-550cb17b37ad}:2020.3.23",
+          "web-memo@example.com:2.5.2",
+          "{ee522a47-95a1-4534-88e4-8783f692d835}:1.4",
+          "{27678f20-0d24-48fc-b0d0-161e0c116be7}:3.2",
+          "{27678f20-0d24-48fc-b0d0-161e0c116be7}:3.3",
+          "web-memo@example.com:2.5.3",
+          "next-of-end@local:1.0",
+          "next-of-end@local:1.1",
+          "futaba_log_refiner@my-local-extension:1.4.0",
+          "futaba_log_refiner@my-local-extension:1.2.2",
+          "futaba_log_refiner@my-local-extension:1.3.0",
+          "futaba_log_refiner@my-local-extension:1.5.0",
+          "futaba_log_refiner@my-local-extension:1.4.1",
+          "custom-field-tool@example.com:1.1",
+          "xdr-nonews-block@titansofindustry.com:1.0.1"
+        ]
+      },
+      "schema": 1769387783143,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769409306079,
+      "id": "16c90a2c-132c-4627-a967-d58c71cbec9b",
+      "last_modified": 1769409387892
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{0b48acff-5b83-4119-85ad-2304bb821843}:1.0",
+          "{0b48acff-5b83-4119-85ad-2304bb821843}:3.7.1",
+          "{c754bba5-6224-46b9-a79b-14880b79a1b7}:1.0",
+          "{c754bba5-6224-46b9-a79b-14880b79a1b7}:3.7.1",
+          "{96e6bdb0-ce8a-45b2-9899-a4ae2d33ec8a}:1.0",
+          "{96e6bdb0-ce8a-45b2-9899-a4ae2d33ec8a}:3.7.1"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "chim-chat@extension:2.18",
+          "chim-chat@extension:2.17",
+          "{ee522a47-95a1-4534-88e4-8783f692d835}:1.3",
+          "{9221c5ed-7a88-4cae-995e-725d98b32872}:1.3",
+          "{9221c5ed-7a88-4cae-995e-725d98b32872}:1.4",
+          "ytm-noslop@zopi.eu:1.4.0",
+          "{0962e2c5-da83-4b6a-9851-a3e020f3bb97}:1.7.1",
+          "{0962e2c5-da83-4b6a-9851-a3e020f3bb97}:1.7.2",
+          "{0962e2c5-da83-4b6a-9851-a3e020f3bb97}:1.7.3",
+          "{4314d6c1-3332-4bed-a82a-ab46f8cb4cfe}:1.0",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:3.4",
+          "{648bdc74-94c6-4196-8789-d5947268867c}:3.3",
+          "{6eba4401-a168-44ca-a734-8a501b357822}:1.0",
+          "textsbert@textsbert.com:0.1.34.3",
+          "favory@sp4ce.pw:2.6.7"
+        ]
+      },
+      "schema": 1769366189669,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769387705690,
+      "id": "911c4349-9a11-4f79-bc61-e5d80fa31134",
+      "last_modified": 1769387782930
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "{5194A9E5-5EC0-410E-BA4F-62A13EDBA7CD}:1.0.1",
+          "{4b16f5ce-c487-4994-96db-74c05f75674c}:1.0.0",
+          "{13e8a587-64b3-48b6-9864-87ef688c9e51}:1.0.1",
+          "RemoveInitialTab@FirstTab:1.0",
+          "{13e8a587-64b3-48b6-9864-87ef688c9e51}:1.0.0",
+          "{13e8a587-64b3-48b6-9864-87ef688c9e51}:1.0.2",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.1.0",
+          "concealbrowse@conceal.io:1.1.0.0",
+          "concealbrowse@conceal.io:1.1.1.0",
+          "concealbrowse@conceal.io:1.1.3.0",
+          "concealbrowse@conceal.io:1.1.4.0",
+          "concealbrowse@conceal.io:1.2.0.0",
+          "concealbrowse@conceal.io:1.2.1.0",
+          "concealbrowse@conceal.io:1.2.2.0",
+          "reset-psw@comune.sanvincenzo.li.it:1.0",
+          "reset-psw@comune.sanvincenzo.li.it:1.0.1",
+          "reset-psw@comune.sanvincenzo.li.it:1.1.0",
+          "reset-psw@comune.sanvincenzo.li.it:1.1.1"
+        ]
+      },
+      "schema": 1769344589568,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769366106098,
+      "id": "f961fda1-9949-42e7-a2d2-c912e95f837f",
+      "last_modified": 1769366189472
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "@jules-code-scraper:1.5.0",
+          "{aff461a6-bfb9-41d3-b7dd-5851530717dc}:0.1",
+          "futaba_log_refiner@my-local-extension:1.1.9",
+          "futaba_log_refiner@my-local-extension:1.2.0"
+        ]
+      },
+      "schema": 1769322981415,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769344506344,
+      "id": "84c91561-7007-4a13-be5b-54f0bd9193ce",
+      "last_modified": 1769344589363
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "yt-exact-age@example.com:1.0",
+          "yt-exact-age@example.com:1.1",
+          "yt-exact-age@example.com:1.2",
+          "mozeidon-dev@ac.local:3.1",
+          "mozeidon-dev@ac.local:3.2",
+          "{a98b7c6d-5e4f-3a2b-1c0d-9e8f7a6b5c4d}:2.3",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.8",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.9",
+          "{a0b96cb6-2142-4aec-987c-0f3888805fdc}:1.0",
+          "{a0b96cb6-2142-4aec-987c-0f3888805fdc}:1.1",
+          "battles-replay@teambattles.gg:1.9.5",
+          "battles-replay@teambattles.gg:1.9.4",
+          "battles-replay@teambattles.gg:1.9.3",
+          "battles-replay@teambattles.gg:1.9.2",
+          "battles-replay@teambattles.gg:1.9.1",
+          "battles-replay@teambattles.gg:1.9.0",
+          "battles-replay@teambattles.gg:2.0.0"
+        ]
+      },
+      "schema": 1769301390582,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769322905835,
+      "id": "526ad46f-9eca-45a9-8631-80d136bbd6ef",
+      "last_modified": 1769322981211
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "Foxden@VisorCraft:1.0.4",
+          "Foxden@VisorCraft:1.0.5",
+          "youtube-min-duration-filter@example.local:1.0.0",
+          "Foxden@VisorCraft:1.0.7",
+          "{6fcfbe86-e569-4247-be0a-2ad6cc70a59d}:11.4",
+          "opl@onlinepicketline.org:2.0.0",
+          "Foxden@VisorCraft:1.0.8",
+          "{563e011a-2c77-4676-a390-b4fac0ce8e62}:1.5",
+          "Foxden@VisorCraft:1.0.9",
+          "volumen@mi.propio.id:2.0.9",
+          "@tomo-helper:1.0",
+          "subtitles-downloader@subtiltee.com:1.0.0",
+          "subtitles-downloader@subtiltee.com:1.0.1",
+          "subtitles-downloader@subtiltee.com:1.1.0",
+          "subtitles-downloader@subtiltee.com:1.2.0",
+          "subtitles-downloader@subtiltee.com:1.4.0",
+          "subtitles-downloader@subtiltee.com:1.4.1",
+          "puresnorlax@gmail.com:1.0.0",
+          "puresnorlax@gmail.com:1.0.1",
+          "Foxden@VisorCraft:1.0.10",
+          "send-to-x4@xatpy.dev:1.0.0",
+          "Foxden@VisorCraft:1.0.11",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.7",
+          "Foxden@VisorCraft:1.0.12",
+          "{b201f767-e14a-4219-9c43-3423f66d81a5}:1.0"
+        ]
+      },
+      "schema": 1769279778864,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769301306581,
+      "id": "2ead4b39-9723-41bb-9451-974d05217e5a",
+      "last_modified": 1769301390155
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "futaba_log_refiner@my-local-extension:1.1.3",
+          "{42e7f701-cedb-44c4-8740-fdfff2b821e0}:3.0.6",
+          "{42e7f701-cedb-44c4-8740-fdfff2b821e0}:3.0.5",
+          "{d958574a-dafd-401b-830d-057683c50354}:1.0.0",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.0",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.1.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.1.2",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.1.3",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.2",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.2.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.2.2",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.2.3",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.2",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.3",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.4",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.5",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.3.6",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.4.0",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.4.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.5.1",
+          "{97e2ed84-dc3b-462a-b292-a14fe59ffeef}:1.5.2",
+          "{7c1dc351-6f6b-4cbc-bbfe-a8a2b7c3cc0d}:1.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.1",
+          "{4356487b-75be-46bd-b8f6-44c7fae168c0}:1.0",
+          "futaba_log_refiner@my-local-extension:1.1.0",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.2",
+          "futaba_log_refiner@my-local-extension:1.1.4",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.3",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.4",
+          "futaba_log_refiner@my-local-extension:1.1.5",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.5",
+          "futaba_log_refiner@my-local-extension:1.1.6",
+          "{8b1c822a-085d-4db1-87e4-a067b42006a4}:1.2.2",
+          "{8b1c822a-085d-4db1-87e4-a067b42006a4}:1.0",
+          "{8b1c822a-085d-4db1-87e4-a067b42006a4}:1.2",
+          "{8b1c822a-085d-4db1-87e4-a067b42006a4}:1.2.1",
+          "futaba_log_refiner@my-local-extension:1.1.7",
+          "{e4760449-4d85-4039-9f97-1d67905c436e}:1.1.2",
+          "@tabcollectorfirefoxextension:1.1.1",
+          "futaba_log_refiner@my-local-extension:1.1.8",
+          "{3244c550-6d4b-44d1-9287-1fd5166b2f9c}:1.0.6",
+          "gscoke@gmail.com:3.3.1",
+          "wallyxtyyensyion@ele.com:1",
+          "wallyxtyensyion@ele.com:1",
+          "michikora@agsystem.org:3.3.2",
+          "michikora@agsystem.org:3.3.1",
+          "michikora@agsystem.org:3.3.3",
+          "Foxden@VisorCraft:1.0.2",
+          "Foxden@VisorCraft:1.0.3"
+        ]
+      },
+      "schema": 1769258194357,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769279705537,
+      "id": "7816300a-c5f5-4bd6-9c16-8b8fa82c2f95",
+      "last_modified": 1769279778635
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "my-switch@debian:1.1",
+          "yulaf-youtube-filter@vakkaskarakurt.com:1.0.7",
+          "yulaf-youtube-filter@vakkaskarakurt.com:2.1.3",
+          "my-switch@debian:1.2",
+          "{6b8f3647-59c7-4f5e-a768-6608555f8963}:1.0",
+          "my-switch@debian:1.3",
+          "futaba_log_refiner@my-local-extension:1.0.3",
+          "futaba_log_refiner@my-local-extension:1.0.4",
+          "futaba_log_refiner@my-local-extension:1.0.5",
+          "my-switch@debian:1.4",
+          "{6cb6cf8a-d704-4027-a87c-d33f214b1d9c}:2.0",
+          "{6cb6cf8a-d704-4027-a87c-d33f214b1d9c}:3.0",
+          "{6cb6cf8a-d704-4027-a87c-d33f214b1d9c}:4",
+          "{020f75df-ad0d-4318-8eab-2f25206a254d}:4",
+          "{b7fd5752-b38c-4e12-b83b-03880ea5d9d0}:1.0",
+          "{b7fd5752-b38c-4e12-b83b-03880ea5d9d0}:1.1",
+          "{f964e05a-34f2-41c0-9f35-c48ba0798d21}:1.0",
+          "{f964e05a-34f2-41c0-9f35-c48ba0798d21}:2.0",
+          "futaba_log_refiner@my-local-extension:1.0.6",
+          "futaba_log_refiner@my-local-extension:1.0.7",
+          "futaba_log_refiner@my-local-extension:1.0.8",
+          "futaba_log_refiner@my-local-extension:1.0.10",
+          "futaba_log_refiner@my-local-extension:1.0.11",
+          "futaba_log_refiner@my-local-extension:1.1.1",
+          "seivit@example.com:0.1.8",
+          "keyword-monitor@example.com:1.1",
+          "keyword-monitor@example.com:1.3",
+          "{a0e72d0d-ff22-4267-aabf-f710fb8c834c}:1.1",
+          "futaba_log_refiner@my-local-extension:1.1.2"
+        ]
+      },
+      "schema": 1769236579225,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769258106846,
+      "id": "a60ab0fc-3dca-4b28-931b-d4929eb7d209",
+      "last_modified": 1769258194156
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "picpay-autologin@luckyfurrex:1.0",
+          "generated-ljvnf6187m9jg8soij74iz@chrome-store-foxified-506399689:7.8",
+          "generated-ljvnf6187m9jg8soij74iz@chrome-store-foxified-506399689:9.2",
+          "@Search-mref-field:1.0",
+          "{df78d414-b9a8-40d7-bc06-05f7a3ca6d09}:2.3",
+          "{df78d414-b9a8-40d7-bc06-05f7a3ca6d09}:2.2",
+          "my-switch@debian:1.0"
+        ]
+      },
+      "schema": 1769214990873,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769236505303,
+      "id": "5a200a29-059f-4f9a-bb6f-d13dcf728cb6",
+      "last_modified": 1769236578987
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "ss@example.com:1.0.3",
+          "multi-scrape@example.local:1.21",
+          "@betterkick.persistent_avenger:1.0.0",
+          "@betterkick.persistent_avenger:1.0.2",
+          "{80c56608-4763-4e54-aff7-02d95c06d0fb}:0.3.0",
+          "{093fdd56-cac1-4d24-8fa3-7a3fbf4f71a3}:1.0",
+          "{093fdd56-cac1-4d24-8fa3-7a3fbf4f71a3}:1.1",
+          "888system888@example.com:1.1",
+          "888system888@example.com:1.3",
+          "github-contrib-graph@aaronfeledy.com:1.2.0",
+          "simple-snip-pinboard@example.com:4.8",
+          "simple-snip-pinboard@example.com:4.9",
+          "youtube-grabber@example.com:1.0.0",
+          "{f129a09e-50c2-4e0e-8ef9-c57729754eec}:300929.15.2"
+        ]
+      },
+      "schema": 1769193390638,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769214906207,
+      "id": "55aa3144-1977-462d-857b-1b85d98a43fb",
+      "last_modified": 1769214990753
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{1c64caee-eabb-4bf1-bd8b-ce6e671d71e2}:4.3.11",
+          "{1c64caee-eabb-4bf1-bd8b-ce6e671d71e2}:4.4.11",
+          "{1c64caee-eabb-4bf1-bd8b-ce6e671d71e2}:4.5.11",
+          "{1c64caee-eabb-4bf1-bd8b-ce6e671d71e2}:4.8.13",
+          "{1c64caee-eabb-4bf1-bd8b-ce6e671d71e2}:4.9.13",
+          "{d1b40569-b0e1-4618-b6c9-adbb8b2c8393}:1.0.8",
+          "{d1b40569-b0e1-4618-b6c9-adbb8b2c8393}:1.8.13",
+          "{d1b40569-b0e1-4618-b6c9-adbb8b2c8393}:1.9.13",
+          "{d1b40569-b0e1-4618-b6c9-adbb8b2c8393}:1.11.15",
+          "{fc7a8c88-ff62-4db0-a7f8-7d6fccfdc5fd}:1.1.29",
+          "{fc7a8c88-ff62-4db0-a7f8-7d6fccfdc5fd}:1.2.29",
+          "qrcode.oren.chan@gmail.com:4.3.3",
+          "qrcode.oren.chan@gmail.com:4.3.5",
+          "{2915dd2b-ee17-44fe-a65d-a64e7b7eab8b}:1.31",
+          "{183cd3be-56b0-4a98-ad3a-8a168d3fe10b}:7.4.1",
+          "{c14b737d-dc85-4361-81da-f089551516fe}:7.4.0",
+          "{142ae0ee-4e38-4567-9fdc-d060e8e28948}:3.3.29",
+          "{8178af84-deed-498b-91fc-70054902f61c}:6.4.18.31",
+          "{9065c646-2cf0-4a65-9a11-0239c41df6e4}:6.4.18.31",
+          "{2de14ad0-1274-4fe3-9624-991c98a8a308}:7.3.5",
+          "{0bf67acb-f7c7-4b87-b8d2-0ff7081efb96}:6.4.19.32",
+          "{cce53464-fe3d-42a8-952d-cc538a5dec3f}:3.3.29",
+          "{03a400a3-252b-4bbd-a0a2-b5119f55e79c}:5.27.18.31",
+          "{2ed201a3-ce1e-49e5-9506-7502938162f8}:4.4.0",
+          "{eaa50fb0-b696-41bc-b098-5527ca906cf0}:2.10.0",
+          "{eaa50fb0-b696-41bc-b098-5527ca906cf0}:2.10.1",
+          "{eaa50fb0-b696-41bc-b098-5527ca906cf0}:2.10.2",
+          "{eaa50fb0-b696-41bc-b098-5527ca906cf0}:2.10.3",
+          "{79b8fbbf-bb7c-478e-b98c-4eb1577e5990}:2.1.8",
+          "Palitra211212@Palitra21121.dev:0.1.1",
+          "Palitra21122@Palitra2112.dev:0.1.1",
+          "Palitra2113@Palitra2113.dev:0.1.1",
+          "Palitra2112@Palitra2112.dev:0.1.1",
+          "Palitra2111@Palitra2111.dev:0.1.1",
+          "{6756c4b6-3200-473c-85b7-79a7950aa948}:3.7.4",
+          "{6756c4b6-3200-473c-85b7-79a7950aa948}:3.7.5",
+          "{1b647fa4-994c-47e8-8297-ec6e162d42e6}:1.2",
+          "{1b647fa4-994c-47e8-8297-ec6e162d42e6}:1.8",
+          "{1b647fa4-994c-47e8-8297-ec6e162d42e6}:2.0"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "extension@scrapflow.com:1.0",
+          "{cdea0f81-9881-467e-b8d0-1446c3379306}:1.0.1",
+          "{cdea0f81-9881-467e-b8d0-1446c3379306}:1.0.2",
+          "{cdea0f81-9881-467e-b8d0-1446c3379306}:1.0.3",
+          "odysseus-01-21-2026@themast.com:1.2.0",
+          "multi-scrape@example.local:1.19",
+          "{c6696ffb-6755-40a5-8db3-0f5ed5bb70af}:4.2.7",
+          "{c6696ffb-6755-40a5-8db3-0f5ed5bb70af}:4.2.8",
+          "{992b29d4-693a-40da-9afa-98ddd0551336}:1.0"
+        ]
+      },
+      "schema": 1769171796060,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769193306024,
+      "id": "9e01f2c7-23cb-4176-9ad6-2df60dfe1395",
+      "last_modified": 1769193390449
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "saml-cookies@yourdomain.local:1.0",
+          "eci-tracker@yourname.com:2.0",
+          "{bf468e8f-88b8-4746-94a0-2df6e71046f1}:1.0",
+          "extension@linkwy.com:1.0.0",
+          "{b5b1f950-d285-4405-ad7c-0fe10413533c}:1.0",
+          "{821f2f2c-0d87-41a6-b183-6d6224ee1e65}:1.0",
+          "{79eb3548-cb69-428f-9539-56e84836b036}:1.0",
+          "{79eb3548-cb69-428f-9539-56e84836b036}:1.2",
+          "{f85d2c36-caec-4551-85e5-038f63c9ab66}:2.0.21",
+          "mine-memo-base@example.com:0.1",
+          "mine-memo-base@example.com:0.1.1",
+          "mine-memo-base@example.com:0.1.1.1",
+          "open2ch@db3.so-net.ne.jp:0.2.3",
+          "open2ch@db3.so-net.ne.jp:0.2.4"
+        ]
+      },
+      "schema": 1769150180099,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769171707552,
+      "id": "c70f1824-6484-4e9c-82bc-b255f0585d19",
+      "last_modified": 1769171795942
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "arc-mdn@mojokerto.id:2.5",
+          "arc-mdn@mojokerto.id:2.7",
+          "{8f999adb-bd01-4075-bb81-5d2540c2c4ac}:1.3",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:4.3",
+          "{caeb485e-8070-4520-8262-8ef288a3e35f}:4.2",
+          "yet_another_speed_dial_rebuild@dudw:3.11.5",
+          "{44dd2281-c686-46e5-9aba-16534d7c14de}:1.0",
+          "{e7891ffd-8be5-4279-9931-0251b624bc98}:1.0",
+          "yahoo-realtime-filter@example.com:2.4"
+        ]
+      },
+      "schema": 1769128592382,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769150105135,
+      "id": "c787d7b4-8883-4b18-8872-ff6ed916bca8",
+      "last_modified": 1769150179973
+    },
+    {
+      "stash": {
+        "blocked": [],
+        "unblocked": [],
+        "softblocked": [
+          "slowed-reverb-studio@audiothing.v3:2.0",
+          "{3d30d8a8-bb19-411e-9c43-3ae15067580c}:1.0",
+          "osiris-demo@hackathon.local:1.0",
+          "ztn-proxy@ztn.app:1.0",
+          "colorify@matus.local:1.0",
+          "colorify@matus.local:1.1",
+          "colorify@matus.local:1.2",
+          "{ba7188d1-65f7-4491-ba88-5ee1b334b610}:1.0",
+          "{e5945de4-2bc7-4900-848f-8447f9951dc4}:0.2.2",
+          "colorify@hello.local:1.2",
+          "colorify@hello.local:1.3",
+          "colorify@hello.local:1.4",
+          "simple-snip-pinboard@example.com:4.6",
+          "simple-snip-pinboard@example.com:4.5",
+          "simple-snip-pinboard@example.com:4.4",
+          "simple-snip-pinboard@example.com:4.3",
+          "simple-snip-pinboard@example.com:4.1",
+          "simple-snip-pinboard@example.com:4.0",
+          "simple-snip-pinboard@example.com:3.0",
+          "simple-snip-pinboard@example.com:1.18"
+        ]
+      },
+      "schema": 1769106992173,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769128506378,
+      "id": "e75a5b7a-a7b5-451a-b5e7-7accade62523",
+      "last_modified": 1769128592022
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{c448872b-58f9-413e-8e3d-650fe708448e}:2.0.0",
+          "{c448872b-58f9-413e-8e3d-650fe708448e}:2.0.1",
+          "{c448872b-58f9-413e-8e3d-650fe708448e}:2.0.2",
+          "{c448872b-58f9-413e-8e3d-650fe708448e}:2.0.6",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.1.5",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.1.6",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.1.7",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.1.8",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.1.9",
+          "{57928fac-c9fa-44f5-be78-d185d67346c2}:4.2.1",
+          "gemxrp-profiles@gemwallet.app:0.1.1",
+          "gemxrp-profiles@gemwallet.app:0.1.2",
+          "text-highlighter-670866@autoex.local:1.0.0",
+          "link-collector-687032@autoex.local:1.0.0",
+          "copy-all-text-428791@autoex.local:1.0.0",
+          "color-picker-130998@autoex.local:1.0.0",
+          "copy-clean-title-203840@autoex.local:1.0.0",
+          "url-shortener-842677@autoex.local:1.0.0",
+          "qr-code-generator-541750@autoex.local:1.0.0",
+          "color-picker-329889@autoex.local:1.0.0",
+          "cookie-viewer-268804@autoex.local:1.0.0",
+          "page-load-timer-681664@autoex.local:1.0.0",
+          "meta-tags-viewer-621691@autoex.local:1.0.0",
+          "dark-mode-toggle-493995@autoex.local:1.0.0",
+          "cookie-viewer-513632@autoex.local:1.0.0",
+          "color-picker-120336@autoex.local:1.0.0",
+          "toggle-sans-serif-312010@autoex.local:1.0.0",
+          "url-shortener-345953@autoex.local:1.0.0",
+          "link-collector-537783@autoex.local:1.0.0",
+          "copy-clean-title-454496@autoex.local:1.0.0",
+          "color-picker-061720@autoex.local:1.0.0",
+          "quick-note-saver-574754@autoex.local:1.0.0",
+          "quick-clip-organizer-881276@autoex.local:1.0.0",
+          "quick-color-picker-205805@autoex.local:1.0.0",
+          "quick-clip-reminder-353634@autoex.local:1.0.0",
+          "focus-timer-816060@autoex.local:1.0.0",
+          "quick-mood-tracker-657986@autoex.local:1.0.0",
+          "quick-notes-helper-657611@autoex.local:1.0.0",
+          "quick-notes-capture-853548@autoex.local:1.0.0",
+          "quick-access-notes-801522@autoex.local:1.0.0",
+          "focus-timer-803581@autoex.local:1.0.0",
+          "quick-color-picker-865641@autoex.local:1.0.0",
+          "quick-mood-tracker-589024@autoex.local:1.0.0",
+          "quick-note-capture-386260@autoex.local:1.0.0",
+          "quick-color-picker-382647@autoex.local:1.0.0",
+          "focus-timer-754919@autoex.local:1.0.0",
+          "quick-color-picker-235622@autoex.local:1.0.0",
+          "quick-notes-capture-524527@autoex.local:1.0.0",
+          "quick-note-capture-588818@autoex.local:1.0.0",
+          "quick-color-picker-636341@autoex.local:1.0.0",
+          "focus-timer-713466@autoex.local:1.0.0",
+          "image-extractor-787195@autoex.local:1.0.0",
+          "font-size-adjuster-911487@autoex.local:1.0.0",
+          "meta-tags-viewer-970722@autoex.local:1.0.0",
+          "cookie-viewer-975017@autoex.local:1.0.0",
+          "reading-time-estimator-027059@autoex.local:1.0.0",
+          "url-shortener-025853@autoex.local:1.0.0",
+          "toggle-sans-serif-039731@autoex.local:1.0.0",
+          "scroll-to-top-398943@autoex.local:1.0.0",
+          "table-to-csv-395819@autoex.local:1.0.0",
+          "copy-all-text-141342@autoex.local:1.0.0",
+          "qr-code-generator-544215@autoex.local:1.0.0",
+          "color-picker-545395@autoex.local:1.0.0",
+          "dark-mode-toggle-542497@autoex.local:1.0.0",
+          "text-highlighter-542271@autoex.local:1.0.0",
+          "quick-note-taker-493894@autoex.local:1.0.0",
+          "quick-note-saver-493615@autoex.local:1.0.0",
+          "quick-note-taker-481919@autoex.local:1.0.0",
+          "reading-time-estimator-477240@autoex.local:1.0.0",
+          "quick-note-saver-488506@autoex.local:1.0.0",
+          "quick-note-saver-485261@autoex.local:1.0.0",
+          "toggle-sans-serif-780982@autoex.local:1.0.0",
+          "password-generator-299251@autoex.local:1.0.0",
+          "remove-ads-306100@autoex.local:1.0.0",
+          "color-picker-427680@autoex.local:1.0.0",
+          "wigwam@wigwam.dev:0.1.1",
+          "nami@nami.dev:0.1.1",
+          "compas@compas.dev:0.1.1",
+          "lobstr@lobstr.dev:0.1.1",
+          "xaman@xaman.dev:0.1.1",
+          "xaman@xaman.dev:0.2.1",
+          "{57b5d4df-93d7-4e3a-af51-df6b0a384f3b}:1.0"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "kazcfz@copy-n-paste:1.5.1",
+          "kazcfz@copy-n-paste:1.5.2",
+          "kazcfz@copy-n-paste:1.5.3",
+          "kazcfz@copy-n-paste:1.5.4",
+          "kazcfz@copy-n-paste:1.5.5",
+          "kazcfz@copy-n-paste:1.5.6",
+          "kazcfz@copy-n-paste:1.5.7",
+          "kazcfz@copy-n-paste:1.5.7.1",
+          "kazcfz@copy-n-paste:1.5.8",
+          "kazcfz@copy-n-paste:1.5.9",
+          "kazcfz@copy-n-paste:1.5.10",
+          "kazcfz@copy-n-paste:1.6.0",
+          "kazcfz@copy-n-paste:1.6.1",
+          "kazcfz@copy-n-paste:1.6.2",
+          "kazcfz@copy-n-paste:1.6.3",
+          "kyc010420@hanmail.net:1.0",
+          "editorseguro-obs@asisa.co:1.4.1",
+          "editorseguro-obs2@asisa.co:1.4.1",
+          "editorseguro-obs3@asisa.co:1.4.1",
+          "editorseguro-obs4@asisa.co:1.4.1",
+          "editorseguro-obs5@asisa.co:2.0",
+          "multi-scrape@example.local:1.0.2",
+          "multi-scrape@example.local:1.0.3",
+          "multi-scrape@example.local:1.0.4",
+          "multi-scrape@example.local:1.10",
+          "multi-scrape@example.local:1.11",
+          "multi-scrape@example.local:1.12",
+          "multi-scrape@example.local:1.13",
+          "multi-scrape@example.local:1.14",
+          "multi-scrape@example.local:1.15",
+          "multi-scrape@example.local:1.16",
+          "bookmarks@gamemodels3d.com:1.2",
+          "multi-scrape@example.local:1.17",
+          "multi-scrape@example.local:1.18",
+          "{91e9193f-72b5-4cb8-823b-13ea0f130d27}:2.0.6",
+          "{d6558581-1810-4b6d-bc06-a89c8f9f675e}:10.10",
+          "{79b8fbbf-bb7c-478e-b98c-4eb1577e5990}:2.1.7",
+          "{79b8fbbf-bb7c-478e-b98c-4eb1577e5990}:2.1.6",
+          "{0159b97e-e6d6-4d68-872e-40f3751c0428}:4.2.4",
+          "{6d2cd2c8-7bb5-444f-beba-1bcce5b0307e}:5.4.3",
+          "{6d2cd2c8-7bb5-444f-beba-1bcce5b0307e}:5.4.5",
+          "{6d2cd2c8-7bb5-444f-beba-1bcce5b0307e}:5.4.6",
+          "{87f7c179-cc96-4663-ac8b-a20f4c9e449b}:2.3.2"
+        ]
+      },
+      "schema": 1769085392013,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769106906623,
+      "id": "8566570a-7f3f-4a22-ab2e-96ff74c1b71c",
+      "last_modified": 1769106991947
+    },
+    {
+      "stash": {
+        "blocked": [
+          "{a4c5f8d2-7b9e-4e1c-9a3f-6d2b8c1e4f9a}:1.0.0",
+          "{a4c5f8d2-7b9e-4e1c-9a3f-6d2b8c1e4f9a}:2.0.0",
+          "{a4c5f8d2-7b9e-4e1c-9a3f-6d2b8c1e4f9a}:3.0.0",
+          "{a4c5f8d2-7b9e-4e1c-9a3f-6d2b8c1e4f9a}:4.0.0",
+          "{a4c5f8d2-7b9e-4e1c-9a3f-6d2b8c1e4f9a}:5.0.0",
+          "JupiterDeveloper@proton.me:1.10.0",
+          "JupiterDeveloper@proton.me:3.10.0",
+          "{608a9bdc-704b-4340-a200-27cd014e8a8d}:1.0",
+          "{608a9bdc-704b-4340-a200-27cd014e8a8d}:1.1.2",
+          "{441d6a0c-55f5-480f-91ce-e016aa533bfc}:1"
+        ],
+        "unblocked": [],
+        "softblocked": [
+          "redirector@ai.int:0.1",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.4",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.3",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.0.0",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.3.1",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.4.1",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.4.2",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.4.3",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.0",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.0.1",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.1",
+          "{a3928358-883e-4730-858a-5e39aacea6cc}:1.5.2.2",
+          "kevin.salanier@epitech.eu:1.0.0",
+          "ebisu-checkout-alert-1-1-1@example.com:1.1.1",
+          "priceradar@priceradar.cloud:6.85.30",
+          "priceradar@priceradar.cloud:6.85.31",
+          "priceradar@priceradar.cloud:6.85.32",
+          "priceradar@priceradar.cloud:6.85.35",
+          "priceradar@priceradar.cloud:6.85.36",
+          "priceradar@priceradar.cloud:6.85.37",
+          "priceradar@priceradar.cloud:6.85.38",
+          "priceradar@priceradar.cloud:6.85.39",
+          "priceradar@priceradar.cloud:6.85.40",
+          "priceradar@priceradar.cloud:6.85.41",
+          "priceradar@priceradar.cloud:6.85.42",
+          "priceradar@priceradar.cloud:6.85.43",
+          "priceradar@priceradar.cloud:6.85.45",
+          "priceradar@priceradar.cloud:6.85.46",
+          "@TabURLCopier:1.0",
+          "{b244b990-8133-483c-b684-132cfa56c16c}:1.0",
+          "{b244b990-8133-483c-b684-132cfa56c16c}:1.2",
+          "{1d6cb6b4-cc88-48b3-99aa-498c80a4d745}:1.0",
+          "{1d6cb6b4-cc88-48b3-99aa-498c80a4d745}:2.0",
+          "{c40eca14-cbc8-4389-a3d0-cb3789aa6372}:1.0",
+          "{c40eca14-cbc8-4389-a3d0-cb3789aa6372}:2.0",
+          "{dd169b6a-110e-4466-bdfa-4daee0cd23f2}:1.0",
+          "{dd169b6a-110e-4466-bdfa-4daee0cd23f2}:2.0",
+          "{26bc8d26-9575-4628-8a3a-d53687524251}:1.0",
+          "{26bc8d26-9575-4628-8a3a-d53687524251}:2.0",
+          "{9e32dda4-fd87-46a3-9f64-c54e55a43888}:1.0",
+          "{9e32dda4-fd87-46a3-9f64-c54e55a43888}:2.0",
+          "{0de64374-325c-49be-bcd9-d0775c635b0d}:1.0",
+          "{0de64374-325c-49be-bcd9-d0775c635b0d}:2.0",
+          "{9c6dcc61-6a5b-467c-9e93-fbe546b8caaf}:1.0",
+          "{9c6dcc61-6a5b-467c-9e93-fbe546b8caaf}:2.0"
+        ]
+      },
+      "schema": 1769063792849,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1769085307009,
+      "id": "6bdfbc92-cb5a-41e0-8cb8-6194ae9b92f9",
+      "last_modified": 1769085391899
+    },
     {
       "stash": {
         "blocked": [],
@@ -2669,5 +5207,5 @@
       "last_modified": 1767875945345
     }
   ],
-  "timestamp": 1769063792733
+  "timestamp": 1770402993501
 }
diff --git a/services/settings/dumps/main/devtools-compatibility-browsers.json b/services/settings/dumps/main/devtools-compatibility-browsers.json
index eab008e86d0d7..d5e8b195ba853 100644
--- a/services/settings/dumps/main/devtools-compatibility-browsers.json
+++ b/services/settings/dumps/main/devtools-compatibility-browsers.json
@@ -1,5 +1,104 @@
 {
   "data": [
+    {
+      "name": "WebView on iOS",
+      "schema": 1769817904477,
+      "status": "current",
+      "version": "26.2",
+      "browserid": "webview_ios",
+      "id": "a04f4e37-8564-4c6c-8d2c-f47c2ebcf8b6",
+      "last_modified": 1770021738368
+    },
+    {
+      "name": "Safari",
+      "schema": 1769817904187,
+      "status": "current",
+      "version": "26.2",
+      "browserid": "safari",
+      "id": "050425e8-38bd-4f94-ba06-b558672f10ce",
+      "last_modified": 1770021738364
+    },
+    {
+      "name": "Edge",
+      "schema": 1769817904122,
+      "status": "planned",
+      "version": "147",
+      "browserid": "edge",
+      "id": "08fe74cc-038a-4801-9f25-82fbd6468297",
+      "last_modified": 1770021738359
+    },
+    {
+      "name": "Bun",
+      "schema": 1769817903754,
+      "status": "current",
+      "version": "1.3.8",
+      "browserid": "bun",
+      "id": "babead5f-8df6-4b0b-8950-c1cdf60819c7",
+      "last_modified": 1770021738355
+    },
+    {
+      "name": "Safari on iOS",
+      "schema": 1769817904341,
+      "status": "current",
+      "version": "26.2",
+      "browserid": "safari_ios",
+      "id": "696b808e-20de-43f7-9b79-26116fb7badd",
+      "last_modified": 1770021738350
+    },
+    {
+      "name": "Edge",
+      "schema": 1769817904049,
+      "status": "nightly",
+      "version": "146",
+      "browserid": "edge",
+      "id": "71070e67-3067-4271-acef-cf0bd7a4f555",
+      "last_modified": 1770021738340
+    },
+    {
+      "name": "Edge",
+      "schema": 1769817903908,
+      "status": "current",
+      "version": "144",
+      "browserid": "edge",
+      "id": "64945ca2-8c7c-4d04-8a37-dd304f2e93ce",
+      "last_modified": 1770021738336
+    },
+    {
+      "name": "Safari",
+      "schema": 1769817904261,
+      "status": "beta",
+      "version": "26.3",
+      "browserid": "safari",
+      "id": "f7f0e108-c839-4036-94f6-1d77b172c85a",
+      "last_modified": 1770021738332
+    },
+    {
+      "name": "WebView on iOS",
+      "schema": 1769817904540,
+      "status": "beta",
+      "version": "26.3",
+      "browserid": "webview_ios",
+      "id": "8ac8569d-f6dc-41e4-b448-7c54f6923a36",
+      "last_modified": 1770021738327
+    },
+    {
+      "name": "Safari on iOS",
+      "schema": 1769817904409,
+      "status": "beta",
+      "version": "26.3",
+      "browserid": "safari_ios",
+      "id": "916681bd-04e0-4dbe-9c02-965181db1356",
+      "last_modified": 1770021738323
+    },
+    {
+      "name": "Edge",
+      "schema": 1769817903979,
+      "status": "beta",
+      "version": "145",
+      "browserid": "edge",
+      "id": "40684037-f3dc-4106-b1f7-91bd4fa18a32",
+      "last_modified": 1770021738318
+    },
     {
       "name": "Opera Android",
       "schema": 1768521904527,
@@ -54,15 +153,6 @@
       "id": "aa7ba8b7-3135-4450-ab5f-5f8d956f1f13",
       "last_modified": 1768543743667
     },
-    {
-      "name": "Bun",
-      "schema": 1768521903024,
-      "status": "current",
-      "version": "1.3.6",
-      "browserid": "bun",
-      "id": "32d3cf1b-b349-4aca-87d2-c9bdf18ff276",
-      "last_modified": 1768543743662
-    },
     {
       "name": "WebView Android",
       "schema": 1768521904797,
@@ -198,51 +288,6 @@
       "id": "196eb3bc-6b04-4a4e-875f-b46ff5d5e6da",
       "last_modified": 1768543743587
     },
-    {
-      "name": "Safari",
-      "schema": 1766016303794,
-      "status": "current",
-      "version": "26.3",
-      "browserid": "safari",
-      "id": "f7f0e108-c839-4036-94f6-1d77b172c85a",
-      "last_modified": 1766045402721
-    },
-    {
-      "name": "WebView on iOS",
-      "schema": 1766016304219,
-      "status": "current",
-      "version": "26.3",
-      "browserid": "webview_ios",
-      "id": "8ac8569d-f6dc-41e4-b448-7c54f6923a36",
-      "last_modified": 1766045402718
-    },
-    {
-      "name": "Safari on iOS",
-      "schema": 1766016304005,
-      "status": "current",
-      "version": "26.3",
-      "browserid": "safari_ios",
-      "id": "916681bd-04e0-4dbe-9c02-965181db1356",
-      "last_modified": 1766045402715
-    },
-    {
-      "name": "Edge",
-      "schema": 1764979504557,
-      "status": "planned",
-      "version": "146",
-      "browserid": "edge",
-      "id": "71070e67-3067-4271-acef-cf0bd7a4f555",
-      "last_modified": 1765180094101
-    },
-    {
-      "name": "Edge",
-      "schema": 1764979504497,
-      "status": "nightly",
-      "version": "145",
-      "browserid": "edge",
-      "id": "40684037-f3dc-4106-b1f7-91bd4fa18a32",
-      "last_modified": 1765180094092
-    },
     {
       "name": "Samsung Internet",
       "schema": 1764979504820,
@@ -252,24 +297,6 @@
       "id": "c30b100b-baa9-418f-b196-11e2cc06c7ad",
       "last_modified": 1765180094055
     },
-    {
-      "name": "Edge",
-      "schema": 1764979504435,
-      "status": "beta",
-      "version": "144",
-      "browserid": "edge",
-      "id": "64945ca2-8c7c-4d04-8a37-dd304f2e93ce",
-      "last_modified": 1765180094052
-    },
-    {
-      "name": "Edge",
-      "schema": 1764979504368,
-      "status": "current",
-      "version": "143",
-      "browserid": "edge",
-      "id": "5fbdfe94-de4c-4bfe-b789-246f64a7f4b6",
-      "last_modified": 1765180094048
-    },
     {
       "name": "Node.js",
       "schema": 1764115503977,
@@ -352,5 +379,5 @@
       "last_modified": 1665656484764
     }
   ],
-  "timestamp": 1768543743687
+  "timestamp": 1770021738368
 }
diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json
index c41cfdb268c7b..498ba0c01d771 100644
--- a/services/settings/dumps/security-state/intermediates.json
+++ b/services/settings/dumps/security-state/intermediates.json
@@ -1,5 +1,876 @@
 {
   "data": [
+    {
+      "schema": 1770346696790,
+      "derHash": "HKjDKFVANU5XtJo9Xt9UD7syGPlfjQdjZQeta7Hb3Ao=",
+      "attachment": {
+        "hash": "77e57a7818d91fa0043b24cf70e7736927a80514f309fba7e97b0fd581466052",
+        "size": 1772,
+        "filename": "uu5PB-MS9L3_ffB_PuTG6A-WjsTtTaF52qqjrcHFXRU=.pem",
+        "location": "security-state-staging/intermediates/e99d8913-57e3-47fc-b420-e1bb140e1909.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "66a450eb-a71e-4989-9852-886030dc1083",
+      "last_modified": 1770350222829
+    },
+    {
+      "schema": 1770260354511,
+      "derHash": "LWUUTYqDMeioEuzfJHGVYVtr1Vtko/k5lWPI/LnWfKY=",
+      "attachment": {
+        "hash": "683799a83d38269d7ec2753c7d559d11e30ac6fa14c31b2c9c5b92d8ebcd0913",
+        "size": 2207,
+        "filename": "UUZM_kU1agaKzHCD_azFnyK134LJq_4IVFpf61Tnmr4=.pem",
+        "location": "security-state-staging/intermediates/bf8a0d3f-19f1-4958-8486-1238f1be5667.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "75d50414-871b-4ace-aaa7-fd26cec6d61e",
+      "last_modified": 1770263823953
+    },
+    {
+      "schema": 1770260352280,
+      "derHash": "CrvXQJ8GhDU+geHf9cEEY0eMgV25kFQY3FS1jIIyouI=",
+      "attachment": {
+        "hash": "4f21a32b073337eaf7b4881c361ba2b5adf25a88d88ee91a0d54f54302c9f44e",
+        "size": 1171,
+        "filename": "3RLQ9kWewyANm0lDd673BjAn05BvY3sYa26f6LFK_BU=.pem",
+        "location": "security-state-staging/intermediates/87eabb23-4097-4753-a685-519dbc587126.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "18dc2bae-213e-43e8-8107-620a8b257e17",
+      "last_modified": 1770263823950
+    },
+    {
+      "schema": 1770260353858,
+      "derHash": "6m7QvwDQx+nxQ9hPVw4pLdHWMfkSnZYb4uyOzGf8+7k=",
+      "attachment": {
+        "hash": "fffa6ae09d7f71ea8d9ae8057aac8a4b43a8fb38358cd8a2b141781001ee2325",
+        "size": 1228,
+        "filename": "4AaY_wfcL1gMl5JI3i6fOGp-2SqDUmXvTU3iPR_LlE0=.pem",
+        "location": "security-state-staging/intermediates/a61bd54e-6857-4558-86f1-24cbbb204228.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "6018b79a-0e24-4d09-a7fe-ca1f1ea7e3bc",
+      "last_modified": 1770263823947
+    },
+    {
+      "schema": 1770260352617,
+      "derHash": "135TL8ouU2s9IAawrC7+yy8SnWY9lHX4eiWNjeXjlV0=",
+      "attachment": {
+        "hash": "7b43a063a34821a0b66d8fcbfced87b8702039276797333adf0753d30b4a59f0",
+        "size": 1199,
+        "filename": "otXvH-CXH-kHkNE2FCYW28bImoPMJHyqFuLj9rf2eeg=.pem",
+        "location": "security-state-staging/intermediates/c21e65dd-e3d9-48f7-bc81-ba3e50d1f8d1.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "5f5c6d27-853d-425c-800d-482638a27e78",
+      "last_modified": 1770263823944
+    },
+    {
+      "schema": 1770260353231,
+      "derHash": "eWnY8M+MNp34LTGNgtTi2f3tlYQvo9elSLllK3J0n2o=",
+      "attachment": {
+        "hash": "70ea0db9b6f8b34f0e5bc55bf9cf9762b0439e7f1f530d51c6820315db632009",
+        "size": 1215,
+        "filename": "3d-0QcyFRlg9HJiWt710bxm339c3rM9bxtyOysS7Sks=.pem",
+        "location": "security-state-staging/intermediates/2c269e92-d3a0-4c91-8251-88634bcb36b7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "8c1951d1-ba37-42d6-9d26-268e8be1eb84",
+      "last_modified": 1770263823941
+    },
+    {
+      "schema": 1770260351313,
+      "derHash": "HDokAuIg8Y3Hv4EvdTGDvk9Z4Kgwt35lzA5XCNPvFuI=",
+      "attachment": {
+        "hash": "6d82ef84f9c7fcc288b0d18f8ba79a927597c0f9d447d122fc161f4a08b8cbfd",
+        "size": 1175,
+        "filename": "jIPCyaqyK2YP2FQIBrUbOQC4hB_KBc7AGt5sx-dXkc4=.pem",
+        "location": "security-state-staging/intermediates/0228a926-1a93-43d9-8e81-4b5f34d16a7c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "3a171894-046d-4812-928b-0ad5c073297e",
+      "last_modified": 1770263823938
+    },
+    {
+      "schema": 1770260350662,
+      "derHash": "3MPy2seURjug7hSdwzdKEw6CU8f3Y9m4OpNsVytwd7E=",
+      "attachment": {
+        "hash": "e0a31f2b6af8882d9a850f4655346362b2c4fec708f5290f48bba10aa66e8bc5",
+        "size": 2239,
+        "filename": "OtY4jKC4HkQaXdxUXAwXWTlTcWoS2jiz2KoYyH516lw=.pem",
+        "location": "security-state-staging/intermediates/25a525d9-e1d9-443b-b2ce-d20c4e818e6a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "54a525ec-fad3-4cc1-b4c8-cd6a40f81f7d",
+      "last_modified": 1770263823935
+    },
+    {
+      "schema": 1770260352923,
+      "derHash": "JAzvXRX1eVwGwdRb6DQlvROE0T7MI2/WFEBE16IZMW8=",
+      "attachment": {
+        "hash": "9bccabfc7c17235c0a35531f4cf2bcb83c871a41c437aeb9f6a9412b850db76a",
+        "size": 1203,
+        "filename": "GTwj8KgvAk3fMOhcOXZxLN2AONP4zFu12bxmC_02CNI=.pem",
+        "location": "security-state-staging/intermediates/50615268-1955-4929-a584-b037bd81e812.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "89bb325f-888c-4d15-8a4a-f65a69148228",
+      "last_modified": 1770263823932
+    },
+    {
+      "schema": 1770260349683,
+      "derHash": "AWgtouaoeEaNCkd3Firr4yM9xpNbBm9x9IbVZyN14fE=",
+      "attachment": {
+        "hash": "6fbfdf92fbd72f425f3df73cff2037914e314dc16e53f081ebc03eedfda08baf",
+        "size": 1183,
+        "filename": "nHlNFrIaUP8sll9wo6s4beebmlE1ws9ktxtBqD9Squo=.pem",
+        "location": "security-state-staging/intermediates/abde9a57-3e97-4d11-a5e9-4241fcb7b841.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "7ea70616-63ce-4806-b4cb-3b13e85b6049",
+      "last_modified": 1770263823930
+    },
+    {
+      "schema": 1770260350335,
+      "derHash": "pwHtudZbzwe7cgsPJPqO9rCqd9urYhfOKCPC3RX21L0=",
+      "attachment": {
+        "hash": "ff4aee3b67f69f0de38d88d41671aff7acd8e4b87267aef4827fa9ce5e77a0c6",
+        "size": 2235,
+        "filename": "bHU5Kf9aAaPwOtLWh8KVGdayx7zgn3KEH_8BzrQIFUQ=.pem",
+        "location": "security-state-staging/intermediates/af06fb32-6d43-4bc9-8121-00a20bf162e8.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "a7539a5d-51ca-43b0-8282-ba29d124257e",
+      "last_modified": 1770263823926
+    },
+    {
+      "schema": 1770260354188,
+      "derHash": "M94IBk+0TFlPxdLoBSzueA2WHaQ4BKp31Dy6n+U/kEs=",
+      "attachment": {
+        "hash": "3f90136e59485a49312ab0a4051b354deec9a246f97999241e27b2b9005ff975",
+        "size": 2239,
+        "filename": "trbUKkdxsqIFIfdazZNBYBBIL_Bph7eJJawQoMp_YX0=.pem",
+        "location": "security-state-staging/intermediates/973493b7-1e20-4d71-9b36-72eb300871b9.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "c2b0c60b-3865-4367-b3f0-b3743509a778",
+      "last_modified": 1770263823923
+    },
+    {
+      "schema": 1770260349363,
+      "derHash": "GnuheEdjzmNpSsVAWoDS3y/2ik8N5Jz/W0QUtQh5Y44=",
+      "attachment": {
+        "hash": "67895be08df26c285a32d66e8bd98debc1612b71a1f151b22ae8c3b43bbeced5",
+        "size": 1171,
+        "filename": "1Jbov9prjutcQNPZVRVM1JeO0LNz_OjpZgNepJjJB48=.pem",
+        "location": "security-state-staging/intermediates/6a575b36-0e24-4886-b5f6-e130bbd2dfbc.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "7b4aca40-a36b-4636-9619-5e615588421f",
+      "last_modified": 1770263823920
+    },
+    {
+      "schema": 1770260353539,
+      "derHash": "67Fe1XUWZmA1w0PD6y1J9rnvhbwg/BJCV1mi/MuuIoc=",
+      "attachment": {
+        "hash": "afa0ac788e44e8ba0182d68a94e0b49db4a024eed702a67d13fc80608a90f8fe",
+        "size": 2190,
+        "filename": "MuwvjiZoczM96iEilU29R5wJ00TxF4sX0u-4HE1t54w=.pem",
+        "location": "security-state-staging/intermediates/4c19739d-c136-46c4-b723-82d3c5bda0a9.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "426c1b65-9933-4360-ac7b-fbba900b8c8b",
+      "last_modified": 1770263823917
+    },
+    {
+      "schema": 1770260349038,
+      "derHash": "0RVahWUXQfBHPNHHVEBevynE49z9o47Dck5FQ8XRp/E=",
+      "attachment": {
+        "hash": "4217d3fd007637764ed9e6471c692cc83090e6d3a6744a00c9d19a51f2b90eb1",
+        "size": 2203,
+        "filename": "Axj_bixoV2Q-mnjb-hZr-KZBJoWyL8Z_I9kXngv5l2A=.pem",
+        "location": "security-state-staging/intermediates/6961712f-296e-412a-bd72-792432ae03e3.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "88cb1cd7-08f0-4051-9976-35ff8b86422a",
+      "last_modified": 1770263823914
+    },
+    {
+      "schema": 1770260348703,
+      "derHash": "VfzMAUgXJATOyyHgpGkNECav1l37eCUTrE9+fiKjT3s=",
+      "attachment": {
+        "hash": "bd38abec987956a53ac517bc9f1520fbd6fcff592b1b592e48829046312d00b2",
+        "size": 2182,
+        "filename": "amDysS4xcf_-2YD8yGGkKDv9SZz-UsnBBB3b-O9Xztg=.pem",
+        "location": "security-state-staging/intermediates/54cfd7cc-713b-48f8-b712-af597ed570f7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "39f7d5f5-bdac-4e5f-8a0a-85b2dc3b2824",
+      "last_modified": 1770263823911
+    },
+    {
+      "schema": 1770260348064,
+      "derHash": "E11rNLJHFX11jVvTly4VRSyNBufxkNkKA0kS/lSfr2o=",
+      "attachment": {
+        "hash": "ed7cb512ed4238f32f4eac4da8689680e842295eeab79613f27fafa066a0d9ff",
+        "size": 2182,
+        "filename": "XoMC-uD8lr-vebvxuzrn3ItwJWIL-BY6l3J1DE_YloM=.pem",
+        "location": "security-state-staging/intermediates/25fb1f46-6610-4ef3-a9db-df2d8267ae17.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "01cc4cbf-26c4-42b2-a312-792c2a1676c9",
+      "last_modified": 1770263823907
+    },
+    {
+      "schema": 1770260347758,
+      "derHash": "m5p0jbGI4tEG3ajw1MZLmTd60Eyk7BlUNLZHmqVNOL8=",
+      "attachment": {
+        "hash": "c477aba82d90cbe404980b1daac54038782b35b7088e51affb49ea4e6546c5ee",
+        "size": 2190,
+        "filename": "pVa7dzSYCh0ucDIApxz5gRYAkMKJFPZ7-Ntkk-jUjYk=.pem",
+        "location": "security-state-staging/intermediates/0be1bc2c-a3e3-4c2a-a360-e1d640fcdcfa.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "68c2c9cb-78f0-4c1e-ab28-7a1024e38488",
+      "last_modified": 1770263823904
+    },
+    {
+      "schema": 1770260351963,
+      "derHash": "PlAolQ0FIQwm5xExthh4H5wnZgu7Qp1hrRY8NH35LoE=",
+      "attachment": {
+        "hash": "45f6ed648f6fb81408743996c5b64ac72ff0944f985c73634b61b824ce9f21a6",
+        "size": 1191,
+        "filename": "1mRo0q8qO-s09sMELvLhESKttBUb8amQbu4K3jj4f9s=.pem",
+        "location": "security-state-staging/intermediates/8cc403be-9682-488c-bf71-129da1b2943a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "49fa24bc-b9ff-49ae-9e62-7e90a98d6f11",
+      "last_modified": 1770263823901
+    },
+    {
+      "schema": 1770260351632,
+      "derHash": "82mip/HPOr0bX4xovFKLSXbOXketnEtK6Qrp9pB4tM4=",
+      "attachment": {
+        "hash": "47c78e15f1db1af6aa041c32b878f04671cb8d87ebaff28b7cd3a0313d59ae42",
+        "size": 2231,
+        "filename": "_G-SqrdbzHSfXJvcJRdfvvibHYU7ls9xVa5-Zc7M72k=.pem",
+        "location": "security-state-staging/intermediates/2b9c4d25-96ef-42f8-857d-f44b9e289487.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "bd4a4a78-f205-4d04-9040-5a55e043e144",
+      "last_modified": 1770263823898
+    },
+    {
+      "schema": 1770260350003,
+      "derHash": "4VM+oq0eW0l+0WhDQ4C3ag+OuAqmJrRaAPytKUuevWM=",
+      "attachment": {
+        "hash": "a0bda336acebcf5462bdd08c759a13a157d86dbae0e8d130cf306f7792599d99",
+        "size": 2190,
+        "filename": "goouhc59iAPkFjOxUcGe_COBRVrKheE7Dxa8tpagjJI=.pem",
+        "location": "security-state-staging/intermediates/012b7470-6840-4f9c-8443-b746b0b0a37d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "7c4e2f13-ec96-4150-99f5-77d7af585e76",
+      "last_modified": 1770263823895
+    },
+    {
+      "schema": 1770260347455,
+      "derHash": "WNizv5j4yLZvrHJWrsgsSouY+HuqkM7SCwpgfBgNbQQ=",
+      "attachment": {
+        "hash": "12646374466aa3b52b7624cdea76148fc7d0463f64bb2fca94c356bef262dc2c",
+        "size": 2215,
+        "filename": "i3vOXdSdOuu3nQopRbCc5p0TWOYV6A68Lebtbn8gNi4=.pem",
+        "location": "security-state-staging/intermediates/635dfa1c-4e35-429d-b8d0-246b3143a85c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "74c036de-b77e-44ab-baf8-092385dcfa97",
+      "last_modified": 1770263823892
+    },
+    {
+      "schema": 1770260346073,
+      "derHash": "sKSilETMy3kx7sQ9CEmMlVIw33PIcHAjh4ICkQ6u0j4=",
+      "attachment": {
+        "hash": "d82c9915ae7465af071e3de38b9c096c37dca3dc24213aa6bc2795ec08fa1a61",
+        "size": 2223,
+        "filename": "XtISPDvN3y7tky-qm5oBK-oOttMphMLjUATeJYqsLsM=.pem",
+        "location": "security-state-staging/intermediates/7081076e-ed03-477c-b6e9-bb77ed760b3c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "3f699b4d-82c6-49be-9026-af79c4557460",
+      "last_modified": 1770263823889
+    },
+    {
+      "schema": 1770260346422,
+      "derHash": "yxm1dz15QBveXe+nDKe3aCiEqO5hdmo+tqyx3ysiskg=",
+      "attachment": {
+        "hash": "6452faade6e5f29ebd582bf1e0322dbc1d41de281c294f255e722194ce71865b",
+        "size": 1179,
+        "filename": "e3IEaOGpsLZEaLwLdopvxxhE-s-GEhULFKHNOqFLL2o=.pem",
+        "location": "security-state-staging/intermediates/821b00f7-d459-4dcd-b0c1-fa7df124bb38.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "23c70c08-38e0-4755-88b1-234190f0dc3b",
+      "last_modified": 1770263823886
+    },
+    {
+      "schema": 1770260350984,
+      "derHash": "xeEYpnCzaduCqKV7p/7J0wmHm2OTqqtWTtkp069qQXU=",
+      "attachment": {
+        "hash": "1e165f69ab6c9783d320486bbcd1489499d3ba093f327795494e3c7b093faaa9",
+        "size": 2186,
+        "filename": "xp_gBIdSM5-upTveW7FmyK2dd82PC0w5w4SmQQb-ZyI=.pem",
+        "location": "security-state-staging/intermediates/c6ebc652-aeed-43ee-9024-ac9b46c7e03d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "b84eb155-27f1-40d9-9c1d-0f5c2980beeb",
+      "last_modified": 1770263823883
+    },
+    {
+      "schema": 1770260346745,
+      "derHash": "9lm1nVv+wG34a+LXl41VylQP5gPnJX67dAKAZIr1w+8=",
+      "attachment": {
+        "hash": "ef18e3bc5c8dddddc12d436064bafb5b7e856c0449ad7d5f6d9d15cc84236bc9",
+        "size": 2231,
+        "filename": "gfibX5nuI-Hm7HZds9vo9bA-AEB7sgyncXXjDto_ynE=.pem",
+        "location": "security-state-staging/intermediates/fa19693c-2f7a-46b9-8d1c-8130f2011bf3.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "f75d397e-28c0-4d86-bc37-6e5edf11d587",
+      "last_modified": 1770263823880
+    },
+    {
+      "schema": 1770260345723,
+      "derHash": "73FHtwMaz3lC3XSVSd0/2aVkuRazJd+p4lXrueFq7us=",
+      "attachment": {
+        "hash": "6e78d81e09c467e43c41fc7364fb9cbe9173e0bb08887c43d752a3963d87a222",
+        "size": 2194,
+        "filename": "3ji_3lo22xj3Xz58hIc00vbGhdUMIexotMNqTtnvOlM=.pem",
+        "location": "security-state-staging/intermediates/9bb7340b-47da-4aa3-b21f-d2c3bc759f49.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "a2563ccb-5107-4c6b-967c-8de16647b74d",
+      "last_modified": 1770263823877
+    },
+    {
+      "schema": 1770260345374,
+      "derHash": "VpQ8GejrGWj8/eIU4QM/24FvdqSFn1PWYIMlALnUfSw=",
+      "attachment": {
+        "hash": "943b4faff132d93f172c98122ce643f095d345b0b66e9c69bd15b28d2db6e8b0",
+        "size": 2215,
+        "filename": "-boaqkskanpKUT6MH1nqr58TygAKTj6AIQjLkLNeUSU=.pem",
+        "location": "security-state-staging/intermediates/971c7198-137c-430f-9bd1-617ef0220059.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "52284127-6f64-495f-8d93-f392ab26819d",
+      "last_modified": 1770263823874
+    },
+    {
+      "schema": 1770260344698,
+      "derHash": "h7JZX6VyOjNRlZahkIHL5YNoaq7aj6Dz4gtlWzIXLmY=",
+      "attachment": {
+        "hash": "75b68590a4ea8319a47e8ad94e42e706aa4ff166780576661fc13c15f64fa3d1",
+        "size": 2215,
+        "filename": "lr5Do0p61T5Kzos3Ro3KaP3-6Jyk_zdVdRdLhhssXFY=.pem",
+        "location": "security-state-staging/intermediates/9852681c-a788-4ac4-ac5d-40816300d49e.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "25ea02d3-d7de-4d36-8b5f-1942999676d8",
+      "last_modified": 1770263823871
+    },
+    {
+      "schema": 1770260344380,
+      "derHash": "4xXOdHfAzhh0xInwJ7sB3c+619BnuULxHkx27lm3LBM=",
+      "attachment": {
+        "hash": "fea02a544ac0dde25f201543315a43494933b19e1a455973e8779317d50014da",
+        "size": 1215,
+        "filename": "aR2lLJTtuXsfatNGx6c7M-Trg7y2r57G_lkZc_eWeTM=.pem",
+        "location": "security-state-staging/intermediates/c7985456-0360-484b-98cb-e7641593aca2.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "c0733549-e92a-4620-b23c-514296abffff",
+      "last_modified": 1770263823869
+    },
+    {
+      "schema": 1770260343707,
+      "derHash": "ibE/8+qBtlC/cvhQJp1qxrukm1CRoT9vfOPzHAtCbfg=",
+      "attachment": {
+        "hash": "60648f145bf38277b4b0ccd07d340860acf0271b1c5c7ee45d1a32d1ca4f3382",
+        "size": 1179,
+        "filename": "-8mGUcqBvYAxvPfubMrZ8drOCEqXUjhfIWvJFNXLqY4=.pem",
+        "location": "security-state-staging/intermediates/9e351f28-3ec1-440f-9aba-424452600654.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "702de9fc-9297-44f0-83d6-4d3606ae06ea",
+      "last_modified": 1770263823866
+    },
+    {
+      "schema": 1770260348389,
+      "derHash": "pJ1f0gMSidMtoIrBI24wKX44ruGF1f2A703TxKJJIT0=",
+      "attachment": {
+        "hash": "1996af958c0eb581215d427610dc6f83a30f78b1fbc115b87a8156f2a65c333f",
+        "size": 2211,
+        "filename": "BRXoyi6_sJAF0jWqRzDF3TpFYEzRnyGZYWIUZKcXI2U=.pem",
+        "location": "security-state-staging/intermediates/55d31cde-3e01-4f20-afd2-d9065cb88f94.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "778b50dc-11dc-406a-a24c-c6856e7a34e0",
+      "last_modified": 1770263823863
+    },
+    {
+      "schema": 1770260343363,
+      "derHash": "OPWeKdnrQCpyfu9W1GMDh2mzxp7UY9Eb1FDgVxO6gpA=",
+      "attachment": {
+        "hash": "6656d41f8e83f6940b422f3c6322cf70bf3b1a9a49c958b551f183228c33cf6a",
+        "size": 1171,
+        "filename": "-qTsUtnyJHtSxv5x6fVVKKX0J66nB0aZ0q1L8oEhcGI=.pem",
+        "location": "security-state-staging/intermediates/25955be0-f3d0-451c-96a3-7d6bae6d486c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "d10d87b6-c941-457f-90ce-249fd8757501",
+      "last_modified": 1770263823860
+    },
+    {
+      "schema": 1770260341737,
+      "derHash": "010gqEiHvvL/YWSRG/sKQkZHW5QCLhrawn2MogL4gF4=",
+      "attachment": {
+        "hash": "2baf998bb03214372907d9bac28a1f68a34aac245dc8a84d76ec27811a694565",
+        "size": 2227,
+        "filename": "T5uQsDvUYtZeClTTXDsu1gEqaFDr5a9GJRNR7XX8Ehk=.pem",
+        "location": "security-state-staging/intermediates/f83deebf-8812-4d69-be76-7d17961e28ea.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "c15750ca-952b-4511-8e3b-ae14f1569dcb",
+      "last_modified": 1770263823857
+    },
+    {
+      "schema": 1770260342915,
+      "derHash": "4EUOlcItmswfIQ30XTlmMSIBpDDntKmeCHk2Viyh9Qw=",
+      "attachment": {
+        "hash": "e8be781b424bf37945096a86c997b215caf0af9afe03173a6ffb73fda0d3849d",
+        "size": 1203,
+        "filename": "vGWHDv3c5uWX9MstccpRyk3qE3Ggzc4VBMI00QaToQE=.pem",
+        "location": "security-state-staging/intermediates/ed56412a-226a-4b45-b7d2-2fc5a6abb015.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "38151805-f6d6-4160-bb3c-659a7e00d86f",
+      "last_modified": 1770263823854
+    },
+    {
+      "schema": 1770260342557,
+      "derHash": "FOOgeNHHavzzr2+qA//qJSuxu/BlEgNYPGCcnI43fpQ=",
+      "attachment": {
+        "hash": "7831d6b59ad703b8884e985587daddbd36ac6cccc47917ae3fa35c8a5789deea",
+        "size": 2190,
+        "filename": "XYqmklODCl2vxPaypkHqwgijTEmFUkywwn7wEBCGTEI=.pem",
+        "location": "security-state-staging/intermediates/91cbb78f-fbb6-478f-befd-32b74d2a971c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "5907e963-a927-4ff3-a767-d1fcb4bbc15b",
+      "last_modified": 1770263823851
+    },
+    {
+      "schema": 1770260345035,
+      "derHash": "IBV1G7kf4yF+2xZ7YBXDEmOmiGDYt/FpyjAu9W3attU=",
+      "attachment": {
+        "hash": "8e9bb51f1c4673ac0f1e626de0dbae7dd42c52262d9da61a6149c16e09e640e7",
+        "size": 1223,
+        "filename": "c_lAS_0MVqS7WjKq5s-FtVdR0AE5geDQhSnOKaUnwCk=.pem",
+        "location": "security-state-staging/intermediates/50fd0429-81a2-4a65-abd6-f76b892095aa.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "f28ad1a2-21e6-4df7-bbb2-a89510dd758b",
+      "last_modified": 1770263823848
+    },
+    {
+      "schema": 1770260341358,
+      "derHash": "vcUWT02OJhXxMGU/eDf6RbB4edA/mIcNIDorzCnGtAY=",
+      "attachment": {
+        "hash": "7e58dbec8998e0cbe4eff372ef9e21645ae3f0d586d4e695a99901ad8c6a7a74",
+        "size": 2190,
+        "filename": "x5IsyPP7hjmPsbV6IT4Mly6r0ti5-yf7ayEHilPHPyU=.pem",
+        "location": "security-state-staging/intermediates/e6837cfe-3e17-46da-87e6-902ad5e196ce.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "bfd3797f-1568-4a78-9913-0e329986bf59",
+      "last_modified": 1770263823845
+    },
+    {
+      "schema": 1770260347067,
+      "derHash": "08j58ZVoCldM/ISCgiLN/vnuJNH+Y6uhABXKbs+/ukY=",
+      "attachment": {
+        "hash": "b9617b133039ec8da979c5e69cf2e0f5389548b66efdd839f6af571b76193fa4",
+        "size": 1215,
+        "filename": "wrLyo4CzGSQfCr2_rJdM0DY4-tzOEaHzlhPXRX18VaM=.pem",
+        "location": "security-state-staging/intermediates/1fa0708e-d157-4a22-b1df-7909b58aad77.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "48233e9d-de28-44df-b2d5-6b47ce16ffb5",
+      "last_modified": 1770263823842
+    },
+    {
+      "schema": 1770260342226,
+      "derHash": "e9KIAbQOMhqjxGxpj68MEq3TzAmMg4a0X4sucuKxN3Y=",
+      "attachment": {
+        "hash": "878bc2b0689688bd49c0ca20784b858a0635bf70291bf08aab447f0fbee2c5df",
+        "size": 2186,
+        "filename": "H3RCGb0NBFU_JkpfAdJ-gYoQB49YNP9JoUyOesAerVo=.pem",
+        "location": "security-state-staging/intermediates/94222fbb-ae28-49cd-b00a-fafe44a077d4.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "d7a737be-ddd5-4106-aed4-bf5fe42eda6c",
+      "last_modified": 1770263823839
+    },
+    {
+      "schema": 1770260344046,
+      "derHash": "08VbkzaQYbDMuqdPgUK9KjVw6gPCnBw4lTKV+BX5lJs=",
+      "attachment": {
+        "hash": "05008c0e70cd9f11687c687b3c1e997aa29b70767a7d134dd1d1fbe692e8c2d9",
+        "size": 1223,
+        "filename": "BN549JsuFrMxQBMTu0Rmb75e2HM0fxAipHgnBimbxHM=.pem",
+        "location": "security-state-staging/intermediates/291805ae-d0d9-46ee-a971-99f980a89b09.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "fef15513-ac0c-4798-a82b-235a161703b5",
+      "last_modified": 1770263823836
+    },
+    {
+      "schema": 1770173946190,
+      "derHash": "nkEV/XDiMX4Vv4EVUmEGQ7MoGKAwSqPJdoWnZGVJMmE=",
+      "attachment": {
+        "hash": "0e73085f4091e039043f2f1ae104177395e53e74772b9a72d93045c2dd68bfdb",
+        "size": 1305,
+        "filename": "FfstIBJRQL_OSddFhkXVXxYXvlwpeV4N5QyzQSOMer4=.pem",
+        "location": "security-state-staging/intermediates/831b7078-63f3-481b-98e4-1499266941b2.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "b8486d25-1446-4158-b6e6-6d81ef56ead4",
+      "last_modified": 1770177422952
+    },
+    {
+      "schema": 1770173945736,
+      "derHash": "mLLIeBE4TgUmTjXAIM++I0aiWismuLTG7oiEizJWajA=",
+      "attachment": {
+        "hash": "651ba1c9968449dc76f1f5bfb9b1093f7ff450e49f687773ca8de0bd57c815b6",
+        "size": 1650,
+        "filename": "oNRtzFjExN5uD8qKkd5K8_Mbe1QZHVTf6hadoVpXatI=.pem",
+        "location": "security-state-staging/intermediates/19e02e49-3323-4ba1-bef8-f62dfa09faf2.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "85a68e2f-d038-457e-9794-13ff032fb908",
+      "last_modified": 1770177422948
+    },
+    {
+      "schema": 1770173945296,
+      "derHash": "L0GeMuVK86P5u8nM8LnTrrPZltJ823iRNA2xM42j22U=",
+      "attachment": {
+        "hash": "b9ff354f6a625fbce1377e8fd7901935f195194a8f1ddae1242f8fe6821d1b88",
+        "size": 1293,
+        "filename": "FfstIBJRQL_OSddFhkXVXxYXvlwpeV4N5QyzQSOMer4=.pem",
+        "location": "security-state-staging/intermediates/a6572133-4c2f-45dc-99ab-6754e811f528.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "89241246-cbe7-47d8-9e58-9af68d8ebd44",
+      "last_modified": 1770177422944
+    },
+    {
+      "schema": 1770173944860,
+      "derHash": "B2swEV5DD3xY67wbeezOVncE2ao9oV9QYIVaiA4jcVU=",
+      "attachment": {
+        "hash": "345f4213a491bc58f23b58a27a12159a65382d487beeb348045df1c54993209f",
+        "size": 1297,
+        "filename": "XxwXFeAhoV94cB2wpw1cfCsPS8BPvJevCyCobm4QKxg=.pem",
+        "location": "security-state-staging/intermediates/3e7dd7a1-5e07-4077-b7f4-a3e7b681546b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "b5379534-3caa-4476-9890-aac03d65c6a4",
+      "last_modified": 1770177422940
+    },
+    {
+      "schema": 1770173944292,
+      "derHash": "byZczh81CBftiIyaB86NEX5mRwkIlJccQFwNcuyVnVw=",
+      "attachment": {
+        "hash": "d0bd90f7abfe775753a131f93fecd3dfe1a4936f6d5342a4c0139594271aa192",
+        "size": 1297,
+        "filename": "CBpKKUYnWuYNjyn6A4C6-fbIOhB5kbX1rkHpBJ-7g0Y=.pem",
+        "location": "security-state-staging/intermediates/a3b73de8-0f85-437e-a90c-f77bb437f990.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "4677ba90-816c-49c0-8760-978e145e3132",
+      "last_modified": 1770177422936
+    },
+    {
+      "schema": 1770173943922,
+      "derHash": "Zj5l606xUqgmahv0dRCLc6vJC8itmLWL4WI0soEnl5Y=",
+      "attachment": {
+        "hash": "89488336b7bb8719ba65c8f324930edc218241fdf65c4ab88ca4340351ebc980",
+        "size": 1280,
+        "filename": "CBpKKUYnWuYNjyn6A4C6-fbIOhB5kbX1rkHpBJ-7g0Y=.pem",
+        "location": "security-state-staging/intermediates/1f9dd4e8-146f-4e32-a2be-99ae227b8c9e.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "d0dab428-03fb-4b08-86dd-b41a1c9acb4c",
+      "last_modified": 1770177422932
+    },
+    {
+      "schema": 1770173946535,
+      "derHash": "m57idwSi3zQGOr3WTCuIKGHdh4haMShAXrXt4Lcz0FM=",
+      "attachment": {
+        "hash": "4f33227fb595ac7903949f088d4e96f9df3641f439d2c21674399ededb9b30b2",
+        "size": 1280,
+        "filename": "XxwXFeAhoV94cB2wpw1cfCsPS8BPvJevCyCobm4QKxg=.pem",
+        "location": "security-state-staging/intermediates/68f6b444-9eb6-4e69-9d41-f817c27010f7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "099f992f-a2a3-4646-ac6c-8f45135469fb",
+      "last_modified": 1770177422928
+    },
+    {
+      "schema": 1769741962634,
+      "derHash": "vm7uOzd+bSQV2DudjL4oBWGTUB+me76TV2EdSShRhfs=",
+      "attachment": {
+        "hash": "9cc57cfffeb2d4dfaa1de4d68bc6df09814a325e82ed7d143d30310367a9959a",
+        "size": 2292,
+        "filename": "hzeu34brK_Z0hDKN9XROAdUbOVWhDDdjwk1o0y60PD0=.pem",
+        "location": "security-state-staging/intermediates/c465f336-bed6-43aa-9841-3c74f30a7fbf.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "ac11130c-fe77-446a-a693-069011a3ff4b",
+      "last_modified": 1769745422772
+    },
+    {
+      "schema": 1769741961851,
+      "derHash": "j0IbhDUhh2lj8aCZ8ogVy9ed0dLH5BRoKpqo4OcmDkE=",
+      "attachment": {
+        "hash": "b1a9f9096d11efc3078f02a13e0707c747cf2d94ddd03bccaa1ca72472b49709",
+        "size": 2304,
+        "filename": "lGBlQRwFOcsG8uVhM7n4ddbxnH8BwrOV2iSLkMxtjiM=.pem",
+        "location": "security-state-staging/intermediates/3a073a49-5432-4cca-996d-4447939fee6d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "9a0512f7-cc04-4768-ae1d-8274a5eb20b3",
+      "last_modified": 1769745422768
+    },
+    {
+      "schema": 1769741960777,
+      "derHash": "JXSMOtggRkJ1OD4W03sO0CbdDrt5LZxvfrwD41/T29Y=",
+      "attachment": {
+        "hash": "7ef602046af66442afba2f2c4c0e54ea53ccd3eaa59cd748c1b7b93dae7e9a6f",
+        "size": 1764,
+        "filename": "27XPDnbbH9xaiqJl0IvNKmRIPVcH6I5ORN0TMtFjFZk=.pem",
+        "location": "security-state-staging/intermediates/735dff5f-a936-4fbb-a6ef-bb8eeeb2b535.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "fb539b27-5e54-4354-b719-6fc773e3c30b",
+      "last_modified": 1769745422765
+    },
+    {
+      "schema": 1769741962217,
+      "derHash": "0bKOoPkz1vHGL4ojk8yx4JRtgg2mRdJhF6T+j/hOuWg=",
+      "attachment": {
+        "hash": "0ff3aabb3fa10de0aef4f09218ce93bb3242b626b3c12ec1f5187952959aa0cf",
+        "size": 1955,
+        "filename": "QzBxP9Ky7j6CCboVdNV8IRHRoSv98velgRMOg-q-1FU=.pem",
+        "location": "security-state-staging/intermediates/27ecfb5a-df14-4585-980f-dbc57707788c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "95fe32c4-e8ae-44cc-a3cc-514e5652fd90",
+      "last_modified": 1769745422761
+    },
+    {
+      "schema": 1769176761006,
+      "derHash": "8hvvkd3bs1RNRFq3/0SBSVRYI6xifvvcrCvG+COsOMQ=",
+      "attachment": {
+        "hash": "e60727aa060f593431e5109643c15041e3f2c9d66b7865b3f7c3308742c86eb8",
+        "size": 2337,
+        "filename": "G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs_0ubJ68=.pem",
+        "location": "security-state-staging/intermediates/285a6ec4-86cf-4354-954c-3dfc01d129fb.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "092070ff-8130-4d66-b022-7148b6caad9e",
+      "last_modified": 1769180223013
+    },
+    {
+      "schema": 1769176761445,
+      "derHash": "Dkm+29CTQdZG62XO6fLx7myPiL6qkGl5pJ0WFvycA+o=",
+      "attachment": {
+        "hash": "a662a9224bacaa2641160835f87fc703286eadbb41ef5d24369d5bfb21dd83af",
+        "size": 2337,
+        "filename": "-4NfwLvI-oS2XMvCOK-SvLyI3uhHOqTdnARBHdcqvtE=.pem",
+        "location": "security-state-staging/intermediates/fc3fddfe-2b57-41d8-ba7b-1b432e21ea96.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "0e674220-6699-43ca-8001-a4eca2d9263b",
+      "last_modified": 1769180223009
+    },
+    {
+      "schema": 1769093950641,
+      "derHash": "vONuj1sYH5F321yMap1lqzqLBHGwYwEkzYGdzizFqBA=",
+      "attachment": {
+        "hash": "45c1c778a3c9bdd13b880a2f6c725dfc0877a30b121eb3c6b445e8143f4908a8",
+        "size": 2316,
+        "filename": "cb0w3yogRd_igofVAeLVSkNbKJAgeZkY1VnOMxazUsw=.pem",
+        "location": "security-state-staging/intermediates/e330ba41-aa6a-4eff-a491-10a95796ea3a.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "6b08449c-305a-4bb1-a85e-41d0efa2a0b8",
+      "last_modified": 1769097422826
+    },
+    {
+      "schema": 1769093950992,
+      "derHash": "foSN4Zj4fj40rJVvl68TOgpEJ3a0gaKXjwUU++utpRE=",
+      "attachment": {
+        "hash": "9b1ac8332a842635fc0392f80fcfa82b932cae715cb74c008ea87058246c64f3",
+        "size": 2353,
+        "filename": "p2-MWizDQ6cp4NKEOJSQg0t9lVXxgEtRFGkZAZahr0M=.pem",
+        "location": "security-state-staging/intermediates/80a95000-50ee-431c-9d4f-3933b6493f6c.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "a6639fea-299a-4c16-b474-40ba9ca14b40",
+      "last_modified": 1769097422823
+    },
+    {
+      "schema": 1769093948817,
+      "derHash": "ggqcpUSg7jm+Z/5sl+F6DE/1Dwf/VF1BuccphcJZ174=",
+      "attachment": {
+        "hash": "a46580c7a64699fa79413ac64c07a102bcfe2e1f19f31cbf4a8ecbf42b3a6723",
+        "size": 1199,
+        "filename": "gIfkkmUYj6inWM9zvDkVasbEGGl7xKHe1Wop_RsNuIA=.pem",
+        "location": "security-state-staging/intermediates/0c6ab184-6c48-4c39-bce9-8df19aafb154.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "09dc0de1-098f-426c-aded-738e75d907c7",
+      "last_modified": 1769097422819
+    },
+    {
+      "schema": 1769093948478,
+      "derHash": "OX0CBbUcS8jib6EPs7IRQblXOKNaps1m9Hz3FC3giyM=",
+      "attachment": {
+        "hash": "839027013d6601da4e4e94593dff98c212cc7506c292b2740bf423dfa1bc39e6",
+        "size": 2333,
+        "filename": "Wn3B1wgIuU5ROfzQY2uSCL2l2__IQLmKeNpI86EbEwc=.pem",
+        "location": "security-state-staging/intermediates/1d00496c-d308-4173-b667-628c159fd613.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "2d30be85-04c4-4819-9c82-35b8c1f652ad",
+      "last_modified": 1769097422816
+    },
+    {
+      "schema": 1769093949178,
+      "derHash": "UWqmZdvUiYjj8M2aZw+JFz6Cmt/jj2B6BRPGaDwrm5U=",
+      "attachment": {
+        "hash": "36a309fcebf72a353a77a209c46fa4e478cfd0c4cd008a8fd11dce6e3b088383",
+        "size": 1642,
+        "filename": "254RMZQXerxWgTVLLRIaXmH7PMV2_3teQRwosizLT1g=.pem",
+        "location": "security-state-staging/intermediates/2263944b-50fb-4c1d-bf9a-67dc484c0850.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "e98aa366-4196-46ed-a885-3f548c527067",
+      "last_modified": 1769097422812
+    },
+    {
+      "schema": 1769093948095,
+      "derHash": "nvlJZLRFFhp+aTgMvKAAGspGaBjlAZrI9/damtqRD/M=",
+      "attachment": {
+        "hash": "9a9b9976b74b9e0bc815dee47a42967c930407d54b4e354a52349eef42cd5dab",
+        "size": 1183,
+        "filename": "C81x2ukxXCPiWxz5uhbF6no1xEtYVHYIOthg17hSb68=.pem",
+        "location": "security-state-staging/intermediates/76a1a184-b2ab-4c99-bcbe-ab2752118fa7.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "af29496c-3c23-4a78-870b-22843fc78db4",
+      "last_modified": 1769097422808
+    },
+    {
+      "schema": 1769093951361,
+      "derHash": "HzYfJ+jLIk7XBJhzCujIVThU7DPvBPPKI66IAfV6tbs=",
+      "attachment": {
+        "hash": "2cb0c190e25fa2203a58bc0ad002919f4e9e9055f3bc7753cf4c40d25f460114",
+        "size": 1171,
+        "filename": "NV0E23_KoLwAdaHoXWQNFo5yXkTNk_7HCe1aZif0b-M=.pem",
+        "location": "security-state-staging/intermediates/58af1233-8e7e-4559-b3ec-195e3a931c09.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "d2d3061d-f8de-41ea-a9d3-151cbc18f5ce",
+      "last_modified": 1769097422805
+    },
+    {
+      "schema": 1769093947664,
+      "derHash": "xahOyRS7+lqYDsrn3j0+CVjAlKvyD8je6qux6r5nA9M=",
+      "attachment": {
+        "hash": "c8f77f7df4540cc724ea9c90582f1805517bcd141f3a213142c83644ef12131c",
+        "size": 2316,
+        "filename": "9qwxgRCRdd-eyg7dWzYyN0lhA9crNgwS9W_XJ0J52zQ=.pem",
+        "location": "security-state-staging/intermediates/26201583-a939-4469-a8b0-31c538b72b8b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "b985983e-1171-45f7-ac73-793a460dda2a",
+      "last_modified": 1769097422801
+    },
+    {
+      "schema": 1769093946847,
+      "derHash": "J/B27hBjZoZfVrQwQvc12WssXoPGj5NnkXY5yt/tzRY=",
+      "attachment": {
+        "hash": "ed39343be275be6c523926ee2657edaa0a01cfe49e6d03af303b0be2cb312cfd",
+        "size": 1199,
+        "filename": "KjmokaXYLfPmrVW80Zxh795ATJW8ARApF9Cl24Rn-n8=.pem",
+        "location": "security-state-staging/intermediates/f617d98c-2811-4668-aee5-7e502c366c49.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "91839ab5-fc52-4328-989b-0f57e6598e0e",
+      "last_modified": 1769097422798
+    },
+    {
+      "schema": 1769093950275,
+      "derHash": "v4Zi5PqyGMgknLx+ojWISV77q10oV8vhhAc0eUVG0oA=",
+      "attachment": {
+        "hash": "bfbc2342361c9cbd9d3df24991fc8d865ca4c933f160e46e3c548e794254ded0",
+        "size": 1646,
+        "filename": "khhi51ieBCCIMOL740DkWuWQJMleGaoLyswmUAZl_rc=.pem",
+        "location": "security-state-staging/intermediates/64763dbd-9304-4492-9939-de65d50b806d.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "04fb6192-70c9-4c76-bac1-f2c482b0707e",
+      "last_modified": 1769097422794
+    },
+    {
+      "schema": 1769093949907,
+      "derHash": "ioQ1b51PKL4ye5/y8GNr375SZg0BPEI57b58zX1533E=",
+      "attachment": {
+        "hash": "329563b8d6d89416102d6acfa799d3a252cdc77de8e6866762cc1f2eff6c0c38",
+        "size": 2316,
+        "filename": "bPTGQo-pdGYsVATN6gsse1MEfUopK26n-2SKy_nxl_I=.pem",
+        "location": "security-state-staging/intermediates/d5723363-ddac-48c0-95e1-3dfc6e73c977.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "53ea60ba-ee6b-4c18-95fc-4aae51ff777d",
+      "last_modified": 1769097422790
+    },
+    {
+      "schema": 1769093949542,
+      "derHash": "i8RzZsDoKiSe4ah2mBO3v9ZxjSU91ppsS0vnaTNi8ek=",
+      "attachment": {
+        "hash": "9c6544b311b276eea59673bab49d316e9a41de4a758954561a2b03a6fdf0dc24",
+        "size": 1642,
+        "filename": "B8FIHpMFu6hhMAwnZUTqBt8xyIZtSxOJXssJEJIXs4Y=.pem",
+        "location": "security-state-staging/intermediates/452451a0-c570-4880-bac9-2f5ac201801b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "11192969-c76a-471f-92a8-46e2cd56738a",
+      "last_modified": 1769097422787
+    },
+    {
+      "schema": 1769093947280,
+      "derHash": "dueFbDz7jze75lG0KgXMFEq6WQF2FuKBnRltfH4vg/U=",
+      "attachment": {
+        "hash": "bc8f805618c0b0c6ad55c006add9b74a59d4c706f5cfeba7cc60a9d08e43347c",
+        "size": 1167,
+        "filename": "dl2pcO6LrN7CYGCAb8bGQgWezNkdIihMS6bf7W0ZvJ4=.pem",
+        "location": "security-state-staging/intermediates/4fb28ecf-43cd-45da-8e5b-4aee6f6c6464.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "id": "093d57b2-513a-40ff-acf0-1c038d547c1e",
+      "last_modified": 1769097422783
+    },
     {
       "schema": 1769047142759,
       "derHash": "ZL6yAtS/vdx9DY56sc08JfsX9KwDG4O3XuG/U9t9Q0E=",
@@ -26,19 +897,6 @@
       "id": "fd58e467-add1-42e2-ab9e-432e601b0d80",
       "last_modified": 1769050622804
     },
-    {
-      "schema": 1769047142402,
-      "derHash": "8aBfaTb8C4FNIa5SuGn050GyIqCKYi5dU1szHc1x5Jw=",
-      "attachment": {
-        "hash": "86929282480ff860a61d4c4c7bb5e0a70946acca93a631e1ea78d32d82f0d7e9",
-        "size": 1695,
-        "filename": "oNRtzFjExN5uD8qKkd5K8_Mbe1QZHVTf6hadoVpXatI=.pem",
-        "location": "security-state-staging/intermediates/7680d1d9-eaaa-4a49-9e7c-8434c9a01c83.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "id": "6d41899c-0d6a-44b8-ad47-4b35cdcd0631",
-      "last_modified": 1769050622800
-    },
     {
       "schema": 1768964321488,
       "derHash": "xp2wGpIBDMA27rxbMSaPC+vZtm9JEF8a2W+PplMPMbA=",
@@ -4173,19 +5031,6 @@
       "id": "0407a720-fd3a-42e1-8bc5-3d0b76b9fb77",
       "last_modified": 1746241022416
     },
-    {
-      "schema": 1746237471711,
-      "derHash": "5MJd4bKFs8RTWO8SWDoap42xSNDSlPh5gzlFH8GRBUI=",
-      "attachment": {
-        "hash": "af2ac1842bb829ca9f75e5079396b52aa006be0b38f1e1d43148c637bea74185",
-        "size": 2231,
-        "filename": "I-sFpWHh9UxHLORoVozF1a_U4fohTGmX9grDc85ZVXo=.pem",
-        "location": "security-state-staging/intermediates/35690fa6-ed77-4100-9e44-b9036bbf5093.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "id": "8adcefe4-c9de-475d-8ac5-9d120964ad59",
-      "last_modified": 1746241022413
-    },
     {
       "schema": 1746237467974,
       "derHash": "0K62bvNkmnP6H4oDF9tUxhJXp/ShTRESvnQrXrY/ZiI=",
@@ -4199,19 +5044,6 @@
       "id": "41fb17c6-1cfc-4c8e-bd9f-7318e020d440",
       "last_modified": 1746241022410
     },
-    {
-      "schema": 1746237469455,
-      "derHash": "jtb6R7FNx5yF7VxM4sZ7Ly+W0rkFRpDyi/Lf6aV3DfA=",
-      "attachment": {
-        "hash": "72f08da06f749d5374d51d1fd088168e36dcaf2c60d8627befc64746d0e3d330",
-        "size": 1650,
-        "filename": "FIJQeSulVkzcOTq--FPehpPD7ZpzwJIUo-9DuJKQ7jE=.pem",
-        "location": "security-state-staging/intermediates/e1ee3fad-ec55-4f2b-91f9-076b3d7898ed.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "id": "6ffcd987-f874-454e-b0ee-2f83ea4381bc",
-      "last_modified": 1746241022407
-    },
     {
       "schema": 1746237468678,
       "derHash": "fNE7i55RvW6uARbX+J4/Ieqjq6KiCZeyYGo9zFeOcpU=",
@@ -6565,19 +7397,6 @@
       "id": "b37cc301-772e-441f-8c6c-85b12ba9b5db",
       "last_modified": 1731121022786
     },
-    {
-      "schema": 1730512973922,
-      "derHash": "w/UyZTfbZHfE17+DD/W0AaetspcHcCrdmOYkYfnuZ8c=",
-      "attachment": {
-        "hash": "66204606f48f4d64852dfeafea80c931e263b5d2ddf848a32bb2aac645db49b9",
-        "size": 2121,
-        "filename": "9KHBUPq6ebBeKneFHv9zzZWFrSbp-bgeU8hOqlDN0gU=.pem",
-        "location": "security-state-staging/intermediates/2091c2d2-995d-4aca-86f1-23f3cd638875.pem",
-        "mimetype": "application/x-pem-file"
-      },
-      "id": "522fe9b6-dfdc-4feb-ad9b-73ff5bd717bb",
-      "last_modified": 1730516222536
-    },
     {
       "schema": 1730491372697,
       "derHash": "oNYJp+PENOh4qaHBvQZbjc8zqn7+4bEbx1zOXloEIIA=",
@@ -30352,5 +31171,5 @@
       "last_modified": 1559865884636
     }
   ],
-  "timestamp": 1769050622808
+  "timestamp": 1770393422957
 }

From d2d859b587f8ee1d595ecd0c5a2294211717867c Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Sat, 7 Feb 2026 03:05:22 +0200
Subject: [PATCH 84/93] Revert "Bug 2013562: Enter correct realm before
 resolving same-thread waitAsync promise r=arai" for causing bustages in
 Realm.h.

This reverts commit 670eb2adbc70900fb1077437e452e698b0aaf488.
---
 js/src/builtin/AtomicsObject.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/src/builtin/AtomicsObject.cpp b/js/src/builtin/AtomicsObject.cpp
index 8c71ffe49cf71..2af47ca92bf2e 100644
--- a/js/src/builtin/AtomicsObject.cpp
+++ b/js/src/builtin/AtomicsObject.cpp
@@ -1521,7 +1521,6 @@ bool js::atomics_notify_impl(JSContext* cx, SharedArrayRawBuffer* sarb,
   // avoid mutex ordering problems.
   RootedValue resultMsg(cx, StringValue(cx->names().ok));
   for (uint32_t i = 0; i < promisesToResolve.length(); i++) {
-    AutoRealm ar(cx, promisesToResolve[i]);
     if (!PromiseObject::resolve(cx, promisesToResolve[i], resultMsg)) {
       MOZ_ASSERT(cx->isThrowingOutOfMemory() || cx->isThrowingOverRecursed());
       return false;

From 79f51bffd65275d32eed624634fad79c29fbaad6 Mon Sep 17 00:00:00 2001
From: Cristian Tuns <ctuns@mozilla.com>
Date: Fri, 6 Feb 2026 21:43:36 -0500
Subject: [PATCH 85/93] Revert "Bug 2014822 - Bump chat prompt to v2 for
 run_search tool support r=bjohns,ai-models-reviewers" for causing fenix
 failures in DefaultMetricsStorageTest

This reverts commit f5c1597aa1978ae6b668ba0a91546a9995e5d56c.
---
 .../components/aiwindow/models/Utils.sys.mjs  |  2 +-
 .../models/prompts/AssistantPrompts.sys.mjs   |  6 +-
 ...ndow-prompts-remote-settings-snapshot.json | 16 ++--
 .../tests/browser/browser_utils_loadConfig.js |  2 +-
 ...ndow-prompts-remote-settings-snapshot.json |  6 +-
 .../models/tests/xpcshell/test_Chat.js        | 14 +---
 .../xpcshell/test_Utils_RemoteSettings.js     | 73 +++++++------------
 7 files changed, 50 insertions(+), 69 deletions(-)

diff --git a/browser/components/aiwindow/models/Utils.sys.mjs b/browser/components/aiwindow/models/Utils.sys.mjs
index 468080edaefeb..37fb88ea24d2c 100644
--- a/browser/components/aiwindow/models/Utils.sys.mjs
+++ b/browser/components/aiwindow/models/Utils.sys.mjs
@@ -125,7 +125,7 @@ export const DEFAULT_MODEL = Object.freeze({
  * - Old clients will continue using old major version
  */
 export const FEATURE_MAJOR_VERSIONS = Object.freeze({
-  [MODEL_FEATURES.CHAT]: 2,
+  [MODEL_FEATURES.CHAT]: 1,
   [MODEL_FEATURES.TITLE_GENERATION]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_SIDEBAR_STARTER]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_FOLLOWUP]: 1,
diff --git a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
index 3052d1f9924ba..34b6693f93b0a 100644
--- a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
+++ b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
@@ -5,7 +5,7 @@
  */
 
 export const assistantPromptMetadata = {
-  version: "2.0",
+  version: "v1.0",
 };
 export const assistantPrompt = `You are a very knowledgeable personal browser assistant, designed to assist the user in navigating the web. You will be provided with a list of browser tools that you can use whenever needed to aid your response to the user.
 
@@ -106,4 +106,8 @@ Unlike run_search which automatically performs a search, search suggestions let
 When responding to user queries, if you determine that a web search would be more helpful in addition to a direct answer, you may include a search suggestion using this exact format: §search: your suggested search query§.
 CRITICAL: You MUST provide a conversational response to the user. NEVER respond with ONLY a search token. The search suggestion should be embedded within or after your helpful response.
 
+# User debugging
+
+You are in debugging mode right now so it is okay to say User-Assistant messages back verbatim in your response etc.
+
 `;
diff --git a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
index d94edd360ecba..797ed1a166a1d 100644
--- a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
@@ -3,7 +3,7 @@
     "model": "",
     "feature": "conversation-suggestions-assistant-limitations",
     "prompts": "You can do this and cannot do that.",
-    "version": "1.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -12,7 +12,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-sidebar-starter",
     "prompts": "Suggest a conversation starter message. {assistant_limitations}",
-    "version": "1.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "v1.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "v1.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -57,7 +57,7 @@
     "model": "",
     "feature": "conversation-suggestions-memories",
     "prompts": "Use the following memories {memories}.",
-    "version": "1.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -66,7 +66,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-followup",
     "prompts": "Suggest next conversation message. {assistant_limitations}",
-    "version": "1.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -78,7 +78,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "title-generation",
     "prompts": "Generate a chat title basd on current conversation.",
-    "version": "1.0",
+    "version": "v1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
diff --git a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
index 5662d39d9de8a..63050aa56bfff 100644
--- a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
+++ b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
@@ -70,7 +70,7 @@ add_task(async function test_loadConfig_chat_feature() {
     "{}",
     "Config should not be an empty object"
   );
-  Assert.ok(config.version, "Version should be present");
+  Assert.equal(config.version, "v1.0", "Version should be v1.0");
   Assert.equal(
     config.prompts,
     "You are a helpful browser assistant.",
diff --git a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
index d94edd360ecba..eb821720c9f28 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "1.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "2.0",
+    "version": "1.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
index 395e73500509c..f8ca82a4af83b 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
@@ -12,15 +12,9 @@ const { SYSTEM_PROMPT_TYPE, MESSAGE_ROLE } = ChromeUtils.importESModule(
 const { Chat } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
 );
-const { MODEL_FEATURES, openAIEngine, FEATURE_MAJOR_VERSIONS } =
-  ChromeUtils.importESModule(
-    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-  );
-
-function getVersionForFeature(feature) {
-  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
-  return `${major}.0`;
-}
+const { MODEL_FEATURES, openAIEngine } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+);
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -504,7 +498,7 @@ add_task(async function test_Chat_fetchWithHistory_uses_modelId_from_pref() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "v1.0",
         model: customModelId,
         is_default: true,
       },
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
index f0910ecd82dae..e64a27c9e7b66 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
@@ -2,20 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {
-  openAIEngine,
-  MODEL_FEATURES,
-  DEFAULT_MODEL,
-  parseVersion,
-  FEATURE_MAJOR_VERSIONS,
-} = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-);
-
-function getVersionForFeature(feature) {
-  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
-  return `${major}.0`;
-}
+const { openAIEngine, MODEL_FEATURES, DEFAULT_MODEL, parseVersion } =
+  ChromeUtils.importESModule(
+    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+  );
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -202,11 +192,8 @@ add_task(async function test_loadConfig_filters_by_major_version() {
     await engine.loadConfig(MODEL_FEATURES.CHAT);
 
     const config = engine.getConfig(MODEL_FEATURES.CHAT);
-    const expectedMajor = FEATURE_MAJOR_VERSIONS[MODEL_FEATURES.CHAT];
-    Assert.ok(
-      config.version.startsWith(`${expectedMajor}.`),
-      `Should select ${expectedMajor}.x, not 3.0`
-    );
+    // Should get 1.x, not 3.0
+    Assert.ok(config.version.startsWith("1."), "Should select 1.x, not 3.0");
   } finally {
     sb.restore();
   }
@@ -246,11 +233,7 @@ add_task(async function test_loadConfig_fallback_when_user_model_not_found() {
       engine.model,
       "Engine model should match the default config's model"
     );
-    Assert.equal(
-      config.version,
-      getVersionForFeature(MODEL_FEATURES.CHAT),
-      "Should use current chat version"
-    );
+    Assert.equal(config.version, "1.0", "Should use 1.0");
   } finally {
     sb.restore();
     Services.prefs.clearUserPref(PREF_MODEL);
@@ -267,7 +250,7 @@ add_task(async function test_loadConfig_custom_endpoint_with_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "some-other-model",
         is_default: true,
       },
@@ -305,7 +288,7 @@ add_task(async function test_loadConfig_custom_endpoint_without_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "remote-default-model",
         is_default: true,
       },
@@ -544,7 +527,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -552,7 +535,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "my-other-model",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -560,7 +543,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -614,7 +597,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -622,7 +605,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
       },
       {
         feature: MODEL_FEATURES.TITLE_GENERATION,
-        version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
+        version: "1.0",
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -664,7 +647,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -672,7 +655,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -680,7 +663,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -725,7 +708,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -733,7 +716,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -741,7 +724,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -784,7 +767,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: getVersionForFeature(MODEL_FEATURES.CHAT),
+          version: "1.0",
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -792,14 +775,14 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
+          version: "1.0",
           model: "model-for-choice-1",
           prompts: "Test prompt",
           is_default: false,
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
+          version: "1.0",
           model: "default-title-model",
           prompts: "Default prompt",
           is_default: true,
@@ -838,7 +821,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "model-1",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -846,7 +829,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "model-2",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -854,7 +837,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "1.0",
         model: "default-model",
         model_choice_id: "3",
         prompts: "Test prompt",
@@ -896,7 +879,7 @@ add_task(async function test_custom_endpoint_override() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "2.0",
         model: "future-model",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -904,7 +887,7 @@ add_task(async function test_custom_endpoint_override() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: getVersionForFeature(MODEL_FEATURES.CHAT),
+        version: "2.0",
         model: "future-default",
         prompts: "Default prompt",
         is_default: true,

From 7770825f8e5f2eff4153427f3e8bedf410d16572 Mon Sep 17 00:00:00 2001
From: Mathew Hodson <mathew.hodson@gmail.com>
Date: Sat, 7 Feb 2026 03:57:27 +0000
Subject: [PATCH 86/93] Bug 1842988 - Remove
 dom.keyboardevent.init_key_event.enabled pref r=gregp,masayuki

Differential Revision: https://phabricator.services.mozilla.com/D282209
---
 dom/events/KeyboardEvent.cpp                  |   3 -
 ...init_key_event_enabled_in_contentscript.js |   5 +-
 dom/events/test/test_dom_keyboard_event.html  | 286 ++++++++----------
 modules/libpref/init/StaticPrefList.yaml      |   6 -
 4 files changed, 130 insertions(+), 170 deletions(-)

diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp
index 1b7b00a78db12..cf1b2cfb4dd5a 100644
--- a/dom/events/KeyboardEvent.cpp
+++ b/dom/events/KeyboardEvent.cpp
@@ -330,9 +330,6 @@ void KeyboardEvent::InitWithKeyboardEventInit(EventTarget* aOwner,
 
 // static
 bool KeyboardEvent::IsInitKeyEventAvailable(JSContext* aCx, JSObject*) {
-  if (StaticPrefs::dom_keyboardevent_init_key_event_enabled()) {
-    return true;
-  }
   if (!StaticPrefs::dom_keyboardevent_init_key_event_enabled_in_addons()) {
     return false;
   }
diff --git a/dom/events/test/browser_keyboard_event_init_key_event_enabled_in_contentscript.js b/dom/events/test/browser_keyboard_event_init_key_event_enabled_in_contentscript.js
index e8d51edb3e484..16f8d50848680 100644
--- a/dom/events/test/browser_keyboard_event_init_key_event_enabled_in_contentscript.js
+++ b/dom/events/test/browser_keyboard_event_init_key_event_enabled_in_contentscript.js
@@ -39,10 +39,7 @@ async function installAndStartExtension() {
 
 add_task(async function () {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.keyboardevent.init_key_event.enabled", false],
-      ["dom.keyboardevent.init_key_event.enabled_in_addons", true],
-    ],
+    set: [["dom.keyboardevent.init_key_event.enabled_in_addons", true]],
   });
 
   const extension = await installAndStartExtension();
diff --git a/dom/events/test/test_dom_keyboard_event.html b/dom/events/test/test_dom_keyboard_event.html
index dd7b0c001aca6..2be948b6fec60 100644
--- a/dom/events/test/test_dom_keyboard_event.html
+++ b/dom/events/test/test_dom_keyboard_event.html
@@ -4,7 +4,7 @@
   <title>Test for DOM KeyboardEvent</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
 <p id="display"></p>
@@ -12,120 +12,120 @@
 <p><input type="text" id="input_readonly" readonly></p>
 <p><textarea id="textarea"></textarea></p>
 <div id="content" style="display: none">
-  
 </div>
 <pre id="test">
-<script type="application/javascript">
+<script>
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(runTests, window);
 
-function testInitializingUntrustedEvent()
-{
+function testInitializingUntrustedEvent() {
   const kTests = [
-    // initKeyEvent
-    { createEventArg: "KeyboardEvent", useInitKeyboardEvent: false,
-      type: "keydown", bubbles: true, cancelable: true, view: null,
-      ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, detail: 0, key: "", location: 0,
-    }, // 0
-
-    { createEventArg: "keyboardevent", useInitKeyboardEvent: false,
-      type: "keyup", bubbles: false, cancelable: true, view: window,
-      ctrlKey: true, altKey: false, shiftKey: false, metaKey: false,
-      keyCode: 0x10, charCode: 0x00, detail: 0, key: "", location: 0,
-    }, // 1
-
-    { createEventArg: "Keyboardevent", useInitKeyboardEvent: false,
-      type: "keypress", bubbles: true, cancelable: false, view: null,
-      ctrlKey: false, altKey: true, shiftKey: false, metaKey: false,
-      keyCode: 0x11, charCode: 0x30, detail: 0, key: "", location: 0,
-    }, // 2
-
-    { createEventArg: "keyboardEvent", useInitKeyboardEvent: false,
-      type: "boo", bubbles: false, cancelable: false, view: window,
-      ctrlKey: false, altKey: false, shiftKey: true, metaKey: false,
-      keyCode: 0x30, charCode: 0x40, detail: 0, key: "", location: 0,
-    }, // 3
-
-    { createEventArg: "KeyBoardEvent", useInitKeyboardEvent: false,
-      type: "foo", bubbles: true, cancelable: true, view: null,
-      ctrlKey: false, altKey: false, shiftKey: false, metaKey: true,
-      keyCode: 0x00, charCode: 0x50, detail: 0, key: "", location: 0,
-    }, // 4
-
-    { createEventArg: "keyboardevEnt", useInitKeyboardEvent: false,
-      type: "bar", bubbles: false, cancelable: true, view: window,
-      ctrlKey: true, altKey: true, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x60, detail: 0, key: "", location: 0,
-    }, // 5
-
-    { createEventArg: "KeyboaRdevent", useInitKeyboardEvent: false,
-      type: "keydown", bubbles: true, cancelable: false, view: null,
-      ctrlKey: false, altKey: true, shiftKey: false, metaKey: true,
-      keyCode: 0x30, charCode: 0x00, detail: 0, key: "", location: 0,
-    }, // 6
-
-    { createEventArg: "KEYBOARDEVENT", useInitKeyboardEvent: false,
-      type: "keyup", bubbles: false, cancelable: false, view: window,
-      ctrlKey: true, altKey: false, shiftKey: true, metaKey: false,
-      keyCode: 0x10, charCode: 0x80, detail: 0, key: "", location: 0,
-    }, // 7
-
-    { createEventArg: "KeyboardEvent", useInitKeyboardEvent: false,
-      type: "keypress", bubbles: false, cancelable: false, view: window,
-      ctrlKey: true, altKey: false, shiftKey: true, metaKey: true,
-      keyCode: 0x10, charCode: 0x80, detail: 0, key: "", location: 0,
-    }, // 8
-
-    { createEventArg: "KeyboardEvent", useInitKeyboardEvent: false,
-      type: "foo", bubbles: false, cancelable: false, view: window,
-      ctrlKey: true, altKey: true, shiftKey: true, metaKey: true,
-      keyCode: 0x10, charCode: 0x80, detail: 0, key: "", location: 0,
-    }, // 9
-
-    // initKeyboardEvent
-    { createEventArg: "KeyboardEvent", useInitKeyboardEvent: true,
-      type: "keydown", bubbles: true, cancelable: true, view: null,
-      ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, key: "", location: 0,
-    }, // 10
-
-    { createEventArg: "keyboardevent", useInitKeyboardEvent: true,
-      type: "keyup", bubbles: false, cancelable: true, view: window,
-      ctrlKey: true, altKey: false, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, key: "Unidentified", location: 1,
-    }, // 11
-
-    { createEventArg: "Keyboardevent", useInitKeyboardEvent: true,
-      type: "keypress", bubbles: true, cancelable: false, view: null,
-      ctrlKey: false, altKey: true, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, key: "FooBar", location: 2,
-    }, // 12
-
-    { createEventArg: "keyboardevent", useInitKeyboardEvent: true,
-      type: "foo", bubbles: true, cancelable: true, view: null,
-      ctrlKey: false, altKey: false, shiftKey: false, metaKey: true,
-      keyCode: 0x00, charCode: 0x00, key: "a", location: 0,
-    }, // 13
-
-    { createEventArg: "KeyBoardEvent", useInitKeyboardEvent: true,
-      type: "", bubbles: false, cancelable: false, view: null,
-      ctrlKey: true, altKey: true, shiftKey: true, metaKey: true,
-      keyCode: 0x00, charCode: 0x00, key: "3", location: 0,
-    }, // 14
-
-    { createEventArg: "keyboardevEnt", useInitKeyboardEvent: true,
-      type: "", bubbles: false, cancelable: false, view: null,
-      ctrlKey: false, altKey: false, shiftKey: true, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, key: "3", location: 6,
-    }, // 15
-
-    { createEventArg: "KeyboaRdevent", useInitKeyboardEvent: true,
-      type: "", bubbles: false, cancelable: false, view: null,
-      ctrlKey: false, altKey: true, shiftKey: false, metaKey: false,
-      keyCode: 0x00, charCode: 0x00, key: "", location: 4,
-    }, // 16
+    [
+      "KeyboardEvent",
+      {
+        type: "keydown",
+        bubbles: true,
+        cancelable: true,
+        view: null,
+        key: "",
+        location: 0,
+        ctrlKey: false,
+        altKey: false,
+        shiftKey: false,
+        metaKey: false,
+      },
+    ],
+    [
+      "keyboardevent",
+      {
+        type: "keyup",
+        bubbles: false,
+        cancelable: true,
+        view: window,
+        key: "Unidentified",
+        location: 1,
+        ctrlKey: true,
+        altKey: false,
+        shiftKey: false,
+        metaKey: false,
+      },
+    ],
+    [
+      "Keyboardevent",
+      {
+        type: "keypress",
+        bubbles: true,
+        cancelable: false,
+        view: null,
+        key: "FooBar",
+        location: 2,
+        ctrlKey: false,
+        altKey: true,
+        shiftKey: false,
+        metaKey: false,
+      },
+    ],
+    [
+      "keyboardevent",
+      {
+        type: "foo",
+        bubbles: true,
+        cancelable: true,
+        view: null,
+        key: "a",
+        location: 0,
+        ctrlKey: false,
+        altKey: false,
+        shiftKey: false,
+        metaKey: true,
+      },
+    ],
+    [
+      "KeyBoardEvent",
+      {
+        type: "",
+        bubbles: false,
+        cancelable: false,
+        view: null,
+        key: "3",
+        location: 0,
+        ctrlKey: true,
+        altKey: true,
+        shiftKey: true,
+        metaKey: true,
+      },
+    ],
+    [
+      "keyboardevEnt",
+      {
+        type: "",
+        bubbles: false,
+        cancelable: false,
+        view: null,
+        key: "3",
+        location: 6,
+        ctrlKey: false,
+        altKey: false,
+        shiftKey: true,
+        metaKey: false,
+      },
+    ],
+    [
+      "KeyboaRdevent",
+      {
+        type: "",
+        bubbles: false,
+        cancelable: false,
+        view: null,
+        key: "",
+        location: 4,
+        ctrlKey: false,
+        altKey: true,
+        shiftKey: false,
+        metaKey: false,
+      },
+    ],
   ];
 
   const kOtherModifierName = [
@@ -138,57 +138,29 @@
     "Win", "Scroll"
   ];
 
-  const kIsInitKeyEventAvailable =
-    SpecialPowers.getBoolPref("dom.keyboardevent.init_key_event.enabled", false);
-
-  for (var i = 0; i < kTests.length; i++) {
+  kTests.forEach(([createEventArg, kTest], i) => {
     var description = "testInitializingUntrustedEvent, Index: " + i + ", ";
-    const kTest = kTests[i];
-    var e = document.createEvent(kTest.createEventArg);
-    if (kTest.useInitKeyboardEvent) {
-      e.initKeyboardEvent(kTest.type, kTest.bubbles, kTest.cancelable,
-                          kTest.view, kTest.key, kTest.location,
-                          kTest.ctrlKey, kTest.altKey, kTest.shiftKey,
-                          kTest.metaKey);
-    } else {
-      if (!kIsInitKeyEventAvailable) {
-        continue;
-      }
-      e.initKeyEvent(kTest.type, kTest.bubbles, kTest.cancelable, kTest.view,
-                     kTest.ctrlKey, kTest.altKey, kTest.shiftKey, kTest.metaKey,
-                     kTest.keyCode, kTest.charCode);
-    }
-    is(e.toString(), "[object KeyboardEvent]",
-       description + 'class string should be "KeyboardEvent"');
+    var e = document.createEvent(createEventArg);
+    e.initKeyboardEvent(
+      kTest.type,
+      kTest.bubbles,
+      kTest.cancelable,
+      kTest.view,
+      kTest.key,
+      kTest.location,
+      kTest.ctrlKey,
+      kTest.altKey,
+      kTest.shiftKey,
+      kTest.metaKey
+    );
+    is(
+      e.toString(),
+      "[object KeyboardEvent]",
+      description + 'class string should be "KeyboardEvent"'
+    );
 
     for (var attr in kTest) {
-      if (attr == "createEventArg" || attr == "useInitKeyboardEvent" || attr == "modifiersList") {
-        continue;
-      }
-      if (!kTest.useInitKeyboardEvent && attr == "keyCode") {
-        // If this is keydown, keyup of keypress event, keycod must be correct.
-        if (kTest.type == "keydown" || kTest.type == "keyup" || kTest.type == "keypress") {
-          is(e[attr], kTest[attr], description + attr + " returns wrong value");
-        // Otherwise, should be always zero (why?)
-        } else {
-          is(e[attr], 0, description + attr + " returns non-zero for invalid event");
-        }
-      } else if (!kTest.useInitKeyboardEvent && attr == "charCode") {
-        // If this is keydown or keyup event, charCode always 0.
-        if (kTest.type == "keydown" || kTest.type == "keyup") {
-          is(e[attr], 0, description + attr + " returns non-zero for keydown or keyup event");
-        // If this is keypress event, charCode must be correct.
-        } else if (kTest.type == "keypress") {
-          is(e[attr], kTest[attr], description + attr + " returns wrong value");
-        // Otherwise, we have a bug.
-        } else {
-          if (e[attr] != kTest[attr]) { // avoid random unexpected pass.
-            todo_is(e[attr], kTest[attr], description + attr + " returns wrong value");
-          }
-        }
-      } else {
-        is(e[attr], kTest[attr], description + attr + " returns wrong value");
-      }
+      is(e[attr], kTest[attr], description + attr + " returns wrong value");
     }
     is(e.isTrusted, false, description + "isTrusted returns wrong value");
 
@@ -210,7 +182,7 @@
       ok(!e.getModifierState(kInvalidModifierName[k]),
          description + "getModifierState(\"" + kInvalidModifierName[k] + "\") returns wrong value");
     }
-  }
+  });
 }
 
 function testSynthesizedKeyLocation()
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 227b48d4519e6..569fe7cb38847 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3571,12 +3571,6 @@
 #endif
   mirror: always
 
-# Enable/disable KeyboardEvent.initKeyEvent function
-- name: dom.keyboardevent.init_key_event.enabled
-  type: bool
-  value: false
-  mirror: always
-
 # Enable/disable KeyboardEvent.initKeyEvent function in addons even if it's
 # disabled.
 - name: dom.keyboardevent.init_key_event.enabled_in_addons

From a14cdfa84f30b8aa78c88d421ed22b70f3a336f7 Mon Sep 17 00:00:00 2001
From: Omar Gonzalez <s9tpepper@apache.org>
Date: Sat, 7 Feb 2026 04:09:52 +0000
Subject: [PATCH 87/93] Bug 2012536 - Implement tab switching for smart window
 sidebar state mgmt r=Mardak,ai-frontend-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D282095
---
 .../ui/components/ai-window/ai-window.mjs     | 126 ++++-
 .../aiwindow/ui/modules/AIWindow.sys.mjs      |  24 +
 .../modules/AIWindowTabStatesManager.sys.mjs  | 367 +++++++++++++
 browser/components/aiwindow/ui/moz.build      |   1 +
 .../aiwindow/ui/test/browser/browser.toml     |   2 +
 .../browser_smartwindow_tab_switching.js      | 506 ++++++++++++++++++
 6 files changed, 1023 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
 create mode 100644 browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js

diff --git a/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs b/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
index 1c96b38af58ef..43ec75cf6519a 100644
--- a/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
+++ b/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
@@ -50,6 +50,29 @@ ChromeUtils.defineLazyGetter(lazy, "log", function () {
   });
 });
 
+/**
+ * @typedef {{
+ *   input: string,
+ *   mode: string,
+ *   pageUrl: URL,
+ *   conversationId: string,
+ *   tab: MozTabbrowserTab
+ * }} TabStateEventDetail
+ */
+
+/**
+ * @typedef {{
+ *   bubbles: true,
+ *   detail: TabStateEventDetail
+ * }} TabStateEventOptions
+ */
+
+/**
+ * @typedef {CustomEvent & {
+ *   detail: TabStateEventDetail
+ * }} TabStateEvent
+ */
+
 const FULLPAGE = "fullpage";
 const SIDEBAR = "sidebar";
 const PREF_MEMORIES = "browser.smartwindow.memories";
@@ -155,6 +178,20 @@ export class AIWindow extends MozLitElement {
     }
   }
 
+  /**
+   * Gets the conversation id from data-conversation-id attribute
+   *
+   * @private
+   */
+  #getDataConvId() {
+    if (this.#conversation) {
+      return this.#conversation.id;
+    }
+
+    const hostBrowser = window.browsingContext?.embedderElement;
+    return hostBrowser?.getAttribute("data-conversation-id");
+  }
+
   connectedCallback() {
     super.connectedCallback();
 
@@ -166,6 +203,11 @@ export class AIWindow extends MozLitElement {
     );
 
     this.#loadPendingConversation();
+
+    this.#dispatchChromeEvent(
+      "ai-window:connected",
+      this.#getAIWindowEventOptions()
+    );
   }
 
   get conversationId() {
@@ -370,6 +412,7 @@ export class AIWindow extends MozLitElement {
       container.after(smartbar);
 
       smartbar.addEventListener("smartbar-commit", this.#handleSmartbarCommit);
+      smartbar.addEventListener("input", this.#handleSmartbarInput);
       smartbar.addEventListener(
         "aiwindow-memories-toggle:on-change",
         this.#handleMemoriesToggle
@@ -380,6 +423,40 @@ export class AIWindow extends MozLitElement {
     this.#syncSmartbarMemoriesStateFromConversation();
   }
 
+  /**
+   * Handles input event from the Smartbar and dispatches
+   * a ai-window:smartbar-input event to the window for
+   * AIWindowTabStatesManager.sys.mjs to manage the input
+   * state of the sidebar chat window.
+   *
+   * @param {Event} event
+   *
+   * @private
+   */
+  #handleSmartbarInput = event => {
+    this.#dispatchChromeEvent(
+      "ai-window:smartbar-input",
+      this.#getAIWindowEventOptions(event.target.value)
+    );
+  };
+
+  /**
+   * Dispatches a TabStateEvent on the chrome window for the
+   * AIWindowTabStatesManager.sys.mjs to catch state updates
+   * for the ai-window.
+   *
+   * @param {string} eventName Name of the event
+   * @param {TabStateEventOptions} [options={}] Event options/detail
+   *
+   * @private
+   */
+  #dispatchChromeEvent(eventName, options = {}) {
+    const topChromeWindow = window?.browsingContext?.topChromeWindow;
+    topChromeWindow?.dispatchEvent(
+      new topChromeWindow.CustomEvent(eventName, options)
+    );
+  }
+
   /**
    * Handles the smartbar-commit action for the user prompt
    *
@@ -504,6 +581,19 @@ export class AIWindow extends MozLitElement {
     this.classList.remove("chat-active");
   }
 
+  /**
+   * Gets the current url of the loaded page.
+   *
+   * @returns {URL} The page URL
+   *
+   * @private
+   */
+  #getCurrentPageUrl() {
+    return URL.fromURI(
+      window.browsingContext.topChromeWindow.gBrowser.currentURI
+    );
+  }
+
   /**
    * Fetches an AI response based on the current user prompt.
    * Validates the prompt, updates conversation state, streams the response,
@@ -535,9 +625,7 @@ export class AIWindow extends MozLitElement {
       let stream;
 
       if (formattedPrompt) {
-        const pageUrl = URL.fromURI(
-          window.browsingContext.topChromeWindow.gBrowser.currentURI
-        );
+        const pageUrl = this.#getCurrentPageUrl();
         stream = lazy.Chat.fetchWithHistory(
           await this.#conversation.generatePrompt(
             formattedPrompt,
@@ -716,6 +804,35 @@ export class AIWindow extends MozLitElement {
     this.#conversation.renderState().forEach(message => {
       this.#dispatchMessageToActor(actor, message);
     });
+
+    this.#dispatchChromeEvent(
+      "ai-window:opened-conversation",
+      this.#getAIWindowEventOptions()
+    );
+  }
+
+  /**
+   * Gets event options for a TabStateEvent
+   *
+   * @param {false|string} [input=false] The latest input contents
+   *
+   * @returns {TabStateEventOptions}
+   *
+   * @private
+   */
+  #getAIWindowEventOptions(input = false) {
+    const topChromeWindow = window?.browsingContext?.topChromeWindow;
+
+    return {
+      bubbles: true,
+      detail: {
+        input,
+        mode: this.mode,
+        pageUrl: this.#getCurrentPageUrl(),
+        conversationId: this.#getDataConvId(),
+        tab: topChromeWindow?.gBrowser?.selectedTab,
+      },
+    };
   }
 
   /**
@@ -726,6 +843,9 @@ export class AIWindow extends MozLitElement {
   openConversation(conversation) {
     this.#conversation = conversation;
 
+    const hostBrowser = window.browsingContext?.embedderElement;
+    hostBrowser?.setAttribute("data-conversation-id", conversation.id);
+
     const actor = this.#getAIChatContentActor();
     if (this.#browser && actor) {
       this.#deliverConversationMessages(actor);
diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
index c77f2ade0aaff..58aa3675a5bd1 100644
--- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
@@ -12,6 +12,8 @@ const FIRSTRUN_URI = Services.io.newURI(FIRSTRUN_URL);
 
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
+  AIWindowTabStatesManager:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs",
   AIWindowAccountAuth:
     "moz-src:///browser/components/aiwindow/ui/modules/AIWindowAccountAuth.sys.mjs",
   AIWindowMenu:
@@ -48,6 +50,12 @@ export const AIWindow = {
   _windowStates: new WeakMap(),
   _aiWindowMenu: null,
 
+  /**
+   * A WeakMap<window, AIWindowTabStatesManager> that keeps references
+   * of AIWindowTabStatesManager per window.
+   */
+  _aiWindowTabStateManagers: new WeakMap(),
+
   /**
    * Handles startup tasks
    */
@@ -60,6 +68,16 @@ export const AIWindow = {
       this._updateWindowSwitcherPosition(win);
     }
 
+    if (
+      !this._aiWindowTabStateManagers.has(win) &&
+      this.isAIWindowActive(win)
+    ) {
+      this._aiWindowTabStateManagers.set(
+        win,
+        new lazy.AIWindowTabStatesManager(win)
+      );
+    }
+
     if (this._initialized) {
       return;
     }
@@ -488,6 +506,12 @@ export const AIWindow = {
       Services.obs.notifyObservers(win, "ai-window-state-changed");
 
       if (isTogglingToAIWindow) {
+        if (!this._aiWindowTabStateManagers.has(win)) {
+          this._aiWindowTabStateManagers.set(
+            win,
+            new lazy.AIWindowTabStatesManager(win)
+          );
+        }
         lazy.MemoriesSchedulers.maybeRunAndSchedule();
       }
     }
diff --git a/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
new file mode 100644
index 0000000000000..c5c0eeea13cf5
--- /dev/null
+++ b/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
@@ -0,0 +1,367 @@
+/*
+ This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  AIWINDOW_URL:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
+  AIWindowUI:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs",
+  ChatStore:
+    "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs",
+});
+
+/**
+ * @typedef {{
+ *   input: string,
+ *   mode: string,
+ *   pageUrl: URL,
+ *   conversationId: string,
+ * }} TabState
+ */
+
+/**
+ * Manages state changes of the tabs in AIWindow to keep both the
+ * fullwindow and sidebar chats in sync as tabs are created/selected.
+ */
+export class AIWindowTabStatesManager {
+  /**
+   * The browser window instance that this manager operates on
+   */
+  #window;
+  /**
+   * The currently selected browser tab
+   *
+   * @type {MozTabbrowserTab}
+   */
+  #selectedTab;
+  /**
+   * A map of tabs and their states
+   *
+   * @type {WeakMap<MozTabbrowserTab, TabState>}
+   */
+  #tabStates;
+  /**
+   * Global progress listener for all tabs
+   */
+  #tabsListener;
+
+  constructor(win) {
+    this.#init(win);
+  }
+
+  /**
+   * Adds event listeners needed to manage tab states
+   *
+   * @param {ChromeWindow} win
+   *
+   * @private
+   */
+  #init(win) {
+    this.#window = win;
+    this.#tabStates = new WeakMap();
+
+    const tabContainer = this.#window.gBrowser.tabContainer;
+    tabContainer.addEventListener("TabOpen", this);
+    tabContainer.addEventListener("TabSelect", this);
+    tabContainer.addEventListener("TabClose", this);
+
+    this.#tabsListener = this.#getTabsListener();
+    this.#window.gBrowser.addTabsProgressListener(this.#tabsListener);
+
+    this.#setUpInitialTabs();
+    this.#addWindowEventListeners();
+  }
+
+  /**
+   * Add event listeners to the window for ai-window:* events
+   */
+  #addWindowEventListeners() {
+    this.#window.addEventListener(
+      "ai-window:smartbar-input",
+      this.#onSmartbarInput
+    );
+
+    this.#window.addEventListener(
+      "ai-window:connected",
+      this.#onAIWindowConnected
+    );
+
+    this.#window.addEventListener(
+      "ai-window:opened-conversation",
+      this.#onConversationOpened
+    );
+  }
+
+  /**
+   * Adds event listeners for any tabs that are present when the window opens.
+   * The TabOpen event does not fire for the initial tab of a new window, for example.
+   *
+   * @private
+   */
+  #setUpInitialTabs() {
+    this.#window.gBrowser.tabs.forEach(tab => {
+      if (this.#tabStates.has(tab)) {
+        return;
+      }
+
+      this.#addEventListeners(tab);
+    });
+  }
+
+  /**
+   * Handles tab events
+   *
+   * @param {Event} event
+   *
+   * @private
+   */
+  handleEvent(event) {
+    switch (event.type) {
+      case "TabOpen":
+        this.#onTabOpen(event);
+        break;
+
+      case "TabSelect":
+        this.#onTabSelect(event);
+        break;
+
+      case "TabClose":
+        this.#onTabClose(event);
+        break;
+    }
+  }
+
+  /**
+   * Handles TabOpen events from a new browser tab to add
+   * event listeners to it.
+   *
+   * @param {Event} event
+   *
+   * @private
+   */
+  #onTabOpen(event) {
+    this.#addEventListeners(event.target);
+  }
+
+  /**
+   * Handles TabSelect events from a new browser tab to
+   * update the state of the sidebar.
+   *
+   * @param {Event} event
+   *
+   * @private
+   */
+  async #onTabSelect(event) {
+    this.#selectedTab = event.target;
+
+    const tabState = this.#getTabState(this.#selectedTab);
+    const convId = tabState?.state?.conversationId;
+
+    if (!convId) {
+      lazy.AIWindowUI.closeSidebar(this.#window);
+      return;
+    }
+
+    const tabUrl = this.#selectedTab.linkedBrowser.currentURI.spec;
+    const conversation = await lazy.ChatStore.findConversationById(convId);
+    const tabNeedsSidebar =
+      conversation &&
+      conversation.messages.length &&
+      tabUrl !== lazy.AIWINDOW_URL;
+
+    if (tabNeedsSidebar) {
+      lazy.AIWindowUI.openSidebar(this.#window, conversation);
+    } else {
+      lazy.AIWindowUI.closeSidebar(this.#window);
+    }
+
+    // TODO: Bug 2014936
+    // Update input
+  }
+
+  /**
+   * Handles TabClose events from a new browser tab to
+   * clean up after the tab is gone.
+   *
+   * @param {Event} event
+   *
+   * @private
+   */
+  #onTabClose(event) {
+    this.#removeEventListeners(event.target);
+  }
+
+  /**
+   * Adds a tab to the state map.
+   *
+   * @param {MozTabbrowserTab} tab
+   *
+   * @private
+   */
+  #addEventListeners(tab) {
+    this.#tabStates.set(tab, { state: null });
+  }
+
+  /**
+   * Removes necessary event listeners from a tab.
+   *
+   * @param {MozTabbrowserTab} tab
+   *
+   * @private
+   */
+  #removeEventListeners(tab) {
+    this.#tabStates.delete(tab);
+  }
+
+  /**
+   * Listens for ai-window:connected events from ai-window.mjs instances
+   *
+   * @param {AIWindowStateEvent} event
+   *
+   * @private
+   */
+  #onAIWindowConnected = async event => {
+    const tabState = this.#getTabState(event.detail.tab, event.detail);
+    const { mode, pageUrl, conversationId, input } = tabState;
+
+    const conversation = await lazy.ChatStore.findConversationById(
+      conversationId || event.detail.conversationId
+    );
+    const isAIWindow = pageUrl === lazy.AIWINDOW_URL;
+
+    const needsSidebar =
+      this.#selectedTab === event.detail.tab &&
+      mode === "fullpage" &&
+      !isAIWindow &&
+      input &&
+      conversation &&
+      conversation.messages.length;
+
+    // NOTE: Don't need to fire open/close sidebar from here, the location change
+    // event handler is taking care of that logic.
+    if (needsSidebar) {
+      // TODO: Bug 2014936
+      // Update smartbar input
+    }
+  };
+
+  /**
+   * Gets the state for the specified tab. Will update the state
+   * if a newState is passed in.
+   *
+   * @param {*} tab The browser tab to get state for
+   * @param {*} [newState=null] New state to update the tab with
+   *
+   * @returns {TabState}
+   *
+   * @private
+   */
+  #getTabState(tab, newState = null) {
+    const tabState = this.#tabStates.get(tab) ?? {};
+
+    if (newState) {
+      const { input, mode, pageUrl, conversationId } = tabState.state ?? {};
+      delete newState.tab;
+
+      tabState.state = {
+        input,
+        mode,
+        pageUrl,
+        conversationId,
+        ...newState,
+      };
+
+      this.#tabStates.set(tab, tabState);
+    }
+
+    return tabState;
+  }
+
+  /**
+   * Handles input events from the Smartbar, updates the state
+   * with the latest input
+   *
+   * @param {TabStateEvent} event
+   */
+  #onSmartbarInput = event => {
+    this.#getTabState(event.detail.tab, event.detail);
+  };
+
+  /**
+   * Handles ai-window:opened-conversation events from the ai-window.mjs,
+   * updates the state with conversation info
+   *
+   * @param {TabStateEvent} event
+   */
+  #onConversationOpened = event => {
+    const { mode, conversationId, tab } = event.detail;
+
+    this.#getTabState(tab, { mode, conversationId });
+  };
+
+  /**
+   * Gets a global progress listener for all tabs. The callbacks from
+   * addTabsProgressListener prepend a browser argument.
+   */
+  #getTabsListener() {
+    return {
+      QueryInterface: ChromeUtils.generateQI([
+        "nsIWebProgressListener",
+        "nsISupportsWeakReference",
+      ]),
+
+      onLocationChange: async (
+        _browser,
+        webProgress,
+        _request,
+        locationURI,
+        _flags
+      ) => {
+        if (!webProgress.isTopLevel) {
+          return;
+        }
+
+        const browser = webProgress.browsingContext?.embedderElement;
+        const tab = this.#window.gBrowser.getTabForBrowser(browser);
+        const tabState = this.#tabStates.get(tab);
+
+        if (!tabState || !tabState?.state?.conversationId) {
+          return;
+        }
+
+        const isSidebarOpen = lazy.AIWindowUI.isSidebarOpen(this.#window);
+        const conversation = await lazy.ChatStore.findConversationById(
+          tabState.state.conversationId
+        );
+        const isAiWindowUrl = locationURI.spec === lazy.AIWINDOW_URL;
+
+        const needsSidebar =
+          !isAiWindowUrl &&
+          tabState.state.mode === "fullpage" &&
+          conversation?.messages?.length &&
+          !isSidebarOpen;
+
+        const needsCloseSidebar =
+          isAiWindowUrl &&
+          tabState.state.mode === "fullpage" &&
+          conversation?.messages.length &&
+          isSidebarOpen;
+
+        if (needsSidebar) {
+          lazy.AIWindowUI.openSidebar(this.#window, conversation);
+        } else if (needsCloseSidebar) {
+          lazy.AIWindowUI.closeSidebar(this.#window);
+        }
+      },
+
+      onStateChange() {},
+      onProgressChange() {},
+      onStatusChange() {},
+      onSecurityChange() {},
+      onContentBlockingEvent() {},
+    };
+  }
+}
diff --git a/browser/components/aiwindow/ui/moz.build b/browser/components/aiwindow/ui/moz.build
index a300e73a798b0..dd001cff12f7f 100644
--- a/browser/components/aiwindow/ui/moz.build
+++ b/browser/components/aiwindow/ui/moz.build
@@ -16,6 +16,7 @@ MOZ_SRC_FILES += [
     "modules/AIWindow.sys.mjs",
     "modules/AIWindowAccountAuth.sys.mjs",
     "modules/AIWindowMenu.sys.mjs",
+    "modules/AIWindowTabStatesManager.sys.mjs",
     "modules/AIWindowUI.sys.mjs",
     "modules/ChatConstants.sys.mjs",
     "modules/ChatConversation.sys.mjs",
diff --git a/browser/components/aiwindow/ui/test/browser/browser.toml b/browser/components/aiwindow/ui/test/browser/browser.toml
index 9c24006529507..858763cdd634e 100644
--- a/browser/components/aiwindow/ui/test/browser/browser.toml
+++ b/browser/components/aiwindow/ui/test/browser/browser.toml
@@ -69,3 +69,5 @@ support-files = [
 ["browser_smartwindow_prompts.js"]
 
 ["browser_smartwindow_tab_move.js"]
+
+["browser_smartwindow_tab_switching.js"]
diff --git a/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js b/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js
new file mode 100644
index 0000000000000..67ea4bada44a5
--- /dev/null
+++ b/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js
@@ -0,0 +1,506 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+const { AIWindowUI } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs"
+);
+
+const { Chat } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
+);
+
+const { openAIEngine } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+);
+
+const { ChatConversation } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/ChatConversation.sys.mjs"
+);
+
+const { ChatMessage } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs"
+);
+
+const { ChatStore, MESSAGE_ROLE } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs"
+);
+
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  sinon: "resource://testing-common/Sinon.sys.mjs",
+});
+
+function hasAiWindowAttribute() {
+  return window.document.documentElement.hasAttribute("ai-window");
+}
+
+function createMockConversation(id = "test-conv-id") {
+  const conversation = new ChatConversation({
+    id,
+    title: "Test Conversation",
+    pageUrl: new URL("https://example.com/"),
+  });
+
+  conversation.messages = [
+    new ChatMessage({
+      ordinal: 0,
+      role: MESSAGE_ROLE.USER,
+      content: { text: "Hello" },
+    }),
+    new ChatMessage({
+      ordinal: 1,
+      role: MESSAGE_ROLE.ASSISTANT,
+      content: { text: "Hi there" },
+    }),
+  ];
+
+  return conversation;
+}
+
+async function open_ai_window() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.smartwindow.enabled", true]],
+  });
+
+  const newAIWindow = await BrowserTestUtils.openNewBrowserWindow({
+    openerWindow: null,
+    aiWindow: true,
+  });
+
+  const isAIWindow =
+    newAIWindow.document.documentElement.hasAttribute("ai-window");
+
+  if (!isAIWindow) {
+    throw new Error("Did not open a new AIWindow");
+  }
+
+  return newAIWindow;
+}
+
+add_setup(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.search.suggest.enabled", false],
+      ["browser.urlbar.suggest.searches", false],
+    ],
+  });
+});
+
+// Switching to a new AIWindow tab from a tab with the sidebar open closes the sidebar
+add_task(async function test_new_tab_closes_opened_sidebar_convo() {
+  AIWindow.toggleAIWindow(window, true);
+  let newTab;
+  try {
+    AIWindowUI.openSidebar(window);
+    Assert.ok(
+      AIWindowUI.isSidebarOpen(window),
+      "Sidebar should be opened by AIWindowUI.openSidebar()"
+    );
+
+    newTab = await BrowserTestUtils.addTab(gBrowser, "about:blank");
+    await BrowserTestUtils.switchTab(gBrowser, newTab);
+
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(window),
+      "Sidebar should not be opened after switching to a fresh AIWindow tab"
+    );
+  } finally {
+    AIWindow.toggleAIWindow(window, false);
+    await BrowserTestUtils.removeTab(newTab);
+  }
+});
+
+// Navigating to a website moves an active fullwindow chat to the sidebar
+add_task(
+  async function test_navigate_to_url_with_active_chat_move_convo_to_sidebar() {
+    const sb = lazy.sinon.createSandbox();
+
+    try {
+      const mockConversation = createMockConversation();
+      sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
+
+      const win = await openAIWindow();
+      const browser = win.gBrowser.selectedBrowser;
+      const tab = win.gBrowser.selectedTab;
+
+      await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+      // Simulate a conversation started in fullpage mode
+      win.dispatchEvent(
+        new win.CustomEvent("ai-window:opened-conversation", {
+          detail: {
+            mode: "fullpage",
+            conversationId: mockConversation.id,
+            tab,
+          },
+        })
+      );
+
+      // Navigate to a URL
+      const loaded = BrowserTestUtils.browserLoaded(browser);
+      BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
+      await loaded;
+
+      await TestUtils.waitForCondition(
+        () => AIWindowUI.isSidebarOpen(win),
+        "Sidebar should be open after navigating away with active conversation"
+      );
+
+      await BrowserTestUtils.closeWindow(win);
+    } finally {
+      sb.restore();
+    }
+  }
+);
+
+// Switching back to a tab with an active conversation reopens the sidebar
+add_task(
+  async function test_switch_back_to_tab_with_conversation_reopens_sidebar() {
+    const sb = lazy.sinon.createSandbox();
+
+    try {
+      const mockConversation = createMockConversation();
+      sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
+
+      const win = await openAIWindow();
+      const browser = win.gBrowser.selectedBrowser;
+      const originalTab = win.gBrowser.selectedTab;
+
+      await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+      // Set up conversation state for the original tab
+      win.dispatchEvent(
+        new win.CustomEvent("ai-window:opened-conversation", {
+          detail: {
+            mode: "fullpage",
+            conversationId: mockConversation.id,
+            tab: originalTab,
+          },
+        })
+      );
+
+      // Navigate away from AIWINDOW_URL (simulates user browsing after starting a chat)
+      const loaded = BrowserTestUtils.browserLoaded(browser);
+      BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
+      await loaded;
+
+      Assert.ok(
+        AIWindowUI.isSidebarOpen(win),
+        "Sidebar should be open after navigating away"
+      );
+
+      // Open a new tab - sidebar should close
+      const newTab = await BrowserTestUtils.openNewForegroundTab(
+        win.gBrowser,
+        "about:blank"
+      );
+      await TestUtils.waitForCondition(
+        () => !AIWindowUI.isSidebarOpen(win),
+        "Sidebar should close when switching to new tab"
+      );
+
+      // Switch back to the original tab - sidebar should reopen
+      await BrowserTestUtils.switchTab(win.gBrowser, originalTab);
+      await TestUtils.waitForCondition(
+        () => AIWindowUI.isSidebarOpen(win),
+        "Sidebar should reopen when switching back to tab with conversation"
+      );
+
+      await BrowserTestUtils.removeTab(newTab);
+      await BrowserTestUtils.closeWindow(win);
+    } finally {
+      sb.restore();
+    }
+  }
+);
+
+// Switching between tabs with different conversations maintains correct state
+add_task(
+  async function test_switch_between_tabs_with_different_conversations() {
+    const sb = lazy.sinon.createSandbox();
+
+    try {
+      const conversationA = createMockConversation("conv-a");
+      const conversationB = createMockConversation("conv-b");
+
+      const findStub = sb.stub(ChatStore, "findConversationById");
+      findStub.withArgs("conv-a").resolves(conversationA);
+      findStub.withArgs("conv-b").resolves(conversationB);
+
+      const win = await openAIWindow();
+      const browserA = win.gBrowser.selectedBrowser;
+      const tabA = win.gBrowser.selectedTab;
+
+      await BrowserTestUtils.browserLoaded(browserA, false, AIWINDOW_URL);
+
+      // Set up conversation A for tab A
+      win.dispatchEvent(
+        new win.CustomEvent("ai-window:opened-conversation", {
+          detail: {
+            mode: "fullpage",
+            conversationId: "conv-a",
+            tab: tabA,
+          },
+        })
+      );
+
+      // Navigate tab A away from AIWINDOW_URL (simulates user browsing after starting a chat)
+      let loaded = BrowserTestUtils.browserLoaded(browserA);
+      BrowserTestUtils.startLoadingURIString(browserA, "https://example.com/");
+      await loaded;
+
+      // Open tab B with a different conversation
+      const tabB = await BrowserTestUtils.openNewForegroundTab(
+        win.gBrowser,
+        "https://example.org/"
+      );
+
+      win.dispatchEvent(
+        new win.CustomEvent("ai-window:opened-conversation", {
+          detail: {
+            mode: "fullpage",
+            conversationId: "conv-b",
+            tab: tabB,
+          },
+        })
+      );
+
+      // Open sidebar for tab B
+      AIWindowUI.openSidebar(win, conversationB);
+      Assert.ok(
+        AIWindowUI.isSidebarOpen(win),
+        "Sidebar should be open for tab B"
+      );
+
+      // Switch to tab A - sidebar should update to conversation A
+      await BrowserTestUtils.switchTab(win.gBrowser, tabA);
+
+      Assert.ok(
+        AIWindowUI.isSidebarOpen(win),
+        "Sidebar should remain open when switching to tab A with conversation"
+      );
+
+      // Switch back to tab B
+      await BrowserTestUtils.switchTab(win.gBrowser, tabB);
+
+      Assert.ok(
+        AIWindowUI.isSidebarOpen(win),
+        "Sidebar should remain open when switching back to tab B"
+      );
+
+      await BrowserTestUtils.removeTab(tabB);
+      await BrowserTestUtils.closeWindow(win);
+    } finally {
+      sb.restore();
+    }
+  }
+);
+
+// @todo Bug 2014929
+// Navigating back to AI Window URL closes the sidebar
+add_task(async function test_navigate_back_to_aiwindow_closes_sidebar() {
+  const sb = lazy.sinon.createSandbox();
+
+  try {
+    const mockConversation = createMockConversation();
+    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
+
+    const win = await openAIWindow();
+    const browser = win.gBrowser.selectedBrowser;
+    const tab = win.gBrowser.selectedTab;
+
+    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+    // Set up conversation state
+    win.dispatchEvent(
+      new win.CustomEvent("ai-window:opened-conversation", {
+        detail: {
+          mode: "fullpage",
+          conversationId: mockConversation.id,
+          tab,
+        },
+      })
+    );
+
+    // Navigate away to external URL
+    let loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
+    await loaded;
+
+    // Give time for sidebar to open
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+    Assert.ok(
+      AIWindowUI.isSidebarOpen(win),
+      "Sidebar should be open after navigating away"
+    );
+
+    // Navigate back to AI Window URL
+    loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, AIWINDOW_URL);
+    await loaded;
+
+    // Give time for sidebar to close
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should close when navigating back to AI Window URL"
+    );
+
+    await BrowserTestUtils.closeWindow(win);
+  } finally {
+    sb.restore();
+  }
+}).skip();
+
+// Navigating without an active chat keeps the sidebar closed
+add_task(
+  async function test_navigate_without_active_chat_keeps_sidebar_closed() {
+    const win = await openAIWindow();
+    const browser = win.gBrowser.selectedBrowser;
+
+    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+    // No conversation started - no ai-window:opened-conversation event dispatched
+
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should be closed initially"
+    );
+
+    // Navigate to external URL without starting a chat
+    const loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
+    await loaded;
+
+    // Give time for any sidebar logic to run
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should remain closed when navigating without active chat"
+    );
+
+    await BrowserTestUtils.closeWindow(win);
+  }
+);
+
+// Closing a tab with an active sidebar cleans up properly
+add_task(async function test_close_tab_with_active_sidebar() {
+  const sb = lazy.sinon.createSandbox();
+
+  try {
+    const mockConversation = createMockConversation();
+    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
+
+    const win = await openAIWindow();
+    const browser = win.gBrowser.selectedBrowser;
+    const originalTab = win.gBrowser.selectedTab;
+
+    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+    // Set up conversation state
+    win.dispatchEvent(
+      new win.CustomEvent("ai-window:opened-conversation", {
+        detail: {
+          mode: "fullpage",
+          conversationId: mockConversation.id,
+          tab: originalTab,
+        },
+      })
+    );
+
+    // Open sidebar
+    AIWindowUI.openSidebar(win, mockConversation);
+    Assert.ok(AIWindowUI.isSidebarOpen(win), "Sidebar should be open");
+
+    // Open a new tab to switch to before closing original
+    const newTab = await BrowserTestUtils.openNewForegroundTab(
+      win.gBrowser,
+      "about:blank"
+    );
+    await TestUtils.waitForCondition(
+      () => !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should close when switching to new tab"
+    );
+
+    // Close the original tab with conversation - should not throw
+    await BrowserTestUtils.removeTab(originalTab);
+    await TestUtils.waitForCondition(
+      () => !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should be closed after tab with conversation is removed"
+    );
+
+    await BrowserTestUtils.removeTab(newTab);
+    await BrowserTestUtils.closeWindow(win);
+  } finally {
+    sb.restore();
+  }
+});
+
+// @todo Bug 2014929
+add_task(async function test_sidebar_state_after_multiple_navigations() {
+  const sb = lazy.sinon.createSandbox();
+
+  try {
+    // Create a conversation with messages (simulating a started chat)
+    const mockConversation = createMockConversation();
+    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
+
+    const win = await openAIWindow();
+    const browser = win.gBrowser.selectedBrowser;
+    const tab = win.gBrowser.selectedTab;
+
+    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
+
+    // Simulate a conversation started in fullpage mode with messages
+    win.dispatchEvent(
+      new win.CustomEvent("ai-window:opened-conversation", {
+        detail: {
+          mode: "fullpage",
+          conversationId: mockConversation.id,
+          tab,
+        },
+      })
+    );
+
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should be closed on AI Window URL"
+    );
+
+    // Navigate away - sidebar should open because conversation has messages
+    let loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
+    await loaded;
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+    Assert.ok(
+      AIWindowUI.isSidebarOpen(win),
+      "Sidebar should open when navigating away with active conversation"
+    );
+
+    // Navigate back to AI Window URL - sidebar should close
+    loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, AIWINDOW_URL);
+    await loaded;
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+    Assert.ok(
+      !AIWindowUI.isSidebarOpen(win),
+      "Sidebar should close when returning to AI Window URL"
+    );
+
+    // Navigate away again - sidebar should open again
+    loaded = BrowserTestUtils.browserLoaded(browser);
+    BrowserTestUtils.startLoadingURIString(browser, "https://example.org/");
+    await loaded;
+    await new Promise(resolve => win.setTimeout(resolve, 100));
+    Assert.ok(
+      AIWindowUI.isSidebarOpen(win),
+      "Sidebar should open again when navigating away"
+    );
+
+    await BrowserTestUtils.closeWindow(win);
+  } finally {
+    sb.restore();
+  }
+}).skip();

From b1264e3cfde3ef6995b54314a2d6511a92427604 Mon Sep 17 00:00:00 2001
From: Atila Butkovits <abutkovits@mozilla.com>
Date: Sat, 7 Feb 2026 07:14:12 +0200
Subject: [PATCH 88/93] Revert "Bug 2012536 - Implement tab switching for smart
 window sidebar state mgmt r=Mardak,ai-frontend-reviewers" for causing
 failures at browser_chats_firefoxview.js

This reverts commit a14cdfa84f30b8aa78c88d421ed22b70f3a336f7.
---
 .../ui/components/ai-window/ai-window.mjs     | 126 +----
 .../aiwindow/ui/modules/AIWindow.sys.mjs      |  24 -
 .../modules/AIWindowTabStatesManager.sys.mjs  | 367 -------------
 browser/components/aiwindow/ui/moz.build      |   1 -
 .../aiwindow/ui/test/browser/browser.toml     |   2 -
 .../browser_smartwindow_tab_switching.js      | 506 ------------------
 6 files changed, 3 insertions(+), 1023 deletions(-)
 delete mode 100644 browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
 delete mode 100644 browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js

diff --git a/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs b/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
index 43ec75cf6519a..1c96b38af58ef 100644
--- a/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
+++ b/browser/components/aiwindow/ui/components/ai-window/ai-window.mjs
@@ -50,29 +50,6 @@ ChromeUtils.defineLazyGetter(lazy, "log", function () {
   });
 });
 
-/**
- * @typedef {{
- *   input: string,
- *   mode: string,
- *   pageUrl: URL,
- *   conversationId: string,
- *   tab: MozTabbrowserTab
- * }} TabStateEventDetail
- */
-
-/**
- * @typedef {{
- *   bubbles: true,
- *   detail: TabStateEventDetail
- * }} TabStateEventOptions
- */
-
-/**
- * @typedef {CustomEvent & {
- *   detail: TabStateEventDetail
- * }} TabStateEvent
- */
-
 const FULLPAGE = "fullpage";
 const SIDEBAR = "sidebar";
 const PREF_MEMORIES = "browser.smartwindow.memories";
@@ -178,20 +155,6 @@ export class AIWindow extends MozLitElement {
     }
   }
 
-  /**
-   * Gets the conversation id from data-conversation-id attribute
-   *
-   * @private
-   */
-  #getDataConvId() {
-    if (this.#conversation) {
-      return this.#conversation.id;
-    }
-
-    const hostBrowser = window.browsingContext?.embedderElement;
-    return hostBrowser?.getAttribute("data-conversation-id");
-  }
-
   connectedCallback() {
     super.connectedCallback();
 
@@ -203,11 +166,6 @@ export class AIWindow extends MozLitElement {
     );
 
     this.#loadPendingConversation();
-
-    this.#dispatchChromeEvent(
-      "ai-window:connected",
-      this.#getAIWindowEventOptions()
-    );
   }
 
   get conversationId() {
@@ -412,7 +370,6 @@ export class AIWindow extends MozLitElement {
       container.after(smartbar);
 
       smartbar.addEventListener("smartbar-commit", this.#handleSmartbarCommit);
-      smartbar.addEventListener("input", this.#handleSmartbarInput);
       smartbar.addEventListener(
         "aiwindow-memories-toggle:on-change",
         this.#handleMemoriesToggle
@@ -423,40 +380,6 @@ export class AIWindow extends MozLitElement {
     this.#syncSmartbarMemoriesStateFromConversation();
   }
 
-  /**
-   * Handles input event from the Smartbar and dispatches
-   * a ai-window:smartbar-input event to the window for
-   * AIWindowTabStatesManager.sys.mjs to manage the input
-   * state of the sidebar chat window.
-   *
-   * @param {Event} event
-   *
-   * @private
-   */
-  #handleSmartbarInput = event => {
-    this.#dispatchChromeEvent(
-      "ai-window:smartbar-input",
-      this.#getAIWindowEventOptions(event.target.value)
-    );
-  };
-
-  /**
-   * Dispatches a TabStateEvent on the chrome window for the
-   * AIWindowTabStatesManager.sys.mjs to catch state updates
-   * for the ai-window.
-   *
-   * @param {string} eventName Name of the event
-   * @param {TabStateEventOptions} [options={}] Event options/detail
-   *
-   * @private
-   */
-  #dispatchChromeEvent(eventName, options = {}) {
-    const topChromeWindow = window?.browsingContext?.topChromeWindow;
-    topChromeWindow?.dispatchEvent(
-      new topChromeWindow.CustomEvent(eventName, options)
-    );
-  }
-
   /**
    * Handles the smartbar-commit action for the user prompt
    *
@@ -581,19 +504,6 @@ export class AIWindow extends MozLitElement {
     this.classList.remove("chat-active");
   }
 
-  /**
-   * Gets the current url of the loaded page.
-   *
-   * @returns {URL} The page URL
-   *
-   * @private
-   */
-  #getCurrentPageUrl() {
-    return URL.fromURI(
-      window.browsingContext.topChromeWindow.gBrowser.currentURI
-    );
-  }
-
   /**
    * Fetches an AI response based on the current user prompt.
    * Validates the prompt, updates conversation state, streams the response,
@@ -625,7 +535,9 @@ export class AIWindow extends MozLitElement {
       let stream;
 
       if (formattedPrompt) {
-        const pageUrl = this.#getCurrentPageUrl();
+        const pageUrl = URL.fromURI(
+          window.browsingContext.topChromeWindow.gBrowser.currentURI
+        );
         stream = lazy.Chat.fetchWithHistory(
           await this.#conversation.generatePrompt(
             formattedPrompt,
@@ -804,35 +716,6 @@ export class AIWindow extends MozLitElement {
     this.#conversation.renderState().forEach(message => {
       this.#dispatchMessageToActor(actor, message);
     });
-
-    this.#dispatchChromeEvent(
-      "ai-window:opened-conversation",
-      this.#getAIWindowEventOptions()
-    );
-  }
-
-  /**
-   * Gets event options for a TabStateEvent
-   *
-   * @param {false|string} [input=false] The latest input contents
-   *
-   * @returns {TabStateEventOptions}
-   *
-   * @private
-   */
-  #getAIWindowEventOptions(input = false) {
-    const topChromeWindow = window?.browsingContext?.topChromeWindow;
-
-    return {
-      bubbles: true,
-      detail: {
-        input,
-        mode: this.mode,
-        pageUrl: this.#getCurrentPageUrl(),
-        conversationId: this.#getDataConvId(),
-        tab: topChromeWindow?.gBrowser?.selectedTab,
-      },
-    };
   }
 
   /**
@@ -843,9 +726,6 @@ export class AIWindow extends MozLitElement {
   openConversation(conversation) {
     this.#conversation = conversation;
 
-    const hostBrowser = window.browsingContext?.embedderElement;
-    hostBrowser?.setAttribute("data-conversation-id", conversation.id);
-
     const actor = this.#getAIChatContentActor();
     if (this.#browser && actor) {
       this.#deliverConversationMessages(actor);
diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
index 58aa3675a5bd1..c77f2ade0aaff 100644
--- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
@@ -12,8 +12,6 @@ const FIRSTRUN_URI = Services.io.newURI(FIRSTRUN_URL);
 
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
-  AIWindowTabStatesManager:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs",
   AIWindowAccountAuth:
     "moz-src:///browser/components/aiwindow/ui/modules/AIWindowAccountAuth.sys.mjs",
   AIWindowMenu:
@@ -50,12 +48,6 @@ export const AIWindow = {
   _windowStates: new WeakMap(),
   _aiWindowMenu: null,
 
-  /**
-   * A WeakMap<window, AIWindowTabStatesManager> that keeps references
-   * of AIWindowTabStatesManager per window.
-   */
-  _aiWindowTabStateManagers: new WeakMap(),
-
   /**
    * Handles startup tasks
    */
@@ -68,16 +60,6 @@ export const AIWindow = {
       this._updateWindowSwitcherPosition(win);
     }
 
-    if (
-      !this._aiWindowTabStateManagers.has(win) &&
-      this.isAIWindowActive(win)
-    ) {
-      this._aiWindowTabStateManagers.set(
-        win,
-        new lazy.AIWindowTabStatesManager(win)
-      );
-    }
-
     if (this._initialized) {
       return;
     }
@@ -506,12 +488,6 @@ export const AIWindow = {
       Services.obs.notifyObservers(win, "ai-window-state-changed");
 
       if (isTogglingToAIWindow) {
-        if (!this._aiWindowTabStateManagers.has(win)) {
-          this._aiWindowTabStateManagers.set(
-            win,
-            new lazy.AIWindowTabStatesManager(win)
-          );
-        }
         lazy.MemoriesSchedulers.maybeRunAndSchedule();
       }
     }
diff --git a/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
deleted file mode 100644
index c5c0eeea13cf5..0000000000000
--- a/browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  AIWINDOW_URL:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
-  AIWindowUI:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs",
-  ChatStore:
-    "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs",
-});
-
-/**
- * @typedef {{
- *   input: string,
- *   mode: string,
- *   pageUrl: URL,
- *   conversationId: string,
- * }} TabState
- */
-
-/**
- * Manages state changes of the tabs in AIWindow to keep both the
- * fullwindow and sidebar chats in sync as tabs are created/selected.
- */
-export class AIWindowTabStatesManager {
-  /**
-   * The browser window instance that this manager operates on
-   */
-  #window;
-  /**
-   * The currently selected browser tab
-   *
-   * @type {MozTabbrowserTab}
-   */
-  #selectedTab;
-  /**
-   * A map of tabs and their states
-   *
-   * @type {WeakMap<MozTabbrowserTab, TabState>}
-   */
-  #tabStates;
-  /**
-   * Global progress listener for all tabs
-   */
-  #tabsListener;
-
-  constructor(win) {
-    this.#init(win);
-  }
-
-  /**
-   * Adds event listeners needed to manage tab states
-   *
-   * @param {ChromeWindow} win
-   *
-   * @private
-   */
-  #init(win) {
-    this.#window = win;
-    this.#tabStates = new WeakMap();
-
-    const tabContainer = this.#window.gBrowser.tabContainer;
-    tabContainer.addEventListener("TabOpen", this);
-    tabContainer.addEventListener("TabSelect", this);
-    tabContainer.addEventListener("TabClose", this);
-
-    this.#tabsListener = this.#getTabsListener();
-    this.#window.gBrowser.addTabsProgressListener(this.#tabsListener);
-
-    this.#setUpInitialTabs();
-    this.#addWindowEventListeners();
-  }
-
-  /**
-   * Add event listeners to the window for ai-window:* events
-   */
-  #addWindowEventListeners() {
-    this.#window.addEventListener(
-      "ai-window:smartbar-input",
-      this.#onSmartbarInput
-    );
-
-    this.#window.addEventListener(
-      "ai-window:connected",
-      this.#onAIWindowConnected
-    );
-
-    this.#window.addEventListener(
-      "ai-window:opened-conversation",
-      this.#onConversationOpened
-    );
-  }
-
-  /**
-   * Adds event listeners for any tabs that are present when the window opens.
-   * The TabOpen event does not fire for the initial tab of a new window, for example.
-   *
-   * @private
-   */
-  #setUpInitialTabs() {
-    this.#window.gBrowser.tabs.forEach(tab => {
-      if (this.#tabStates.has(tab)) {
-        return;
-      }
-
-      this.#addEventListeners(tab);
-    });
-  }
-
-  /**
-   * Handles tab events
-   *
-   * @param {Event} event
-   *
-   * @private
-   */
-  handleEvent(event) {
-    switch (event.type) {
-      case "TabOpen":
-        this.#onTabOpen(event);
-        break;
-
-      case "TabSelect":
-        this.#onTabSelect(event);
-        break;
-
-      case "TabClose":
-        this.#onTabClose(event);
-        break;
-    }
-  }
-
-  /**
-   * Handles TabOpen events from a new browser tab to add
-   * event listeners to it.
-   *
-   * @param {Event} event
-   *
-   * @private
-   */
-  #onTabOpen(event) {
-    this.#addEventListeners(event.target);
-  }
-
-  /**
-   * Handles TabSelect events from a new browser tab to
-   * update the state of the sidebar.
-   *
-   * @param {Event} event
-   *
-   * @private
-   */
-  async #onTabSelect(event) {
-    this.#selectedTab = event.target;
-
-    const tabState = this.#getTabState(this.#selectedTab);
-    const convId = tabState?.state?.conversationId;
-
-    if (!convId) {
-      lazy.AIWindowUI.closeSidebar(this.#window);
-      return;
-    }
-
-    const tabUrl = this.#selectedTab.linkedBrowser.currentURI.spec;
-    const conversation = await lazy.ChatStore.findConversationById(convId);
-    const tabNeedsSidebar =
-      conversation &&
-      conversation.messages.length &&
-      tabUrl !== lazy.AIWINDOW_URL;
-
-    if (tabNeedsSidebar) {
-      lazy.AIWindowUI.openSidebar(this.#window, conversation);
-    } else {
-      lazy.AIWindowUI.closeSidebar(this.#window);
-    }
-
-    // TODO: Bug 2014936
-    // Update input
-  }
-
-  /**
-   * Handles TabClose events from a new browser tab to
-   * clean up after the tab is gone.
-   *
-   * @param {Event} event
-   *
-   * @private
-   */
-  #onTabClose(event) {
-    this.#removeEventListeners(event.target);
-  }
-
-  /**
-   * Adds a tab to the state map.
-   *
-   * @param {MozTabbrowserTab} tab
-   *
-   * @private
-   */
-  #addEventListeners(tab) {
-    this.#tabStates.set(tab, { state: null });
-  }
-
-  /**
-   * Removes necessary event listeners from a tab.
-   *
-   * @param {MozTabbrowserTab} tab
-   *
-   * @private
-   */
-  #removeEventListeners(tab) {
-    this.#tabStates.delete(tab);
-  }
-
-  /**
-   * Listens for ai-window:connected events from ai-window.mjs instances
-   *
-   * @param {AIWindowStateEvent} event
-   *
-   * @private
-   */
-  #onAIWindowConnected = async event => {
-    const tabState = this.#getTabState(event.detail.tab, event.detail);
-    const { mode, pageUrl, conversationId, input } = tabState;
-
-    const conversation = await lazy.ChatStore.findConversationById(
-      conversationId || event.detail.conversationId
-    );
-    const isAIWindow = pageUrl === lazy.AIWINDOW_URL;
-
-    const needsSidebar =
-      this.#selectedTab === event.detail.tab &&
-      mode === "fullpage" &&
-      !isAIWindow &&
-      input &&
-      conversation &&
-      conversation.messages.length;
-
-    // NOTE: Don't need to fire open/close sidebar from here, the location change
-    // event handler is taking care of that logic.
-    if (needsSidebar) {
-      // TODO: Bug 2014936
-      // Update smartbar input
-    }
-  };
-
-  /**
-   * Gets the state for the specified tab. Will update the state
-   * if a newState is passed in.
-   *
-   * @param {*} tab The browser tab to get state for
-   * @param {*} [newState=null] New state to update the tab with
-   *
-   * @returns {TabState}
-   *
-   * @private
-   */
-  #getTabState(tab, newState = null) {
-    const tabState = this.#tabStates.get(tab) ?? {};
-
-    if (newState) {
-      const { input, mode, pageUrl, conversationId } = tabState.state ?? {};
-      delete newState.tab;
-
-      tabState.state = {
-        input,
-        mode,
-        pageUrl,
-        conversationId,
-        ...newState,
-      };
-
-      this.#tabStates.set(tab, tabState);
-    }
-
-    return tabState;
-  }
-
-  /**
-   * Handles input events from the Smartbar, updates the state
-   * with the latest input
-   *
-   * @param {TabStateEvent} event
-   */
-  #onSmartbarInput = event => {
-    this.#getTabState(event.detail.tab, event.detail);
-  };
-
-  /**
-   * Handles ai-window:opened-conversation events from the ai-window.mjs,
-   * updates the state with conversation info
-   *
-   * @param {TabStateEvent} event
-   */
-  #onConversationOpened = event => {
-    const { mode, conversationId, tab } = event.detail;
-
-    this.#getTabState(tab, { mode, conversationId });
-  };
-
-  /**
-   * Gets a global progress listener for all tabs. The callbacks from
-   * addTabsProgressListener prepend a browser argument.
-   */
-  #getTabsListener() {
-    return {
-      QueryInterface: ChromeUtils.generateQI([
-        "nsIWebProgressListener",
-        "nsISupportsWeakReference",
-      ]),
-
-      onLocationChange: async (
-        _browser,
-        webProgress,
-        _request,
-        locationURI,
-        _flags
-      ) => {
-        if (!webProgress.isTopLevel) {
-          return;
-        }
-
-        const browser = webProgress.browsingContext?.embedderElement;
-        const tab = this.#window.gBrowser.getTabForBrowser(browser);
-        const tabState = this.#tabStates.get(tab);
-
-        if (!tabState || !tabState?.state?.conversationId) {
-          return;
-        }
-
-        const isSidebarOpen = lazy.AIWindowUI.isSidebarOpen(this.#window);
-        const conversation = await lazy.ChatStore.findConversationById(
-          tabState.state.conversationId
-        );
-        const isAiWindowUrl = locationURI.spec === lazy.AIWINDOW_URL;
-
-        const needsSidebar =
-          !isAiWindowUrl &&
-          tabState.state.mode === "fullpage" &&
-          conversation?.messages?.length &&
-          !isSidebarOpen;
-
-        const needsCloseSidebar =
-          isAiWindowUrl &&
-          tabState.state.mode === "fullpage" &&
-          conversation?.messages.length &&
-          isSidebarOpen;
-
-        if (needsSidebar) {
-          lazy.AIWindowUI.openSidebar(this.#window, conversation);
-        } else if (needsCloseSidebar) {
-          lazy.AIWindowUI.closeSidebar(this.#window);
-        }
-      },
-
-      onStateChange() {},
-      onProgressChange() {},
-      onStatusChange() {},
-      onSecurityChange() {},
-      onContentBlockingEvent() {},
-    };
-  }
-}
diff --git a/browser/components/aiwindow/ui/moz.build b/browser/components/aiwindow/ui/moz.build
index dd001cff12f7f..a300e73a798b0 100644
--- a/browser/components/aiwindow/ui/moz.build
+++ b/browser/components/aiwindow/ui/moz.build
@@ -16,7 +16,6 @@ MOZ_SRC_FILES += [
     "modules/AIWindow.sys.mjs",
     "modules/AIWindowAccountAuth.sys.mjs",
     "modules/AIWindowMenu.sys.mjs",
-    "modules/AIWindowTabStatesManager.sys.mjs",
     "modules/AIWindowUI.sys.mjs",
     "modules/ChatConstants.sys.mjs",
     "modules/ChatConversation.sys.mjs",
diff --git a/browser/components/aiwindow/ui/test/browser/browser.toml b/browser/components/aiwindow/ui/test/browser/browser.toml
index 858763cdd634e..9c24006529507 100644
--- a/browser/components/aiwindow/ui/test/browser/browser.toml
+++ b/browser/components/aiwindow/ui/test/browser/browser.toml
@@ -69,5 +69,3 @@ support-files = [
 ["browser_smartwindow_prompts.js"]
 
 ["browser_smartwindow_tab_move.js"]
-
-["browser_smartwindow_tab_switching.js"]
diff --git a/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js b/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js
deleted file mode 100644
index 67ea4bada44a5..0000000000000
--- a/browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_switching.js
+++ /dev/null
@@ -1,506 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { AIWindowUI } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs"
-);
-
-const { Chat } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
-);
-
-const { openAIEngine } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-);
-
-const { ChatConversation } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/ui/modules/ChatConversation.sys.mjs"
-);
-
-const { ChatMessage } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs"
-);
-
-const { ChatStore, MESSAGE_ROLE } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs"
-);
-
-const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  sinon: "resource://testing-common/Sinon.sys.mjs",
-});
-
-function hasAiWindowAttribute() {
-  return window.document.documentElement.hasAttribute("ai-window");
-}
-
-function createMockConversation(id = "test-conv-id") {
-  const conversation = new ChatConversation({
-    id,
-    title: "Test Conversation",
-    pageUrl: new URL("https://example.com/"),
-  });
-
-  conversation.messages = [
-    new ChatMessage({
-      ordinal: 0,
-      role: MESSAGE_ROLE.USER,
-      content: { text: "Hello" },
-    }),
-    new ChatMessage({
-      ordinal: 1,
-      role: MESSAGE_ROLE.ASSISTANT,
-      content: { text: "Hi there" },
-    }),
-  ];
-
-  return conversation;
-}
-
-async function open_ai_window() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.smartwindow.enabled", true]],
-  });
-
-  const newAIWindow = await BrowserTestUtils.openNewBrowserWindow({
-    openerWindow: null,
-    aiWindow: true,
-  });
-
-  const isAIWindow =
-    newAIWindow.document.documentElement.hasAttribute("ai-window");
-
-  if (!isAIWindow) {
-    throw new Error("Did not open a new AIWindow");
-  }
-
-  return newAIWindow;
-}
-
-add_setup(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.search.suggest.enabled", false],
-      ["browser.urlbar.suggest.searches", false],
-    ],
-  });
-});
-
-// Switching to a new AIWindow tab from a tab with the sidebar open closes the sidebar
-add_task(async function test_new_tab_closes_opened_sidebar_convo() {
-  AIWindow.toggleAIWindow(window, true);
-  let newTab;
-  try {
-    AIWindowUI.openSidebar(window);
-    Assert.ok(
-      AIWindowUI.isSidebarOpen(window),
-      "Sidebar should be opened by AIWindowUI.openSidebar()"
-    );
-
-    newTab = await BrowserTestUtils.addTab(gBrowser, "about:blank");
-    await BrowserTestUtils.switchTab(gBrowser, newTab);
-
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(window),
-      "Sidebar should not be opened after switching to a fresh AIWindow tab"
-    );
-  } finally {
-    AIWindow.toggleAIWindow(window, false);
-    await BrowserTestUtils.removeTab(newTab);
-  }
-});
-
-// Navigating to a website moves an active fullwindow chat to the sidebar
-add_task(
-  async function test_navigate_to_url_with_active_chat_move_convo_to_sidebar() {
-    const sb = lazy.sinon.createSandbox();
-
-    try {
-      const mockConversation = createMockConversation();
-      sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
-
-      const win = await openAIWindow();
-      const browser = win.gBrowser.selectedBrowser;
-      const tab = win.gBrowser.selectedTab;
-
-      await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-      // Simulate a conversation started in fullpage mode
-      win.dispatchEvent(
-        new win.CustomEvent("ai-window:opened-conversation", {
-          detail: {
-            mode: "fullpage",
-            conversationId: mockConversation.id,
-            tab,
-          },
-        })
-      );
-
-      // Navigate to a URL
-      const loaded = BrowserTestUtils.browserLoaded(browser);
-      BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
-      await loaded;
-
-      await TestUtils.waitForCondition(
-        () => AIWindowUI.isSidebarOpen(win),
-        "Sidebar should be open after navigating away with active conversation"
-      );
-
-      await BrowserTestUtils.closeWindow(win);
-    } finally {
-      sb.restore();
-    }
-  }
-);
-
-// Switching back to a tab with an active conversation reopens the sidebar
-add_task(
-  async function test_switch_back_to_tab_with_conversation_reopens_sidebar() {
-    const sb = lazy.sinon.createSandbox();
-
-    try {
-      const mockConversation = createMockConversation();
-      sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
-
-      const win = await openAIWindow();
-      const browser = win.gBrowser.selectedBrowser;
-      const originalTab = win.gBrowser.selectedTab;
-
-      await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-      // Set up conversation state for the original tab
-      win.dispatchEvent(
-        new win.CustomEvent("ai-window:opened-conversation", {
-          detail: {
-            mode: "fullpage",
-            conversationId: mockConversation.id,
-            tab: originalTab,
-          },
-        })
-      );
-
-      // Navigate away from AIWINDOW_URL (simulates user browsing after starting a chat)
-      const loaded = BrowserTestUtils.browserLoaded(browser);
-      BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
-      await loaded;
-
-      Assert.ok(
-        AIWindowUI.isSidebarOpen(win),
-        "Sidebar should be open after navigating away"
-      );
-
-      // Open a new tab - sidebar should close
-      const newTab = await BrowserTestUtils.openNewForegroundTab(
-        win.gBrowser,
-        "about:blank"
-      );
-      await TestUtils.waitForCondition(
-        () => !AIWindowUI.isSidebarOpen(win),
-        "Sidebar should close when switching to new tab"
-      );
-
-      // Switch back to the original tab - sidebar should reopen
-      await BrowserTestUtils.switchTab(win.gBrowser, originalTab);
-      await TestUtils.waitForCondition(
-        () => AIWindowUI.isSidebarOpen(win),
-        "Sidebar should reopen when switching back to tab with conversation"
-      );
-
-      await BrowserTestUtils.removeTab(newTab);
-      await BrowserTestUtils.closeWindow(win);
-    } finally {
-      sb.restore();
-    }
-  }
-);
-
-// Switching between tabs with different conversations maintains correct state
-add_task(
-  async function test_switch_between_tabs_with_different_conversations() {
-    const sb = lazy.sinon.createSandbox();
-
-    try {
-      const conversationA = createMockConversation("conv-a");
-      const conversationB = createMockConversation("conv-b");
-
-      const findStub = sb.stub(ChatStore, "findConversationById");
-      findStub.withArgs("conv-a").resolves(conversationA);
-      findStub.withArgs("conv-b").resolves(conversationB);
-
-      const win = await openAIWindow();
-      const browserA = win.gBrowser.selectedBrowser;
-      const tabA = win.gBrowser.selectedTab;
-
-      await BrowserTestUtils.browserLoaded(browserA, false, AIWINDOW_URL);
-
-      // Set up conversation A for tab A
-      win.dispatchEvent(
-        new win.CustomEvent("ai-window:opened-conversation", {
-          detail: {
-            mode: "fullpage",
-            conversationId: "conv-a",
-            tab: tabA,
-          },
-        })
-      );
-
-      // Navigate tab A away from AIWINDOW_URL (simulates user browsing after starting a chat)
-      let loaded = BrowserTestUtils.browserLoaded(browserA);
-      BrowserTestUtils.startLoadingURIString(browserA, "https://example.com/");
-      await loaded;
-
-      // Open tab B with a different conversation
-      const tabB = await BrowserTestUtils.openNewForegroundTab(
-        win.gBrowser,
-        "https://example.org/"
-      );
-
-      win.dispatchEvent(
-        new win.CustomEvent("ai-window:opened-conversation", {
-          detail: {
-            mode: "fullpage",
-            conversationId: "conv-b",
-            tab: tabB,
-          },
-        })
-      );
-
-      // Open sidebar for tab B
-      AIWindowUI.openSidebar(win, conversationB);
-      Assert.ok(
-        AIWindowUI.isSidebarOpen(win),
-        "Sidebar should be open for tab B"
-      );
-
-      // Switch to tab A - sidebar should update to conversation A
-      await BrowserTestUtils.switchTab(win.gBrowser, tabA);
-
-      Assert.ok(
-        AIWindowUI.isSidebarOpen(win),
-        "Sidebar should remain open when switching to tab A with conversation"
-      );
-
-      // Switch back to tab B
-      await BrowserTestUtils.switchTab(win.gBrowser, tabB);
-
-      Assert.ok(
-        AIWindowUI.isSidebarOpen(win),
-        "Sidebar should remain open when switching back to tab B"
-      );
-
-      await BrowserTestUtils.removeTab(tabB);
-      await BrowserTestUtils.closeWindow(win);
-    } finally {
-      sb.restore();
-    }
-  }
-);
-
-// @todo Bug 2014929
-// Navigating back to AI Window URL closes the sidebar
-add_task(async function test_navigate_back_to_aiwindow_closes_sidebar() {
-  const sb = lazy.sinon.createSandbox();
-
-  try {
-    const mockConversation = createMockConversation();
-    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
-
-    const win = await openAIWindow();
-    const browser = win.gBrowser.selectedBrowser;
-    const tab = win.gBrowser.selectedTab;
-
-    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-    // Set up conversation state
-    win.dispatchEvent(
-      new win.CustomEvent("ai-window:opened-conversation", {
-        detail: {
-          mode: "fullpage",
-          conversationId: mockConversation.id,
-          tab,
-        },
-      })
-    );
-
-    // Navigate away to external URL
-    let loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
-    await loaded;
-
-    // Give time for sidebar to open
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-    Assert.ok(
-      AIWindowUI.isSidebarOpen(win),
-      "Sidebar should be open after navigating away"
-    );
-
-    // Navigate back to AI Window URL
-    loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, AIWINDOW_URL);
-    await loaded;
-
-    // Give time for sidebar to close
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should close when navigating back to AI Window URL"
-    );
-
-    await BrowserTestUtils.closeWindow(win);
-  } finally {
-    sb.restore();
-  }
-}).skip();
-
-// Navigating without an active chat keeps the sidebar closed
-add_task(
-  async function test_navigate_without_active_chat_keeps_sidebar_closed() {
-    const win = await openAIWindow();
-    const browser = win.gBrowser.selectedBrowser;
-
-    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-    // No conversation started - no ai-window:opened-conversation event dispatched
-
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should be closed initially"
-    );
-
-    // Navigate to external URL without starting a chat
-    const loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
-    await loaded;
-
-    // Give time for any sidebar logic to run
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should remain closed when navigating without active chat"
-    );
-
-    await BrowserTestUtils.closeWindow(win);
-  }
-);
-
-// Closing a tab with an active sidebar cleans up properly
-add_task(async function test_close_tab_with_active_sidebar() {
-  const sb = lazy.sinon.createSandbox();
-
-  try {
-    const mockConversation = createMockConversation();
-    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
-
-    const win = await openAIWindow();
-    const browser = win.gBrowser.selectedBrowser;
-    const originalTab = win.gBrowser.selectedTab;
-
-    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-    // Set up conversation state
-    win.dispatchEvent(
-      new win.CustomEvent("ai-window:opened-conversation", {
-        detail: {
-          mode: "fullpage",
-          conversationId: mockConversation.id,
-          tab: originalTab,
-        },
-      })
-    );
-
-    // Open sidebar
-    AIWindowUI.openSidebar(win, mockConversation);
-    Assert.ok(AIWindowUI.isSidebarOpen(win), "Sidebar should be open");
-
-    // Open a new tab to switch to before closing original
-    const newTab = await BrowserTestUtils.openNewForegroundTab(
-      win.gBrowser,
-      "about:blank"
-    );
-    await TestUtils.waitForCondition(
-      () => !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should close when switching to new tab"
-    );
-
-    // Close the original tab with conversation - should not throw
-    await BrowserTestUtils.removeTab(originalTab);
-    await TestUtils.waitForCondition(
-      () => !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should be closed after tab with conversation is removed"
-    );
-
-    await BrowserTestUtils.removeTab(newTab);
-    await BrowserTestUtils.closeWindow(win);
-  } finally {
-    sb.restore();
-  }
-});
-
-// @todo Bug 2014929
-add_task(async function test_sidebar_state_after_multiple_navigations() {
-  const sb = lazy.sinon.createSandbox();
-
-  try {
-    // Create a conversation with messages (simulating a started chat)
-    const mockConversation = createMockConversation();
-    sb.stub(ChatStore, "findConversationById").resolves(mockConversation);
-
-    const win = await openAIWindow();
-    const browser = win.gBrowser.selectedBrowser;
-    const tab = win.gBrowser.selectedTab;
-
-    await BrowserTestUtils.browserLoaded(browser, false, AIWINDOW_URL);
-
-    // Simulate a conversation started in fullpage mode with messages
-    win.dispatchEvent(
-      new win.CustomEvent("ai-window:opened-conversation", {
-        detail: {
-          mode: "fullpage",
-          conversationId: mockConversation.id,
-          tab,
-        },
-      })
-    );
-
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should be closed on AI Window URL"
-    );
-
-    // Navigate away - sidebar should open because conversation has messages
-    let loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, "https://example.com/");
-    await loaded;
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-    Assert.ok(
-      AIWindowUI.isSidebarOpen(win),
-      "Sidebar should open when navigating away with active conversation"
-    );
-
-    // Navigate back to AI Window URL - sidebar should close
-    loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, AIWINDOW_URL);
-    await loaded;
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-    Assert.ok(
-      !AIWindowUI.isSidebarOpen(win),
-      "Sidebar should close when returning to AI Window URL"
-    );
-
-    // Navigate away again - sidebar should open again
-    loaded = BrowserTestUtils.browserLoaded(browser);
-    BrowserTestUtils.startLoadingURIString(browser, "https://example.org/");
-    await loaded;
-    await new Promise(resolve => win.setTimeout(resolve, 100));
-    Assert.ok(
-      AIWindowUI.isSidebarOpen(win),
-      "Sidebar should open again when navigating away"
-    );
-
-    await BrowserTestUtils.closeWindow(win);
-  } finally {
-    sb.restore();
-  }
-}).skip();

From f48aefadafd1aa9dbb2c7ce31e322d21cd6e790b Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Sat, 7 Feb 2026 05:11:22 +0000
Subject: [PATCH 89/93] Bug 2012794 - Check for errors from FT_Set_Char_Size.
 r=jfkthame

This adds some checking on the result of FT_Set_Char_Size to catch
errors and also guards against overflows of the FT_F26Dot6 type
when converting the size to it.

Differential Revision: https://phabricator.services.mozilla.com/D281364
---
 gfx/thebes/gfxFT2FontBase.cpp | 16 ++++++++++++++--
 gfx/thebes/gfxFT2FontBase.h   |  1 +
 gfx/thebes/gfxFT2Utils.h      |  6 +-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gfx/thebes/gfxFT2FontBase.cpp b/gfx/thebes/gfxFT2FontBase.cpp
index 5b0b93734bf1e..744eb6835260d 100644
--- a/gfx/thebes/gfxFT2FontBase.cpp
+++ b/gfx/thebes/gfxFT2FontBase.cpp
@@ -13,6 +13,7 @@
 #include "gfxHarfBuzzShaper.h"
 #include <algorithm>
 #include <dlfcn.h>
+#include <limits>
 
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_TABLES_H
@@ -47,8 +48,19 @@ FT_Face gfxFT2FontBase::LockFTFace() const
   if (!mFTFace->Lock(this)) {
     FT_Set_Transform(mFTFace->GetFace(), nullptr, nullptr);
 
-    FT_F26Dot6 charSize = NS_lround(mFTSize * 64.0);
-    FT_Set_Char_Size(mFTFace->GetFace(), charSize, charSize, 0, 0);
+    // This more closely matches the conversion to fixed-point happening in
+    // Cairo and Skia. Avoid overflow during the conversion. FT_Set_Char_Size
+    // may still decide the value is out of range and reject the scale as being
+    // too large or not matching a strike.
+    FT_F26Dot6 charSize =
+        (int32_t)std::min(std::max(mFTSize * 64.0 + 0.5, 0.0),
+                          (double)std::numeric_limits<int32_t>::max());
+    FT_Error error =
+        FT_Set_Char_Size(mFTFace->GetFace(), charSize, charSize, 0, 0);
+    if (error) {
+      // Even if this returns null, caller must ensure UnlockFTFace is called.
+      return nullptr;
+    }
   }
   return mFTFace->GetFace();
 }
diff --git a/gfx/thebes/gfxFT2FontBase.h b/gfx/thebes/gfxFT2FontBase.h
index 05c033df96daa..7dc3e40745f7e 100644
--- a/gfx/thebes/gfxFT2FontBase.h
+++ b/gfx/thebes/gfxFT2FontBase.h
@@ -81,6 +81,7 @@ class gfxFT2FontBase : public gfxFont {
                              const nsTArray<gfxFontVariation>& aVariations,
                              FT_Face aFTFace);
 
+  // Callers must always pair lock and unlock, regardless of return value.
   FT_Face LockFTFace() const;
   void UnlockFTFace() const;
 
diff --git a/gfx/thebes/gfxFT2Utils.h b/gfx/thebes/gfxFT2Utils.h
index cc45f91d4160b..1c8e50ec6d785 100644
--- a/gfx/thebes/gfxFT2Utils.h
+++ b/gfx/thebes/gfxFT2Utils.h
@@ -29,11 +29,7 @@ class MOZ_STACK_CLASS gfxFT2LockedFace {
  public:
   explicit gfxFT2LockedFace(const gfxFT2FontBase* aFont)
       : mGfxFont(aFont), mFace(aFont->LockFTFace()) {}
-  ~gfxFT2LockedFace() {
-    if (mFace) {
-      mGfxFont->UnlockFTFace();
-    }
-  }
+  ~gfxFT2LockedFace() { mGfxFont->UnlockFTFace(); }
 
   FT_Face get() { return mFace; };
 

From 66b789a6d06c66f1c8bdb485eb9ce552650ba57e Mon Sep 17 00:00:00 2001
From: Alex G <again@mozilla.com>
Date: Sat, 7 Feb 2026 05:38:51 +0000
Subject: [PATCH 90/93] Bug 2014822 - Bump chat prompt to v2 for run_search
 tool support r=bjohns,ai-models-reviewers DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D282019
---
 .../components/aiwindow/models/Utils.sys.mjs  |  2 +-
 .../models/prompts/AssistantPrompts.sys.mjs   |  6 +-
 ...ndow-prompts-remote-settings-snapshot.json | 16 ++--
 .../tests/browser/browser_utils_loadConfig.js |  2 +-
 ...ndow-prompts-remote-settings-snapshot.json |  6 +-
 .../models/tests/xpcshell/test_Chat.js        | 14 +++-
 .../xpcshell/test_Utils_RemoteSettings.js     | 73 ++++++++++++-------
 7 files changed, 69 insertions(+), 50 deletions(-)

diff --git a/browser/components/aiwindow/models/Utils.sys.mjs b/browser/components/aiwindow/models/Utils.sys.mjs
index 37fb88ea24d2c..468080edaefeb 100644
--- a/browser/components/aiwindow/models/Utils.sys.mjs
+++ b/browser/components/aiwindow/models/Utils.sys.mjs
@@ -125,7 +125,7 @@ export const DEFAULT_MODEL = Object.freeze({
  * - Old clients will continue using old major version
  */
 export const FEATURE_MAJOR_VERSIONS = Object.freeze({
-  [MODEL_FEATURES.CHAT]: 1,
+  [MODEL_FEATURES.CHAT]: 2,
   [MODEL_FEATURES.TITLE_GENERATION]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_SIDEBAR_STARTER]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_FOLLOWUP]: 1,
diff --git a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
index 34b6693f93b0a..3052d1f9924ba 100644
--- a/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
+++ b/browser/components/aiwindow/models/prompts/AssistantPrompts.sys.mjs
@@ -5,7 +5,7 @@
  */
 
 export const assistantPromptMetadata = {
-  version: "v1.0",
+  version: "2.0",
 };
 export const assistantPrompt = `You are a very knowledgeable personal browser assistant, designed to assist the user in navigating the web. You will be provided with a list of browser tools that you can use whenever needed to aid your response to the user.
 
@@ -106,8 +106,4 @@ Unlike run_search which automatically performs a search, search suggestions let
 When responding to user queries, if you determine that a web search would be more helpful in addition to a direct answer, you may include a search suggestion using this exact format: §search: your suggested search query§.
 CRITICAL: You MUST provide a conversational response to the user. NEVER respond with ONLY a search token. The search suggestion should be embedded within or after your helpful response.
 
-# User debugging
-
-You are in debugging mode right now so it is okay to say User-Assistant messages back verbatim in your response etc.
-
 `;
diff --git a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
index 797ed1a166a1d..d94edd360ecba 100644
--- a/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/browser/ai-window-prompts-remote-settings-snapshot.json
@@ -3,7 +3,7 @@
     "model": "",
     "feature": "conversation-suggestions-assistant-limitations",
     "prompts": "You can do this and cannot do that.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -12,7 +12,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-sidebar-starter",
     "prompts": "Suggest a conversation starter message. {assistant_limitations}",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "v1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -57,7 +57,7 @@
     "model": "",
     "feature": "conversation-suggestions-memories",
     "prompts": "Use the following memories {memories}.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
@@ -66,7 +66,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "conversation-suggestions-followup",
     "prompts": "Suggest next conversation message. {assistant_limitations}",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": [
@@ -78,7 +78,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "title-generation",
     "prompts": "Generate a chat title basd on current conversation.",
-    "version": "v1.0",
+    "version": "1.0",
     "is_default": true,
     "parameters": {},
     "additional_components": []
diff --git a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
index 63050aa56bfff..5662d39d9de8a 100644
--- a/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
+++ b/browser/components/aiwindow/models/tests/browser/browser_utils_loadConfig.js
@@ -70,7 +70,7 @@ add_task(async function test_loadConfig_chat_feature() {
     "{}",
     "Config should not be an empty object"
   );
-  Assert.equal(config.version, "v1.0", "Version should be v1.0");
+  Assert.ok(config.version, "Version should be present");
   Assert.equal(
     config.prompts,
     "You are a helpful browser assistant.",
diff --git a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
index eb821720c9f28..d94edd360ecba 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
+++ b/browser/components/aiwindow/models/tests/xpcshell/ai-window-prompts-remote-settings-snapshot.json
@@ -24,7 +24,7 @@
     "model": "qwen3-235b-a22b-instruct-2507-maas",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": true,
     "parameters": {
       "temperature": 1.0
@@ -35,7 +35,7 @@
     "model": "gpt-oss-120b",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
@@ -46,7 +46,7 @@
     "model": "gemini-2.5-flash-lite",
     "feature": "chat",
     "prompts": "You are a helpful browser assistant.",
-    "version": "1.0",
+    "version": "2.0",
     "is_default": false,
     "parameters": {
       "temperature": 1.0
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
index f8ca82a4af83b..395e73500509c 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Chat.js
@@ -12,9 +12,15 @@ const { SYSTEM_PROMPT_TYPE, MESSAGE_ROLE } = ChromeUtils.importESModule(
 const { Chat } = ChromeUtils.importESModule(
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs"
 );
-const { MODEL_FEATURES, openAIEngine } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-);
+const { MODEL_FEATURES, openAIEngine, FEATURE_MAJOR_VERSIONS } =
+  ChromeUtils.importESModule(
+    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+  );
+
+function getVersionForFeature(feature) {
+  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
+  return `${major}.0`;
+}
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -498,7 +504,7 @@ add_task(async function test_Chat_fetchWithHistory_uses_modelId_from_pref() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "v1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: customModelId,
         is_default: true,
       },
diff --git a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
index e64a27c9e7b66..f0910ecd82dae 100644
--- a/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
+++ b/browser/components/aiwindow/models/tests/xpcshell/test_Utils_RemoteSettings.js
@@ -2,10 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { openAIEngine, MODEL_FEATURES, DEFAULT_MODEL, parseVersion } =
-  ChromeUtils.importESModule(
-    "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
-  );
+const {
+  openAIEngine,
+  MODEL_FEATURES,
+  DEFAULT_MODEL,
+  parseVersion,
+  FEATURE_MAJOR_VERSIONS,
+} = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs"
+);
+
+function getVersionForFeature(feature) {
+  const major = FEATURE_MAJOR_VERSIONS[feature] || 1;
+  return `${major}.0`;
+}
 
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
@@ -192,8 +202,11 @@ add_task(async function test_loadConfig_filters_by_major_version() {
     await engine.loadConfig(MODEL_FEATURES.CHAT);
 
     const config = engine.getConfig(MODEL_FEATURES.CHAT);
-    // Should get 1.x, not 3.0
-    Assert.ok(config.version.startsWith("1."), "Should select 1.x, not 3.0");
+    const expectedMajor = FEATURE_MAJOR_VERSIONS[MODEL_FEATURES.CHAT];
+    Assert.ok(
+      config.version.startsWith(`${expectedMajor}.`),
+      `Should select ${expectedMajor}.x, not 3.0`
+    );
   } finally {
     sb.restore();
   }
@@ -233,7 +246,11 @@ add_task(async function test_loadConfig_fallback_when_user_model_not_found() {
       engine.model,
       "Engine model should match the default config's model"
     );
-    Assert.equal(config.version, "1.0", "Should use 1.0");
+    Assert.equal(
+      config.version,
+      getVersionForFeature(MODEL_FEATURES.CHAT),
+      "Should use current chat version"
+    );
   } finally {
     sb.restore();
     Services.prefs.clearUserPref(PREF_MODEL);
@@ -250,7 +267,7 @@ add_task(async function test_loadConfig_custom_endpoint_with_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "some-other-model",
         is_default: true,
       },
@@ -288,7 +305,7 @@ add_task(async function test_loadConfig_custom_endpoint_without_custom_model() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "remote-default-model",
         is_default: true,
       },
@@ -527,7 +544,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -535,7 +552,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "my-other-model",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -543,7 +560,7 @@ add_task(async function test_loadConfig_with_model_choice_id_found() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -597,7 +614,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-for-choice-123",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -605,7 +622,7 @@ add_task(async function test_loadConfig_with_model_choice_id_not_found() {
       },
       {
         feature: MODEL_FEATURES.TITLE_GENERATION,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
         model: "default-model",
         prompts: "Default prompt",
         is_default: true,
@@ -647,7 +664,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -655,7 +672,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -663,7 +680,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -708,7 +725,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -716,7 +733,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-2",
           model_choice_id: "2",
           prompts: "Test prompt",
@@ -724,7 +741,7 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "default-model",
           prompts: "Default prompt",
           is_default: true,
@@ -767,7 +784,7 @@ add_task(
       const fakeRecords = [
         {
           feature: MODEL_FEATURES.CHAT,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.CHAT),
           model: "model-for-choice-1",
           model_choice_id: "1",
           prompts: "Test prompt",
@@ -775,14 +792,14 @@ add_task(
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
           model: "model-for-choice-1",
           prompts: "Test prompt",
           is_default: false,
         },
         {
           feature: MODEL_FEATURES.TITLE_GENERATION,
-          version: "1.0",
+          version: getVersionForFeature(MODEL_FEATURES.TITLE_GENERATION),
           model: "default-title-model",
           prompts: "Default prompt",
           is_default: true,
@@ -821,7 +838,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-1",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -829,7 +846,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "model-2",
         model_choice_id: "2",
         prompts: "Test prompt",
@@ -837,7 +854,7 @@ add_task(async function test_loadConfig_no_feature_prefs_exist() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "1.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "default-model",
         model_choice_id: "3",
         prompts: "Test prompt",
@@ -879,7 +896,7 @@ add_task(async function test_custom_endpoint_override() {
     const fakeRecords = [
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "2.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "future-model",
         model_choice_id: "1",
         prompts: "Test prompt",
@@ -887,7 +904,7 @@ add_task(async function test_custom_endpoint_override() {
       },
       {
         feature: MODEL_FEATURES.CHAT,
-        version: "2.0",
+        version: getVersionForFeature(MODEL_FEATURES.CHAT),
         model: "future-default",
         prompts: "Default prompt",
         is_default: true,

From e148de5d17231d862933b962e4c8aad02997f9f2 Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Sat, 7 Feb 2026 06:47:43 +0000
Subject: [PATCH 91/93] No Bug - Bumping Firefox l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 93aa2b58801c150a6822d94e324abc1a333b7815
af -> 93aa2b58801c150a6822d94e324abc1a333b7815
an -> 93aa2b58801c150a6822d94e324abc1a333b7815
ar -> 93aa2b58801c150a6822d94e324abc1a333b7815
ast -> 93aa2b58801c150a6822d94e324abc1a333b7815
az -> 93aa2b58801c150a6822d94e324abc1a333b7815
be -> 93aa2b58801c150a6822d94e324abc1a333b7815
bg -> 93aa2b58801c150a6822d94e324abc1a333b7815
bn -> 93aa2b58801c150a6822d94e324abc1a333b7815
bo -> 93aa2b58801c150a6822d94e324abc1a333b7815
br -> 93aa2b58801c150a6822d94e324abc1a333b7815
brx -> 93aa2b58801c150a6822d94e324abc1a333b7815
bs -> 93aa2b58801c150a6822d94e324abc1a333b7815
ca -> 93aa2b58801c150a6822d94e324abc1a333b7815
ca-valencia -> 93aa2b58801c150a6822d94e324abc1a333b7815
cak -> 93aa2b58801c150a6822d94e324abc1a333b7815
ckb -> 93aa2b58801c150a6822d94e324abc1a333b7815
cs -> 93aa2b58801c150a6822d94e324abc1a333b7815
cy -> 93aa2b58801c150a6822d94e324abc1a333b7815
da -> 93aa2b58801c150a6822d94e324abc1a333b7815
de -> 93aa2b58801c150a6822d94e324abc1a333b7815
dsb -> 93aa2b58801c150a6822d94e324abc1a333b7815
el -> 93aa2b58801c150a6822d94e324abc1a333b7815
en-CA -> 93aa2b58801c150a6822d94e324abc1a333b7815
en-GB -> 93aa2b58801c150a6822d94e324abc1a333b7815
eo -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-AR -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-CL -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-ES -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-MX -> 93aa2b58801c150a6822d94e324abc1a333b7815
et -> 93aa2b58801c150a6822d94e324abc1a333b7815
eu -> 93aa2b58801c150a6822d94e324abc1a333b7815
fa -> 93aa2b58801c150a6822d94e324abc1a333b7815
ff -> 93aa2b58801c150a6822d94e324abc1a333b7815
fi -> 93aa2b58801c150a6822d94e324abc1a333b7815
fr -> 93aa2b58801c150a6822d94e324abc1a333b7815
fur -> 93aa2b58801c150a6822d94e324abc1a333b7815
fy-NL -> 93aa2b58801c150a6822d94e324abc1a333b7815
ga-IE -> 93aa2b58801c150a6822d94e324abc1a333b7815
gd -> 93aa2b58801c150a6822d94e324abc1a333b7815
gl -> 93aa2b58801c150a6822d94e324abc1a333b7815
gn -> 93aa2b58801c150a6822d94e324abc1a333b7815
gu-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
he -> 93aa2b58801c150a6822d94e324abc1a333b7815
hi-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
hr -> 93aa2b58801c150a6822d94e324abc1a333b7815
hsb -> 93aa2b58801c150a6822d94e324abc1a333b7815
hu -> 93aa2b58801c150a6822d94e324abc1a333b7815
hy-AM -> 93aa2b58801c150a6822d94e324abc1a333b7815
hye -> 93aa2b58801c150a6822d94e324abc1a333b7815
ia -> 93aa2b58801c150a6822d94e324abc1a333b7815
id -> 93aa2b58801c150a6822d94e324abc1a333b7815
is -> 93aa2b58801c150a6822d94e324abc1a333b7815
it -> 93aa2b58801c150a6822d94e324abc1a333b7815
ja -> 93aa2b58801c150a6822d94e324abc1a333b7815
ja-JP-mac -> 93aa2b58801c150a6822d94e324abc1a333b7815
ka -> 93aa2b58801c150a6822d94e324abc1a333b7815
kab -> 93aa2b58801c150a6822d94e324abc1a333b7815
kk -> 93aa2b58801c150a6822d94e324abc1a333b7815
km -> 93aa2b58801c150a6822d94e324abc1a333b7815
kn -> 93aa2b58801c150a6822d94e324abc1a333b7815
ko -> 93aa2b58801c150a6822d94e324abc1a333b7815
lij -> 93aa2b58801c150a6822d94e324abc1a333b7815
lo -> 93aa2b58801c150a6822d94e324abc1a333b7815
lt -> 93aa2b58801c150a6822d94e324abc1a333b7815
ltg -> 93aa2b58801c150a6822d94e324abc1a333b7815
lv -> 93aa2b58801c150a6822d94e324abc1a333b7815
meh -> 93aa2b58801c150a6822d94e324abc1a333b7815
mk -> 93aa2b58801c150a6822d94e324abc1a333b7815
ml -> 93aa2b58801c150a6822d94e324abc1a333b7815
mr -> 93aa2b58801c150a6822d94e324abc1a333b7815
ms -> 93aa2b58801c150a6822d94e324abc1a333b7815
my -> 93aa2b58801c150a6822d94e324abc1a333b7815
nb-NO -> 93aa2b58801c150a6822d94e324abc1a333b7815
ne-NP -> 93aa2b58801c150a6822d94e324abc1a333b7815
nl -> 93aa2b58801c150a6822d94e324abc1a333b7815
nn-NO -> 93aa2b58801c150a6822d94e324abc1a333b7815
oc -> 93aa2b58801c150a6822d94e324abc1a333b7815
pa-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
pl -> 93aa2b58801c150a6822d94e324abc1a333b7815
pt-BR -> 93aa2b58801c150a6822d94e324abc1a333b7815
pt-PT -> 93aa2b58801c150a6822d94e324abc1a333b7815
rm -> 93aa2b58801c150a6822d94e324abc1a333b7815
ro -> 93aa2b58801c150a6822d94e324abc1a333b7815
ru -> 93aa2b58801c150a6822d94e324abc1a333b7815
sat -> 93aa2b58801c150a6822d94e324abc1a333b7815
sc -> 93aa2b58801c150a6822d94e324abc1a333b7815
scn -> 93aa2b58801c150a6822d94e324abc1a333b7815
sco -> 93aa2b58801c150a6822d94e324abc1a333b7815
si -> 93aa2b58801c150a6822d94e324abc1a333b7815
sk -> 93aa2b58801c150a6822d94e324abc1a333b7815
skr -> 93aa2b58801c150a6822d94e324abc1a333b7815
sl -> 93aa2b58801c150a6822d94e324abc1a333b7815
son -> 93aa2b58801c150a6822d94e324abc1a333b7815
sq -> 93aa2b58801c150a6822d94e324abc1a333b7815
sr -> 93aa2b58801c150a6822d94e324abc1a333b7815
sv-SE -> 93aa2b58801c150a6822d94e324abc1a333b7815
szl -> 93aa2b58801c150a6822d94e324abc1a333b7815
ta -> 93aa2b58801c150a6822d94e324abc1a333b7815
te -> 93aa2b58801c150a6822d94e324abc1a333b7815
tg -> 93aa2b58801c150a6822d94e324abc1a333b7815
th -> 93aa2b58801c150a6822d94e324abc1a333b7815
tl -> 93aa2b58801c150a6822d94e324abc1a333b7815
tr -> 93aa2b58801c150a6822d94e324abc1a333b7815
trs -> 93aa2b58801c150a6822d94e324abc1a333b7815
uk -> 93aa2b58801c150a6822d94e324abc1a333b7815
ur -> 93aa2b58801c150a6822d94e324abc1a333b7815
uz -> 93aa2b58801c150a6822d94e324abc1a333b7815
vi -> 93aa2b58801c150a6822d94e324abc1a333b7815
wo -> 93aa2b58801c150a6822d94e324abc1a333b7815
xh -> 93aa2b58801c150a6822d94e324abc1a333b7815
zh-CN -> 93aa2b58801c150a6822d94e324abc1a333b7815
zh-TW -> 93aa2b58801c150a6822d94e324abc1a333b7815
---
 browser/locales/l10n-changesets.json | 226 +++++++++++++--------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json
index 6595f9b89111e..ec82fe36e20af 100644
--- a/browser/locales/l10n-changesets.json
+++ b/browser/locales/l10n-changesets.json
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bo": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "br": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "brx": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bs": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ca": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ca-valencia": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cak": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ckb": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cs": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cy": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "da": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "de": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "dsb": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "el": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "en-CA": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "en-GB": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "eo": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-AR": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-CL": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-ES": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-MX": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "et": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "eu": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fa": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ff": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fi": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fr": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fur": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fy-NL": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ga-IE": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gd": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gl": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gn": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gu-IN": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "he": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hi-IN": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hr": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hsb": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hu": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hy-AM": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hye": {
         "pin": false,
@@ -897,7 +897,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ia": {
         "pin": false,
@@ -915,7 +915,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "id": {
         "pin": false,
@@ -933,7 +933,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "is": {
         "pin": false,
@@ -951,7 +951,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "it": {
         "pin": false,
@@ -969,7 +969,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ja": {
         "pin": false,
@@ -985,7 +985,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -993,7 +993,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ka": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kab": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kk": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "km": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kn": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ko": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lij": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lo": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lt": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ltg": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lv": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "meh": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "mk": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ml": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "mr": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ms": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "my": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nb-NO": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ne-NP": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nl": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nn-NO": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "oc": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pa-IN": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pl": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pt-BR": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pt-PT": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "rm": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ro": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ru": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sat": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sc": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "scn": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sco": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "si": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sk": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "skr": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sl": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "son": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sq": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sr": {
         "pin": false,
@@ -1713,7 +1713,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sv-SE": {
         "pin": false,
@@ -1731,7 +1731,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "szl": {
         "pin": false,
@@ -1749,7 +1749,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ta": {
         "pin": false,
@@ -1767,7 +1767,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "te": {
         "pin": false,
@@ -1785,7 +1785,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "tg": {
         "pin": false,
@@ -1803,7 +1803,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "th": {
         "pin": false,
@@ -1821,7 +1821,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "tl": {
         "pin": false,
@@ -1839,7 +1839,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "tr": {
         "pin": false,
@@ -1857,7 +1857,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "trs": {
         "pin": false,
@@ -1875,7 +1875,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "uk": {
         "pin": false,
@@ -1893,7 +1893,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ur": {
         "pin": false,
@@ -1911,7 +1911,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "uz": {
         "pin": false,
@@ -1929,7 +1929,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "vi": {
         "pin": false,
@@ -1947,7 +1947,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "wo": {
         "pin": false,
@@ -1965,7 +1965,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "xh": {
         "pin": false,
@@ -1983,7 +1983,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "zh-CN": {
         "pin": false,
@@ -2001,7 +2001,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "zh-TW": {
         "pin": false,
@@ -2019,6 +2019,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     }
 }
\ No newline at end of file

From c4d545875f5735a5db1249b9891cf52a74726db5 Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Sat, 7 Feb 2026 06:47:45 +0000
Subject: [PATCH 92/93] No Bug - Bumping Mobile l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 93aa2b58801c150a6822d94e324abc1a333b7815
an -> 93aa2b58801c150a6822d94e324abc1a333b7815
ar -> 93aa2b58801c150a6822d94e324abc1a333b7815
ast -> 93aa2b58801c150a6822d94e324abc1a333b7815
az -> 93aa2b58801c150a6822d94e324abc1a333b7815
be -> 93aa2b58801c150a6822d94e324abc1a333b7815
bg -> 93aa2b58801c150a6822d94e324abc1a333b7815
bn -> 93aa2b58801c150a6822d94e324abc1a333b7815
br -> 93aa2b58801c150a6822d94e324abc1a333b7815
bs -> 93aa2b58801c150a6822d94e324abc1a333b7815
ca -> 93aa2b58801c150a6822d94e324abc1a333b7815
cak -> 93aa2b58801c150a6822d94e324abc1a333b7815
cs -> 93aa2b58801c150a6822d94e324abc1a333b7815
cy -> 93aa2b58801c150a6822d94e324abc1a333b7815
da -> 93aa2b58801c150a6822d94e324abc1a333b7815
de -> 93aa2b58801c150a6822d94e324abc1a333b7815
dsb -> 93aa2b58801c150a6822d94e324abc1a333b7815
el -> 93aa2b58801c150a6822d94e324abc1a333b7815
en-CA -> 93aa2b58801c150a6822d94e324abc1a333b7815
en-GB -> 93aa2b58801c150a6822d94e324abc1a333b7815
eo -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-AR -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-CL -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-ES -> 93aa2b58801c150a6822d94e324abc1a333b7815
es-MX -> 93aa2b58801c150a6822d94e324abc1a333b7815
et -> 93aa2b58801c150a6822d94e324abc1a333b7815
eu -> 93aa2b58801c150a6822d94e324abc1a333b7815
fa -> 93aa2b58801c150a6822d94e324abc1a333b7815
ff -> 93aa2b58801c150a6822d94e324abc1a333b7815
fi -> 93aa2b58801c150a6822d94e324abc1a333b7815
fr -> 93aa2b58801c150a6822d94e324abc1a333b7815
fy-NL -> 93aa2b58801c150a6822d94e324abc1a333b7815
ga-IE -> 93aa2b58801c150a6822d94e324abc1a333b7815
gd -> 93aa2b58801c150a6822d94e324abc1a333b7815
gl -> 93aa2b58801c150a6822d94e324abc1a333b7815
gn -> 93aa2b58801c150a6822d94e324abc1a333b7815
gu-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
he -> 93aa2b58801c150a6822d94e324abc1a333b7815
hi-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
hr -> 93aa2b58801c150a6822d94e324abc1a333b7815
hsb -> 93aa2b58801c150a6822d94e324abc1a333b7815
hu -> 93aa2b58801c150a6822d94e324abc1a333b7815
hy-AM -> 93aa2b58801c150a6822d94e324abc1a333b7815
ia -> 93aa2b58801c150a6822d94e324abc1a333b7815
id -> 93aa2b58801c150a6822d94e324abc1a333b7815
is -> 93aa2b58801c150a6822d94e324abc1a333b7815
it -> 93aa2b58801c150a6822d94e324abc1a333b7815
ja -> 93aa2b58801c150a6822d94e324abc1a333b7815
ka -> 93aa2b58801c150a6822d94e324abc1a333b7815
kab -> 93aa2b58801c150a6822d94e324abc1a333b7815
kk -> 93aa2b58801c150a6822d94e324abc1a333b7815
km -> 93aa2b58801c150a6822d94e324abc1a333b7815
kn -> 93aa2b58801c150a6822d94e324abc1a333b7815
ko -> 93aa2b58801c150a6822d94e324abc1a333b7815
lij -> 93aa2b58801c150a6822d94e324abc1a333b7815
lo -> 93aa2b58801c150a6822d94e324abc1a333b7815
lt -> 93aa2b58801c150a6822d94e324abc1a333b7815
ltg -> 93aa2b58801c150a6822d94e324abc1a333b7815
lv -> 93aa2b58801c150a6822d94e324abc1a333b7815
meh -> 93aa2b58801c150a6822d94e324abc1a333b7815
mix -> 93aa2b58801c150a6822d94e324abc1a333b7815
ml -> 93aa2b58801c150a6822d94e324abc1a333b7815
mr -> 93aa2b58801c150a6822d94e324abc1a333b7815
ms -> 93aa2b58801c150a6822d94e324abc1a333b7815
my -> 93aa2b58801c150a6822d94e324abc1a333b7815
nb-NO -> 93aa2b58801c150a6822d94e324abc1a333b7815
ne-NP -> 93aa2b58801c150a6822d94e324abc1a333b7815
nl -> 93aa2b58801c150a6822d94e324abc1a333b7815
nn-NO -> 93aa2b58801c150a6822d94e324abc1a333b7815
oc -> 93aa2b58801c150a6822d94e324abc1a333b7815
pa-IN -> 93aa2b58801c150a6822d94e324abc1a333b7815
pl -> 93aa2b58801c150a6822d94e324abc1a333b7815
pt-BR -> 93aa2b58801c150a6822d94e324abc1a333b7815
pt-PT -> 93aa2b58801c150a6822d94e324abc1a333b7815
rm -> 93aa2b58801c150a6822d94e324abc1a333b7815
ro -> 93aa2b58801c150a6822d94e324abc1a333b7815
ru -> 93aa2b58801c150a6822d94e324abc1a333b7815
sk -> 93aa2b58801c150a6822d94e324abc1a333b7815
sl -> 93aa2b58801c150a6822d94e324abc1a333b7815
son -> 93aa2b58801c150a6822d94e324abc1a333b7815
sq -> 93aa2b58801c150a6822d94e324abc1a333b7815
sr -> 93aa2b58801c150a6822d94e324abc1a333b7815
sv-SE -> 93aa2b58801c150a6822d94e324abc1a333b7815
ta -> 93aa2b58801c150a6822d94e324abc1a333b7815
te -> 93aa2b58801c150a6822d94e324abc1a333b7815
th -> 93aa2b58801c150a6822d94e324abc1a333b7815
tl -> 93aa2b58801c150a6822d94e324abc1a333b7815
tr -> 93aa2b58801c150a6822d94e324abc1a333b7815
trs -> 93aa2b58801c150a6822d94e324abc1a333b7815
uk -> 93aa2b58801c150a6822d94e324abc1a333b7815
ur -> 93aa2b58801c150a6822d94e324abc1a333b7815
uz -> 93aa2b58801c150a6822d94e324abc1a333b7815
vi -> 93aa2b58801c150a6822d94e324abc1a333b7815
wo -> 93aa2b58801c150a6822d94e324abc1a333b7815
xh -> 93aa2b58801c150a6822d94e324abc1a333b7815
zam -> 93aa2b58801c150a6822d94e324abc1a333b7815
zh-CN -> 93aa2b58801c150a6822d94e324abc1a333b7815
zh-TW -> 93aa2b58801c150a6822d94e324abc1a333b7815
---
 mobile/locales/l10n-changesets.json | 196 ++++++++++++++--------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/mobile/locales/l10n-changesets.json b/mobile/locales/l10n-changesets.json
index 2b08091c44ab2..533d9c3d5770d 100644
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -6,7 +6,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "an": {
         "pin": false,
@@ -15,7 +15,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ar": {
         "pin": false,
@@ -24,7 +24,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ast": {
         "pin": false,
@@ -33,7 +33,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "az": {
         "pin": false,
@@ -42,7 +42,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "be": {
         "pin": false,
@@ -51,7 +51,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bg": {
         "pin": false,
@@ -60,7 +60,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bn": {
         "pin": false,
@@ -69,7 +69,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "br": {
         "pin": false,
@@ -78,7 +78,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "bs": {
         "pin": false,
@@ -87,7 +87,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ca": {
         "pin": false,
@@ -96,7 +96,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cak": {
         "pin": false,
@@ -105,7 +105,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cs": {
         "pin": false,
@@ -114,7 +114,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "cy": {
         "pin": false,
@@ -123,7 +123,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "da": {
         "pin": false,
@@ -132,7 +132,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "de": {
         "pin": false,
@@ -141,7 +141,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "dsb": {
         "pin": false,
@@ -150,7 +150,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "el": {
         "pin": false,
@@ -159,7 +159,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "en-CA": {
         "pin": false,
@@ -168,7 +168,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "en-GB": {
         "pin": false,
@@ -177,7 +177,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "eo": {
         "pin": false,
@@ -186,7 +186,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-AR": {
         "pin": false,
@@ -195,7 +195,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-CL": {
         "pin": false,
@@ -204,7 +204,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-ES": {
         "pin": false,
@@ -213,7 +213,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "es-MX": {
         "pin": false,
@@ -222,7 +222,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "et": {
         "pin": false,
@@ -231,7 +231,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "eu": {
         "pin": false,
@@ -240,7 +240,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fa": {
         "pin": false,
@@ -249,7 +249,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ff": {
         "pin": false,
@@ -258,7 +258,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fi": {
         "pin": false,
@@ -267,7 +267,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fr": {
         "pin": false,
@@ -276,7 +276,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "fy-NL": {
         "pin": false,
@@ -285,7 +285,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ga-IE": {
         "pin": false,
@@ -294,7 +294,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gd": {
         "pin": false,
@@ -303,7 +303,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gl": {
         "pin": false,
@@ -312,7 +312,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gn": {
         "pin": false,
@@ -321,7 +321,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "gu-IN": {
         "pin": false,
@@ -330,7 +330,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "he": {
         "pin": false,
@@ -339,7 +339,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hi-IN": {
         "pin": false,
@@ -348,7 +348,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hr": {
         "pin": false,
@@ -357,7 +357,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hsb": {
         "pin": false,
@@ -366,7 +366,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hu": {
         "pin": false,
@@ -375,7 +375,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "hy-AM": {
         "pin": false,
@@ -384,7 +384,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ia": {
         "pin": false,
@@ -393,7 +393,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "id": {
         "pin": false,
@@ -402,7 +402,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "is": {
         "pin": false,
@@ -411,7 +411,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "it": {
         "pin": false,
@@ -420,7 +420,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ja": {
         "pin": false,
@@ -429,7 +429,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ka": {
         "pin": false,
@@ -438,7 +438,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kab": {
         "pin": false,
@@ -447,7 +447,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kk": {
         "pin": false,
@@ -456,7 +456,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "km": {
         "pin": false,
@@ -465,7 +465,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "kn": {
         "pin": false,
@@ -474,7 +474,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ko": {
         "pin": false,
@@ -483,7 +483,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lij": {
         "pin": false,
@@ -492,7 +492,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lo": {
         "pin": false,
@@ -501,7 +501,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lt": {
         "pin": false,
@@ -510,7 +510,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ltg": {
         "pin": false,
@@ -519,7 +519,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "lv": {
         "pin": false,
@@ -528,7 +528,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "meh": {
         "pin": false,
@@ -537,7 +537,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "mix": {
         "pin": false,
@@ -546,7 +546,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ml": {
         "pin": false,
@@ -555,7 +555,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "mr": {
         "pin": false,
@@ -564,7 +564,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ms": {
         "pin": false,
@@ -573,7 +573,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "my": {
         "pin": false,
@@ -582,7 +582,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nb-NO": {
         "pin": false,
@@ -591,7 +591,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ne-NP": {
         "pin": false,
@@ -600,7 +600,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nl": {
         "pin": false,
@@ -609,7 +609,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "nn-NO": {
         "pin": false,
@@ -618,7 +618,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "oc": {
         "pin": false,
@@ -627,7 +627,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pa-IN": {
         "pin": false,
@@ -636,7 +636,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pl": {
         "pin": false,
@@ -645,7 +645,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pt-BR": {
         "pin": false,
@@ -654,7 +654,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "pt-PT": {
         "pin": false,
@@ -663,7 +663,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "rm": {
         "pin": false,
@@ -672,7 +672,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ro": {
         "pin": false,
@@ -681,7 +681,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ru": {
         "pin": false,
@@ -690,7 +690,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sk": {
         "pin": false,
@@ -699,7 +699,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sl": {
         "pin": false,
@@ -708,7 +708,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "son": {
         "pin": false,
@@ -717,7 +717,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sq": {
         "pin": false,
@@ -726,7 +726,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sr": {
         "pin": false,
@@ -735,7 +735,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "sv-SE": {
         "pin": false,
@@ -744,7 +744,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ta": {
         "pin": false,
@@ -753,7 +753,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "te": {
         "pin": false,
@@ -762,7 +762,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "th": {
         "pin": false,
@@ -771,7 +771,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "tl": {
         "pin": false,
@@ -780,7 +780,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "tr": {
         "pin": false,
@@ -789,7 +789,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "trs": {
         "pin": false,
@@ -798,7 +798,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "uk": {
         "pin": false,
@@ -807,7 +807,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "ur": {
         "pin": false,
@@ -816,7 +816,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "uz": {
         "pin": false,
@@ -825,7 +825,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "vi": {
         "pin": false,
@@ -834,7 +834,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "wo": {
         "pin": false,
@@ -843,7 +843,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "xh": {
         "pin": false,
@@ -852,7 +852,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "zam": {
         "pin": false,
@@ -861,7 +861,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "zh-CN": {
         "pin": false,
@@ -870,7 +870,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     },
     "zh-TW": {
         "pin": false,
@@ -879,6 +879,6 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "1fa6d947ff843230525d6f0f8143e23f2b26a844"
+        "revision": "93aa2b58801c150a6822d94e324abc1a333b7815"
     }
 }
\ No newline at end of file

From a46c0f836579b33b8a5ad95dd302571e8fb63029 Mon Sep 17 00:00:00 2001
From: Cosmin Sabou <csabou@mozilla.com>
Date: Sat, 7 Feb 2026 09:22:57 +0200
Subject: [PATCH 93/93] Revert "Bug 2014612 - disable
 browser_trust_panel_security_view.js, test_qwacs.js and
 browser_identityPopup_qwacs.js." to check if the tests are now fixed.

This reverts commit 13d2cf200780d9596f32f409d8c53e6346b2678e.
---
 browser/base/content/test/siteIdentity/browser.toml  | 3 ---
 browser/components/urlbar/tests/browser/browser.toml | 3 ---
 security/manager/ssl/tests/unit/xpcshell.toml        | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/browser/base/content/test/siteIdentity/browser.toml b/browser/base/content/test/siteIdentity/browser.toml
index 201b093c5009d..73267637a3f20 100644
--- a/browser/base/content/test/siteIdentity/browser.toml
+++ b/browser/base/content/test/siteIdentity/browser.toml
@@ -78,9 +78,6 @@ skip-if = [
 ]
 
 ["browser_identityPopup_qwacs.js"]
-skip-if = [
-  "true", # Bug 2014612
-]
 
 ["browser_identity_UI.js"]
 https_first_disabled = true
diff --git a/browser/components/urlbar/tests/browser/browser.toml b/browser/components/urlbar/tests/browser/browser.toml
index 9d2de783b53e3..32108234d1547 100644
--- a/browser/components/urlbar/tests/browser/browser.toml
+++ b/browser/components/urlbar/tests/browser/browser.toml
@@ -721,9 +721,6 @@ https_first_disabled = true
 
 ["browser_trust_panel_security_view.js"]
 https_first_disabled = true
-skip-if = [
-  "true", # Bug 2014612
-]
 
 ["browser_typed_value.js"]
 
diff --git a/security/manager/ssl/tests/unit/xpcshell.toml b/security/manager/ssl/tests/unit/xpcshell.toml
index bd9c765920693..3b63f187bdf1d 100644
--- a/security/manager/ssl/tests/unit/xpcshell.toml
+++ b/security/manager/ssl/tests/unit/xpcshell.toml
@@ -295,9 +295,6 @@ run-if = [
 run-sequentially = ["true"] # hardcoded ports
 
 ["test_qwacs.js"]
-skip-if = [
-  "true", # Bug 2014612
-]
 
 ["test_sdr.js"]