X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/2166ccd61b644e71611c0c8db58d2093043a5f99..607477196eb1e0720764f07cdee6befc677e8d7b:/windows/firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 952366d..d30e96a 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="2.7" schemaVersion="1.0">
+<?xml version="1.0" encoding="utf-8"?>
+<policyDefinitions revision="4.4" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="2.7"/>
+  <resources minRequiredRevision="4.4"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -39,6 +39,25 @@
       <definition name="SUPPORTED_FF84" displayName="$(string.SUPPORTED_FF84)"/>
       <definition name="SUPPORTED_FF85" displayName="$(string.SUPPORTED_FF85)"/>
       <definition name="SUPPORTED_FF86" displayName="$(string.SUPPORTED_FF86)"/>
+      <definition name="SUPPORTED_FF88" displayName="$(string.SUPPORTED_FF88)"/>
+      <definition name="SUPPORTED_FF89" displayName="$(string.SUPPORTED_FF89)"/>
+      <definition name="SUPPORTED_FF90" displayName="$(string.SUPPORTED_FF90)"/>
+      <definition name="SUPPORTED_FF91" displayName="$(string.SUPPORTED_FF91)"/>
+      <definition name="SUPPORTED_FF95" displayName="$(string.SUPPORTED_FF95)"/>
+      <definition name="SUPPORTED_FF96" displayName="$(string.SUPPORTED_FF96)"/>
+      <definition name="SUPPORTED_FF96_ONLY" displayName="$(string.SUPPORTED_FF96_ONLY)"/>
+      <definition name="SUPPORTED_FF97" displayName="$(string.SUPPORTED_FF97)"/>
+      <definition name="SUPPORTED_FF98_ONLY" displayName="$(string.SUPPORTED_FF98_ONLY)"/>
+      <definition name="SUPPORTED_FF99" displayName="$(string.SUPPORTED_FF99)"/>
+      <definition name="SUPPORTED_FF100" displayName="$(string.SUPPORTED_FF100)"/>
+      <definition name="SUPPORTED_FF101" displayName="$(string.SUPPORTED_FF101)"/>
+      <definition name="SUPPORTED_FF102" displayName="$(string.SUPPORTED_FF102)"/>
+      <definition name="SUPPORTED_FF104" displayName="$(string.SUPPORTED_FF104)"/>
+      <definition name="SUPPORTED_FF105" displayName="$(string.SUPPORTED_FF105)"/>
+      <definition name="SUPPORTED_FF106" displayName="$(string.SUPPORTED_FF106)"/>
+      <definition name="SUPPORTED_FF107" displayName="$(string.SUPPORTED_FF107)"/>
+      <definition name="SUPPORTED_FF108" displayName="$(string.SUPPORTED_FF108)"/>
+      <definition name="SUPPORTED_FF109" displayName="$(string.SUPPORTED_FF109)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -283,7 +302,7 @@
     <policy name="Certificates_Install" class="Both" displayName="$(string.Certificates_Install)" explainText="$(string.Certificates_Install_Explain)" key="Software\Policies\Mozilla\Certificates" presentation="$(presentation.Certificates_Install)" >
       <parentCategory ref="Certificates" />
       <supportedOn ref="SUPPORTED_FF64" />
-      <elements >
+      <elements>
         <list id="Certificates_Install" key="Software\Policies\Mozilla\Firefox\Certificates\Install" valuePrefix="" expandable="true"/>
       </elements>
     </policy>
