diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fea030d42c0..2ba57fdb8d7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,13 +50,15 @@ begin with the accepted Jira ticket number.
 
 ## Contributor License Agreement
 
-In order to contribute to this project, the Unicode Consortium must have on file a Contributor License Agreement (CLA) covering your contributions, either an individual or a corporate CLA. Pull Requests will not be merged until the correct CLA is signed. Which version needs to be signed depends on who owns the contribution being made: you as the individual making the contribution or your employer. _It is your responsibility to determine whether your contribution is owned by your employer._ Please review [The Unicode Consortium Intellectual Property, Licensing, and Technical Contribution Policies][policies] for further guidance on which CLA to sign, as well as other information and guidelines regarding the Consortium’s licensing and technical contribution policies and procedures.
+In order to contribute to this project, the Unicode Consortium must have on file a Contributor License Agreement (CLA) covering your contributions, either an individual or a corporate CLA. Pull Requests, issues, and other contributions will not be merged/accepted until the correct CLA is signed. Which version needs to be signed depends on who owns the contribution being made: you as the individual making the contribution or your employer. **It is your responsibility to determine whether your contribution is owned by your employer.** Please review the [Unicode Intellectual Property, Licensing, & Technical Contribution Policy][policies] for further guidance on which CLA to sign, as well as other information and guidelines regarding the Consortium’s licensing and technical contribution policies and procedures.
 
-- **Individual CLA**: If you have determined that the Individual CLA is appropriate, then when you open your first Pull Request, an automated comment will appear that contains a link you can follow to accept the Individual CLA.
+To sign the CLA in Github, open a Pull Request (a comment will be automatically added with a link to the CLA Form), or go directly to [the CLA Form][sign-cla]. You may need to sign in to Github to see the entire CLA Form.
 
-- **Corporate CLA**: If you have determined that a Corporate CLA is appropriate, please check the [public list of Corporate CLAs][unicode-corporate-clas] that the Consortium has on file. If your employer has already signed a CLA, then when you open your first Pull Request, an automated comment will appear that contains a link you can follow to declare your affiliation with this employer. If your employer has not already signed a CLA, you will need to arrange for your employer to sign the Corporate CLA, as described in [How to Sign a Unicode CLA][signing].
+- **Individual CLA**: If you have determined that the Individual CLA is appropriate, then when you access the CLA Form, click the Individual CLA and complete the Form.
 
-Unless otherwise noted in the [LICENSE](./LICENSE) file, this project is released under the free and open-source [Unicode License][unicode-license], also known as Unicode, Inc. License Agreement - Data Files and Software.
+- **Corporate CLA**: If you have determined that a Corporate CLA is appropriate, please first check the [public list of Corporate CLAs][unicode-corporate-clas] that the Consortium has on file. If your employer is listed, then when you access the CLA Form, you can click the box indicating that you are covered by your employer’s corporate CLA. If your employer is not on the list, then it has not already signed a CLA and you will need to arrange for your employer to do so before you contribute, as described in [How to Sign a Unicode CLA][signing].
+
+Unless otherwise noted in the [`LICENSE`](./LICENSE) file, this project is released under the [OSI-approved][osi-Unicode-License-3.0] free and open-source [Unicode License v3][unicode-license].
 
 ## Building
 
@@ -108,4 +110,6 @@ All rights reserved. [Terms of use][]
 [policies]: https://www.unicode.org/policies/licensing_policy.html
 [unicode-corporate-clas]: https://www.unicode.org/policies/corporate-cla-list/
 [signing]: https://www.unicode.org/policies/licensing_policy.html#signing
-[unicode-license]: ./LICENSE
+[sign-cla]: https://cla-assistant.io/unicode-org/.github
+[osi-Unicode-License-3.0]: https://opensource.org/license/unicode-license-v3/
+[unicode-license]: https://www.unicode.org/license.txt
diff --git a/LICENSE b/LICENSE
index 7dd35b154e1..a82da826331 100644
--- a/LICENSE
+++ b/LICENSE
@@ -37,3 +37,5 @@ Except as contained in this notice, the name of a copyright holder shall
 not be used in advertising or otherwise to promote the sale, use or other
 dealings in these Data Files or Software without prior written
 authorization of the copyright holder.
+
+SPDX-License-Identifier: Unicode-3.0
diff --git a/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd
index 2478f3310d2..c1ce94cad51 100644
--- a/common/dtd/ldmlSupplemental.dtd
+++ b/common/dtd/ldmlSupplemental.dtd
@@ -944,8 +944,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ELEMENT parentLocale EMPTY >
 <!ATTLIST parentLocale parent NMTOKEN #REQUIRED >
     <!--@MATCH:validity/locale-->
+<!ATTLIST parentLocale localeRules NMTOKENS #IMPLIED >
+    <!--@MATCH:set/literal/nonlikelyScript-->
+    <!--@VALUE-->
 <!ATTLIST parentLocale locales NMTOKENS #REQUIRED >
-    <!--@MATCH:or/set/validity/locale||literal/nonlikelyScript-->
+    <!--@MATCH:set/validity/locale-->
     <!--@VALUE-->
 
 <!ELEMENT personNamesDefaults ( alias | ( nameOrderLocalesDefault* ) ) >
diff --git a/common/properties/coverageLevels.txt b/common/properties/coverageLevels.txt
index fc4a5d31df7..3a2bb78c703 100644
--- a/common/properties/coverageLevels.txt
+++ b/common/properties/coverageLevels.txt
@@ -144,7 +144,6 @@ th ;	modern ;	Thai
 ti ;	basic ;	Tigrinya
 tk ;	modern ;	Turkmen
 to ;	basic ;	Tongan
-tok ;	basic ;	Toki Pona
 tr ;	modern ;	Turkish
 tt ;	basic ;	Tatar
 ug ;	basic ;	Uyghur
diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml
index 38836c62767..9ca973a94cb 100644
--- a/common/supplemental/supplementalData.xml
+++ b/common/supplemental/supplementalData.xml
@@ -5423,7 +5423,7 @@ XXX Code for transations where no currency is involved
     </codeMappings>
 
 	<parentLocales>
-		<parentLocale parent="root" locales="nonlikelyScript"/>
+		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kk_Arab ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
 		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
 		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
 		<parentLocale parent="en_IN" locales="hi_Latn"/>
diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt
index 1f9e3557fff..8ea95c10c7f 100644
--- a/common/testData/localeIdentifiers/likelySubtags.txt
+++ b/common/testData/localeIdentifiers/likelySubtags.txt
@@ -1,5 +1,5 @@
 # Test data for Likely Subtags
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
 #  SPDX-License-Identifier: Unicode-DFS-2016
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/testData/localeIdentifiers/localeCanonicalization.txt b/common/testData/localeIdentifiers/localeCanonicalization.txt
index bce4a8a4ff7..a0145488b7b 100644
--- a/common/testData/localeIdentifiers/localeCanonicalization.txt
+++ b/common/testData/localeIdentifiers/localeCanonicalization.txt
@@ -1,5 +1,5 @@
 # Test data for locale identifier canonicalization
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
 #  SPDX-License-Identifier: Unicode-DFS-2016
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/testData/localeIdentifiers/localeDisplayName.txt b/common/testData/localeIdentifiers/localeDisplayName.txt
index 655a6f4eb9f..9d4715bd976 100644
--- a/common/testData/localeIdentifiers/localeDisplayName.txt
+++ b/common/testData/localeIdentifiers/localeDisplayName.txt
@@ -1,5 +1,5 @@
 # Test data for locale display name generation
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
 #  SPDX-License-Identifier: Unicode-DFS-2016
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/testData/units/unitPreferencesTest.txt b/common/testData/units/unitPreferencesTest.txt
index 61abdcafd12..900c314ae01 100644
--- a/common/testData/units/unitPreferencesTest.txt
+++ b/common/testData/units/unitPreferencesTest.txt
@@ -1,6 +1,6 @@
 
 # Test data for unit preferences
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
 #  SPDX-License-Identifier: Unicode-DFS-2016
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/common/testData/units/unitsTest.txt b/common/testData/units/unitsTest.txt
index 233a9304ece..e23fd02b749 100644
--- a/common/testData/units/unitsTest.txt
+++ b/common/testData/units/unitsTest.txt
@@ -1,5 +1,5 @@
 # Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
 #  SPDX-License-Identifier: Unicode-DFS-2016
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -189,9 +189,9 @@ speed	;	meter-per-second	;	meter-per-second	;	1 * x	;	1,000.00
 substance-amount	;	item	;	item	;	1 * x	;	1,000.00
 substance-amount	;	mole	;	item	;	602,214,076,000,000,000,000,000 * x	;	6.022141E26
 temperature	;	rankine	;	kelvin	;	5/9 * x	;	555.5556
-temperature	;	fahrenheit	;	kelvin	;	5/9 * x - 2,298.35/9	;	810.9278
+temperature	;	fahrenheit	;	kelvin	;	5/9 * x + 2,298.35/9	;	810.9278
 temperature	;	kelvin	;	kelvin	;	1 * x	;	1,000.00
-temperature	;	celsius	;	kelvin	;	1 * x - 273.15	;	1273.15
+temperature	;	celsius	;	kelvin	;	1 * x + 273.15	;	1273.15
 typewidth	;	em	;	em	;	1 * x	;	1,000.00
 voltage	;	volt	;	kilogram-square-meter-per-cubic-second-ampere	;	1 * x	;	1000.0
 volume	;	drop	;	cubic-meter	;	0.0000001540287998046875/3 * x	;	5.134293E-5
diff --git a/docs/charts/keyboard/package-lock.json b/docs/charts/keyboard/package-lock.json
index 4321cadf3a8..2cafa9454c6 100644
--- a/docs/charts/keyboard/package-lock.json
+++ b/docs/charts/keyboard/package-lock.json
@@ -8,7 +8,7 @@
       "name": "@unicode-org/keyboard-charts",
       "version": "1.0.0",
       "hasInstallScript": true,
-      "license": "Unicode-DFS-2016",
+      "license": "Unicode-3.0",
       "dependencies": {
         "fast-xml-parser": "^4.2.5"
       }
diff --git a/docs/charts/keyboard/package.json b/docs/charts/keyboard/package.json
index 06bf42abbe2..69c1ecc396d 100644
--- a/docs/charts/keyboard/package.json
+++ b/docs/charts/keyboard/package.json
@@ -12,7 +12,7 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "license": "Unicode-DFS-2016",
+  "license": "Unicode-3.0",
   "bugs": {
     "url": "https://github.com/unicode-org/cldr/issues"
   },
diff --git a/docs/ldml/tr35.md b/docs/ldml/tr35.md
index 89a70d8d80b..1318c0ccfd4 100644
--- a/docs/ldml/tr35.md
+++ b/docs/ldml/tr35.md
@@ -1790,18 +1790,21 @@ then a mixture of child and parent textual data is a mishmash of different scrip
 Thus there are two cases where the truncation inheritance needs to be overridden:
 
 1.  When the parent locale would have a different script, and text would be mixed.
-2.  In certain exceptional circumstances where the parent.
+2.  In certain exceptional circumstances where the 'truncation' parent needs to be adjusted.
 
 The `parentLocale` element is used to override the normal inheritance when accessing CLDR data.
 
-For case 1, there is a special value for the locales, `nonlikelyScript`,
-which includes all locales of the form <lang>_<script>, where the <script> is not the likely script for <lang>.
+For case 1, there is a special attribute and value, `localeRules="nonlikelyScript"`,
+which specifies **all locales** of the form <lang>_<script>, wherever the <script> is **not** the likely script for <lang>.
+For migration, the previous short list of locales (a subset of the nonlikelyScript locales) is retained,
+but those locales are slated for removal in the future. 
+For example, `ru_Latn` is not included in the short list but is included (programmatically) in the rule.
 
 ```xml
-<parentLocale parent="root" locales="nonlikelyScript"/>
+<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn … yue_Hans zh_Hant"/>/>
 ```
 
-This is used for the main component.
+The `localeRules` is used for the main component, for example.
 It is not used to components where text is not mixed, 
 such as the collations component or the plurals component.
 
@@ -1811,7 +1814,11 @@ For case 2, the children and parent share the same primary language, but the reg
 <parentLocale parent="es_419" locales="es_AR es_BO … es_UY es_VE"/>
 ```
 
-There are certain components that require addenda to the common parent fallback rules. For a locale like `zh_Hant` in the example above, the `parentLocale` element would dictate the parent as `root` when referring to main locale data, but for collation data, the parent locale should still be `zh`, even though the `parentLocale` element is present for that locale. To address this, components can have their own fallback rules that inherit from the common rules and add additional parents that supplement or override the common rules:
+There are certain components that require addenda to the common parent fallback rules. 
+For a locale like `zh_Hant` in the example above, the `parentLocale` element would dictate the parent as `root` when referring to main locale data,
+but for collation data, the parent locale should still be `zh`,
+even though the `parentLocale` element is present for that locale.
+To address this, components can have their own fallback rules that inherit from the common rules and add additional parents that supplement or override the common rules:
 
 ```xml
 <parentLocales component="segmentations">