@@ -371,6 +390,82 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="Cookies_Behavior" class="Both" displayName="$(string.Cookies_Behavior)" explainText="$(string.Cookies_Behavior_Explain)" key="Software\Policies\Mozilla\Firefox\Cookies"  presentation="$(presentation.Cookies_Behavior)">
+      <parentCategory ref="Cookies"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <enum id="Cookies_Behavior" valueName="Behavior">
+          <item displayName="$(string.Cookies_Behavior_Accept)">
+            <value>
+              <string>accept</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectForeign)">
+            <value>
+              <string>reject-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_Reject)">
+            <value>
+              <string>reject</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_LimitForeign)">
+            <value>
+              <string>limit-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTracker)">
+            <value>
+              <string>reject-tracker</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTrackerAndPartitionForeign)">
+            <value>
+              <string>reject-tracker-and-partition-foreign</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="Cookies_BehaviorPrivateBrowsing" class="Both" displayName="$(string.Cookies_BehaviorPrivateBrowsing)" explainText="$(string.Cookies_BehaviorPrivateBrowsing_Explain)" key="Software\Policies\Mozilla\Firefox\Cookies"  presentation="$(presentation.Cookies_BehaviorPrivateBrowsing)">
+      <parentCategory ref="Cookies"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <enum id="Cookies_BehaviorPrivateBrowsing" valueName="BehaviorPrivateBrowsing">
+          <item displayName="$(string.Cookies_Behavior_Accept)">
+            <value>
+              <string>accept</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectForeign)">
+            <value>
+              <string>reject-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_Reject)">
+            <value>
+              <string>reject</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_LimitForeign)">
+            <value>
+              <string>limit-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTracker)">
+            <value>
+              <string>reject-tracker</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTrackerAndPartitionForeign)">
+            <value>
+              <string>reject-tracker-and-partition-foreign</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
     <policy name="Camera_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Camera_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
       <parentCategory ref="Camera"/>
       <supportedOn ref="SUPPORTED_FF62"/>
@@ -636,29 +731,6 @@
         <list id="List" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains" valuePrefix=""/>
       </elements>
     </policy>
-    <policy name="DNSOverHTTPS" class="Both" displayName="$(string.DNSOverHTTPS)" explainText="$(string.DNSOverHTTPS_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.DNSOverHTTPS)" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_FF63ESR" />
-      <elements >
-        <text id="ProviderURL" valueName="ProviderURL" />
-        <boolean id="DNSOverHTTPSEnabled" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Enabled">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="DNSOverHTTPSLocked" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-      </elements>
-    </policy>
     <policy name="DisableAppUpdate" class="Both" displayName="$(string.DisableAppUpdate)" explainText="$(string.DisableAppUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableAppUpdate">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
@@ -879,6 +951,29 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisplayBookmarksToolbar_Enum" class="Both" displayName="$(string.DisplayBookmarksToolbar_Enum)" explainText="$(string.DisplayBookmarksToolbar_Enum_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.DisplayBookmarksToolbar)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF109"/>
+        <elements>
+        <enum id="DisplayBookmarksToolbar" valueName="DisplayBookmarksToolbar">
+          <item displayName="$(string.DisplayBookmarksToolbar_Always)">
+            <value>
+              <string>always</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_Never)">
+            <value>
+              <string>never</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_NewTab)">
+            <value>
+              <string>newtab</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
     <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
@@ -938,11 +1033,11 @@
         <list id="Extensions" key="Software\Policies\Mozilla\Firefox\Extensions\Locked" valuePrefix=""/>
       </elements>
     </policy>
-    <policy name="ExtensionSettings" class="Both" displayName="$(string.ExtensionSettings)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)"  presentation="$(presentation.ExtensionSettings)">">
+    <policy name="ExtensionSettings" class="Both" displayName="$(string.ExtensionSettings)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)" presentation="$(presentation.ExtensionSettings)">
       <parentCategory ref="Extensions"/>
       <supportedOn ref="SUPPORTED_FF69"/>
       <elements>
-        <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="2048"/>
+        <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="16384"/>
       </elements>
     </policy>
     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
@@ -985,10 +1080,27 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="LegacySameSiteCookieBehaviorEnabled" class="Both" displayName="$(string.LegacySameSiteCookieBehaviorEnabled)" explainText="$(string.LegacySameSiteCookieBehaviorEnabled_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="LegacySameSiteCookieBehaviorEnabled">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF96_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="LegacySameSiteCookieBehaviorEnabledForDomainList" class="Both" displayName="$(string.LegacySameSiteCookieBehaviorEnabledForDomainList)" explainText="$(string.LegacySameSiteCookieBehaviorEnabledForDomainList_Explain)" key="Software\Policies\Mozilla\Firefox\LegacySameSiteCookieBehaviorEnabledForDomainList" presentation="$(presentation.LegacySameSiteCookieBehaviorEnabledForDomainList)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF96_ONLY"/>
+      <elements>
+        <list id="LegacySameSiteCookieBehaviorEnabledForDomainList" key="Software\Policies\Mozilla\Firefox\LegacySameSiteCookieBehaviorEnabledForDomainList" valuePrefix=""/>
+      </elements>
+    </policy>
     <policy name="LocalFileLinks" class="Both" displayName="$(string.LocalFileLinks)" explainText="$(string.LocalFileLinks_Explain)" key="Software\Policies\Mozilla\Firefox\LocalFileLinks" presentation="$(presentation.LocalFileLinks)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF68ESR" />
-      <elements >
+      <elements>
         <list id="LocalFileLinks" key="Software\Policies\Mozilla\Firefox\LocalFileLinks" valuePrefix=""/>
       </elements>
     </policy>
@@ -1079,7 +1191,7 @@
     <policy name="CustomizeFirefoxHome" class="Both" displayName="$(string.FirefoxHome)" explainText="$(string.FirefoxHome_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.FirefoxHome)" >
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF68"/>
-      <elements >
+      <elements>
         <boolean id="FirefoxHome_Search" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Search">
           <trueValue>
             <decimal value="1"/>
@@ -1096,6 +1208,14 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
+        <boolean id="FirefoxHome_SponsoredTopSites" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="SponsoredTopSites">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
         <boolean id="FirefoxHome_Highlights" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Highlights">
           <trueValue>
             <decimal value="1"/>
@@ -1112,6 +1232,14 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
+        <boolean id="FirefoxHome_SponsoredPocket" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="SponsoredPocket">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
         <boolean id="FirefoxHome_Snippets" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Snippets">
           <trueValue>
             <decimal value="1"/>
@@ -1210,87 +1338,10 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <!-- Alphabetization is based on name, so had to add C -->
-    <policy name="C_SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown" presentation="$(presentation.SanitizeOnShutdown)" >
-      <parentCategory ref="firefox"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
-      <enabledValue>
-        <decimal value="1"/>
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0"/>
-      </disabledValue>
-      <elements >
-        <boolean id="SanitizeOnShutdown_Cache" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cache">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_Cookies" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cookies">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_Downloads" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Downloads">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_FormData" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="FormData">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_History" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="History">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_Sessions" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Sessions">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_SiteSettings" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="SiteSettings">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="SanitizeOnShutdown_OfflineApps" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="OfflineApps">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-      </elements>
-    </policy>
     <policy name="HomepageURL" class="Both" displayName="$(string.HomepageURL)" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="HomepageURL" valueName="URL" required="true" />
         <boolean id="HomepageLocked" key="Software\Policies\Mozilla\Firefox\Homepage" valueName="Locked">
           <trueValue>
@@ -1305,14 +1356,14 @@
     <policy name="HomepageAdditional" class="Both" displayName="$(string.HomepageAdditional)" explainText="$(string.HomepageAdditional_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageAdditional)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
       </elements>
     </policy>
     <policy name="HomepageStartPage" class="Both" displayName="$(string.HomepageStartPage)" explainText="$(string.HomepageStartPage_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.StartPage)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_FF64" />
-      <elements >
+      <elements>
         <enum id="StartPage" valueName="StartPage">
           <item displayName="$(string.None)">
             <value>
@@ -1337,10 +1388,27 @@
         </enum>
       </elements>
     </policy>