@@ -1827,7 +1834,8 @@ the parentLocale information is contained in CLDR’s [supplemental data.](tr35-
 
 When a `parentLocale` element is used to override normal inheritance, the following guidelines apply in most cases:
 
-1.  If X is the parentLocale of Y, then either X is the root locale, or X has the same base language code as Y. For example, the parent of `en` cannot be `fr`, and the parent of `en_YY` cannot be `fr` or `fr_XX`.
+1.  If X is the parentLocale of Y, then either X is the root locale, or X has the same base language code as Y.
+For example, the parent of `en` cannot be `fr`, and the parent of `en_YY` cannot be `fr` or `fr_XX`.
 2.  If X is the parentLocale of Y, Y must not be a base language locale. For example, the parent of `en` cannot be `en_XX`.
 
 There may be specific exceptions to these for certain closely-related languages or language-script combinations, for example:
diff --git a/keyboards/3.0/bn.xml b/keyboards/3.0/bn.xml
index 2ff2993d0a2..88f897ff4dc 100644
--- a/keyboards/3.0/bn.xml
+++ b/keyboards/3.0/bn.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="bn" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="bn" conformsTo="techpreview">
     <!--
         History:
           Based on
diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml
index c745caaef42..86ee027c239 100644
--- a/keyboards/3.0/fr-t-k0-azerty.xml
+++ b/keyboards/3.0/fr-t-k0-azerty.xml
@@ -7,8 +7,7 @@
 
 	Also NOTE: this is really a test keyboard.  CLDR-12026 will be for the real new azerty keyboard
 -->
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="fr-t-k0-azerty" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="fr-t-k0-azerty" conformsTo="techpreview">
 	<locales>
 		<locale id="br" /> <!-- example of including Breton -->
 	</locales>
diff --git a/keyboards/3.0/ja-Latn.xml b/keyboards/3.0/ja-Latn.xml
index b9bd594b8f0..d48acb70b01 100644
--- a/keyboards/3.0/ja-Latn.xml
+++ b/keyboards/3.0/ja-Latn.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="ja-Latn" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="ja-Latn" conformsTo="techpreview">
 	<locales>
 		<locale id="en" />
 	</locales>
diff --git a/keyboards/3.0/mt-t-k0-47key.xml b/keyboards/3.0/mt-t-k0-47key.xml
index 71eec6ff573..788be91a296 100644
--- a/keyboards/3.0/mt-t-k0-47key.xml
+++ b/keyboards/3.0/mt-t-k0-47key.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="mt-t-k0-47key" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt-t-k0-47key" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
diff --git a/keyboards/3.0/mt.xml b/keyboards/3.0/mt.xml
index afce16ccf27..64e29cc1dc8 100644
--- a/keyboards/3.0/mt.xml
+++ b/keyboards/3.0/mt.xml
@@ -5,8 +5,7 @@
     This file is subject to change.
     Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest information.
 -->
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
diff --git a/keyboards/3.0/pcm.xml b/keyboards/3.0/pcm.xml
index 33fc3072dbe..867e35ec4f2 100644
--- a/keyboards/3.0/pcm.xml
+++ b/keyboards/3.0/pcm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="pcm" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="pcm" conformsTo="techpreview">
   <version number="1.0.0" />
   <info name="Naijíriá Píjin" />
   <keys>
diff --git a/keyboards/3.0/pt-t-k0-abnt2.xml b/keyboards/3.0/pt-t-k0-abnt2.xml
index 21c36210599..64977cd23bf 100644
--- a/keyboards/3.0/pt-t-k0-abnt2.xml
+++ b/keyboards/3.0/pt-t-k0-abnt2.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd"> <!-- TODO: to make tests pass, see CLDR-17191 -->
-<keyboard3 locale="pt-t-k0-abnt2" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="pt-t-k0-abnt2" conformsTo="techpreview">
 	<locales>
 		<locale id="pt" />
 	</locales>
diff --git a/keyboards/dtd/ldmlKeyboard3.dtd b/keyboards/dtd/ldmlKeyboard3.dtd
index 633aece6729..a5160c3119e 100644
--- a/keyboards/dtd/ldmlKeyboard3.dtd
+++ b/keyboards/dtd/ldmlKeyboard3.dtd
@@ -17,6 +17,9 @@ Please view the subcommittee page for the most recent information.
 <!ATTLIST keyboard3 conformsTo (techpreview) #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
+<!ATTLIST keyboard3 xmlns CDATA #IMPLIED >
+    <!--@MATCH:any-->
+    <!--@METADATA-->
 
 <!ELEMENT import EMPTY >
     <!--@TECHPREVIEW-->
diff --git a/keyboards/dtd/ldmlKeyboard3.xsd b/keyboards/dtd/ldmlKeyboard3.xsd
index f314094239e..9a445135fc8 100644
--- a/keyboards/dtd/ldmlKeyboard3.xsd
+++ b/keyboards/dtd/ldmlKeyboard3.xsd
@@ -11,7 +11,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 --><!--
   Important Note:
-  
+
   The CLDR Keyboard Subcommittee is currently developing major changes to the CLDR keyboard specification.
   Please view the subcommittee page for the most recent information.
   <https://cldr.unicode.org/index/keyboard-workgroup>
@@ -43,10 +43,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="import">
     <xs:complexType>
       <xs:attribute name="path" use="required"/>
@@ -59,8 +59,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="locales">
     <xs:complexType>
       <xs:sequence>
@@ -68,14 +68,14 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="locale">
     <xs:complexType>
       <xs:attribute name="id" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number"/>
@@ -88,12 +88,12 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <!-- Note: post techpreview, change cldrVersion to MATCH:version -->
-  
-  
+
+
   <xs:element name="info">
     <xs:complexType>
       <xs:attribute name="name" use="required"/>
@@ -102,15 +102,15 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="indicator"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
+
   <xs:element name="settings">
     <xs:complexType>
       <xs:attribute name="normalization">
@@ -122,9 +122,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <xs:element name="displays">
     <xs:complexType>
       <xs:sequence>
@@ -135,7 +135,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="display">
     <xs:complexType>
       <xs:attribute name="keyId" type="xs:NMTOKEN"/>
@@ -143,24 +143,24 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="display" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
   <xs:element name="displayOptions">
     <xs:complexType>
       <xs:attribute name="baseCharacter"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="special" type="any"/>
-  
+
   <xs:element name="keys">
     <xs:complexType>
       <xs:sequence>
@@ -170,7 +170,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="key">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
@@ -197,24 +197,24 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="width"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   <xs:element name="flicks">
     <xs:complexType>
       <xs:sequence>
@@ -233,18 +233,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="flickSegment">
     <xs:complexType>
       <xs:attribute name="directions" type="xs:NMTOKENS" use="required"/>
       <xs:attribute name="keyId" type="xs:NMTOKEN" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="forms">
     <xs:complexType>
       <xs:sequence>
@@ -254,7 +254,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="form">
     <xs:complexType>
       <xs:sequence>
@@ -264,16 +264,16 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="id" type="xs:NMTOKEN"/>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="scanCodes">
     <xs:complexType>
       <xs:attribute name="codes" type="xs:NMTOKENS" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <xs:element name="layers">
     <xs:complexType>
       <xs:sequence>
@@ -285,9 +285,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="minDeviceWidth"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <xs:element name="layer">
     <xs:complexType>
       <xs:sequence>
@@ -298,18 +298,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="modifiers" type="xs:NMTOKENS"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <xs:element name="row">
     <xs:complexType>
       <xs:attribute name="keys" type="xs:NMTOKENS" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="variables">
     <xs:complexType>
       <xs:sequence>
@@ -321,36 +321,36 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="string">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="value" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="set">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="value" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
+
+
+
+
   <xs:element name="uset">
     <xs:complexType>
       <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="value" use="required"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
+
+
+
   <xs:element name="transforms">
     <xs:complexType>
       <xs:sequence>
@@ -368,8 +368,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:attribute>
     </xs:complexType>
   </xs:element>
-  
-  
+
+
   <xs:element name="transformGroup">
     <xs:complexType>
       <xs:sequence>
@@ -382,20 +382,20 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  
+
   <xs:element name="transform">
     <xs:complexType>
       <xs:attribute name="from" use="required"/>
       <xs:attribute name="to"/>
     </xs:complexType>
   </xs:element>
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
   <xs:element name="reorder">
     <xs:complexType>
       <xs:attribute name="before"/>
@@ -411,4 +411,4 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:any maxOccurs="unbounded" minOccurs="0" processContents="strict"/>
     </xs:sequence>
   </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/pom.xml b/pom.xml
index 0c0c4323bbb..0af8401f2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 	<licenses>
 		<license>
-			<name>Unicode-DFS-2016</name>
+			<name>Unicode-3.0</name>
 		</license>
 	</licenses>
 	<properties>
diff --git a/tools/cldr-apps/js/package-lock.json b/tools/cldr-apps/js/package-lock.json
index cd8053554d5..0422d061243 100644
--- a/tools/cldr-apps/js/package-lock.json
+++ b/tools/cldr-apps/js/package-lock.json
@@ -7,7 +7,7 @@
     "": {
       "name": "cldr-apps-js",
       "version": "1.0.0",
-      "license": "Unicode-DFS-2016",
+      "license": "Unicode-3.0",
       "dependencies": {
         "@datadog/browser-logs": "^5.4.0",
         "@datadog/browser-rum": "^5.4.0",
diff --git a/tools/cldr-apps/js/package.json b/tools/cldr-apps/js/package.json
index 16c6ad5374a..e6869cf6cde 100644
--- a/tools/cldr-apps/js/package.json
+++ b/tools/cldr-apps/js/package.json
@@ -22,7 +22,7 @@
     "ui"
   ],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "license": "Unicode-DFS-2016",
+  "license": "Unicode-3.0",
   "bugs": {
     "url": "https://github.com/unicode-org/cldr/issues"
   },
diff --git a/tools/cldr-code/pom.xml b/tools/cldr-code/pom.xml
index 1f617861a09..e0801dbbf58 100644
--- a/tools/cldr-code/pom.xml
+++ b/tools/cldr-code/pom.xml
@@ -111,7 +111,7 @@
 					<!--
 						exclude the "for-cldr" dependencies.
 						see https://unicode-org.atlassian.net/browse/ICU-21425
-						these are actually under Unicode-DFS-2016 the same as CLDR is.
+						these are actually under Unicode-3.0 the same as CLDR is.
 						The ICU license file itself is pulled in during assembly (into /LICENSE), which contains
 						all of ICU's third party license information.
 					-->
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java b/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java
index fd117c7dfe8..b2e839a4310 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java
@@ -322,6 +322,7 @@ public static class SplittableAttributeSpec {
                     .add("systems")
                     .add("origin")
                     .add("component") // for parentLocales - may need to be more specific here
+                    .add("localeRules") // for parentLocales
                     .add("values") // for unitIdComponents - may need to be more specific here
                     .freeze();
 
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java
index 32955055b10..6f9ead94cfb 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java
@@ -21,6 +21,7 @@
 import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CLDRFile.DraftStatus;
 import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.Factory;
 import org.unicode.cldr.util.TempPrintWriter;
 import org.unicode.cldr.util.personname.PersonNameFormatter;
@@ -244,12 +245,8 @@ public static void main(String[] args) {
                 try (TempPrintWriter output2 =
                         TempPrintWriter.openUTF8Writer(dir.toString(), locale + ".txt"); ) {
                     output2.write(
-                            "# Test data for unit conversions"
-                                    + "\n#  Copyright © 1991-2023 Unicode, Inc."
-                                    + "\n#  For terms of use, see http://www.unicode.org/copyright.html"
-                                    + "\n#  SPDX-License-Identifier: Unicode-DFS-2016"
-                                    + "\n#  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)"
-                                    + "\n#"
+                            "# Test data for Person Name Data"
+                                    + CldrUtility.getCopyrightString("#  ")
                                     + "\n# CLDR person name formatting test data for: "
                                     + locale
                                     + "\n#"
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
index fc94139ec89..9f8f93421ba 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
@@ -7,6 +7,8 @@
  * @author srl
  */
 public abstract class CLDRURLS {
+    public static final String CLDR_SCHEMA_BASE = "https://schemas.unicode.org/cldr";
+    public static final String CLDR_CURVER_BASE = CLDR_SCHEMA_BASE + "/" + CLDRFile.GEN_VERSION;
     /** Base URL for the CLDR repository */
     public static final String CLDR_REPO_BASE = "https://github.com/unicode-org/cldr";
 
@@ -25,7 +27,7 @@ public abstract class CLDRURLS {
     public static final String UNICODE_CONSORTIUM = "The Unicode Consortium";
     public static final String CLDR_UPDATINGDTD_URL = CLDR_HOMEPAGE + "/development/updating-dtds";
     /** Our license, in SPDX format */
-    public static final String UNICODE_SPDX = "Unicode-DFS-2016";
+    public static final String UNICODE_SPDX = "Unicode-3.0";
     /**
      * See:
      * https://spdx.github.io/spdx-spec/appendix-V-using-SPDX-short-identifiers-in-source-files/
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DoctypeXmlStreamWrapper.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DoctypeXmlStreamWrapper.java
new file mode 100644
index 00000000000..f1e9f7370e9
--- /dev/null
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DoctypeXmlStreamWrapper.java
@@ -0,0 +1,162 @@
+package org.unicode.cldr.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import org.unicode.cldr.icu.LDMLConstants;
+import org.xml.sax.InputSource;
+
+public class DoctypeXmlStreamWrapper {
+    private static final String DOCTYPE = "<!DOCTYPE";
+    private static final char DOCTYPE_CHARS[] = DOCTYPE.toCharArray();
+    private static final byte DOCTYPE_BYTES[] = DOCTYPE.getBytes(StandardCharsets.UTF_8);
+    // the string to look for:  xmlns="
+    private static final String XMLNS_EQUALS = LDMLConstants.XMLNS + "=\"";
+    /**
+     * Size of the input buffer, needs to be able to handle any expansion when the header is updated
+     */
+    public static int BUFFER_MAX_SIZE = 1024;
+    /** Size of the first read, needs to contain xmlns="..." and be less than BUFFER_MAX_SIZE */
+    public static int BUFFER_READ_SIZE = 512;
+
+    /**
+     * Wrap an InputSource in something that will automatically insert a DTD reference in place of
+     * an xmlns directive.
+     *
+     * @throws IOException
+     */
+    public static InputSource wrap(InputSource src) throws IOException {
+        Reader r = src.getCharacterStream();
+        InputStream is = src.getByteStream();
+        if (r != null) {
+            src.setCharacterStream(wrap(r));
+        } else if (is != null) {
+            src.setByteStream(wrap(is, src.getEncoding()));
+        } else {
+            throw new NullPointerException(
+                    "Internal error: Character and Byte stream are both null");
+        }
+        return src;
+    }
+
+    /** wrap a byte oriented stream */
+    public static InputStream wrap(InputStream src, String encoding) throws IOException {
+        if (encoding == null) {
+            encoding = "UTF-8";
+        }
+        PushbackInputStream pr = new PushbackInputStream(src, BUFFER_MAX_SIZE);
+        byte inbuf[] = pr.readNBytes(BUFFER_READ_SIZE);
+        if (!hasDocType(inbuf, encoding)) {
+            inbuf = fixup(inbuf, encoding).getBytes(encoding);
+        }
+        pr.unread(inbuf);
+        return pr;
+    }
+
+    /** wrap a char oriented stream */
+    public static Reader wrap(Reader src) throws IOException {
+        PushbackReader pr = new PushbackReader(src, BUFFER_MAX_SIZE);
+        char inbuf[] = new char[BUFFER_READ_SIZE];
+        int readlen = pr.read(inbuf);
+        if (!hasDocType(inbuf, readlen)) {
+            char buf2[] = Arrays.copyOf(inbuf, readlen);
+            inbuf = fixup(new String(buf2)).toCharArray();
+            readlen = inbuf.length;
+        }
+        pr.unread(inbuf, 0, readlen);
+        return pr;
+    }
+
+    /** Fix an input byte array, including the DOCTYPE */
+    private static String fixup(byte[] inbuf, String encoding) {
+        try {
+            final String s = new String(inbuf, encoding);
+            return fixup(s);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("While parsing " + encoding, e);
+        }
+    }
+
+    /** Fix an input String, including DOCTYPE */
+    private static String fixup(final String s) {
+        // exit if nothing matches
+        for (final DtdType d : DtdType.values()) {
+            if (s.contains(XMLNS_EQUALS + d.getNsUrl())) {
+                return fixup(s, d);
+            }
+        }
+        // couldn't fix it, just pass through
+        return s;
+    }
+
+    /** Fix an input String given a specific DtdType. */
+    private static String fixup(String s, DtdType d) {
+        int n = s.indexOf("?>");
+        if (n == -1) {
+            throw new IllegalArgumentException("Invalid XML prefix: ?> not found.");
+        }
+        n += 2; // move the cut-point to the end of the "?>" sequence
+
+        final String doctype = "\n" + d.getDoctype() + "\n";
+        final String s2 = s.substring(0, n) + doctype + s.substring(n);
+        return s2;
+    }
+
+    private static final boolean hasDocType(byte[] inbuf, String encoding) {
+        if (inbuf == null || inbuf.length == 0) return false;
+
+        // Try as utf-8/ASCII bytes - this will be the common case
+        if (arrayContains(inbuf, inbuf.length, DOCTYPE_BYTES)) return true;
+
+        // break out here
+        if (encoding == null || encoding.equals("UTF-8")) return false;
+
+        // Try 2, with encoding
+        try {
+            final String s = new String(inbuf, encoding);
+            return s.contains(DOCTYPE);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("While parsing " + encoding, e);
+        }
+    }
+
+    private static final boolean hasDocType(char[] inbuf, int readlen) {
+        if (inbuf == null || readlen <= 0) {
+            return false;
+        }
+        return arrayContains(inbuf, readlen, DOCTYPE_CHARS);
+    }
+
+    private static boolean arrayContains(char[] inbuf, int inlen, char[] testbuf) {
+        final int testlen = testbuf.length;
+        int t = 0;
+        for (int i = 0; i < inlen; i++) {
+            if (inbuf[i] == testbuf[t]) {
+                t++;
+                if (t == testlen) return true;
+            } else {
+                t = 0;
+            }
+        }
+        return false;
+    }
+
+    private static boolean arrayContains(byte[] inbuf, int inlen, byte[] testbuf) {
+        final int testlen = testbuf.length;
+        int t = 0;
+        for (int i = 0; i < inlen; i++) {
+            if (inbuf[i] == testbuf[t]) {
+                t++;
+                if (t == testlen) return true;
+            } else {
+                t = 0;
+            }
+        }
+        return false;
+    }
+}
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java
index 70d5e41c95c..e629f26530b 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java
@@ -1,6 +1,7 @@
 package org.unicode.cldr.util;
 
 import com.google.common.collect.ImmutableSet;
+import java.io.File;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.Set;
@@ -154,4 +155,19 @@ public String rootElement() {
     public String getXsdPath() {
         return dtdPath.replaceAll("\\.dtd$", ".xsd");
     }
+
+    /** The xmlns name for this dtd type */
+    public String getNsUrl() {
+        return CLDRURLS.CLDR_CURVER_BASE + "/" + name();
+    }
+
+    /** The current version DTD as a URI */
+    String getDtdUri() {
+        return new File(CLDRPaths.BASE_DIRECTORY, dtdPath).toURI().toString();
+    }
+
+    /** DOCTYPE for this DTD (current version) */
+    String getDoctype() {
+        return "<!DOCTYPE " + name() + " SYSTEM \"" + getDtdUri() + "\">";
+    }
 }
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java
index f3c27281717..02f8f9fe478 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/StandardCodes.java
@@ -149,6 +149,10 @@ private Map<String, List<String>> getCodeData(CodeType type) {
         return type_code_data.get(type);
     }
 
+    public Set<String> getCodes(CodeType type) {
+        return type_code_data.get(type).keySet();
+    }
+
     /**
      * Get at the language registry values, as a Map from label to value.
      *
@@ -275,7 +279,7 @@ public Set<String> getGoodAvailableCodes(CodeType type) {
                     case script:
                         return sd.getCLDRScriptCodes();
                     case tzid:
-                        break; // nothing special
+                        return sd.getCLDRTimezoneCodes();
                     default:
                         for (Iterator<String> it = result.iterator(); it.hasNext(); ) {
                             String code = it.next();
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java
index a5aac3b40e5..882a3b74db0 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/SupplementalDataInfo.java
@@ -4,10 +4,13 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.impl.IterableComparator;
 import com.ibm.icu.impl.Relation;
@@ -74,6 +77,7 @@
 import org.unicode.cldr.util.GrammarInfo.GrammaticalScope;
 import org.unicode.cldr.util.GrammarInfo.GrammaticalTarget;
 import org.unicode.cldr.util.Rational.RationalParser;
+import org.unicode.cldr.util.StandardCodes.CodeType;
 import org.unicode.cldr.util.StandardCodes.LstrType;
 import org.unicode.cldr.util.SupplementalDataInfo.BasicLanguageData.Type;
 import org.unicode.cldr.util.SupplementalDataInfo.NumberingSystemInfo.NumberingSystemType;
@@ -984,6 +988,10 @@ public enum RBNFGroup {
     public Map<Row.R2<String, String>, String> bcp47Since = new TreeMap<>();
     public Map<Row.R2<String, String>, String> bcp47Preferred = new TreeMap<>();
     public Map<Row.R2<String, String>, String> bcp47Deprecated = new TreeMap<>();
+
+    Map<String, Map<String, Bcp47KeyInfo>> bcp47KeyToSubtypeToInfo = new TreeMap<>();
+    Map<String, Map<String, String>> bcp47KeyToAliasToSubtype = new TreeMap<>();
+
     public Map<String, String> bcp47ValueType = new TreeMap<>();
 
     public Map<String, Row.R2<String, String>> validityInfo = new LinkedHashMap<>();
@@ -1148,6 +1156,34 @@ private SupplementalDataInfo(File directory) {
         this.validity = Validity.getInstance(directory.toString() + "/../validity/");
     } // hide
 
+    public static class Bcp47KeyInfo {
+        public Bcp47KeyInfo(
+                Set<String> aliases,
+                String description,
+                String since,
+                String preferred,
+                String deprecated) {
+            this.description = description;
+            this.deprecated = !(deprecated == null || deprecated.equals("false"));
+            this.preferred = preferred;
+            this.since = since == null ? null : VersionInfo.getInstance(since);
+            this.aliases = aliases;
+        }
+
+        final String description;
+        final VersionInfo since;
+        final String preferred;
+        final boolean deprecated;
+        final Set<String> aliases;
+
+        @Override
+        public String toString() {
+            return String.format(
+                    "{description=«%s» since=%s preferred=%s deprecated=%s aliases=%s}",
+                    description, since, preferred, deprecated, aliases);
+        }
+    }
+
     private void makeStuffSafe() {
         // now make stuff safe
         allLanguages.addAll(languageToPopulation.keySet());
@@ -1227,19 +1263,54 @@ private void makeStuffSafe() {
         }
         typeToLocaleToDayPeriodInfo = CldrUtility.protectCollection(typeToLocaleToDayPeriodInfo);
         languageMatch = CldrUtility.protectCollection(languageMatch);
-        bcp47Key2Subtypes.freeze();
+
         bcp47Extension2Keys.freeze();
-        bcp47Aliases.freeze();
+        bcp47Key2Subtypes.freeze();
+        CldrUtility.protectCollection(bcp47ValueType);
         if (bcp47Key2Subtypes.isEmpty()) {
             throw new InternalError(
                     "No BCP47 key 2 subtype data was loaded from bcp47 dir "
                             + getBcp47Directory().getAbsolutePath());
         }
+
+        bcp47Aliases.freeze();
         CldrUtility.protectCollection(bcp47Descriptions);
         CldrUtility.protectCollection(bcp47Since);
         CldrUtility.protectCollection(bcp47Preferred);
         CldrUtility.protectCollection(bcp47Deprecated);
-        CldrUtility.protectCollection(bcp47ValueType);
+
+        // create clean structure
+
+        for (Entry<String, Set<String>> entry : bcp47Extension2Keys.keyValuesSet()) {
+            for (String key : entry.getValue()) {
+                Map<String, Bcp47KeyInfo> subtypeToInfo = bcp47KeyToSubtypeToInfo.get(key);
+                if (subtypeToInfo == null) {
+                    bcp47KeyToSubtypeToInfo.put(key, subtypeToInfo = new TreeMap<>());
+                }
+                Map<String, String> aliasToRegular = bcp47KeyToAliasToSubtype.get(key);
+                if (aliasToRegular == null) {
+                    bcp47KeyToAliasToSubtype.put(key, aliasToRegular = new TreeMap<>());
+                }
+                for (String subtype : bcp47Key2Subtypes.get(key)) {
+                    final R2<String, String> pair = R2.of(key, subtype);
+                    final Set<String> aliases = bcp47Aliases.get(pair);
+                    final Bcp47KeyInfo info =
+                            new Bcp47KeyInfo(
+                                    aliases,
+                                    bcp47Descriptions.get(pair),
+                                    bcp47Since.get(pair),
+                                    bcp47Preferred.get(pair),
+                                    bcp47Deprecated.get(pair));
+                    subtypeToInfo.put(subtype, info);
+                    final Map<String, String> aliasToRegularFinal = aliasToRegular;
+                    if (aliases != null) {
+                        aliases.forEach(x -> aliasToRegularFinal.put(x, subtype));
+                    }
+                }
+            }
+        }
+        bcp47KeyToSubtypeToInfo = CldrUtility.protectCollection(bcp47KeyToSubtypeToInfo);
+        bcp47KeyToAliasToSubtype = CldrUtility.protectCollection(bcp47KeyToAliasToSubtype);
 
         CoverageLevelInfo.fixEU(coverageLevels, this);
         coverageLevels = Collections.unmodifiableSortedSet(coverageLevels);
@@ -1906,10 +1977,17 @@ private void handleParentLocales(XPathParts parts) {
             }
             String parent = parts.getAttributeValue(-1, "parent");
             String locales = parts.getAttributeValue(-1, "locales");
+            String localeRules = parts.getAttributeValue(-1, "localeRules");
+            Set<String> localeRuleSet =
+                    localeRules == null
+                            ? Set.of()
+                            : Set.copyOf(split_space.splitToList(localeRules));
 
             for (ParentLocaleComponent component : components) {
                 Map<String, String> componentParentLocales = parentLocales.get(component);
-                if (locales.equals(NONLIKELYSCRIPT)) {
+                if (localeRuleSet.contains(NONLIKELYSCRIPT)) {
+                    // This will need to be modified if we add any other rules,
+                    // particularly if any rules are based on the particular parent
                     parentLocalesSkipNonLikely.add(component);
                     continue;
                 }
@@ -5190,4 +5268,64 @@ public UnitPrefixInfo getUnitPrefixInfo(String prefix) {
     public Set<String> getUnitPrefixes() {
         return unitPrefixInfo.keySet();
     }
+
+    /**
+     * Filter out deprecated items. This is more complicated than it seems. The deprecation is in
+     * timezones.xml, eg: <type name="cathu" description="Thunder Bay, Canada" deprecated="true"
+     * preferred="cator"/> <type name="cator" description="Toronto, Canada" alias="America/Toronto
+     * America/Montreal Canada/Eastern America/Nipigon America/Thunder_Bay"/> We need to find the
+     * short id's that are deprecated, put there is a problem due to
+     * https://unicode-org.atlassian.net/browse/CLDR-17412.
+     *
+     * <p>America/Nipigon, America/Thunder_Bay, America/Rainy_River
+     */
+    Supplier<Set<String>> goodTimezones =
+            Suppliers.memoize(
+                    new Supplier<Set<String>>() {
+
+                        @Override
+                        public Set<String> get() {
+                            Set<String> availableLongTz = sc.getAvailableCodes(CodeType.tzid);
+                            Set<String> result = null;
+                            if (true) { // hack for now
+                                final Set<String> hack =
+                                        Set.of(
+                                                "America/Santa_Isabel",
+                                                "Australia/Currie",
+                                                "America/Yellowknife",
+                                                "America/Rainy_River",
+                                                "America/Thunder_Bay",
+                                                "America/Nipigon",
+                                                "America/Pangnirtung",
+                                                "Europe/Uzhgorod",
+                                                "Europe/Zaporozhye",
+                                                "Pacific/Johnston");
+                                result = Set.copyOf(Sets.difference(availableLongTz, hack));
+                            } else { // TODO restore when CLDR-17412 is fixed
+                                Map<String, String> aliasToRegular =
+                                        bcp47KeyToAliasToSubtype.get("tz");
+                                Map<String, Bcp47KeyInfo> subtypeToInfo =
+                                        bcp47KeyToSubtypeToInfo.get("tz");
+                                result =
+                                        availableLongTz.stream()
+                                                .filter(
+                                                        x -> {
+                                                            String shortId = aliasToRegular.get(x);
+                                                            Bcp47KeyInfo info =
+                                                                    subtypeToInfo.get(shortId);
+                                                            System.out.println(
+                                                                    String.format(
+                                                                            "%s %s %s",
+                                                                            x, shortId, info));
+                                                            return !info.deprecated;
+                                                        })
+                                                .collect(Collectors.toUnmodifiableSet());
+                            }
+                            return result;
+                        }
+                    });
+
+    public Set<String> getCLDRTimezoneCodes() {
+        return goodTimezones.get();
+    }
 }
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLFileReader.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLFileReader.java
index 1b72a7da369..46549e9817b 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLFileReader.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/XMLFileReader.java
@@ -182,6 +182,8 @@ public static void read(
             AllHandler allHandler) {
         try {
             XMLReader xmlReader = createXMLReader(handlers, validating, allHandler);
+            // wrap the reader to insert a character stream
+            DoctypeXmlStreamWrapper.wrap(is);
             is.setSystemId(systemID);
             try {
                 xmlReader.parse(is);
@@ -198,7 +200,7 @@ public static void read(
         }
     }
 
-    private static final XMLReader createXMLReader(
+    public static final XMLReader createXMLReader(
             int handlers, boolean validating, AllHandler allHandler)
             throws SAXNotRecognizedException, SAXNotSupportedException {
         XMLReader xmlReader = createXMLReader(validating);
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
index 26646a2211a..0422bacff8a 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
@@ -207,7 +207,7 @@ Google	; nn	; Modern ; Nynorsk
 Google	;	no	;	modern	;	T2	Norwegian (Bokmål)
 Google	;	or	;	modern	;	T5	Odia
 Google	;	pa	;	modern	;	T4.1	Punjabi
-Google	;	pcm	;	modern	;	Nigerian Pidgin
+Google	;	pcm	;	moderate	;	Nigerian Pidgin
 Google	;	pl	;	modern	;	T1	Polish
 Google	;	ps	;	modern	;	T5	Pashto
 Google	;	pt	;	modern	;	T1	Brazilian Portuguese
@@ -283,7 +283,7 @@ Apple	;	kn	;	modern
 Apple	;	ko	;	modern
 Apple	;	lt	;	modern
 Apple	;	lv	;	modern
-Apple	;	mi	;	modern
+Apple	;	mi	;	moderate
 Apple	;	mk	;	modern
 Apple	;	ml	;	modern
 Apple	;	mr	;	modern
@@ -485,7 +485,7 @@ Cldr  ; cv  ; basic
 Cldr	;	en_AU	;	modern
 Cldr	;	es_MX	;	modern
 Cldr	;	fr_CA	;	modern
-Cldr  ; mi  ; modern
+Cldr  ; mi  ; moderate
 Cldr	;	zh_Hant_HK	;	modern
 
 #Cldr	other (from Google)
@@ -516,7 +516,7 @@ Cldr	; su ; basic ; Sundanese (script TBD)
 Cldr  ; ks_Deva ; basic ; Kashmiri (Devanagari)
 Cldr	; sd_Deva ; basic ; Sindhi (Devanagari script)
 # Cldr	; cad ; basic ; Caddo
-Cldr	; pcm ; modern ; Nigerian Pidgin
+Cldr	; pcm ; moderate ; Nigerian Pidgin
 
 Cldr	;	bgc	;	basic	;	Haryanvi
 Cldr	;	bho	;	basic	;	Bhojpuri
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathHeader.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathHeader.txt
index 21cca8ca4f8..95b27ebe082 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathHeader.txt
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/PathHeader.txt
@@ -418,6 +418,7 @@
 //supplementalData/windowsZones/mapTimezones/mapZone[@other="%A"][@territory="%A"]/_type			; Supplemental ; WZoneMapping ; $1 ; $2 ; HIDE
 
 //supplementalData/parentLocales/parentLocale[@parent="%A"]/_locales			; Supplemental ; Locale ; Parent ; $1 ; HIDE
+//supplementalData/parentLocales/parentLocale[@parent="%A"]/_localeRules			; Supplemental ; Locale ; Parent Rules ; $1 ; HIDE
 //supplementalData/parentLocales[@component="%A"]/parentLocale[@parent="%A"]/_locales			; Supplemental ; Locale ; Parent ($1) ; $2 ; HIDE
 //supplementalData/metadata/skipDefaultLocale/_services			; Supplemental ; Locale ; SkipDefault ; plain ; HIDE
 //supplementalData/metadata/defaultContent/_locales			; Supplemental ; Locale ; DefaultContent ; plain ; HIDE
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestBasic.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestBasic.java
index d4925bf8115..ebd7783451c 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestBasic.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestBasic.java
@@ -58,6 +58,7 @@
 import org.unicode.cldr.util.Counter;
 import org.unicode.cldr.util.DiscreteComparator;
 import org.unicode.cldr.util.DiscreteComparator.Ordering;
+import org.unicode.cldr.util.DoctypeXmlStreamWrapper;
 import org.unicode.cldr.util.DtdData;
 import org.unicode.cldr.util.DtdData.Attribute;
 import org.unicode.cldr.util.DtdData.Element;
@@ -376,6 +377,7 @@ public TimingInfo check(File systemID) {
             xmlReader.setErrorHandler(new MyErrorHandler());
             InputSource is = new InputSource(fis);
             is.setSystemId(systemID.toString());
+            DoctypeXmlStreamWrapper.wrap(is);
             xmlReader.parse(is);
             // fis.close();
         } catch (SAXException | IOException e) {
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
index 98001180d0f..14afd4f0b4c 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
@@ -840,14 +840,12 @@ public void TestFallbackFormat() {
 
     public void Test4897() {
         ExampleGenerator exampleGenerator = getExampleGenerator("it");
+        final CLDRFile cldrFile = exampleGenerator.getCldrFile();
         for (String xpath :
                 With.in(
-                        exampleGenerator
-                                .getCldrFile()
-                                .iterator(
-                                        "//ldml/dates/timeZoneNames",
-                                        exampleGenerator.getCldrFile().getComparator()))) {
-            String value = exampleGenerator.getCldrFile().getStringValue(xpath);
+                        cldrFile.iterator(
+                                "//ldml/dates/timeZoneNames", cldrFile.getComparator()))) {
+            String value = cldrFile.getStringValue(xpath);
             String actual = exampleGenerator.getExampleHtml(xpath, value);
             if (actual == null) {
                 if (!xpath.contains("singleCountries") && !xpath.contains("gmtZeroFormat")) {
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestDoctypeXmlStreamWrapper.java b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestDoctypeXmlStreamWrapper.java
new file mode 100644
index 00000000000..a534136a1f9
--- /dev/null
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestDoctypeXmlStreamWrapper.java
@@ -0,0 +1,115 @@
+package org.unicode.cldr.util;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.unicode.cldr.util.XMLFileReader.LoggingHandler;
+import org.unicode.cldr.util.XMLFileReader.SimpleHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+public class TestDoctypeXmlStreamWrapper {
+    private static final int COUNT = 10; // increase this for perf testing
+    private static final String COMMON_MT = CLDRPaths.BASE_DIRECTORY + "/common/main/mt.xml";
+    private static final String KEYBOARDS_MT = CLDRPaths.BASE_DIRECTORY + "/keyboards/3.0/mt.xml";
+
+    // make sure we get some basic loading first before starting the clock
+    @BeforeAll
+    public static final void SetupStuff() throws IOException {
+        TestDoctypeXmlStreamWrapper t = new TestDoctypeXmlStreamWrapper();
+        t.TestReadJar();
+        t.TestReadCommon();
+    }
+
+    @Test
+    void TestProcessPathValues() {
+        for (int i = 0; i < COUNT; i++) {
+            XMLFileReader.processPathValues(COMMON_MT, true, new SimpleHandler());
+        }
+    }
+
+    @Test
+    void TestReadJar() throws IOException {
+        for (int i = 0; i < COUNT; i++) {
+            new XMLFileReader()
+                    .setHandler(new XMLFileReader.SimpleHandler())
+                    .readCLDRResource("dl_iso_table_a1.xml", -1, false);
+        }
+    }
+
+    @Test
+    void TestReadCommon() throws FileNotFoundException, IOException {
+        for (int i = 0; i < COUNT; i++) {
+            new XMLFileReader()
+                    .setHandler(new XMLFileReader.SimpleHandler())
+                    .read(COMMON_MT, -1, true);
+        }
+    }
+
+    @Test
+    void TestReadKeyboard() throws FileNotFoundException, IOException {
+        for (int i = 0; i < COUNT; i++) {
+            new XMLFileReader()
+                    .setHandler(new XMLFileReader.SimpleHandler())
+                    .read(KEYBOARDS_MT, -1, true);
+        }
+    }
+
+    @Test
+    void TestReadKeyboardByte() throws IOException, SAXException {
+        // verify that reading via InputStream (byte) works as well
+        try (InputStream fis = new FileInputStream(KEYBOARDS_MT); ) {
+            InputSource is = new InputSource(fis);
+            is.setSystemId(KEYBOARDS_MT);
+            is = DoctypeXmlStreamWrapper.wrap(is);
+            XMLFileReader.createXMLReader(-1, true, new LoggingHandler()).parse(is);
+        }
+    }
+
+    @Test
+    void TestReadKeyboardChar() throws IOException, SAXException {
+        // verify that reading via Reader (char) works as well
+        try (InputStream fis = new FileInputStream(KEYBOARDS_MT);
+                InputStreamReader isr = new InputStreamReader(fis); ) {
+            InputSource is = new InputSource(isr);
+            is.setSystemId(KEYBOARDS_MT);
+            is = DoctypeXmlStreamWrapper.wrap(is);
+            XMLFileReader.createXMLReader(-1, true, new LoggingHandler()).parse(is);
+        }
+    }
+
+    @ParameterizedTest(name = "[{index}] wrapped={arguments}")
+    @ValueSource(booleans = {false, true, false, true})
+    public void TestBytePerf(boolean wrapped) throws IOException, SAXException {
+        for (int i = 0; i < COUNT; i++) {
+            // mimic XMLFileHandler.read() here, but with wrapping enabled/disabled
+            try (InputStream fis = new FileInputStream(COMMON_MT); ) {
+                InputSource is = new InputSource(fis);
+                is.setSystemId(COMMON_MT);
+                if (wrapped) is = DoctypeXmlStreamWrapper.wrap(is);
+                XMLFileReader.createXMLReader(-1, true, new LoggingHandler()).parse(is);
+            }
+        }
+    }
+
+    @ParameterizedTest(name = "[{index}] wrapped={arguments}")
+    @ValueSource(booleans = {false, true, false, true})
+    public void TestCharPerf(boolean wrapped) throws IOException, SAXException {
+        for (int i = 0; i < COUNT; i++) {
+            // mimic XMLFileHandler.read() here, but with wrapping enabled/disabled
+            try (InputStream fis = new FileInputStream(COMMON_MT);
+                    InputStreamReader isr = new InputStreamReader(fis); ) {
+                InputSource is = new InputSource(isr);
+                is.setSystemId(COMMON_MT);
+                if (wrapped) is = DoctypeXmlStreamWrapper.wrap(is);
+                XMLFileReader.createXMLReader(-1, true, new LoggingHandler()).parse(is);
+            }
+        }
+    }
+}
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestStandardCodes.java b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestStandardCodes.java
index 34eea77d547..6cc91e02f20 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestStandardCodes.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/util/TestStandardCodes.java
@@ -1,8 +1,12 @@
 package org.unicode.cldr.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.Set;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -30,4 +34,12 @@ void testTargetCoverageLevel(final String locale, final String level) {
                                 "Expected getTargetCoverageLevel(%s)=%s but was %s",
                                 locale, expectLevel, actualLevel));
     }
+
+    @Test
+    void testTimezoneExclusions() {
+        SupplementalDataInfo sdi = SupplementalDataInfo.getInstance();
+        Set<String> timezones = sdi.getCLDRTimezoneCodes();
+        assertTrue(timezones.contains("Europe/Andorra"));
+        assertFalse(timezones.contains("America/Nipigon"));
+    }
 }
diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml
index dc1f123c6ad..69c240a1c19 100644
--- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml
+++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-missing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml
index 3d2a49209ba..4982742d91d 100644
--- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml
+++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownbase.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml
index 2a778e761fd..ddd4045ee92 100644
--- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml
+++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-unknownver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="techpreview">
     <locales>
         <!-- English is also an official language in Malta.-->
         <locale id="en" />
diff --git a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml
index a3810de8b0a..71ba07e115a 100644
--- a/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml
+++ b/tools/cldr-code/src/test/resources/org/unicode/cldr/tool/KeyboardFlatten/broken-import-wrongparent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<keyboard3 locale="mt" conformsTo="techpreview">
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="techpreview">
     <locales>
         <!-- Error - can't import 'keys' into a 'locales' section. -->
         <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml"/>
diff --git a/tools/pom.xml b/tools/pom.xml
index 216cdd8c183..519889e0ed5 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 	<licenses>
 		<license>
-			<name>Unicode-DFS-2016</name>
+			<name>Unicode-3.0</name>
 		</license>
 	</licenses>
 	<properties>
@@ -254,6 +254,25 @@
 							<java.awt.headless>true</java.awt.headless>
 						</systemPropertyVariables>
 						<argLine>-Xmx6g -enableassertions</argLine>
+						<statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
+						  <disable>false</disable>
+						  <version>3.0</version>
+						  <usePhrasedFileName>false</usePhrasedFileName>
+						  <usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
+						  <usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
+						  <usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
+						</statelessTestsetReporter>
+						<consoleOutputReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5ConsoleOutputReporter">
+						  <disable>false</disable>
+						  <encoding>UTF-8</encoding>
+						  <usePhrasedFileName>false</usePhrasedFileName>
+						</consoleOutputReporter>
+						<statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
+						  <disable>false</disable>
+						  <usePhrasedFileName>false</usePhrasedFileName>
+						  <usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
+						  <usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
+						</statelessTestsetInfoReporter>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/tools/scripts/ansible/roles/openliberty/meta/main.yml b/tools/scripts/ansible/roles/openliberty/meta/main.yml
index 98f1d3bf94e..06ae2979bc3 100644
--- a/tools/scripts/ansible/roles/openliberty/meta/main.yml
+++ b/tools/scripts/ansible/roles/openliberty/meta/main.yml
@@ -2,7 +2,7 @@ galaxy_info:
   author: Steven R. Loomis
   description: Ubuntu installer for OpenLiberty
 
-  license: Unicode-DFS-2016
+  license: Unicode-3.0
 
   min_ansible_version: "2.1"
 
diff --git a/tools/scripts/tr-archive/package-lock.json b/tools/scripts/tr-archive/package-lock.json
index 92dca05f37d..6b276c7f007 100644
--- a/tools/scripts/tr-archive/package-lock.json
+++ b/tools/scripts/tr-archive/package-lock.json
@@ -7,7 +7,7 @@
     "": {
       "name": "tr-archive",
       "version": "1.0.0",
-      "license": "Unicode-DFS-2016",
+      "license": "Unicode-3.0",
       "dependencies": {
         "@not-dalia/gfm-toc": "github:not-dalia/gfm-toc",
         "anchor-js": "^5.0.0",
diff --git a/tools/scripts/tr-archive/package.json b/tools/scripts/tr-archive/package.json
index fb01a35443b..496632a3731 100644
--- a/tools/scripts/tr-archive/package.json
+++ b/tools/scripts/tr-archive/package.json
@@ -19,6 +19,6 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "license": "Unicode-DFS-2016",
+  "license": "Unicode-3.0",
   "private": true
 }
diff --git a/tools/st-prom-exporter/package.json b/tools/st-prom-exporter/package.json
index d6103f1c1b6..4e95cf2040c 100644
--- a/tools/st-prom-exporter/package.json
+++ b/tools/st-prom-exporter/package.json
@@ -9,7 +9,7 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "license": "Unicode-DFS-2016",
+  "license": "Unicode-3.0",
   "dependencies": {
     "bent": "^7.3.10",
     "express": "^4.18.2",