+    <policy name="Homepage_ShowHomeButton" class="Both" displayName="$(string.Homepage_ShowHomeButton)" explainText="$(string.Homepage_ShowHomeButton_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="ShowHomeButton">
+      <parentCategory ref="Homepage"/>
+      <supportedOn ref="SUPPORTED_FF88"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="A_Bookmarks" class="Both" displayName="$(string.Bookmarks)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Bookmarks_Explain)" presentation="$(presentation.JSON)">
+      <parentCategory ref="Bookmarks"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <multiText id="JSON" valueName="Bookmarks"  maxLength="16384"/>
+      </elements>
+    </policy>
     <policy name="Bookmark01" class="Both" displayName="$(string.Bookmark01)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\1" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1362,7 +1430,7 @@
     <policy name="Bookmark02" class="Both" displayName="$(string.Bookmark02)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\10" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1384,7 +1452,7 @@
     <policy name="Bookmark03" class="Both" displayName="$(string.Bookmark03)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\11" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1406,7 +1474,7 @@
     <policy name="Bookmark04" class="Both" displayName="$(string.Bookmark04)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\12" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1428,7 +1496,7 @@
     <policy name="Bookmark05" class="Both" displayName="$(string.Bookmark05)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\13" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1450,7 +1518,7 @@
 	<policy name="Bookmark06" class="Both" displayName="$(string.Bookmark06)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\14" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1472,7 +1540,7 @@
 	<policy name="Bookmark07" class="Both" displayName="$(string.Bookmark07)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\15" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1494,7 +1562,7 @@
 	<policy name="Bookmark08" class="Both" displayName="$(string.Bookmark08)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\16" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1516,7 +1584,7 @@
 	<policy name="Bookmark09" class="Both" displayName="$(string.Bookmark09)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\17" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1538,7 +1606,7 @@
 	<policy name="Bookmark10" class="Both" displayName="$(string.Bookmark10)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\18" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1560,7 +1628,7 @@
 	<policy name="Bookmark11" class="Both" displayName="$(string.Bookmark11)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\19" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1582,7 +1650,7 @@
 	<policy name="Bookmark12" class="Both" displayName="$(string.Bookmark12)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\2" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1604,7 +1672,7 @@
 	<policy name="Bookmark13" class="Both" displayName="$(string.Bookmark13)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\20" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1626,7 +1694,7 @@
 	<policy name="Bookmark14" class="Both" displayName="$(string.Bookmark14)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\21" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1648,7 +1716,7 @@
 	<policy name="Bookmark15" class="Both" displayName="$(string.Bookmark15)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\22" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1670,7 +1738,7 @@
 	<policy name="Bookmark16" class="Both" displayName="$(string.Bookmark16)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\23" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1692,7 +1760,7 @@
 	<policy name="Bookmark17" class="Both" displayName="$(string.Bookmark17)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\24" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1714,7 +1782,7 @@
 	<policy name="Bookmark18" class="Both" displayName="$(string.Bookmark18)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\25" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1736,7 +1804,7 @@
 	<policy name="Bookmark19" class="Both" displayName="$(string.Bookmark19)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\26" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1758,7 +1826,7 @@
 	<policy name="Bookmark20" class="Both" displayName="$(string.Bookmark20)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\27" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1780,7 +1848,7 @@
 	<policy name="Bookmark21" class="Both" displayName="$(string.Bookmark21)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\28" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1802,7 +1870,7 @@
 	<policy name="Bookmark22" class="Both" displayName="$(string.Bookmark22)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\29" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1824,7 +1892,7 @@
 	<policy name="Bookmark23" class="Both" displayName="$(string.Bookmark23)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\3" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1846,7 +1914,7 @@
 	<policy name="Bookmark24" class="Both" displayName="$(string.Bookmark24)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\30" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1868,7 +1936,7 @@
 	<policy name="Bookmark25" class="Both" displayName="$(string.Bookmark25)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\31" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1890,7 +1958,7 @@
 	<policy name="Bookmark26" class="Both" displayName="$(string.Bookmark26)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\32" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1912,7 +1980,7 @@
 	<policy name="Bookmark27" class="Both" displayName="$(string.Bookmark27)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\33" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1934,7 +2002,7 @@
 	<policy name="Bookmark28" class="Both" displayName="$(string.Bookmark28)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\34" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1956,7 +2024,7 @@
 	<policy name="Bookmark29" class="Both" displayName="$(string.Bookmark29)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\35" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -1978,7 +2046,7 @@
 	<policy name="Bookmark30" class="Both" displayName="$(string.Bookmark30)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\36" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2000,7 +2068,7 @@
 	<policy name="Bookmark31" class="Both" displayName="$(string.Bookmark31)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\37" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2022,7 +2090,7 @@
 	<policy name="Bookmark32" class="Both" displayName="$(string.Bookmark32)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\38" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2044,7 +2112,7 @@
 	<policy name="Bookmark33" class="Both" displayName="$(string.Bookmark33)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\39" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2066,7 +2134,7 @@
 	<policy name="Bookmark34" class="Both" displayName="$(string.Bookmark34)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\4" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2088,7 +2156,7 @@
 	<policy name="Bookmark35" class="Both" displayName="$(string.Bookmark35)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\40" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2110,7 +2178,7 @@
 	<policy name="Bookmark36" class="Both" displayName="$(string.Bookmark36)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\41" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2132,7 +2200,7 @@
 	<policy name="Bookmark37" class="Both" displayName="$(string.Bookmark37)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\42" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2154,7 +2222,7 @@
 	<policy name="Bookmark38" class="Both" displayName="$(string.Bookmark38)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\43" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2176,7 +2244,7 @@
 	<policy name="Bookmark39" class="Both" displayName="$(string.Bookmark39)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\44" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2198,7 +2266,7 @@
 	<policy name="Bookmark40" class="Both" displayName="$(string.Bookmark40)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\45" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2220,7 +2288,7 @@
 	<policy name="Bookmark41" class="Both" displayName="$(string.Bookmark41)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\46" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2242,7 +2310,7 @@
 	<policy name="Bookmark42" class="Both" displayName="$(string.Bookmark42)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\47" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2264,7 +2332,7 @@
 	<policy name="Bookmark43" class="Both" displayName="$(string.Bookmark43)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\48" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2286,7 +2354,7 @@
 	<policy name="Bookmark44" class="Both" displayName="$(string.Bookmark44)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\49" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2308,7 +2376,7 @@
 	<policy name="Bookmark45" class="Both" displayName="$(string.Bookmark45)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2330,7 +2398,7 @@
 	<policy name="Bookmark46" class="Both" displayName="$(string.Bookmark46)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\50" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2352,7 +2420,7 @@
 	<policy name="Bookmark47" class="Both" displayName="$(string.Bookmark47)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\6" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2374,7 +2442,7 @@
 	<policy name="Bookmark48" class="Both" displayName="$(string.Bookmark48)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\7" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2396,7 +2464,7 @@
 	<policy name="Bookmark49" class="Both" displayName="$(string.Bookmark49)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\8" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2418,7 +2486,7 @@
 	<policy name="Bookmark50" class="Both" displayName="$(string.Bookmark50)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\9" presentation="$(presentation.Bookmark)" >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <text id="BookmarkTitle" valueName="Title" required="true" />
         <text id="BookmarkURL" valueName="URL" required="true" />
         <text id="BookmarkFolder" valueName="Folder" />
@@ -2447,10 +2515,17 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="PasswordManagerExceptions" class="Both" displayName="$(string.PasswordManagerExceptions)" explainText="$(string.PasswordManagerExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" presentation="$(presentation.List)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF101"/>
+      <elements>
+        <list id="List" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" valuePrefix=""/>
+      </elements>
+    </policy>
     <policy name="Proxy" class="Both" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF60" />
-      <elements >
+      <elements>
         <boolean id="ProxyLocked" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
           <trueValue>
             <decimal value="1"/>
@@ -2558,43 +2633,6 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
-      <parentCategory ref="firefox"/>
-      <supportedOn ref="SUPPORTED_FF60"/>
-      <enabledValue>
-        <decimal value="1"/>
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0"/>
-      </disabledValue>
-      <elements >
-        <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="Cryptomining" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Cryptomining">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="Fingerprinting" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Fingerprinting">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <list id="TrackingProtection_Exceptions" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions" valuePrefix=""/>
-      </elements>
-    </policy>
     <!-- Alphabetization is based on name, so had to add B -->
     <policy name="B_WebsiteFilter_Block" class="Both" displayName="$(string.WebsiteFilter_Block)" explainText="$(string.WebsiteFilter_Block_Explain)" key="Software\Policies\Mozilla\WebsiteFilter\Block" presentation="$(presentation.WebsiteFilter)">
       <parentCategory ref="firefox"/>
@@ -2614,7 +2652,7 @@
     <policy name="SearchEngines_1" class="Both" displayName="$(string.SearchEngines_1)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\1" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngine_Name" valueName="Name" required="true" />
         <text id="SearchEngine_URLTemplate" valueName="URLTemplate" required="true" />
         <enum id="SearchEngine_Method" valueName="Method">
@@ -2634,12 +2672,13 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_2" class="Both" displayName="$(string.SearchEngines_2)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\2" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngine_Name" valueName="Name" required="true" />
         <text id="SearchEngine_URLTemplate" valueName="URLTemplate" required="true" />
         <enum id="SearchEngine_Method" valueName="Method">
@@ -2659,12 +2698,13 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_3" class="Both" displayName="$(string.SearchEngines_3)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\3" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngine_Name" valueName="Name" required="true" />
         <text id="SearchEngine_URLTemplate" valueName="URLTemplate" required="true" />
         <enum id="SearchEngine_Method" valueName="Method">
@@ -2684,12 +2724,13 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_4" class="Both" displayName="$(string.SearchEngines_4)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\4" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngine_Name" valueName="Name" required="true" />
         <text id="SearchEngine_URLTemplate" valueName="URLTemplate" required="true" />
         <enum id="SearchEngine_Method" valueName="Method">
@@ -2709,12 +2750,13 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_5" class="Both" displayName="$(string.SearchEngines_5)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\5" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngine_Name" valueName="Name" required="true" />
         <text id="SearchEngine_URLTemplate" valueName="URLTemplate" required="true" />
         <enum id="SearchEngine_Method" valueName="Method">
@@ -2734,12 +2776,13 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_Default" class="Both" displayName="$(string.SearchEngines_Default)" explainText="$(string.SearchEngines_Default_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines" presentation="$(presentation.SearchEngines_Default)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <text id="SearchEngines_Default" valueName="Default" required="true" />
       </elements>
     </policy>
@@ -2756,42 +2799,42 @@
     <policy name="SearchEngines_Remove" class="Both" displayName="$(string.SearchEngines_Remove)" explainText="$(string.SearchEngines_Remove_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" presentation="$(presentation.SearchEngines_Remove)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
-      <elements >
+      <elements>
         <list id="SearchEngines_Remove" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" valuePrefix=""/>
       </elements>
     </policy>
     <policy name="AppUpdateURL" class="Both" displayName="$(string.AppUpdateURL)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.AppUpdateURL)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF62" />
-      <elements >
+      <elements>
         <text id="AppUpdateURL" valueName="AppUpdateURL" required="true" />
       </elements>
     </policy>
     <policy name="SecurityDevices" class="Both" displayName="$(string.SecurityDevices)" explainText="$(string.SecurityDevices_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SecurityDevices)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF64" />
-      <elements >
+      <elements>
         <list id="SecurityDevices" key="Software\Policies\Mozilla\Firefox\SecurityDevices" valuePrefix="" explicitValue="true" expandable="true"/>
       </elements>
     </policy>
     <policy name="RequestedLocales" class="Both" displayName="$(string.RequestedLocales)" explainText="$(string.RequestedLocales_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.RequestedLocales)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF64" />
-      <elements >
+      <elements>
         <list id="RequestedLocales" key="Software\Policies\Mozilla\Firefox\RequestedLocales" valuePrefix=""/>
       </elements>
     </policy>
     <policy name="RequestedLocalesString" class="Both" displayName="$(string.RequestedLocalesString)" explainText="$(string.RequestedLocales_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="RequestedLocales"/>
       </elements>
     </policy>
     <policy name="SSLVersionMin" class="Both" displayName="$(string.SSLVersionMin)" explainText="$(string.SSLVersionMin_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersion)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
-      <elements >
+      <elements>
         <enum id="SSLVersion" valueName="SSLVersionMin">
           <item displayName="$(string.TLS1)">
             <value>
@@ -2819,7 +2862,7 @@
     <policy name="SSLVersionMax" class="Both" displayName="$(string.SSLVersionMax)" explainText="$(string.SSLVersionMax_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersion)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
-      <elements >
+      <elements>
         <enum id="SSLVersion" valueName="SSLVersionMax">
           <item displayName="$(string.TLS1)">
             <value>
@@ -2847,7 +2890,7 @@
     <policy name="SupportMenu" class="Both" displayName="$(string.SupportMenu)" explainText="$(string.SupportMenu_Explain)" key="Software\Policies\Mozilla\Firefox\SupportMenu" presentation="$(presentation.SupportMenu)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF6801" />
-      <elements >
+      <elements>
         <text id="SupportMenuTitle" valueName="Title" required="true" />
         <text id="SupportMenuURL" valueName="URL" required="true" />
         <text id="SupportMenuAccessKey" valueName="AccessKey" />
@@ -2894,7 +2937,7 @@
     <policy name="browser_bookmarks_file" class="Both" displayName="$(string.browser_bookmarks_file)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF70" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="browser.bookmarks.file" required="true" expandable="true"/>
       </elements>
     </policy>
@@ -3131,7 +3174,7 @@
     <policy name="intl_accept_languages" class="Both" displayName="$(string.intl_accept_languages)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF70" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="intl.accept_languages" required="true" expandable="true"/>
       </elements>
     </policy>
@@ -3238,21 +3281,21 @@
     <policy name="browser_cache_disk_parent_directory" class="Both" displayName="$(string.browser_cache_disk_parent_directory)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="browser.cache.disk.parent_directory" required="true" expandable="true"/>
       </elements>
     </policy>
     <policy name="dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl" class="Both" displayName="$(string.dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl" required="true" />
       </elements>
     </policy>
     <policy name="dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl" class="Both" displayName="$(string.dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl" required="true" />
       </elements>
     </policy>
@@ -3277,7 +3320,7 @@
     <policy name="browser_newtabpage_activity-stream_default_sites" class="Both" displayName="$(string.browser_newtabpage_activity-stream_default_sites)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF72" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="browser.newtabpage.activity-stream.default.sites" required="true" />
       </elements>
     </policy>
@@ -3304,14 +3347,14 @@
     <policy name="media_peerconnection_ice_obfuscate_host_addresses_whitelist" class="Both" displayName="$(string.media_peerconnection_ice_obfuscate_host_addresses_whitelist)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="media.peerconnection.ice.obfuscate_host_addresses.whitelist" required="true" />
       </elements>
     </policy>
     <policy name="media_peerconnection_ice_obfuscate_host_addresses_blocklist" class="Both" displayName="$(string.media_peerconnection_ice_obfuscate_host_addresses_blocklist)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF79" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="media.peerconnection.ice.obfuscate_host_addresses.blocklist" required="true" />
       </elements>
     </policy>
@@ -3338,7 +3381,7 @@
     <policy name="widget_content_gtk-theme-override" class="Both" displayName="$(string.widget_content_gtk-theme-override)" explainText="$(string.Preferences_String_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" presentation="$(presentation.Preferences_String)" >
       <parentCategory ref="Preferences" />
       <supportedOn ref="SUPPORTED_FF68" />
-      <elements >
+      <elements>
         <text id="Preferences_String" valueName="widget.content.gtk-theme-override" required="true" />
       </elements>
     </policy>
@@ -3519,6 +3562,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="UserMessaging_SkipOnboarding" class="Both" displayName="$(string.UserMessaging_SkipOnboarding)" explainText="$(string.UserMessaging_SkipOnboarding_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="SkipOnboarding">
+      <parentCategory ref="UserMessaging"/>
+      <supportedOn ref="SUPPORTED_FF88"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="UserMessaging_MoreFromMozilla" class="Both" displayName="$(string.UserMessaging_MoreFromMozilla)" explainText="$(string.UserMessaging_MoreFromMozilla_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="MoreFromMozilla">
+      <parentCategory ref="UserMessaging"/>
+      <supportedOn ref="SUPPORTED_FF98_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_DHE_RSA_WITH_AES_128_CBC_SHA">
       <parentCategory ref="DisabledCiphers"/>
       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
@@ -3629,6 +3692,66 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF97"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="EncryptedMediaExtensions_Enabled" class="Both" displayName="$(string.EncryptedMediaExtensions_Enabled)" explainText="$(string.EncryptedMediaExtensions_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\EncryptedMediaExtensions" valueName="Enabled">
       <parentCategory ref="EncryptedMediaExtensions"/>
       <supportedOn ref="SUPPORTED_FF77"/>
@@ -3679,7 +3802,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="PictureInPicture_Locked" class="Both" displayName="$(string.PictureInPicture_Locked)" explainText="$(string.PictureInPicture_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\PictureInPicture" valueName="Locked">
+    <policy name="PictureInPicture_Locked" class="Both" displayName="$(string.PictureInPicture_Locked)" explainText="$(string.PictureInPicture_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\PictureInPicture" valueName="Locked">
       <parentCategory ref="PictureInPicture"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <enabledValue>
@@ -3699,26 +3822,104 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
+    <policy name="Handlers" class="Both" displayName="$(string.Handlers)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)" presentation="$(presentation.Handlers)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <elements>
-        <multiText id="Handlers" valueName="Handlers"  maxLength="2048"/>
+        <multiText id="Handlers" valueName="Handlers"  maxLength="16384"/>
       </elements>
     </policy>
-    <policy name="Preferences" class="Both" displayName="$(string.Preferences)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)"  presentation="$(presentation.JSON)">">
+    <policy name="Preferences" class="Both" displayName="$(string.Preferences)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF81"/>
       <elements>
-        <multiText id="JSON" valueName="Preferences"  maxLength="2048"/>
+        <multiText id="JSON" valueName="Preferences"  maxLength="16384"/>
       </elements>
     </policy>
-    <policy name="ManagedBookmarks" class="Both" displayName="$(string.ManagedBookmarks)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)"  presentation="$(presentation.JSON)">">
+    <policy name="ManagedBookmarks" class="Both" displayName="$(string.ManagedBookmarks)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF83"/>
       <elements>
         <multiText id="JSON" valueName="ManagedBookmarks"  maxLength="16384"/>
       </elements>
     </policy>
+    <policy name="AllowedDomainsForApps" class="Both" displayName="$(string.AllowedDomainsForApps)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.AllowedDomainsForApps_Explain)" presentation="$(presentation.String)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF89"/>
+      <elements>
+        <text id="String" valueName="AllowedDomainsForApps"/>
+      </elements>
+    </policy>
+    <policy name="BackgroundAppUpdate" class="Both" displayName="$(string.BackgroundAppUpdate)" explainText="$(string.BackgroundAppUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BackgroundAppUpdate">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF90"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="AutoLaunchProtocolsFromOrigins" class="Both" displayName="$(string.AutoLaunchProtocolsFromOrigins)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.AutoLaunchProtocolsFromOrigins_Explain)" presentation="$(presentation.JSON)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF81"/>
+      <elements>
+        <multiText id="JSON" valueName="AutoLaunchProtocolsFromOrigins"  maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="WindowsSSO" class="Both" displayName="$(string.WindowsSSO)" explainText="$(string.WindowsSSO_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="WindowsSSO">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF91"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="UseSystemPrintDialog" class="Both" displayName="$(string.UseSystemPrintDialog)" explainText="$(string.UseSystemPrintDialog_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="UseSystemPrintDialog">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings" class="Both" displayName="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarnings)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain)" presentation="$(presentation.JSON)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <elements>
+        <multiText id="JSON" valueName="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings"  maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="StartDownloadsInTempDirectory" class="Both" displayName="$(string.StartDownloadsInTempDirectory)" explainText="$(string.StartDownloadsInTempDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="StartDownloadsInTempDirectory">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="GoToIntranetSiteForSingleWordEntryInAddressBar" class="Both" displayName="$(string.GoToIntranetSiteForSingleWordEntryInAddressBar)" explainText="$(string.GoToIntranetSiteForSingleWordEntryInAddressBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="GoToIntranetSiteForSingleWordEntryInAddressBar">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF104"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="AppUpdatePin" class="Both" displayName="$(string.AppUpdatePin)" explainText="$(string.AppUpdatePin_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.String)">
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_FF102" />
+      <elements>
+        <text id="String" valueName="AppUpdatePin" required="true" />
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>