diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index ffd49a9..039550b 100644
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -232,9 +232,11 @@
 # may fail.
 # Repeat steps 4-7 until there are no errors.
 
-# 9. You can also run the make check tests in exhaustive mode (these will also
-# be run automatically on the default branch after the merge resulting from this
-# integration):
+# 9. You can also run the make check tests in exhaustive mode. As an alternative
+# you can run them as part of the pre-merge tests by adding the following as a
+# comment in the pull request: "/azp run CI-Exhaustive". You should do one or the
+# other; the exhaustive tests are *not* run automatically on each pull request,
+# and are only run occasionally on the default branch.
 
 cd $ICU4C_DIR/source
 export INTLTEST_OPTS="-e"
@@ -249,7 +251,6 @@
 # as a base for comparison):
 
 cd $ICU4J_ROOT
-ant all 2>&1 | tee /tmp/icu4j-oldData-antAll.txt
 ant check 2>&1 | tee /tmp/icu4j-oldData-antCheck.txt
 
 # 12. Transfer the data to ICU4J:
diff --git a/icu4c/source/data/coll/br.txt b/icu4c/source/data/coll/br.txt
new file mode 100644
index 0000000..a5d3f51
--- /dev/null
+++ b/icu4c/source/data/coll/br.txt
@@ -0,0 +1,12 @@
+﻿// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
+br{
+    Version{"38"}
+    collations{
+        standard{
+            Sequence{"&C<ch<<<Ch<<<CH<c''h=c\u2019h<<<C''h=C\u2019h<<<C''H=C\u2019H"}
+            Version{"38"}
+        }
+    }
+}
diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt
index b265f41..a5b2b51 100644
--- a/icu4c/source/data/lang/en.txt
+++ b/icu4c/source/data/lang/en.txt
@@ -16,6 +16,7 @@
         collation{"Sort Order"}
         currency{"Currency"}
         d0{"Transform Destination"}
+        dx{"Dictionary Break Exclusions"}
         em{"Emoji Presentation Style"}
         fw{"First day of week"}
         h0{"Mixed-in"}
diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt
index 3a39613..db75a26 100644
--- a/icu4c/source/data/locales/ar.txt
+++ b/icu4c/source/data/locales/ar.txt
@@ -161,60 +161,60 @@
             patternsShort{
                 currencyFormat{
                     1000{
-                        few{" 0 ألف ¤"}
-                        many{" 0 ألف ¤"}
-                        one{" 0 ألف ¤"}
-                        other{" 0 ألف ¤"}
-                        two{" 0 ألف ¤"}
-                        zero{" 0 ألف ¤"}
+                        few{"0 ألف ¤"}
+                        many{"0 ألف ¤"}
+                        one{"0 ألف ¤"}
+                        other{"0 ألف ¤"}
+                        two{"0 ألف ¤"}
+                        zero{"0 ألف ¤"}
                     }
                     10000{
-                        few{" 00 ألف ¤"}
-                        many{" 00 ألف ¤"}
-                        one{" 00 ألف ¤"}
-                        other{" 00 ألف ¤"}
-                        two{" 00 ألف ¤"}
-                        zero{" 00 ألف ¤"}
+                        few{"00 ألف ¤"}
+                        many{"00 ألف ¤"}
+                        one{"00 ألف ¤"}
+                        other{"00 ألف ¤"}
+                        two{"00 ألف ¤"}
+                        zero{"00 ألف ¤"}
                     }
                     100000{
-                        few{" 000 ألف ¤"}
-                        many{" 000 ألف ¤"}
-                        one{" 000 ألف ¤"}
-                        other{" 000 ألف ¤"}
-                        two{" 000 ألف ¤"}
-                        zero{" 000 ألف ¤"}
+                        few{"000 ألف ¤"}
+                        many{"000 ألف ¤"}
+                        one{"000 ألف ¤"}
+                        other{"000 ألف ¤"}
+                        two{"000 ألف ¤"}
+                        zero{"000 ألف ¤"}
                     }
                     1000000{
-                        few{" 0 مليون ¤"}
-                        many{" 0 مليون ¤"}
-                        one{" 0 مليون ¤"}
-                        other{" 0 مليون ¤"}
-                        two{" 0 مليون ¤"}
-                        zero{" 0 مليون ¤"}
+                        few{"0 مليون ¤"}
+                        many{"0 مليون ¤"}
+                        one{"0 مليون ¤"}
+                        other{"0 مليون ¤"}
+                        two{"0 مليون ¤"}
+                        zero{"0 مليون ¤"}
                     }
                     10000000{
-                        few{" 00 مليون ¤"}
-                        many{" 00 مليون ¤"}
-                        one{" 00 مليون ¤"}
-                        other{" 00 مليون ¤"}
-                        two{" 00 مليون ¤"}
-                        zero{" 00 مليون ¤"}
+                        few{"00 مليون ¤"}
+                        many{"00 مليون ¤"}
+                        one{"00 مليون ¤"}
+                        other{"00 مليون ¤"}
+                        two{"00 مليون ¤"}
+                        zero{"00 مليون ¤"}
                     }
                     100000000{
-                        few{" 000 مليون ¤"}
-                        many{" 000 مليون ¤"}
-                        one{" 000 مليون ¤"}
-                        other{" 000 مليون ¤"}
-                        two{" 000 مليون ¤"}
-                        zero{" 000 مليون ¤"}
+                        few{"000 مليون ¤"}
+                        many{"000 مليون ¤"}
+                        one{"000 مليون ¤"}
+                        other{"000 مليون ¤"}
+                        two{"000 مليون ¤"}
+                        zero{"000 مليون ¤"}
                     }
                     1000000000{
-                        few{" 0 مليار ¤"}
-                        many{" 0 مليار ¤"}
-                        one{" 0 مليار ¤"}
-                        other{" 0 مليار ¤"}
-                        two{" 0 مليار ¤"}
-                        zero{" 0 مليار ¤"}
+                        few{"0 مليار ¤"}
+                        many{"0 مليار ¤"}
+                        one{"0 مليار ¤"}
+                        other{"0 مليار ¤"}
+                        two{"0 مليار ¤"}
+                        zero{"0 مليار ¤"}
                     }
                     10000000000{
                         few{"00 مليار ¤"}
@@ -3096,7 +3096,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/en_001.txt b/icu4c/source/data/locales/en_001.txt
index 7148c3a..b403586 100644
--- a/icu4c/source/data/locales/en_001.txt
+++ b/icu4c/source/data/locales/en_001.txt
@@ -99,7 +99,6 @@
                 "{1}, {0}",
             }
             availableFormats{
-                Bhms{"h:mm.ss B"}
                 EBhm{"E, h:mm B"}
                 EBhms{"E, h:mm:ss B"}
                 EHm{"E, HH:mm"}
diff --git a/icu4c/source/data/locales/en_AE.txt b/icu4c/source/data/locales/en_AE.txt
index 6e45e79..1f4fa35 100644
--- a/icu4c/source/data/locales/en_AE.txt
+++ b/icu4c/source/data/locales/en_AE.txt
@@ -99,7 +99,6 @@
                 "{1}, {0}",
             }
             availableFormats{
-                Bhms{"h:mm.ss B"}
                 EBhm{"E, h:mm B"}
                 EBhms{"E, h:mm:ss B"}
                 EHm{"E, HH:mm"}
diff --git a/icu4c/source/data/locales/es_419.txt b/icu4c/source/data/locales/es_419.txt
index 46b33aa..3c41e83 100644
--- a/icu4c/source/data/locales/es_419.txt
+++ b/icu4c/source/data/locales/es_419.txt
@@ -269,9 +269,9 @@
                 Hms{"HH:mm:ss"}
                 MMMdd{"dd-MMM"}
                 yMEd{"E d/M/y"}
-                yMMM{"MMMM 'de' y"}
+                yMMM{"MMM 'de' y"}
                 yMMMEd{"E, d 'de' MMM 'de' y"}
-                yMMMd{"d 'de' MMMM 'de' y"}
+                yMMMd{"d 'de' MMM 'de' y"}
                 yQQQ{"QQQ 'de' y"}
             }
             dayNames{
diff --git a/icu4c/source/data/locales/es_AR.txt b/icu4c/source/data/locales/es_AR.txt
index f58ab57..fde546e 100644
--- a/icu4c/source/data/locales/es_AR.txt
+++ b/icu4c/source/data/locales/es_AR.txt
@@ -36,7 +36,6 @@
                 yMEd{"E, d/M/y"}
                 yMMM{"MMM y"}
                 yMMMEd{"E, d MMM y"}
-                yMMMd{"d 'de' MMM 'de' y"}
             }
             dayNames{
                 format{
diff --git a/icu4c/source/data/locales/es_CO.txt b/icu4c/source/data/locales/es_CO.txt
index b77103b..b055afb 100644
--- a/icu4c/source/data/locales/es_CO.txt
+++ b/icu4c/source/data/locales/es_CO.txt
@@ -125,8 +125,6 @@
                 MMMd{"d 'de' MMM"}
                 MMMdd{"d 'de' MMM"}
                 yMEd{"EEE, d/M/y"}
-                yMMM{"MMM 'de' y"}
-                yMMMd{"d 'de' MMM 'de' y"}
             }
             dayNames{
                 format{
diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt
index f4bf065..fda00fa 100644
--- a/icu4c/source/data/locales/es_MX.txt
+++ b/icu4c/source/data/locales/es_MX.txt
@@ -172,7 +172,7 @@
                 MMdd{"dd/MM"}
                 yMEd{"E, d/M/y"}
                 yMM{"MM/y"}
-                yMMMEd{"EEE, d 'de' MMMM 'de' y"}
+                yMMMEd{"EEE, d 'de' MMM 'de' y"}
                 yQQQ{"QQQ y"}
             }
             dayNames{
diff --git a/icu4c/source/data/locales/es_US.txt b/icu4c/source/data/locales/es_US.txt
index 2b27653..0e36a67 100644
--- a/icu4c/source/data/locales/es_US.txt
+++ b/icu4c/source/data/locales/es_US.txt
@@ -151,7 +151,7 @@
                 MMdd{"dd/MM"}
                 yMEd{"E, d/M/y"}
                 yMM{"MM/y"}
-                yMMMEd{"EEE, d 'de' MMMM 'de' y"}
+                yMMMEd{"EEE, d 'de' MMM 'de' y"}
                 yQQQ{"QQQ y"}
             }
             dayNames{
diff --git a/icu4c/source/data/locales/et.txt b/icu4c/source/data/locales/et.txt
index 82c6669..117ff39 100644
--- a/icu4c/source/data/locales/et.txt
+++ b/icu4c/source/data/locales/et.txt
@@ -316,7 +316,7 @@
                 GyMMMd{"d. MMM y G"}
                 H{"HH"}
                 Hm{"HH:mm"}
-                Hms{"H:mm.ss"}
+                Hms{"H:mm:ss"}
                 M{"M"}
                 MEd{"E, d.M"}
                 MMM{"MMMM"}
@@ -328,9 +328,9 @@
                 d{"d"}
                 h{"h a"}
                 hm{"h:mm a"}
-                hms{"h:mm.ss a"}
-                mmss{"mm.ss"}
-                ms{"mm.ss"}
+                hms{"h:mm:ss a"}
+                mmss{"mm:ss"}
+                ms{"mm:ss"}
                 y{"y G"}
                 yyyy{"y G"}
                 yyyyM{"M.y G"}
@@ -1931,7 +1931,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt
index 96be420..6905156 100644
--- a/icu4c/source/data/locales/fr.txt
+++ b/icu4c/source/data/locales/fr.txt
@@ -217,6 +217,7 @@
                 other{"Prenez la {0}e à droite."}
             }
             plural{
+                many{"{0} de jours"}
                 one{"{0} jour"}
                 other{"{0} jours"}
             }
diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt
index 6a527f3..a2219a6 100644
--- a/icu4c/source/data/locales/is.txt
+++ b/icu4c/source/data/locales/is.txt
@@ -3912,7 +3912,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/jv.txt b/icu4c/source/data/locales/jv.txt
index 4979af4..3193e7b 100644
--- a/icu4c/source/data/locales/jv.txt
+++ b/icu4c/source/data/locales/jv.txt
@@ -1431,7 +1431,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/ku.txt b/icu4c/source/data/locales/ku.txt
index 2973f7c..603f167 100644
--- a/icu4c/source/data/locales/ku.txt
+++ b/icu4c/source/data/locales/ku.txt
@@ -605,7 +605,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt
index b1d1aa5..489b629 100644
--- a/icu4c/source/data/locales/ms.txt
+++ b/icu4c/source/data/locales/ms.txt
@@ -1689,247 +1689,6 @@
                 "{1} {0}",
                 "{1} {0}",
             }
-            eras{
-                wide{
-                    "Taika (645–650)",
-                    "Hakuchi (650–671)",
-                    "Hakuho (672–686)",
-                    "Shucho (686–701)",
-                    "Taiho (701–704)",
-                    "Keiun (704–708)",
-                    "Wado (708–715)",
-                    "Reiki (715–717)",
-                    "Yoro (717–724)",
-                    "Jinki (724–729)",
-                    "Tenpyo (729–749)",
-                    "Tenpyo-kampo (749–749)",
-                    "Tenpyo-shoho (749–757)",
-                    "Tenpyo-hoji (757–765)",
-                    "Tenpyo-jingo (765–767)",
-                    "Jingo-keiun (767–770)",
-                    "Hoki (770–780)",
-                    "Ten-o (781–782)",
-                    "Enryaku (782–806)",
-                    "Daido (806–810)",
-                    "Konin (810–824)",
-                    "Tencho (824–834)",
-                    "Jowa (834–848)",
-                    "Kajo (848–851)",
-                    "Ninju (851–854)",
-                    "Saiko (854–857)",
-                    "Ten-an (857–859)",
-                    "Jogan (859–877)",
-                    "Gangyoō (877–885)",
-                    "Ninna (885–889)",
-                    "Kanpyo (889–898)",
-                    "Shotai (898–901)",
-                    "Engi (901–923)",
-                    "Encho (923–931)",
-                    "Johei (931–938)",
-                    "Tengyo (938–947)",
-                    "Tenryaku (947–957)",
-                    "Tentoku (957–961)",
-                    "Owa (961–964)",
-                    "Koho (964–968)",
-                    "Anna (968–970)",
-                    "Tenroku (970–973)",
-                    "Ten’en (973–976)",
-                    "Jogen (976–978)",
-                    "Tengen (978–983)",
-                    "Eikan (983–985)",
-                    "Kanna (985–987)",
-                    "Eien (987–989)",
-                    "Eiso (989–990)",
-                    "Shoryaku (990–995)",
-                    "Chotoku (995–999)",
-                    "Choho (999–1004)",
-                    "Kanko (1004–1012)",
-                    "Chowa (1012–1017)",
-                    "Kannin (1017–1021)",
-                    "Jian (1021–1024)",
-                    "Manju (1024–1028)",
-                    "Chogen (1028–1037)",
-                    "Choryaku (1037–1040)",
-                    "Chōkyū (1040–1044)",
-                    "Kantoku (1044–1046)",
-                    "Eishō (1046–1053)",
-                    "Tengi (1053–1058)",
-                    "Kōhei (1058–1065)",
-                    "Jiryaku (1065–1069)",
-                    "Enkyū (1069–1074)",
-                    "Shōho (1074–1077)",
-                    "Shōryaku (1077–1081)",
-                    "Eihō (1081–1084)",
-                    "Ōtoku (1084–1087)",
-                    "Kanji (1087–1094)",
-                    "Kahō (1094–1096)",
-                    "Eichō (1096–1097)",
-                    "Jōtoku (1097–1099)",
-                    "Kōwa (1099–1104)",
-                    "Chōji (1104–1106)",
-                    "Kashō (1106–1108)",
-                    "Tennin (1108–1110)",
-                    "Ten-ei (1110–1113)",
-                    "Eikyū (1113–1118)",
-                    "Gen’ei (1118–1120)",
-                    "Hōan (1120–1124)",
-                    "Tenji (1124–1126)",
-                    "Daiji (1126–1131)",
-                    "Tenshō (1131–1132)",
-                    "Chōshō (1132–1135)",
-                    "Hōen (1135–1141)",
-                    "Eiji (1141–1142)",
-                    "Kōji (1142–1144)",
-                    "Ten’yō (1144–1145)",
-                    "Kyūan (1145–1151)",
-                    "Ninpei (1151–1154)",
-                    "Kyūju (1154–1156)",
-                    "Hōgen (1156–1159)",
-                    "Heiji (1159–1160)",
-                    "Eiryaku (1160–1161)",
-                    "Ōho (1161–1163)",
-                    "Chōkan (1163–1165)",
-                    "Eiman (1165–1166)",
-                    "Nin’an (1166–1169)",
-                    "Kaō (1169–1171)",
-                    "Shōan (1171–1175)",
-                    "Angen (1175–1177)",
-                    "Jishō (1177–1181)",
-                    "Yōwa (1181–1182)",
-                    "Juei (1182–1184)",
-                    "Genryaku (1184–1185)",
-                    "Bunji (1185–1190)",
-                    "Kenkyū (1190–1199)",
-                    "Shōji (1199–1201)",
-                    "Kennin (1201–1204)",
-                    "Genkyū (1204–1206)",
-                    "Ken’ei (1206–1207)",
-                    "Jōgen (1207–1211)",
-                    "Kenryaku (1211–1213)",
-                    "Kenpō (1213–1219)",
-                    "Jōkyū (1219–1222)",
-                    "Jōō (1222–1224)",
-                    "Gennin (1224–1225)",
-                    "Karoku (1225–1227)",
-                    "Antei (1227–1229)",
-                    "Kanki (1229–1232)",
-                    "Jōei (1232–1233)",
-                    "Tenpuku (1233–1234)",
-                    "Bunryaku (1234–1235)",
-                    "Katei (1235–1238)",
-                    "Ryakunin (1238–1239)",
-                    "En’ō (1239–1240)",
-                    "Ninji (1240–1243)",
-                    "Kangen (1243–1247)",
-                    "Hōji (1247–1249)",
-                    "Kenchō (1249–1256)",
-                    "Kōgen (1256–1257)",
-                    "Shōka (1257–1259)",
-                    "Shōgen (1259–1260)",
-                    "Bun’ō (1260–1261)",
-                    "Kōchō (1261–1264)",
-                    "Bun’ei (1264–1275)",
-                    "Kenji (1275–1278)",
-                    "Kōan (1278–1288)",
-                    "Shōō (1288–1293)",
-                    "Einin (1293–1299)",
-                    "Shōan (1299–1302)",
-                    "Kengen (1302–1303)",
-                    "Kagen (1303–1306)",
-                    "Tokuji (1306–1308)",
-                    "Enkyō (1308–1311)",
-                    "Ōchō (1311–1312)",
-                    "Shōwa (1312–1317)",
-                    "Bunpō (1317–1319)",
-                    "Genō (1319–1321)",
-                    "Genkō (1321–1324)",
-                    "Shōchū (1324–1326)",
-                    "Karyaku (1326–1329)",
-                    "Gentoku (1329–1331)",
-                    "Genkō (1331–1334)",
-                    "Kenmu (1334–1336)",
-                    "Engen (1336–1340)",
-                    "Kōkoku (1340–1346)",
-                    "Shōhei (1346–1370)",
-                    "Kentoku (1370–1372)",
-                    "Bunchū (1372–1375)",
-                    "Tenju (1375–1379)",
-                    "Kōryaku (1379–1381)",
-                    "Kōwa (1381–1384)",
-                    "Genchū (1384–1392)",
-                    "Meitoku (1384–1387)",
-                    "Kakei (1387–1389)",
-                    "Kōō (1389–1390)",
-                    "Meitoku (1390–1394)",
-                    "Ōei (1394–1428)",
-                    "Shōchō (1428–1429)",
-                    "Eikyō (1429–1441)",
-                    "Kakitsu (1441–1444)",
-                    "Bun’an (1444–1449)",
-                    "Hōtoku (1449–1452)",
-                    "Kyōtoku (1452–1455)",
-                    "Kōshō (1455–1457)",
-                    "Chōroku (1457–1460)",
-                    "Kanshō (1460–1466)",
-                    "Bunshō (1466–1467)",
-                    "Ōnin (1467–1469)",
-                    "Bunmei (1469–1487)",
-                    "Chōkyō (1487–1489)",
-                    "Entoku (1489–1492)",
-                    "Meiō (1492–1501)",
-                    "Bunki (1501–1504)",
-                    "Eishō (1504–1521)",
-                    "Taiei (1521–1528)",
-                    "Kyōroku (1528–1532)",
-                    "Tenbun (1532–1555)",
-                    "Kōji (1555–1558)",
-                    "Eiroku (1558–1570)",
-                    "Genki (1570–1573)",
-                    "Tenshō (1573–1592)",
-                    "Bunroku (1592–1596)",
-                    "Keichō (1596–1615)",
-                    "Genna (1615–1624)",
-                    "Kan’ei (1624–1644)",
-                    "Shōho (1644–1648)",
-                    "Keian (1648–1652)",
-                    "Jōō (1652–1655)",
-                    "Meireki (1655–1658)",
-                    "Manji (1658–1661)",
-                    "Kanbun (1661–1673)",
-                    "Enpō (1673–1681)",
-                    "Tenna (1681–1684)",
-                    "Jōkyō (1684–1688)",
-                    "Genroku (1688–1704)",
-                    "Hōei (1704–1711)",
-                    "Shōtoku (1711–1716)",
-                    "Kyōhō (1716–1736)",
-                    "Genbun (1736–1741)",
-                    "Kanpō (1741–1744)",
-                    "Enkyō (1744–1748)",
-                    "Kan’en (1748–1751)",
-                    "Hōreki (1751–1764)",
-                    "Meiwa (1764–1772)",
-                    "An’ei (1772–1781)",
-                    "Tenmei (1781–1789)",
-                    "Kansei (1789–1801)",
-                    "Kyōwa (1801–1804)",
-                    "Bunka (1804–1818)",
-                    "Bunsei (1818–1830)",
-                    "Tenpō (1830–1844)",
-                    "Kōka (1844–1848)",
-                    "Kaei (1848–1854)",
-                    "Ansei (1854–1860)",
-                    "Man’en (1860–1861)",
-                    "Bunkyū (1861–1864)",
-                    "Genji (1864–1865)",
-                    "Keiō (1865–1868)",
-                    "Meiji",
-                    "Taishō",
-                    "Shōwa",
-                    "Heisei",
-                    "Reiwa",
-                }
-            }
         }
         persian{
             eras{
diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt
index 0434c4a..9fb1183 100644
--- a/icu4c/source/data/locales/nl.txt
+++ b/icu4c/source/data/locales/nl.txt
@@ -7927,7 +7927,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/pl.txt b/icu4c/source/data/locales/pl.txt
index 28087ee..75eaa40 100644
--- a/icu4c/source/data/locales/pl.txt
+++ b/icu4c/source/data/locales/pl.txt
@@ -2670,7 +2670,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt
index 8156400..5698d31 100644
--- a/icu4c/source/data/locales/ps.txt
+++ b/icu4c/source/data/locales/ps.txt
@@ -2128,7 +2128,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/pt.txt b/icu4c/source/data/locales/pt.txt
index 7b47ff4..cd59089 100644
--- a/icu4c/source/data/locales/pt.txt
+++ b/icu4c/source/data/locales/pt.txt
@@ -2002,7 +2002,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt
index 2c8a67a..0aef5e5 100644
--- a/icu4c/source/data/locales/root.txt
+++ b/icu4c/source/data/locales/root.txt
@@ -2608,7 +2608,7 @@
         }
         general{
             lenient{
-                "[.ᱹ․。︒﹒．｡]",
+                "[.․。︒﹒．｡]",
                 "['ʼ՚᾽᾿’＇]",
                 "[%٪﹪％]",
                 "[؉‰]",
@@ -2621,13 +2621,13 @@
         }
         number{
             lenient{
-                "[\\-ᱼ‐‒–⁻₋−➖﹣－]",
+                "[\\-‐‒–⁻₋−➖﹣－]",
                 "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
             stricter{
                 "[,٫⹁︐﹐，]",
-                "[.ᱹ․﹒．｡]",
+                "[.․﹒．｡]",
             }
         }
     }
diff --git a/icu4c/source/data/locales/sat.txt b/icu4c/source/data/locales/sat.txt
index 9c63346..6b9c906 100644
--- a/icu4c/source/data/locales/sat.txt
+++ b/icu4c/source/data/locales/sat.txt
@@ -8,9 +8,9 @@
         default{"olck"}
         latn{
             symbols{
-                decimal{"ᱹ"}
+                decimal{"."}
                 group{","}
-                minusSign{"ᱼ"}
+                minusSign{"-"}
                 percentSign{"%"}
                 plusSign{"+"}
             }
diff --git a/icu4c/source/data/locales/sd.txt b/icu4c/source/data/locales/sd.txt
index 87c0bfc..64cf58e 100644
--- a/icu4c/source/data/locales/sd.txt
+++ b/icu4c/source/data/locales/sd.txt
@@ -1813,7 +1813,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
             stricter{
diff --git a/icu4c/source/data/locales/so.txt b/icu4c/source/data/locales/so.txt
index b400568..62cc7b7 100644
--- a/icu4c/source/data/locales/so.txt
+++ b/icu4c/source/data/locales/so.txt
@@ -1944,7 +1944,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt
index 93738df..62bf696 100644
--- a/icu4c/source/data/locales/sr.txt
+++ b/icu4c/source/data/locales/sr.txt
@@ -2373,7 +2373,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt
index a4a77c6..ae38d59 100644
--- a/icu4c/source/data/locales/sr_Latn.txt
+++ b/icu4c/source/data/locales/sr_Latn.txt
@@ -2372,7 +2372,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/vi.txt b/icu4c/source/data/locales/vi.txt
index 81f2f09..a49c5c0 100644
--- a/icu4c/source/data/locales/vi.txt
+++ b/icu4c/source/data/locales/vi.txt
@@ -2510,7 +2510,7 @@
         number{
             lenient{
                 "[\\-‒⁻₋−➖﹣－]",
-                "[,،٫、︐︑﹐﹑，､]",
+                "[,،٫⹁、︐︑﹐﹑，､]",
                 "[+⁺₊➕﬩﹢＋]",
             }
         }
diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt
index 38173fc..b1e37d0 100644
--- a/icu4c/source/data/locales/zh.txt
+++ b/icu4c/source/data/locales/zh.txt
@@ -3059,7 +3059,7 @@
                 "Gy年M月d日EEEE",
                 "Gy年M月d日",
                 "Gy年M月d日",
-                "Gyy-MM-dd",
+                "Gy-MM-dd",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
@@ -3931,7 +3931,7 @@
                 "Gy年M月d日EEEE",
                 "Gy年M月d日",
                 "Gy年M月d日",
-                "Gyy/M/d",
+                "Gy/M/d",
                 "{1} {0}",
                 "{1} {0}",
                 "{1} {0}",
diff --git a/icu4c/source/data/misc/dayPeriods.txt b/icu4c/source/data/misc/dayPeriods.txt
index 0a76bb9..cf0ed81 100644
--- a/icu4c/source/data/misc/dayPeriods.txt
+++ b/icu4c/source/data/misc/dayPeriods.txt
@@ -4,165 +4,167 @@
 dayPeriods:table(nofallback){
     locales{
         af{"set3"}
-        am{"set68"}
-        ar{"set66"}
-        az{"set62"}
-        bg{"set21"}
-        bn{"set34"}
-        bs{"set25"}
+        am{"set69"}
+        ar{"set67"}
+        az{"set63"}
+        bg{"set22"}
+        bn{"set35"}
+        bs{"set26"}
         ca{"set15"}
-        ccp{"set34"}
-        chr{"set76"}
-        cs{"set27"}
-        cy{"set78"}
+        ccp{"set35"}
+        chr{"set77"}
+        cs{"set28"}
+        cy{"set79"}
         da{"set7"}
         de{"set6"}
-        ee{"set77"}
-        el{"set40"}
+        ee{"set78"}
+        el{"set41"}
         en{"set2"}
         es{"set13"}
         es_CO{"set14"}
-        et{"set49"}
-        eu{"set74"}
-        fa{"set43"}
-        fi{"set48"}
-        fil{"set60"}
-        fr{"set18"}
+        et{"set50"}
+        eu{"set75"}
+        fa{"set44"}
+        fi{"set49"}
+        fil{"set61"}
+        fr{"set19"}
         gl{"set12"}
         gsw{"set5"}
-        gu{"set35"}
-        he{"set67"}
-        hi{"set33"}
-        hr{"set24"}
-        hu{"set50"}
-        hy{"set42"}
-        id{"set58"}
+        gu{"set36"}
+        he{"set68"}
+        hi{"set34"}
+        hr{"set25"}
+        hu{"set51"}
+        hy{"set43"}
+        id{"set59"}
         is{"set10"}
         it{"set16"}
-        ja{"set53"}
-        ka{"set73"}
-        kk{"set63"}
-        km{"set70"}
-        kn{"set47"}
-        ko{"set54"}
-        ky{"set64"}
-        lo{"set57"}
-        lt{"set30"}
-        lv{"set31"}
-        mk{"set22"}
-        ml{"set46"}
-        mn{"set75"}
-        mr{"set36"}
-        ms{"set59"}
-        my{"set55"}
+        ja{"set54"}
+        ka{"set74"}
+        kk{"set64"}
+        km{"set71"}
+        kn{"set48"}
+        ko{"set55"}
+        ky{"set65"}
+        lij{"set17"}
+        lo{"set58"}
+        lt{"set31"}
+        lv{"set32"}
+        mk{"set23"}
+        ml{"set47"}
+        mn{"set76"}
+        mr{"set37"}
+        ms{"set60"}
+        my{"set56"}
         nb{"set8"}
-        ne{"set37"}
+        ne{"set38"}
         nl{"set4"}
-        pa{"set38"}
-        pl{"set29"}
+        pa{"set39"}
+        pl{"set30"}
         pt{"set11"}
-        ro{"set17"}
+        ro{"set18"}
         root{"set1"}
-        ru{"set19"}
-        si{"set39"}
-        sk{"set28"}
-        sl{"set26"}
-        sq{"set41"}
-        sr{"set23"}
+        ru{"set20"}
+        si{"set40"}
+        sk{"set29"}
+        sl{"set27"}
+        sq{"set42"}
+        sr{"set24"}
         sv{"set9"}
-        sw{"set71"}
-        ta{"set44"}
-        te{"set45"}
-        th{"set56"}
-        tr{"set61"}
-        uk{"set20"}
-        ur{"set32"}
-        uz{"set65"}
-        vi{"set69"}
-        yue{"set52"}
-        zh{"set51"}
-        zu{"set72"}
+        sw{"set72"}
+        ta{"set45"}
+        te{"set46"}
+        th{"set57"}
+        tr{"set62"}
+        uk{"set21"}
+        ur{"set33"}
+        uz{"set66"}
+        vi{"set70"}
+        yue{"set53"}
+        zh{"set52"}
+        zu{"set73"}
     }
     locales_selection{
-        af{"set81"}
-        am{"set150"}
-        ar{"set141"}
-        az{"set132"}
-        bg{"set104"}
-        bn{"set117"}
-        bs{"set98"}
-        ca{"set93"}
-        ccp{"set117"}
-        chr{"set154"}
-        cs{"set101"}
-        cy{"set156"}
-        da{"set85"}
-        de{"set84"}
-        ee{"set155"}
-        el{"set110"}
-        en{"set80"}
-        es{"set91"}
-        es_CO{"set92"}
-        et{"set136"}
-        eu{"set151"}
-        fa{"set111"}
-        fi{"set137"}
-        fil{"set145"}
-        fr{"set96"}
-        gl{"set90"}
-        gsw{"set83"}
-        gu{"set118"}
-        he{"set142"}
-        hi{"set116"}
-        hr{"set97"}
-        hu{"set138"}
-        hy{"set112"}
-        id{"set143"}
-        is{"set88"}
-        it{"set94"}
-        ja{"set129"}
-        ka{"set113"}
-        kk{"set133"}
-        km{"set147"}
-        kn{"set126"}
-        ko{"set130"}
-        ky{"set134"}
-        lo{"set140"}
-        lt{"set108"}
-        lv{"set109"}
-        mk{"set105"}
-        ml{"set125"}
-        mn{"set152"}
-        mr{"set119"}
-        ms{"set144"}
-        my{"set153"}
-        nb{"set86"}
-        ne{"set120"}
-        nl{"set82"}
-        pa{"set121"}
-        pl{"set103"}
-        pt{"set89"}
-        ro{"set95"}
-        root{"set79"}
-        ru{"set106"}
-        si{"set122"}
-        sk{"set102"}
-        sl{"set100"}
-        sq{"set114"}
-        sr{"set99"}
-        sv{"set87"}
-        sw{"set148"}
-        ta{"set123"}
-        te{"set124"}
-        th{"set139"}
-        tr{"set131"}
-        uk{"set107"}
-        ur{"set115"}
-        uz{"set135"}
-        vi{"set146"}
-        yue{"set128"}
-        zh{"set127"}
-        zu{"set149"}
+        af{"set82"}
+        am{"set152"}
+        ar{"set143"}
+        az{"set134"}
+        bg{"set106"}
+        bn{"set119"}
+        bs{"set100"}
+        ca{"set94"}
+        ccp{"set119"}
+        chr{"set156"}
+        cs{"set103"}
+        cy{"set158"}
+        da{"set86"}
+        de{"set85"}
+        ee{"set157"}
+        el{"set112"}
+        en{"set81"}
+        es{"set92"}
+        es_CO{"set93"}
+        et{"set138"}
+        eu{"set153"}
+        fa{"set113"}
+        fi{"set139"}
+        fil{"set147"}
+        fr{"set98"}
+        gl{"set91"}
+        gsw{"set84"}
+        gu{"set120"}
+        he{"set144"}
+        hi{"set118"}
+        hr{"set99"}
+        hu{"set140"}
+        hy{"set114"}
+        id{"set145"}
+        is{"set89"}
+        it{"set95"}
+        ja{"set131"}
+        ka{"set115"}
+        kk{"set135"}
+        km{"set149"}
+        kn{"set128"}
+        ko{"set132"}
+        ky{"set136"}
+        lij{"set96"}
+        lo{"set142"}
+        lt{"set110"}
+        lv{"set111"}
+        mk{"set107"}
+        ml{"set127"}
+        mn{"set154"}
+        mr{"set121"}
+        ms{"set146"}
+        my{"set155"}
+        nb{"set87"}
+        ne{"set122"}
+        nl{"set83"}
+        pa{"set123"}
+        pl{"set105"}
+        pt{"set90"}
+        ro{"set97"}
+        root{"set80"}
+        ru{"set108"}
+        si{"set124"}
+        sk{"set104"}
+        sl{"set102"}
+        sq{"set116"}
+        sr{"set101"}
+        sv{"set88"}
+        sw{"set150"}
+        ta{"set125"}
+        te{"set126"}
+        th{"set141"}
+        tr{"set133"}
+        uk{"set109"}
+        ur{"set117"}
+        uz{"set137"}
+        vi{"set148"}
+        yue{"set130"}
+        zh{"set129"}
+        zu{"set151"}
     }
     rules{
         set1{
@@ -205,6 +207,42 @@
                 from{"12:00"}
             }
             evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"21:00"}
+            }
+        }
+        set101{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"21:00"}
+            }
+        }
+        set102{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
@@ -221,56 +259,56 @@
                 from{"22:00"}
             }
         }
-        set101{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"22:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"09:00"}
-                from{"04:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"09:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"22:00"}
-            }
-        }
-        set102{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"22:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"09:00"}
-                from{"04:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"09:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"22:00"}
-            }
-        }
         set103{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
             evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"09:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"09:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"22:00"}
+            }
+        }
+        set104{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"09:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"09:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"22:00"}
+            }
+        }
+        set105{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
@@ -287,7 +325,7 @@
                 from{"21:00"}
             }
         }
-        set104{
+        set106{
             afternoon1{
                 before{"18:00"}
                 from{"14:00"}
@@ -309,7 +347,7 @@
                 from{"22:00"}
             }
         }
-        set105{
+        set107{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -331,42 +369,6 @@
                 from{"00:00"}
             }
         }
-        set106{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"00:00"}
-            }
-        }
-        set107{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"00:00"}
-            }
-        }
         set108{
             afternoon1{
                 before{"18:00"}
@@ -378,10 +380,10 @@
             }
             morning1{
                 before{"12:00"}
-                from{"06:00"}
+                from{"04:00"}
             }
             night1{
-                before{"06:00"}
+                before{"04:00"}
                 from{"00:00"}
             }
         }
@@ -391,16 +393,16 @@
                 from{"12:00"}
             }
             evening1{
-                before{"23:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"06:00"}
+                from{"04:00"}
             }
             night1{
-                before{"06:00"}
-                from{"23:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
         set11{
@@ -429,6 +431,42 @@
         }
         set110{
             afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+        }
+        set111{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"23:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"23:00"}
+            }
+        }
+        set112{
+            afternoon1{
                 before{"17:00"}
                 from{"12:00"}
             }
@@ -445,7 +483,7 @@
                 from{"20:00"}
             }
         }
-        set111{
+        set113{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -471,7 +509,7 @@
                 from{"00:00"}
             }
         }
-        set112{
+        set114{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -489,7 +527,7 @@
                 from{"00:00"}
             }
         }
-        set113{
+        set115{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -507,7 +545,7 @@
                 from{"21:00"}
             }
         }
-        set114{
+        set116{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -529,46 +567,6 @@
                 from{"00:00"}
             }
         }
-        set115{
-            afternoon1{
-                before{"16:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"18:00"}
-                from{"16:00"}
-            }
-            evening1{
-                before{"20:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"20:00"}
-            }
-        }
-        set116{
-            afternoon1{
-                before{"16:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"20:00"}
-                from{"16:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"20:00"}
-            }
-        }
         set117{
             afternoon1{
                 before{"16:00"}
@@ -583,12 +581,8 @@
                 from{"18:00"}
             }
             morning1{
-                before{"06:00"}
-                from{"04:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"06:00"}
+                from{"04:00"}
             }
             night1{
                 before{"04:00"}
@@ -618,12 +612,12 @@
                 before{"16:00"}
                 from{"12:00"}
             }
-            evening1{
+            afternoon2{
                 before{"18:00"}
                 from{"16:00"}
             }
-            evening2{
-                before{"21:00"}
+            evening1{
+                before{"20:00"}
                 from{"18:00"}
             }
             morning1{
@@ -636,7 +630,7 @@
             }
             night1{
                 before{"04:00"}
-                from{"21:00"}
+                from{"20:00"}
             }
         }
         set12{
@@ -669,6 +663,50 @@
                 before{"16:00"}
                 from{"12:00"}
             }
+            evening1{
+                before{"20:00"}
+                from{"16:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"20:00"}
+            }
+        }
+        set121{
+            afternoon1{
+                before{"16:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"18:00"}
+                from{"16:00"}
+            }
+            evening2{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"21:00"}
+            }
+        }
+        set122{
+            afternoon1{
+                before{"16:00"}
+                from{"12:00"}
+            }
             afternoon2{
                 before{"19:00"}
                 from{"16:00"}
@@ -686,7 +724,7 @@
                 from{"22:00"}
             }
         }
-        set121{
+        set123{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -704,7 +742,7 @@
                 from{"21:00"}
             }
         }
-        set122{
+        set124{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -730,7 +768,7 @@
                 from{"00:00"}
             }
         }
-        set123{
+        set125{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -760,7 +798,7 @@
                 from{"21:00"}
             }
         }
-        set124{
+        set126{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -778,7 +816,7 @@
                 from{"21:00"}
             }
         }
-        set125{
+        set127{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -808,7 +846,7 @@
                 from{"19:00"}
             }
         }
-        set126{
+        set128{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -826,78 +864,30 @@
                 from{"21:00"}
             }
         }
-        set127{
-            afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"19:00"}
-            }
-            morning1{
-                before{"08:00"}
-                from{"05:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"08:00"}
-            }
-            night1{
-                before{"05:00"}
-                from{"00:00"}
-            }
-        }
-        set128{
-            afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"19:00"}
-            }
-            morning1{
-                before{"08:00"}
-                from{"05:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"08:00"}
-            }
-            night1{
-                before{"05:00"}
-                from{"00:00"}
-            }
-        }
         set129{
             afternoon1{
-                before{"16:00"}
+                before{"13:00"}
                 from{"12:00"}
             }
-            evening1{
+            afternoon2{
                 before{"19:00"}
-                from{"16:00"}
+                from{"13:00"}
             }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"23:00"}
+            evening1{
+                before{"24:00"}
                 from{"19:00"}
             }
-            night2{
-                before{"04:00"}
-                from{"23:00"}
+            morning1{
+                before{"08:00"}
+                from{"05:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"08:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"00:00"}
             }
         }
         set13{
@@ -923,6 +913,54 @@
         }
         set130{
             afternoon1{
+                before{"13:00"}
+                from{"12:00"}
+            }
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"19:00"}
+            }
+            morning1{
+                before{"08:00"}
+                from{"05:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"08:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"00:00"}
+            }
+        }
+        set131{
+            afternoon1{
+                before{"16:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"19:00"}
+                from{"16:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"23:00"}
+                from{"19:00"}
+            }
+            night2{
+                before{"04:00"}
+                from{"23:00"}
+            }
+        }
+        set132{
+            afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
@@ -943,7 +981,7 @@
                 from{"21:00"}
             }
         }
-        set131{
+        set133{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -969,7 +1007,7 @@
                 from{"21:00"}
             }
         }
-        set132{
+        set134{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -995,45 +1033,45 @@
                 from{"00:00"}
             }
         }
-        set133{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"21:00"}
-            }
-        }
-        set134{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"21:00"}
-            }
-        }
         set135{
             afternoon1{
                 before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"21:00"}
+            }
+        }
+        set136{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"21:00"}
+            }
+        }
+        set137{
+            afternoon1{
+                before{"18:00"}
                 from{"11:00"}
             }
             evening1{
@@ -1049,7 +1087,7 @@
                 from{"22:00"}
             }
         }
-        set136{
+        set138{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1067,7 +1105,7 @@
                 from{"23:00"}
             }
         }
-        set137{
+        set139{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1089,7 +1127,24 @@
                 from{"23:00"}
             }
         }
-        set138{
+        set14{
+            evening1{
+                before{"20:00"}
+                from{"12:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"20:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set140{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1115,7 +1170,7 @@
                 from{"04:00"}
             }
         }
-        set139{
+        set141{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1141,24 +1196,7 @@
                 from{"21:00"}
             }
         }
-        set14{
-            evening1{
-                before{"20:00"}
-                from{"12:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"00:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"20:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
-        set140{
+        set142{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1176,7 +1214,7 @@
                 from{"20:00"}
             }
         }
-        set141{
+        set143{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1206,7 +1244,7 @@
                 from{"01:00"}
             }
         }
-        set142{
+        set144{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1232,7 +1270,7 @@
                 from{"03:00"}
             }
         }
-        set143{
+        set145{
             afternoon1{
                 before{"15:00"}
                 from{"10:00"}
@@ -1250,7 +1288,7 @@
                 from{"18:00"}
             }
         }
-        set144{
+        set146{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1272,7 +1310,7 @@
                 from{"19:00"}
             }
         }
-        set145{
+        set147{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1294,84 +1332,40 @@
                 from{"18:00"}
             }
         }
-        set146{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-        }
-        set147{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"00:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"21:00"}
-            }
-        }
         set148{
             afternoon1{
-                before{"16:00"}
+                before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"19:00"}
-                from{"16:00"}
+                before{"21:00"}
+                from{"18:00"}
             }
             morning1{
-                before{"07:00"}
-                from{"04:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"07:00"}
+                from{"04:00"}
             }
             night1{
                 before{"04:00"}
-                from{"19:00"}
+                from{"21:00"}
             }
         }
         set149{
             afternoon1{
-                before{"13:00"}
-                from{"10:00"}
+                before{"18:00"}
+                from{"12:00"}
             }
             evening1{
-                before{"19:00"}
-                from{"13:00"}
+                before{"21:00"}
+                from{"18:00"}
             }
             morning1{
-                before{"06:00"}
+                before{"12:00"}
                 from{"00:00"}
             }
-            morning2{
-                before{"10:00"}
-                from{"06:00"}
-            }
             night1{
                 before{"24:00"}
-                from{"19:00"}
+                from{"21:00"}
             }
         }
         set15{
@@ -1405,6 +1399,50 @@
         }
         set150{
             afternoon1{
+                before{"16:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"19:00"}
+                from{"16:00"}
+            }
+            morning1{
+                before{"07:00"}
+                from{"04:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"07:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"19:00"}
+            }
+        }
+        set151{
+            afternoon1{
+                before{"13:00"}
+                from{"10:00"}
+            }
+            evening1{
+                before{"19:00"}
+                from{"13:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"10:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"19:00"}
+            }
+        }
+        set152{
+            afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
@@ -1421,7 +1459,7 @@
                 from{"00:00"}
             }
         }
-        set151{
+        set153{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1447,7 +1485,7 @@
                 from{"21:00"}
             }
         }
-        set152{
+        set154{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1465,7 +1503,7 @@
                 from{"21:00"}
             }
         }
-        set153{
+        set155{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1483,7 +1521,7 @@
                 from{"19:00"}
             }
         }
-        set154{
+        set156{
             afternoon1{
                 before{"24:00"}
                 from{"12:00"}
@@ -1493,7 +1531,7 @@
                 from{"00:00"}
             }
         }
-        set155{
+        set157{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1519,7 +1557,7 @@
                 from{"21:00"}
             }
         }
-        set156{
+        set158{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1571,10 +1609,10 @@
             }
             morning1{
                 before{"12:00"}
-                from{"05:00"}
+                from{"06:00"}
             }
             night1{
-                before{"05:00"}
+                before{"06:00"}
                 from{"22:00"}
             }
             noon{
@@ -1587,7 +1625,7 @@
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             midnight{
@@ -1595,11 +1633,11 @@
             }
             morning1{
                 before{"12:00"}
-                from{"04:00"}
+                from{"05:00"}
             }
             night1{
-                before{"04:00"}
-                from{"00:00"}
+                before{"05:00"}
+                from{"22:00"}
             }
             noon{
                 at{"12:00"}
@@ -1680,6 +1718,30 @@
         set21{
             afternoon1{
                 before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"00:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set22{
+            afternoon1{
+                before{"18:00"}
                 from{"14:00"}
             }
             evening1{
@@ -1702,7 +1764,7 @@
                 from{"22:00"}
             }
         }
-        set22{
+        set23{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1730,7 +1792,7 @@
                 at{"12:00"}
             }
         }
-        set23{
+        set24{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1754,30 +1816,6 @@
                 at{"12:00"}
             }
         }
-        set24{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
         set25{
             afternoon1{
                 before{"18:00"}
@@ -1808,23 +1846,19 @@
                 from{"12:00"}
             }
             evening1{
-                before{"22:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"06:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"04:00"}
             }
             night1{
-                before{"06:00"}
-                from{"22:00"}
+                before{"04:00"}
+                from{"21:00"}
             }
             noon{
                 at{"12:00"}
@@ -1843,15 +1877,15 @@
                 at{"00:00"}
             }
             morning1{
-                before{"09:00"}
-                from{"04:00"}
+                before{"10:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"09:00"}
+                from{"10:00"}
             }
             night1{
-                before{"04:00"}
+                before{"06:00"}
                 from{"22:00"}
             }
             noon{
@@ -1892,23 +1926,23 @@
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             midnight{
                 at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"06:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"09:00"}
             }
             night1{
-                before{"06:00"}
-                from{"21:00"}
+                before{"04:00"}
+                from{"22:00"}
             }
             noon{
                 at{"12:00"}
@@ -1941,6 +1975,34 @@
                 from{"12:00"}
             }
             evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"10:00"}
+                from{"06:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"10:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"21:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set31{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
@@ -1959,7 +2021,7 @@
                 at{"12:00"}
             }
         }
-        set31{
+        set32{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1983,7 +2045,7 @@
                 at{"12:00"}
             }
         }
-        set32{
+        set33{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2008,7 +2070,7 @@
                 from{"20:00"}
             }
         }
-        set33{
+        set34{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2029,7 +2091,7 @@
                 from{"20:00"}
             }
         }
-        set34{
+        set35{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2055,7 +2117,7 @@
                 from{"20:00"}
             }
         }
-        set35{
+        set36{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2076,7 +2138,7 @@
                 from{"20:00"}
             }
         }
-        set36{
+        set37{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2108,7 +2170,7 @@
                 at{"12:00"}
             }
         }
-        set37{
+        set38{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2136,7 +2198,7 @@
                 at{"12:00"}
             }
         }
-        set38{
+        set39{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2157,7 +2219,28 @@
                 from{"21:00"}
             }
         }
-        set39{
+        set4{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+        }
+        set40{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2189,28 +2272,7 @@
                 at{"12:00"}
             }
         }
-        set4{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-        }
-        set40{
+        set41{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -2228,7 +2290,7 @@
                 from{"20:00"}
             }
         }
-        set41{
+        set42{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2256,7 +2318,7 @@
                 at{"12:00"}
             }
         }
-        set42{
+        set43{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2280,7 +2342,7 @@
                 at{"12:00"}
             }
         }
-        set43{
+        set44{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2306,7 +2368,7 @@
                 from{"00:00"}
             }
         }
-        set44{
+        set45{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2342,7 +2404,7 @@
                 at{"12:00"}
             }
         }
-        set45{
+        set46{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2363,7 +2425,7 @@
                 from{"21:00"}
             }
         }
-        set46{
+        set47{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2399,7 +2461,7 @@
                 at{"12:00"}
             }
         }
-        set47{
+        set48{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2420,7 +2482,7 @@
                 from{"21:00"}
             }
         }
-        set48{
+        set49{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2448,30 +2510,6 @@
                 at{"12:00"}
             }
         }
-        set49{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"23:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"05:00"}
-            }
-            night1{
-                before{"05:00"}
-                from{"23:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
         set5{
             afternoon1{
                 before{"14:00"}
@@ -2503,6 +2541,30 @@
                 from{"12:00"}
             }
             evening1{
+                before{"23:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"05:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"23:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set51{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
@@ -2529,35 +2591,6 @@
                 at{"12:00"}
             }
         }
-        set51{
-            afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"19:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"08:00"}
-                from{"05:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"08:00"}
-            }
-            night1{
-                before{"05:00"}
-                from{"00:00"}
-            }
-        }
         set52{
             afternoon1{
                 before{"13:00"}
@@ -2589,6 +2622,35 @@
         }
         set53{
             afternoon1{
+                before{"13:00"}
+                from{"12:00"}
+            }
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"19:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"08:00"}
+                from{"05:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"08:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"00:00"}
+            }
+        }
+        set54{
+            afternoon1{
                 before{"16:00"}
                 from{"12:00"}
             }
@@ -2615,7 +2677,7 @@
                 at{"12:00"}
             }
         }
-        set54{
+        set55{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2643,7 +2705,7 @@
                 at{"12:00"}
             }
         }
-        set55{
+        set56{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2667,7 +2729,7 @@
                 at{"12:00"}
             }
         }
-        set56{
+        set57{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2699,7 +2761,7 @@
                 at{"12:00"}
             }
         }
-        set57{
+        set58{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -2723,7 +2785,7 @@
                 at{"12:00"}
             }
         }
-        set58{
+        set59{
             afternoon1{
                 before{"15:00"}
                 from{"10:00"}
@@ -2747,28 +2809,6 @@
                 at{"12:00"}
             }
         }
-        set59{
-            afternoon1{
-                before{"14:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"19:00"}
-                from{"14:00"}
-            }
-            morning1{
-                before{"01:00"}
-                from{"00:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"01:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"19:00"}
-            }
-        }
         set6{
             afternoon1{
                 before{"13:00"}
@@ -2800,6 +2840,28 @@
         }
         set60{
             afternoon1{
+                before{"14:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"19:00"}
+                from{"14:00"}
+            }
+            morning1{
+                before{"01:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"01:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"19:00"}
+            }
+        }
+        set61{
+            afternoon1{
                 before{"16:00"}
                 from{"12:00"}
             }
@@ -2826,7 +2888,7 @@
                 at{"12:00"}
             }
         }
-        set61{
+        set62{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -2858,7 +2920,7 @@
                 at{"12:00"}
             }
         }
-        set62{
+        set63{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -2890,30 +2952,6 @@
                 at{"12:00"}
             }
         }
-        set63{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"21:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
         set64{
             afternoon1{
                 before{"18:00"}
@@ -2941,6 +2979,30 @@
         set65{
             afternoon1{
                 before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"21:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set66{
+            afternoon1{
+                before{"18:00"}
                 from{"11:00"}
             }
             evening1{
@@ -2962,7 +3024,7 @@
                 at{"12:00"}
             }
         }
-        set66{
+        set67{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -2992,7 +3054,7 @@
                 from{"01:00"}
             }
         }
-        set67{
+        set68{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -3021,7 +3083,7 @@
                 from{"03:00"}
             }
         }
-        set68{
+        set69{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3045,30 +3107,6 @@
                 at{"12:00"}
             }
         }
-        set69{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            midnight{
-                at{"00:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-            noon{
-                at{"12:00"}
-            }
-        }
         set7{
             afternoon1{
                 before{"18:00"}
@@ -3108,6 +3146,30 @@
             }
             morning1{
                 before{"12:00"}
+                from{"04:00"}
+            }
+            night1{
+                before{"04:00"}
+                from{"21:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set71{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            midnight{
+                at{"00:00"}
+            }
+            morning1{
+                before{"12:00"}
                 from{"00:00"}
             }
             night1{
@@ -3118,7 +3180,7 @@
                 at{"12:00"}
             }
         }
-        set71{
+        set72{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -3146,7 +3208,7 @@
                 at{"12:00"}
             }
         }
-        set72{
+        set73{
             afternoon1{
                 before{"13:00"}
                 from{"10:00"}
@@ -3168,7 +3230,7 @@
                 from{"19:00"}
             }
         }
-        set73{
+        set74{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3192,7 +3254,7 @@
                 at{"12:00"}
             }
         }
-        set74{
+        set75{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3221,7 +3283,7 @@
                 from{"21:00"}
             }
         }
-        set75{
+        set76{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3245,7 +3307,7 @@
                 at{"12:00"}
             }
         }
-        set76{
+        set77{
             afternoon1{
                 before{"24:00"}
                 from{"12:00"}
@@ -3258,7 +3320,7 @@
                 at{"12:00"}
             }
         }
-        set77{
+        set78{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3284,7 +3346,7 @@
                 from{"21:00"}
             }
         }
-        set78{
+        set79{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3304,16 +3366,6 @@
                 at{"12:00"}
             }
         }
-        set79{
-            am{
-                before{"12:00"}
-                from{"00:00"}
-            }
-            pm{
-                before{"24:00"}
-                from{"12:00"}
-            }
-        }
         set8{
             afternoon1{
                 before{"18:00"}
@@ -3340,6 +3392,16 @@
             }
         }
         set80{
+            am{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            pm{
+                before{"24:00"}
+                from{"12:00"}
+            }
+        }
+        set81{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3357,7 +3419,7 @@
                 from{"21:00"}
             }
         }
-        set81{
+        set82{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3375,7 +3437,7 @@
                 from{"00:00"}
             }
         }
-        set82{
+        set83{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3393,7 +3455,7 @@
                 from{"00:00"}
             }
         }
-        set83{
+        set84{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3418,7 +3480,7 @@
                 from{"00:00"}
             }
         }
-        set84{
+        set85{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3444,28 +3506,6 @@
                 from{"00:00"}
             }
         }
-        set85{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"10:00"}
-                from{"05:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"10:00"}
-            }
-            night1{
-                before{"05:00"}
-                from{"00:00"}
-            }
-        }
         set86{
             afternoon1{
                 before{"18:00"}
@@ -3477,6 +3517,28 @@
             }
             morning1{
                 before{"10:00"}
+                from{"05:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"10:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"00:00"}
+            }
+        }
+        set87{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"10:00"}
                 from{"06:00"}
             }
             morning2{
@@ -3488,7 +3550,7 @@
                 from{"00:00"}
             }
         }
-        set87{
+        set88{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3510,7 +3572,7 @@
                 from{"00:00"}
             }
         }
-        set88{
+        set89{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3528,24 +3590,6 @@
                 from{"00:00"}
             }
         }
-        set89{
-            afternoon1{
-                before{"19:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"24:00"}
-                from{"19:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"06:00"}
-            }
-            night1{
-                before{"06:00"}
-                from{"00:00"}
-            }
-        }
         set9{
             afternoon1{
                 before{"18:00"}
@@ -3573,6 +3617,24 @@
         }
         set90{
             afternoon1{
+                before{"19:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"24:00"}
+                from{"19:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+        }
+        set91{
+            afternoon1{
                 before{"13:00"}
                 from{"12:00"}
             }
@@ -3593,7 +3655,7 @@
                 from{"21:00"}
             }
         }
-        set91{
+        set92{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
@@ -3611,7 +3673,7 @@
                 from{"20:00"}
             }
         }
-        set92{
+        set93{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
@@ -3625,7 +3687,7 @@
                 from{"20:00"}
             }
         }
-        set93{
+        set94{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3651,7 +3713,7 @@
                 from{"21:00"}
             }
         }
-        set94{
+        set95{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3669,7 +3731,25 @@
                 from{"00:00"}
             }
         }
-        set95{
+        set96{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"22:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"06:00"}
+                from{"22:00"}
+            }
+        }
+        set97{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3687,7 +3767,7 @@
                 from{"22:00"}
             }
         }
-        set96{
+        set98{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3705,42 +3785,6 @@
                 from{"00:00"}
             }
         }
-        set97{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-        }
-        set98{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"18:00"}
-            }
-            morning1{
-                before{"12:00"}
-                from{"04:00"}
-            }
-            night1{
-                before{"04:00"}
-                from{"21:00"}
-            }
-        }
         set99{
             afternoon1{
                 before{"18:00"}
@@ -3752,10 +3796,10 @@
             }
             morning1{
                 before{"12:00"}
-                from{"06:00"}
+                from{"04:00"}
             }
             night1{
-                before{"06:00"}
+                before{"04:00"}
                 from{"21:00"}
             }
         }
diff --git a/icu4c/source/data/misc/genderList.txt b/icu4c/source/data/misc/genderList.txt
index 62060e1..da4fd9a 100644
--- a/icu4c/source/data/misc/genderList.txt
+++ b/icu4c/source/data/misc/genderList.txt
@@ -31,6 +31,7 @@
         ja{"neutral"}
         kn{"neutral"}
         ko{"neutral"}
+        lij{"maleTaints"}
         lt{"maleTaints"}
         lv{"maleTaints"}
         ml{"neutral"}
diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt
index 57ded85..ba3d648 100644
--- a/icu4c/source/data/misc/icuver.txt
+++ b/icu4c/source/data/misc/icuver.txt
@@ -7,9 +7,8 @@
 // * Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
-
-icuver:table(nofallback){ 
+icuver:table(nofallback){
     CLDRVersion{"38"}
-    DataVersion { "68.1.0.0" }
-    ICUVersion  { "68.1.0.0" }
+    DataVersion{"68.1.0.0"}
+    ICUVersion{"68.1.0.0"}
 }
diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt
index a35cad5..3a71a35 100644
--- a/icu4c/source/data/misc/keyTypeData.txt
+++ b/icu4c/source/data/misc/keyTypeData.txt
@@ -15,6 +15,7 @@
         }
         valueType{
             ca{"incremental"}
+            dx{"multiple"}
             h0{"single"}
             kr{"multiple"}
             vt{"multiple"}
@@ -36,6 +37,7 @@
         colstrength{"ks"}
         currency{"cu"}
         d0{""}
+        dx{""}
         em{""}
         fw{""}
         h0{""}
@@ -493,6 +495,9 @@
             upper{""}
             zawgyi{""}
         }
+        dx{
+            SCRIPT_CODE{""}
+        }
         em{
             default{""}
             emoji{""}
diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt
index 9d8405f..2ddb019 100644
--- a/icu4c/source/data/misc/metadata.txt
+++ b/icu4c/source/data/misc/metadata.txt
@@ -362,7 +362,7 @@
             }
             drw{
                 reason{"deprecated"}
-                replacement{"fa_af"}
+                replacement{"fa_AF"}
             }
             dud{
                 reason{"deprecated"}
@@ -1642,7 +1642,7 @@
             }
             tnf{
                 reason{"deprecated"}
-                replacement{"fa_af"}
+                replacement{"fa_AF"}
             }
             ton{
                 reason{"overlong"}
@@ -1712,6 +1712,10 @@
                 reason{"deprecated"}
                 replacement{"und"}
             }
+            und_hepburn_heploc{
+                reason{"deprecated"}
+                replacement{"und_alalc97"}
+            }
             und_lojban{
                 reason{"deprecated"}
                 replacement{"und"}
@@ -5230,9 +5234,11 @@
         "ku_TR",
         "kw_GB",
         "ky_KG",
+        "la_VA",
         "lag_TZ",
         "lb_LU",
         "lg_UG",
+        "lij_IT",
         "lkt_US",
         "ln_CD",
         "lo_LA",
diff --git a/icu4c/source/data/misc/pluralRanges.txt b/icu4c/source/data/misc/pluralRanges.txt
index 06e8d4e..49afa1f 100644
--- a/icu4c/source/data/misc/pluralRanges.txt
+++ b/icu4c/source/data/misc/pluralRanges.txt
@@ -49,6 +49,7 @@
         kn{"set01"}
         ko{"set00"}
         ky{"set03"}
+        lij{"set03"}
         lo{"set00"}
         lt{"set15"}
         lv{"set09"}
diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt
index 89568ee..51bde47 100644
--- a/icu4c/source/data/misc/plurals.txt
+++ b/icu4c/source/data/misc/plurals.txt
@@ -3,320 +3,322 @@
 // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
 plurals:table(nofallback){
     locales{
-        af{"set8"}
-        ak{"set6"}
+        af{"set9"}
+        ak{"set7"}
         am{"set1"}
-        an{"set8"}
-        ar{"set34"}
-        ars{"set34"}
+        an{"set9"}
+        ar{"set35"}
+        ars{"set35"}
         as{"set1"}
-        asa{"set8"}
-        ast{"set4"}
-        az{"set8"}
-        be{"set26"}
-        bem{"set8"}
-        bez{"set8"}
-        bg{"set8"}
-        bho{"set6"}
+        asa{"set9"}
+        ast{"set5"}
+        az{"set9"}
+        be{"set27"}
+        bem{"set9"}
+        bez{"set9"}
+        bg{"set9"}
+        bho{"set7"}
         bm{"set0"}
         bn{"set1"}
         bo{"set0"}
-        br{"set30"}
-        brx{"set8"}
-        bs{"set19"}
-        ca{"set4"}
-        ce{"set8"}
-        ceb{"set12"}
-        cgg{"set8"}
-        chr{"set8"}
-        ckb{"set8"}
-        cs{"set24"}
-        cy{"set35"}
-        da{"set9"}
-        de{"set4"}
+        br{"set31"}
+        brx{"set9"}
+        bs{"set20"}
+        ca{"set5"}
+        ce{"set9"}
+        ceb{"set13"}
+        cgg{"set9"}
+        chr{"set9"}
+        ckb{"set9"}
+        cs{"set25"}
+        cy{"set36"}
+        da{"set10"}
+        de{"set5"}
         doi{"set1"}
-        dsb{"set22"}
-        dv{"set8"}
+        dsb{"set23"}
+        dv{"set9"}
         dz{"set0"}
-        ee{"set8"}
-        el{"set8"}
-        en{"set4"}
-        eo{"set8"}
-        es{"set8"}
-        et{"set4"}
-        eu{"set8"}
+        ee{"set9"}
+        el{"set9"}
+        en{"set5"}
+        eo{"set9"}
+        es{"set9"}
+        et{"set5"}
+        eu{"set9"}
         fa{"set1"}
         ff{"set2"}
-        fi{"set4"}
-        fil{"set12"}
-        fo{"set8"}
-        fr{"set2"}
-        fur{"set8"}
-        fy{"set4"}
-        ga{"set31"}
-        gd{"set20"}
-        gl{"set4"}
-        gsw{"set8"}
+        fi{"set5"}
+        fil{"set13"}
+        fo{"set9"}
+        fr{"set3"}
+        fur{"set9"}
+        fy{"set5"}
+        ga{"set32"}
+        gd{"set21"}
+        gl{"set5"}
+        gsw{"set9"}
         gu{"set1"}
-        guw{"set6"}
-        gv{"set32"}
-        ha{"set8"}
-        haw{"set8"}
-        he{"set23"}
+        guw{"set7"}
+        gv{"set33"}
+        ha{"set9"}
+        haw{"set9"}
+        he{"set24"}
         hi{"set1"}
-        hr{"set19"}
-        hsb{"set22"}
-        hu{"set8"}
+        hr{"set20"}
+        hsb{"set23"}
+        hu{"set9"}
         hy{"set2"}
-        ia{"set4"}
+        ia{"set5"}
         id{"set0"}
         ig{"set0"}
         ii{"set0"}
         in{"set0"}
-        io{"set4"}
-        is{"set10"}
-        it{"set4"}
-        iu{"set16"}
-        iw{"set23"}
+        io{"set5"}
+        is{"set11"}
+        it{"set5"}
+        iu{"set17"}
+        iw{"set24"}
         ja{"set0"}
         jbo{"set0"}
-        jgo{"set8"}
-        ji{"set4"}
-        jmc{"set8"}
+        jgo{"set9"}
+        ji{"set5"}
+        jmc{"set9"}
         jv{"set0"}
         jw{"set0"}
-        ka{"set8"}
+        ka{"set9"}
         kab{"set2"}
-        kaj{"set8"}
-        kcg{"set8"}
+        kaj{"set9"}
+        kcg{"set9"}
         kde{"set0"}
         kea{"set0"}
-        kk{"set8"}
-        kkj{"set8"}
-        kl{"set8"}
+        kk{"set9"}
+        kkj{"set9"}
+        kl{"set9"}
         km{"set0"}
         kn{"set1"}
         ko{"set0"}
-        ks{"set8"}
-        ksb{"set8"}
-        ksh{"set15"}
-        ku{"set8"}
-        kw{"set33"}
-        ky{"set8"}
-        lag{"set14"}
-        lb{"set8"}
-        lg{"set8"}
+        ks{"set9"}
+        ksb{"set9"}
+        ksh{"set16"}
+        ku{"set9"}
+        kw{"set34"}
+        ky{"set9"}
+        lag{"set15"}
+        lb{"set9"}
+        lg{"set9"}
+        lij{"set5"}
         lkt{"set0"}
-        ln{"set6"}
+        ln{"set7"}
         lo{"set0"}
-        lt{"set27"}
-        lv{"set13"}
-        mas{"set8"}
-        mg{"set6"}
-        mgo{"set8"}
-        mk{"set11"}
-        ml{"set8"}
-        mn{"set8"}
-        mo{"set18"}
-        mr{"set8"}
+        lt{"set28"}
+        lv{"set14"}
+        mas{"set9"}
+        mg{"set7"}
+        mgo{"set9"}
+        mk{"set12"}
+        ml{"set9"}
+        mn{"set9"}
+        mo{"set19"}
+        mr{"set9"}
         ms{"set0"}
-        mt{"set28"}
+        mt{"set29"}
         my{"set0"}
-        nah{"set8"}
-        naq{"set16"}
-        nb{"set8"}
-        nd{"set8"}
-        ne{"set8"}
-        nl{"set4"}
-        nn{"set8"}
-        nnh{"set8"}
-        no{"set8"}
+        nah{"set9"}
+        naq{"set17"}
+        nb{"set9"}
+        nd{"set9"}
+        ne{"set9"}
+        nl{"set5"}
+        nn{"set9"}
+        nnh{"set9"}
+        no{"set9"}
         nqo{"set0"}
-        nr{"set8"}
-        nso{"set6"}
-        ny{"set8"}
-        nyn{"set8"}
-        om{"set8"}
-        or{"set8"}
-        os{"set8"}
+        nr{"set9"}
+        nso{"set7"}
+        ny{"set9"}
+        nyn{"set9"}
+        om{"set9"}
+        or{"set9"}
+        os{"set9"}
         osa{"set0"}
-        pa{"set6"}
-        pap{"set8"}
+        pa{"set7"}
+        pap{"set9"}
         pcm{"set1"}
-        pl{"set25"}
-        prg{"set13"}
-        ps{"set8"}
-        pt{"set3"}
-        pt_PT{"set4"}
-        rm{"set8"}
-        ro{"set18"}
-        rof{"set8"}
+        pl{"set26"}
+        prg{"set14"}
+        ps{"set9"}
+        pt{"set4"}
+        pt_PT{"set5"}
+        rm{"set9"}
+        ro{"set19"}
+        rof{"set9"}
         root{"set0"}
-        ru{"set29"}
-        rwk{"set8"}
+        ru{"set30"}
+        rwk{"set9"}
         sah{"set0"}
-        saq{"set8"}
-        sat{"set16"}
-        sc{"set4"}
-        scn{"set4"}
-        sd{"set8"}
-        sdh{"set8"}
-        se{"set16"}
-        seh{"set8"}
+        saq{"set9"}
+        sat{"set17"}
+        sc{"set5"}
+        scn{"set5"}
+        sd{"set9"}
+        sdh{"set9"}
+        se{"set17"}
+        seh{"set9"}
         ses{"set0"}
         sg{"set0"}
-        sh{"set19"}
-        shi{"set17"}
-        si{"set5"}
-        sk{"set24"}
-        sl{"set21"}
-        sma{"set16"}
-        smi{"set16"}
-        smj{"set16"}
-        smn{"set16"}
-        sms{"set16"}
-        sn{"set8"}
-        so{"set8"}
-        sq{"set8"}
-        sr{"set19"}
-        ss{"set8"}
-        ssy{"set8"}
-        st{"set8"}
+        sh{"set20"}
+        shi{"set18"}
+        si{"set6"}
+        sk{"set25"}
+        sl{"set22"}
+        sma{"set17"}
+        smi{"set17"}
+        smj{"set17"}
+        smn{"set17"}
+        sms{"set17"}
+        sn{"set9"}
+        so{"set9"}
+        sq{"set9"}
+        sr{"set20"}
+        ss{"set9"}
+        ssy{"set9"}
+        st{"set9"}
         su{"set0"}
-        sv{"set4"}
-        sw{"set4"}
-        syr{"set8"}
-        ta{"set8"}
-        te{"set8"}
-        teo{"set8"}
+        sv{"set5"}
+        sw{"set5"}
+        syr{"set9"}
+        ta{"set9"}
+        te{"set9"}
+        teo{"set9"}
         th{"set0"}
-        ti{"set6"}
-        tig{"set8"}
-        tk{"set8"}
-        tl{"set12"}
-        tn{"set8"}
+        ti{"set7"}
+        tig{"set9"}
+        tk{"set9"}
+        tl{"set13"}
+        tn{"set9"}
         to{"set0"}
-        tr{"set8"}
-        ts{"set8"}
-        tzm{"set7"}
-        ug{"set8"}
-        uk{"set29"}
-        ur{"set4"}
-        uz{"set8"}
-        ve{"set8"}
+        tr{"set9"}
+        ts{"set9"}
+        tzm{"set8"}
+        ug{"set9"}
+        uk{"set30"}
+        ur{"set5"}
+        uz{"set9"}
+        ve{"set9"}
         vi{"set0"}
-        vo{"set8"}
-        vun{"set8"}
-        wa{"set6"}
-        wae{"set8"}
+        vo{"set9"}
+        vun{"set9"}
+        wa{"set7"}
+        wae{"set9"}
         wo{"set0"}
-        xh{"set8"}
-        xog{"set8"}
-        yi{"set4"}
+        xh{"set9"}
+        xog{"set9"}
+        yi{"set5"}
         yo{"set0"}
         yue{"set0"}
         zh{"set0"}
         zu{"set1"}
     }
     locales_ordinals{
-        af{"set36"}
-        am{"set36"}
-        an{"set36"}
-        ar{"set36"}
-        as{"set56"}
-        az{"set54"}
-        be{"set41"}
-        bg{"set36"}
-        bn{"set56"}
-        bs{"set36"}
-        ca{"set52"}
-        ce{"set36"}
-        cs{"set36"}
-        cy{"set58"}
-        da{"set36"}
-        de{"set36"}
-        dsb{"set36"}
-        el{"set36"}
-        en{"set49"}
-        es{"set36"}
-        et{"set36"}
-        eu{"set36"}
-        fa{"set36"}
-        fi{"set36"}
-        fil{"set38"}
-        fr{"set38"}
-        fy{"set36"}
-        ga{"set38"}
-        gd{"set51"}
-        gl{"set36"}
-        gsw{"set36"}
-        gu{"set55"}
-        he{"set36"}
-        hi{"set55"}
-        hr{"set36"}
-        hsb{"set36"}
-        hu{"set39"}
-        hy{"set38"}
-        ia{"set36"}
-        id{"set36"}
-        in{"set36"}
-        is{"set36"}
-        it{"set45"}
-        iw{"set36"}
-        ja{"set36"}
-        ka{"set46"}
-        kk{"set44"}
-        km{"set36"}
-        kn{"set36"}
-        ko{"set36"}
-        kw{"set48"}
-        ky{"set36"}
-        lo{"set38"}
-        lt{"set36"}
-        lv{"set36"}
-        mk{"set53"}
-        ml{"set36"}
-        mn{"set36"}
-        mo{"set38"}
-        mr{"set50"}
-        ms{"set38"}
-        my{"set36"}
-        nb{"set36"}
-        ne{"set40"}
-        nl{"set36"}
-        or{"set57"}
-        pa{"set36"}
-        pl{"set36"}
-        prg{"set36"}
-        ps{"set36"}
-        pt{"set36"}
-        ro{"set38"}
-        root{"set36"}
-        ru{"set36"}
-        sc{"set45"}
-        scn{"set45"}
-        sd{"set36"}
-        sh{"set36"}
-        si{"set36"}
-        sk{"set36"}
-        sl{"set36"}
-        sq{"set47"}
-        sr{"set36"}
-        sv{"set37"}
-        sw{"set36"}
-        ta{"set36"}
-        te{"set36"}
-        th{"set36"}
-        tk{"set43"}
-        tl{"set38"}
-        tr{"set36"}
-        uk{"set42"}
-        ur{"set36"}
-        uz{"set36"}
-        vi{"set38"}
-        yue{"set36"}
-        zh{"set36"}
-        zu{"set36"}
+        af{"set37"}
+        am{"set37"}
+        an{"set37"}
+        ar{"set37"}
+        as{"set58"}
+        az{"set56"}
+        be{"set42"}
+        bg{"set37"}
+        bn{"set58"}
+        bs{"set37"}
+        ca{"set54"}
+        ce{"set37"}
+        cs{"set37"}
+        cy{"set60"}
+        da{"set37"}
+        de{"set37"}
+        dsb{"set37"}
+        el{"set37"}
+        en{"set51"}
+        es{"set37"}
+        et{"set37"}
+        eu{"set37"}
+        fa{"set37"}
+        fi{"set37"}
+        fil{"set39"}
+        fr{"set39"}
+        fy{"set37"}
+        ga{"set39"}
+        gd{"set53"}
+        gl{"set37"}
+        gsw{"set37"}
+        gu{"set57"}
+        he{"set37"}
+        hi{"set57"}
+        hr{"set37"}
+        hsb{"set37"}
+        hu{"set40"}
+        hy{"set39"}
+        ia{"set37"}
+        id{"set37"}
+        in{"set37"}
+        is{"set37"}
+        it{"set46"}
+        iw{"set37"}
+        ja{"set37"}
+        ka{"set48"}
+        kk{"set45"}
+        km{"set37"}
+        kn{"set37"}
+        ko{"set37"}
+        kw{"set50"}
+        ky{"set37"}
+        lij{"set47"}
+        lo{"set39"}
+        lt{"set37"}
+        lv{"set37"}
+        mk{"set55"}
+        ml{"set37"}
+        mn{"set37"}
+        mo{"set39"}
+        mr{"set52"}
+        ms{"set39"}
+        my{"set37"}
+        nb{"set37"}
+        ne{"set41"}
+        nl{"set37"}
+        or{"set59"}
+        pa{"set37"}
+        pl{"set37"}
+        prg{"set37"}
+        ps{"set37"}
+        pt{"set37"}
+        ro{"set39"}
+        root{"set37"}
+        ru{"set37"}
+        sc{"set46"}
+        scn{"set46"}
+        sd{"set37"}
+        sh{"set37"}
+        si{"set37"}
+        sk{"set37"}
+        sl{"set37"}
+        sq{"set49"}
+        sr{"set37"}
+        sv{"set38"}
+        sw{"set37"}
+        ta{"set37"}
+        te{"set37"}
+        th{"set37"}
+        tk{"set44"}
+        tl{"set39"}
+        tr{"set37"}
+        uk{"set43"}
+        ur{"set37"}
+        uz{"set37"}
+        vi{"set39"}
+        yue{"set37"}
+        zh{"set37"}
+        zu{"set37"}
     }
     rules{
         set0{
@@ -333,6 +335,13 @@
             }
         }
         set10{
+            one{"n = 1 or t != 0 and i = 0,1 @integer 1 @decimal 0.1~1.6"}
+            other{
+                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
+                ", 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set11{
             one{
                 "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31,"
                 " 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 100"
@@ -344,7 +353,7 @@
                 "00000.0, 1000000.0, …"
             }
         }
-        set11{
+        set12{
             one{
                 "v = 0 and i % 10 = 1 and i % 100 != 11 or f % 10 = 1 and f % 100 != "
                 "11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1"
@@ -356,7 +365,7 @@
                 "0, …"
             }
         }
-        set12{
+        set13{
             one{
                 "v = 0 and i = 1,2,3 or v = 0 and i % 10 != 4,6,9 or v != 0 and f % 1"
                 "0 != 4,6,9 @integer 0~3, 5, 7, 8, 10~13, 15, 17, 18, 20, 21, 100, 10"
@@ -369,7 +378,7 @@
                 "6, 0.9, 1.4, 1.6, 1.9, 2.4, 2.6, 10.4, 100.4, 1000.4, …"
             }
         }
-        set13{
+        set14{
             one{
                 "n % 10 = 1 and n % 100 != 11 or v = 2 and f % 10 = 1 and f % 100 != "
                 "11 or v != 2 and f % 10 = 1 @integer 1, 21, 31, 41, 51, 61, 71, 81, "
@@ -387,7 +396,7 @@
                 "10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set14{
+        set15{
             one{"i = 0,1 and n != 0 @integer 1 @decimal 0.1~1.6"}
             other{
                 " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
@@ -395,7 +404,7 @@
             }
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set15{
+        set16{
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
             other{
                 " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0."
@@ -403,7 +412,7 @@
             }
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set16{
+        set17{
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
             other{
                 " @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
@@ -411,7 +420,7 @@
             }
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
         }
-        set17{
+        set18{
             few{
                 "n = 2..10 @integer 2~10 @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, "
                 "9.0, 10.0, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00"
@@ -422,7 +431,7 @@
                 ".9, 2.1~2.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set18{
+        set19{
             few{
                 "v != 0 or n = 0 or n % 100 = 2..19 @integer 0, 2~16, 102, 1002, … @d"
                 "ecimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
@@ -430,7 +439,14 @@
             one{"i = 1 and v = 0 @integer 1"}
             other{" @integer 20~35, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set19{
+        set2{
+            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
+                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set20{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 or f % 10 = 2..4 and f"
                 " % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, "
@@ -448,14 +464,7 @@
                 " 1000000.0, …"
             }
         }
-        set2{
-            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
-            other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
-                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set20{
+        set21{
             few{
                 "n = 3..10,13..19 @integer 3~10, 13~19 @decimal 3.0, 4.0, 5.0, 6.0, 7"
                 ".0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 3.00"
@@ -473,7 +482,7 @@
                 "00, 2.0000"
             }
         }
-        set21{
+        set22{
             few{
                 "v = 0 and i % 100 = 3..4 or v != 0 @integer 3, 4, 103, 104, 203, 204"
                 ", 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … @decimal"
@@ -489,7 +498,7 @@
                 " 1002, …"
             }
         }
-        set22{
+        set23{
             few{
                 "v = 0 and i % 100 = 3..4 or f % 100 = 3..4 @integer 3, 4, 103, 104, "
                 "203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … "
@@ -512,7 +521,7 @@
                 "7.2, 10.2, 100.2, 1000.2, …"
             }
         }
-        set23{
+        set24{
             many{
                 "v = 0 and n != 0..10 and n % 10 = 0 @integer 20, 30, 40, 50, 60, 70,"
                 " 80, 90, 100, 1000, 10000, 100000, 1000000, …"
@@ -524,7 +533,7 @@
             }
             two{"i = 2 and v = 0 @integer 2"}
         }
-        set24{
+        set25{
             few{"i = 2..4 and v = 0 @integer 2~4"}
             many{
                 "v != 0   @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1"
@@ -533,7 +542,7 @@
             one{"i = 1 and v = 0 @integer 1"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set25{
+        set26{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3"
                 "2~34, 42~44, 52~54, 62, 102, 1002, …"
@@ -549,7 +558,7 @@
                 ".0, …"
             }
         }
-        set26{
+        set27{
             few{
                 "n % 10 = 2..4 and n % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~4"
                 "4, 52~54, 62, 102, 1002, … @decimal 2.0, 3.0, 4.0, 22.0, 23.0, 24.0,"
@@ -567,7 +576,7 @@
             }
             other{"   @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.1, 1000.1, …"}
         }
-        set27{
+        set28{
             few{
                 "n % 10 = 2..9 and n % 100 != 11..19 @integer 2~9, 22~29, 102, 1002, "
                 "… @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 22.0, 102.0, 1002"
@@ -585,7 +594,7 @@
                 "1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set28{
+        set29{
             few{
                 "n = 0 or n % 100 = 2..10 @integer 0, 2~10, 102~107, 1002, … @decimal"
                 " 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 102.0, 1002.0, …"
@@ -600,7 +609,18 @@
                 ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set29{
+        set3{
+            many{
+                "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0 .. 5 @integ"
+                "er 1000000"
+            }
+            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, … @decimal 2.0~3.5, 10.0, "
+                "100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set30{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3"
                 "2~34, 42~44, 52~54, 62, 102, 1002, …"
@@ -618,14 +638,7 @@
                 ".0, …"
             }
         }
-        set3{
-            one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"}
-            other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
-                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set30{
+        set31{
             few{
                 "n % 10 = 3..4,9 and n % 100 != 10..19,70..79,90..99 @integer 3, 4, 9"
                 ", 23, 24, 29, 33, 34, 39, 43, 44, 49, 103, 1003, … @decimal 3.0, 4.0"
@@ -650,7 +663,7 @@
                 "2.0, 1002.0, …"
             }
         }
-        set31{
+        set32{
             few{
                 "n = 3..6 @integer 3~6 @decimal 3.0, 4.0, 5.0, 6.0, 3.00, 4.00, 5.00,"
                 " 6.00, 3.000, 4.000, 5.000, 6.000, 3.0000, 4.0000, 5.0000, 6.0000"
@@ -667,7 +680,7 @@
             }
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
         }
-        set32{
+        set33{
             few{
                 "v = 0 and i % 100 = 0,20,40,60,80 @integer 0, 20, 40, 60, 80, 100, 1"
                 "20, 140, 1000, 10000, 100000, 1000000, …"
@@ -686,7 +699,7 @@
                 "02, …"
             }
         }
-        set33{
+        set34{
             few{
                 "n % 100 = 3,23,43,63,83 @integer 3, 23, 43, 63, 83, 103, 123, 143, 1"
                 "003, … @decimal 3.0, 23.0, 43.0, 63.0, 83.0, 103.0, 123.0, 143.0, 10"
@@ -711,7 +724,7 @@
             }
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set34{
+        set35{
             few{
                 "n % 100 = 3..10 @integer 3~10, 103~110, 1003, … @decimal 3.0, 4.0, 5"
                 ".0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …"
@@ -729,7 +742,7 @@
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set35{
+        set36{
             few{"n = 3 @integer 3 @decimal 3.0, 3.00, 3.000, 3.0000"}
             many{"n = 6 @integer 6 @decimal 6.0, 6.00, 6.000, 6.0000"}
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
@@ -741,50 +754,50 @@
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set36{
+        set37{
             other{" @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set37{
+        set38{
             one{
                 "n % 10 = 1,2 and n % 100 != 11,12 @integer 1, 2, 21, 22, 31, 32, 41,"
                 " 42, 51, 52, 61, 62, 71, 72, 81, 82, 101, 1001, …"
             }
             other{" @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set38{
+        set39{
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set39{
-            one{"n = 1,5 @integer 1, 5"}
-            other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"}
-        }
         set4{
-            one{"i = 1 and v = 0 @integer 1"}
+            one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"}
             other{
-                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                "~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
+                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
         set40{
+            one{"n = 1,5 @integer 1, 5"}
+            other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"}
+        }
+        set41{
             one{"n = 1..4 @integer 1~4"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set41{
+        set42{
             few{
                 "n % 10 = 2,3 and n % 100 != 12,13 @integer 2, 3, 22, 23, 32, 33, 42,"
                 " 43, 52, 53, 62, 63, 72, 73, 82, 83, 102, 1002, …"
             }
             other{" @integer 0, 1, 4~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set42{
+        set43{
             few{
                 "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
                 " 103, 1003, …"
             }
             other{" @integer 0~2, 4~16, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set43{
+        set44{
             few{
                 "n % 10 = 6,9 or n = 10 @integer 6, 9, 10, 16, 19, 26, 29, 36, 39, 10"
                 "6, 1006, …"
@@ -794,7 +807,7 @@
                 "00000, …"
             }
         }
-        set44{
+        set45{
             many{
                 "n % 10 = 6 or n % 10 = 9 or n % 10 = 0 and n != 0 @integer 6, 9, 10,"
                 " 16, 19, 20, 26, 29, 30, 36, 39, 40, 100, 1000, 10000, 100000, 10000"
@@ -802,16 +815,20 @@
             }
             other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"}
         }
-        set45{
+        set46{
             many{"n = 11,8,80,800 @integer 8, 11, 80, 800"}
             other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set46{
+        set47{
+            many{"n = 11,8,80..89,800..899 @integer 8, 11, 80~89, 800~899"}
+            other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"}
+        }
+        set48{
             many{"i = 0 or i % 100 = 2..20,40,60,80 @integer 0, 2~16, 102, 1002, …"}
             one{"i = 1 @integer 1"}
             other{" @integer 21~36, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set47{
+        set49{
             many{
                 "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84,"
                 " 104, 1004, …"
@@ -819,7 +836,14 @@
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2, 3, 5~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set48{
+        set5{
+            one{"i = 1 and v = 0 @integer 1"}
+            other{
+                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
+                "~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set50{
             many{
                 "n = 5 or n % 100 = 5 @integer 5, 105, 205, 305, 405, 505, 605, 705, "
                 "1005, …"
@@ -830,7 +854,7 @@
             }
             other{" @integer 0, 6~20, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set49{
+        set51{
             few{
                 "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
                 " 103, 1003, …"
@@ -845,35 +869,25 @@
                 " 102, 1002, …"
             }
         }
-        set5{
-            one{
-                "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0"
-                "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000"
-            }
-            other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0."
-                "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set50{
+        set52{
             few{"n = 4 @integer 4"}
             one{"n = 1 @integer 1"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set51{
+        set53{
             few{"n = 3,13 @integer 3, 13"}
             one{"n = 1,11 @integer 1, 11"}
             other{" @integer 0, 4~10, 14~21, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,12 @integer 2, 12"}
         }
-        set52{
+        set54{
             few{"n = 4 @integer 4"}
             one{"n = 1,3 @integer 1, 3"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2 @integer 2"}
         }
-        set53{
+        set55{
             many{
                 "i % 10 = 7,8 and i % 100 != 17,18 @integer 7, 8, 27, 28, 37, 38, 47,"
                 " 48, 57, 58, 67, 68, 77, 78, 87, 88, 107, 1007, …"
@@ -888,7 +902,7 @@
                 " 102, 1002, …"
             }
         }
-        set54{
+        set56{
             few{
                 "i % 10 = 3,4 or i % 1000 = 100,200,300,400,500,600,700,800,900 @inte"
                 "ger 3, 4, 13, 14, 23, 24, 33, 34, 43, 44, 53, 54, 63, 64, 73, 74, 10"
@@ -907,28 +921,38 @@
                 "00000, 1000000, …"
             }
         }
-        set55{
+        set57{
             few{"n = 4 @integer 4"}
             many{"n = 6 @integer 6"}
             one{"n = 1 @integer 1"}
             other{" @integer 0, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set56{
+        set58{
             few{"n = 4 @integer 4"}
             many{"n = 6 @integer 6"}
             one{"n = 1,5,7,8,9,10 @integer 1, 5, 7~10"}
             other{" @integer 0, 11~25, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set57{
+        set59{
             few{"n = 4 @integer 4"}
             many{"n = 6 @integer 6"}
             one{"n = 1,5,7..9 @integer 1, 5, 7~9"}
             other{" @integer 0, 10~24, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set58{
+        set6{
+            one{
+                "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0"
+                "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000"
+            }
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0."
+                "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set60{
             few{"n = 3,4 @integer 3, 4"}
             many{"n = 5,6 @integer 5, 6"}
             one{"n = 1 @integer 1"}
@@ -936,7 +960,7 @@
             two{"n = 2 @integer 2"}
             zero{"n = 0,7,8,9 @integer 0, 7~9"}
         }
-        set6{
+        set7{
             one{
                 "n = 0..1 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, "
                 "0.0000, 1.0000"
@@ -946,7 +970,7 @@
                 "9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set7{
+        set8{
             one{
                 "n = 0..1 or n = 11..99 @integer 0, 1, 11~24 @decimal 0.0, 1.0, 11.0,"
                 " 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 2"
@@ -957,19 +981,12 @@
                 "1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set8{
+        set9{
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
             other{
                 " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
                 "~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set9{
-            one{"n = 1 or t != 0 and i = 0,1 @integer 1 @decimal 0.1~1.6"}
-            other{
-                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                ", 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
     }
 }
diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
index 22cdf80..03c0f51 100644
--- a/icu4c/source/data/misc/units.txt
+++ b/icu4c/source/data/misc/units.txt
@@ -1903,8 +1903,7 @@
         ampere-per-square-meter{"current-density"}
         bit{"digital"}
         candela{"luminous-intensity"}
-        candela-per-square-meter{"luminance"}
-        candela-square-meter{"luminence"}
+        candela-per-square-meter{"illuminance"}
         candela-square-meter-per-square-meter{"luminous-flux"}
         cubic-meter{"volume"}
         cubic-meter-per-kilogram{"specific-volume"}
diff --git a/icu4c/source/data/zone/ti.txt b/icu4c/source/data/zone/ti.txt
index f29b0c6..aacd9d0 100644
--- a/icu4c/source/data/zone/ti.txt
+++ b/icu4c/source/data/zone/ti.txt
@@ -1290,289 +1290,6 @@
         "Pacific:Wallis"{
             ec{"Wallis"}
         }
-        "meta:Afghanistan"{
-            ls{"Afghanistan Time"}
-        }
-        "meta:Africa_Central"{
-            ls{"Central Africa Time"}
-        }
-        "meta:Africa_Eastern"{
-            ls{"East Africa Time"}
-        }
-        "meta:Africa_Southern"{
-            ls{"South Africa Standard Time"}
-        }
-        "meta:Africa_Western"{
-            ld{"West Africa Summer Time"}
-            lg{"West Africa Time"}
-            ls{"West Africa Standard Time"}
-        }
-        "meta:Alaska"{
-            ld{"Alaska Daylight Time"}
-            lg{"Alaska Time"}
-            ls{"Alaska Standard Time"}
-        }
-        "meta:Amazon"{
-            ld{"Amazon Summer Time"}
-            lg{"Amazon Time"}
-            ls{"Amazon Standard Time"}
-        }
-        "meta:America_Central"{
-            ld{"Central Daylight Time"}
-            lg{"Central Time"}
-            ls{"Central Standard Time"}
-        }
-        "meta:America_Eastern"{
-            ld{"Eastern Daylight Time"}
-            lg{"Eastern Time"}
-            ls{"Eastern Standard Time"}
-        }
-        "meta:America_Mountain"{
-            ld{"Mountain Daylight Time"}
-            lg{"Mountain Time"}
-            ls{"Mountain Standard Time"}
-        }
-        "meta:America_Pacific"{
-            ld{"Pacific Daylight Time"}
-            lg{"Pacific Time"}
-            ls{"Pacific Standard Time"}
-        }
-        "meta:Apia"{
-            ld{"Apia Daylight Time"}
-            lg{"Apia Time"}
-            ls{"Apia Standard Time"}
-        }
-        "meta:Arabian"{
-            ld{"Arabian Daylight Time"}
-            lg{"Arabian Time"}
-            ls{"Arabian Standard Time"}
-        }
-        "meta:Argentina"{
-            ld{"Argentina Summer Time"}
-            lg{"Argentina Time"}
-            ls{"Argentina Standard Time"}
-        }
-        "meta:Argentina_Western"{
-            ld{"Western Argentina Summer Time"}
-            lg{"Western Argentina Time"}
-            ls{"Western Argentina Standard Time"}
-        }
-        "meta:Armenia"{
-            ld{"Armenia Summer Time"}
-            lg{"Armenia Time"}
-            ls{"Armenia Standard Time"}
-        }
-        "meta:Atlantic"{
-            ld{"Atlantic Daylight Time"}
-            lg{"Atlantic Time"}
-            ls{"Atlantic Standard Time"}
-        }
-        "meta:Australia_Central"{
-            ld{"Australian Central Daylight Time"}
-            lg{"Central Australia Time"}
-            ls{"Australian Central Standard Time"}
-        }
-        "meta:Australia_CentralWestern"{
-            ld{"Australian Central Western Daylight Time"}
-            lg{"Australian Central Western Time"}
-            ls{"Australian Central Western Standard Time"}
-        }
-        "meta:Australia_Eastern"{
-            ld{"Australian Eastern Daylight Time"}
-            lg{"Eastern Australia Time"}
-            ls{"Australian Eastern Standard Time"}
-        }
-        "meta:Australia_Western"{
-            ld{"Australian Western Daylight Time"}
-            lg{"Western Australia Time"}
-            ls{"Australian Western Standard Time"}
-        }
-        "meta:Azerbaijan"{
-            ld{"Azerbaijan Summer Time"}
-            lg{"Azerbaijan Time"}
-            ls{"Azerbaijan Standard Time"}
-        }
-        "meta:Azores"{
-            ld{"Azores Summer Time"}
-            lg{"Azores Time"}
-            ls{"Azores Standard Time"}
-        }
-        "meta:Bangladesh"{
-            ld{"Bangladesh Summer Time"}
-            lg{"Bangladesh Time"}
-            ls{"Bangladesh Standard Time"}
-        }
-        "meta:Bhutan"{
-            ls{"Bhutan Time"}
-        }
-        "meta:Bolivia"{
-            ls{"Bolivia Time"}
-        }
-        "meta:Brasilia"{
-            ld{"Brasilia Summer Time"}
-            lg{"Brasilia Time"}
-            ls{"Brasilia Standard Time"}
-        }
-        "meta:Brunei"{
-            ls{"Brunei Darussalam Time"}
-        }
-        "meta:Cape_Verde"{
-            ld{"Cape Verde Summer Time"}
-            lg{"Cape Verde Time"}
-            ls{"Cape Verde Standard Time"}
-        }
-        "meta:Chamorro"{
-            ls{"Chamorro Standard Time"}
-        }
-        "meta:Chatham"{
-            ld{"Chatham Daylight Time"}
-            lg{"Chatham Time"}
-            ls{"Chatham Standard Time"}
-        }
-        "meta:Chile"{
-            ld{"Chile Summer Time"}
-            lg{"Chile Time"}
-            ls{"Chile Standard Time"}
-        }
-        "meta:China"{
-            ld{"China Daylight Time"}
-            lg{"China Time"}
-            ls{"China Standard Time"}
-        }
-        "meta:Choibalsan"{
-            ld{"Choibalsan Summer Time"}
-            lg{"Choibalsan Time"}
-            ls{"Choibalsan Standard Time"}
-        }
-        "meta:Christmas"{
-            ls{"Christmas Island Time"}
-        }
-        "meta:Cocos"{
-            ls{"Cocos Islands Time"}
-        }
-        "meta:Colombia"{
-            ld{"Colombia Summer Time"}
-            lg{"Colombia Time"}
-            ls{"Colombia Standard Time"}
-        }
-        "meta:Cook"{
-            ld{"Cook Islands Half Summer Time"}
-            lg{"Cook Islands Time"}
-            ls{"Cook Islands Standard Time"}
-        }
-        "meta:Cuba"{
-            ld{"Cuba Daylight Time"}
-            lg{"Cuba Time"}
-            ls{"Cuba Standard Time"}
-        }
-        "meta:Davis"{
-            ls{"Davis Time"}
-        }
-        "meta:DumontDUrville"{
-            ls{"Dumont-d’Urville Time"}
-        }
-        "meta:East_Timor"{
-            ls{"East Timor Time"}
-        }
-        "meta:Easter"{
-            ld{"Easter Island Summer Time"}
-            lg{"Easter Island Time"}
-            ls{"Easter Island Standard Time"}
-        }
-        "meta:Ecuador"{
-            ls{"Ecuador Time"}
-        }
-        "meta:Europe_Central"{
-            ld{"Central European Summer Time"}
-            lg{"Central European Time"}
-            ls{"Central European Standard Time"}
-        }
-        "meta:Europe_Eastern"{
-            ld{"Eastern European Summer Time"}
-            lg{"Eastern European Time"}
-            ls{"Eastern European Standard Time"}
-        }
-        "meta:Europe_Further_Eastern"{
-            ls{"Further-eastern European Time"}
-        }
-        "meta:Europe_Western"{
-            ld{"Western European Summer Time"}
-            lg{"Western European Time"}
-            ls{"Western European Standard Time"}
-        }
-        "meta:Falkland"{
-            ld{"Falkland Islands Summer Time"}
-            lg{"Falkland Islands Time"}
-            ls{"Falkland Islands Standard Time"}
-        }
-        "meta:Fiji"{
-            ld{"Fiji Summer Time"}
-            lg{"Fiji Time"}
-            ls{"Fiji Standard Time"}
-        }
-        "meta:French_Guiana"{
-            ls{"French Guiana Time"}
-        }
-        "meta:French_Southern"{
-            ls{"French Southern & Antarctic Time"}
-        }
-        "meta:GMT"{
-            ls{"Greenwich Mean Time"}
-        }
-        "meta:Galapagos"{
-            ls{"Galapagos Time"}
-        }
-        "meta:Gambier"{
-            ls{"Gambier Time"}
-        }
-        "meta:Georgia"{
-            ld{"Georgia Summer Time"}
-            lg{"Georgia Time"}
-            ls{"Georgia Standard Time"}
-        }
-        "meta:Gilbert_Islands"{
-            ls{"Gilbert Islands Time"}
-        }
-        "meta:Greenland_Eastern"{
-            ld{"East Greenland Summer Time"}
-            lg{"East Greenland Time"}
-            ls{"East Greenland Standard Time"}
-        }
-        "meta:Greenland_Western"{
-            ld{"West Greenland Summer Time"}
-            lg{"West Greenland Time"}
-            ls{"West Greenland Standard Time"}
-        }
-        "meta:Gulf"{
-            ls{"Gulf Standard Time"}
-        }
-        "meta:Guyana"{
-            ls{"Guyana Time"}
-        }
-        "meta:Hawaii_Aleutian"{
-            ld{"Hawaii-Aleutian Daylight Time"}
-            lg{"Hawaii-Aleutian Time"}
-            ls{"Hawaii-Aleutian Standard Time"}
-        }
-        "meta:Hong_Kong"{
-            ld{"Hong Kong Summer Time"}
-            lg{"Hong Kong Time"}
-            ls{"Hong Kong Standard Time"}
-        }
-        "meta:Hovd"{
-            ld{"Hovd Summer Time"}
-            lg{"Hovd Time"}
-            ls{"Hovd Standard Time"}
-        }
-        "meta:India"{
-            ls{"India Standard Time"}
-        }
-        "meta:Indian_Ocean"{
-            ls{"Indian Ocean Time"}
-        }
-        "meta:Indochina"{
-            ls{"Indochina Time"}
-        }
         "meta:Indonesia_Central"{
             ls{"Central Indonesia Time"}
         }
@@ -1582,305 +1299,12 @@
         "meta:Indonesia_Western"{
             ls{"Western Indonesia Time"}
         }
-        "meta:Iran"{
-            ld{"Iran Daylight Time"}
-            lg{"Iran Time"}
-            ls{"Iran Standard Time"}
-        }
-        "meta:Irkutsk"{
-            ld{"Irkutsk Summer Time"}
-            lg{"Irkutsk Time"}
-            ls{"Irkutsk Standard Time"}
-        }
-        "meta:Israel"{
-            ld{"Israel Daylight Time"}
-            lg{"Israel Time"}
-            ls{"Israel Standard Time"}
-        }
-        "meta:Japan"{
-            ld{"Japan Daylight Time"}
-            lg{"Japan Time"}
-            ls{"Japan Standard Time"}
-        }
-        "meta:Kazakhstan_Eastern"{
-            ls{"East Kazakhstan Time"}
-        }
-        "meta:Kazakhstan_Western"{
-            ls{"West Kazakhstan Time"}
-        }
-        "meta:Korea"{
-            ld{"Korean Daylight Time"}
-            lg{"Korean Time"}
-            ls{"Korean Standard Time"}
-        }
-        "meta:Kosrae"{
-            ls{"Kosrae Time"}
-        }
-        "meta:Krasnoyarsk"{
-            ld{"Krasnoyarsk Summer Time"}
-            lg{"Krasnoyarsk Time"}
-            ls{"Krasnoyarsk Standard Time"}
-        }
-        "meta:Kyrgystan"{
-            ls{"Kyrgyzstan Time"}
-        }
-        "meta:Line_Islands"{
-            ls{"Line Islands Time"}
-        }
-        "meta:Lord_Howe"{
-            ld{"Lord Howe Daylight Time"}
-            lg{"Lord Howe Time"}
-            ls{"Lord Howe Standard Time"}
-        }
-        "meta:Macquarie"{
-            ls{"Macquarie Island Time"}
-        }
-        "meta:Magadan"{
-            ld{"Magadan Summer Time"}
-            lg{"Magadan Time"}
-            ls{"Magadan Standard Time"}
-        }
         "meta:Malaysia"{
             ls{"Malaysia Time"}
         }
-        "meta:Maldives"{
-            ls{"Maldives Time"}
-        }
-        "meta:Marquesas"{
-            ls{"Marquesas Time"}
-        }
-        "meta:Marshall_Islands"{
-            ls{"Marshall Islands Time"}
-        }
-        "meta:Mauritius"{
-            ld{"Mauritius Summer Time"}
-            lg{"Mauritius Time"}
-            ls{"Mauritius Standard Time"}
-        }
-        "meta:Mawson"{
-            ls{"Mawson Time"}
-        }
-        "meta:Mexico_Northwest"{
-            ld{"Northwest Mexico Daylight Time"}
-            lg{"Northwest Mexico Time"}
-            ls{"Northwest Mexico Standard Time"}
-        }
-        "meta:Mexico_Pacific"{
-            ld{"Mexican Pacific Daylight Time"}
-            lg{"Mexican Pacific Time"}
-            ls{"Mexican Pacific Standard Time"}
-        }
-        "meta:Mongolia"{
-            ld{"Ulaanbaatar Summer Time"}
-            lg{"Ulaanbaatar Time"}
-            ls{"Ulaanbaatar Standard Time"}
-        }
-        "meta:Moscow"{
-            ld{"Moscow Summer Time"}
-            lg{"Moscow Time"}
-            ls{"Moscow Standard Time"}
-        }
-        "meta:Myanmar"{
-            ls{"Myanmar Time"}
-        }
-        "meta:Nauru"{
-            ls{"Nauru Time"}
-        }
-        "meta:Nepal"{
-            ls{"Nepal Time"}
-        }
-        "meta:New_Caledonia"{
-            ld{"New Caledonia Summer Time"}
-            lg{"New Caledonia Time"}
-            ls{"New Caledonia Standard Time"}
-        }
-        "meta:New_Zealand"{
-            ld{"New Zealand Daylight Time"}
-            lg{"New Zealand Time"}
-            ls{"New Zealand Standard Time"}
-        }
-        "meta:Newfoundland"{
-            ld{"Newfoundland Daylight Time"}
-            lg{"Newfoundland Time"}
-            ls{"Newfoundland Standard Time"}
-        }
-        "meta:Niue"{
-            ls{"Niue Time"}
-        }
-        "meta:Norfolk"{
-            ld{"Norfolk Island Daylight Time"}
-            lg{"Norfolk Island Time"}
-            ls{"Norfolk Island Standard Time"}
-        }
-        "meta:Noronha"{
-            ld{"Fernando de Noronha Summer Time"}
-            lg{"Fernando de Noronha Time"}
-            ls{"Fernando de Noronha Standard Time"}
-        }
-        "meta:Novosibirsk"{
-            ld{"Novosibirsk Summer Time"}
-            lg{"Novosibirsk Time"}
-            ls{"Novosibirsk Standard Time"}
-        }
-        "meta:Omsk"{
-            ld{"Omsk Summer Time"}
-            lg{"Omsk Time"}
-            ls{"Omsk Standard Time"}
-        }
-        "meta:Pakistan"{
-            ld{"Pakistan Summer Time"}
-            lg{"Pakistan Time"}
-            ls{"Pakistan Standard Time"}
-        }
-        "meta:Palau"{
-            ls{"Palau Time"}
-        }
-        "meta:Papua_New_Guinea"{
-            ls{"Papua New Guinea Time"}
-        }
-        "meta:Paraguay"{
-            ld{"Paraguay Summer Time"}
-            lg{"Paraguay Time"}
-            ls{"Paraguay Standard Time"}
-        }
-        "meta:Peru"{
-            ld{"Peru Summer Time"}
-            lg{"Peru Time"}
-            ls{"Peru Standard Time"}
-        }
-        "meta:Philippines"{
-            ld{"Philippine Summer Time"}
-            lg{"Philippine Time"}
-            ls{"Philippine Standard Time"}
-        }
-        "meta:Phoenix_Islands"{
-            ls{"Phoenix Islands Time"}
-        }
-        "meta:Pierre_Miquelon"{
-            ld{"St. Pierre & Miquelon Daylight Time"}
-            lg{"St. Pierre & Miquelon Time"}
-            ls{"St. Pierre & Miquelon Standard Time"}
-        }
-        "meta:Pitcairn"{
-            ls{"Pitcairn Time"}
-        }
-        "meta:Ponape"{
-            ls{"Ponape Time"}
-        }
-        "meta:Pyongyang"{
-            ls{"Pyongyang Time"}
-        }
-        "meta:Reunion"{
-            ls{"Réunion Time"}
-        }
-        "meta:Rothera"{
-            ls{"Rothera Time"}
-        }
-        "meta:Sakhalin"{
-            ld{"Sakhalin Summer Time"}
-            lg{"Sakhalin Time"}
-            ls{"Sakhalin Standard Time"}
-        }
-        "meta:Samoa"{
-            ld{"Samoa Daylight Time"}
-            lg{"Samoa Time"}
-            ls{"Samoa Standard Time"}
-        }
-        "meta:Seychelles"{
-            ls{"Seychelles Time"}
-        }
         "meta:Singapore"{
             ls{"Singapore Standard Time"}
         }
-        "meta:Solomon"{
-            ls{"Solomon Islands Time"}
-        }
-        "meta:South_Georgia"{
-            ls{"South Georgia Time"}
-        }
-        "meta:Suriname"{
-            ls{"Suriname Time"}
-        }
-        "meta:Syowa"{
-            ls{"Syowa Time"}
-        }
-        "meta:Tahiti"{
-            ls{"Tahiti Time"}
-        }
-        "meta:Taipei"{
-            ld{"Taipei Daylight Time"}
-            lg{"Taipei Time"}
-            ls{"Taipei Standard Time"}
-        }
-        "meta:Tajikistan"{
-            ls{"Tajikistan Time"}
-        }
-        "meta:Tokelau"{
-            ls{"Tokelau Time"}
-        }
-        "meta:Tonga"{
-            ld{"Tonga Summer Time"}
-            lg{"Tonga Time"}
-            ls{"Tonga Standard Time"}
-        }
-        "meta:Truk"{
-            ls{"Chuuk Time"}
-        }
-        "meta:Turkmenistan"{
-            ld{"Turkmenistan Summer Time"}
-            lg{"Turkmenistan Time"}
-            ls{"Turkmenistan Standard Time"}
-        }
-        "meta:Tuvalu"{
-            ls{"Tuvalu Time"}
-        }
-        "meta:Uruguay"{
-            ld{"Uruguay Summer Time"}
-            lg{"Uruguay Time"}
-            ls{"Uruguay Standard Time"}
-        }
-        "meta:Uzbekistan"{
-            ld{"Uzbekistan Summer Time"}
-            lg{"Uzbekistan Time"}
-            ls{"Uzbekistan Standard Time"}
-        }
-        "meta:Vanuatu"{
-            ld{"Vanuatu Summer Time"}
-            lg{"Vanuatu Time"}
-            ls{"Vanuatu Standard Time"}
-        }
-        "meta:Venezuela"{
-            ls{"Venezuela Time"}
-        }
-        "meta:Vladivostok"{
-            ld{"Vladivostok Summer Time"}
-            lg{"Vladivostok Time"}
-            ls{"Vladivostok Standard Time"}
-        }
-        "meta:Volgograd"{
-            ld{"Volgograd Summer Time"}
-            lg{"Volgograd Time"}
-            ls{"Volgograd Standard Time"}
-        }
-        "meta:Vostok"{
-            ls{"Vostok Time"}
-        }
-        "meta:Wake"{
-            ls{"Wake Island Time"}
-        }
-        "meta:Wallis"{
-            ls{"Wallis & Futuna Time"}
-        }
-        "meta:Yakutsk"{
-            ld{"Yakutsk Summer Time"}
-            lg{"Yakutsk Time"}
-            ls{"Yakutsk Standard Time"}
-        }
-        "meta:Yekaterinburg"{
-            ld{"Yekaterinburg Summer Time"}
-            lg{"Yekaterinburg Time"}
-            ls{"Yekaterinburg Standard Time"}
-        }
         fallbackFormat{"{1} ({0})"}
         gmtFormat{"GMT{0}"}
         gmtZeroFormat{"GMT"}
diff --git a/icu4c/source/test/cintltst/cpluralrulestest.c b/icu4c/source/test/cintltst/cpluralrulestest.c
index 8db9d1f..b0ac873 100644
--- a/icu4c/source/test/cintltst/cpluralrulestest.c
+++ b/icu4c/source/test/cintltst/cpluralrulestest.c
@@ -180,7 +180,7 @@
 static const KeywordsForLang getKeywordsItems[] = {
     { "zh", { "other" } },
     { "en", { "one", "other" } },
-    { "fr", { "one", "other" } },
+    { "fr", { "one", "many", "other" } },
     { "lv", { "zero", "one", "other" } },
     { "hr", { "one", "few", "other" } },
     { "sl", { "one", "two", "few", "other" } },
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index ac3b45e..fc0a5f6 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -3290,73 +3290,73 @@
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "-8:00" },
-        { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Pacific Standard Time", "-8:00" },
+        { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "GMT-08:00", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "-7:00" },
-        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Pacific Daylight Time", "-7:00" },
+        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "GMT-07:00", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles", "America/Los_Angeles" },
-        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Pacific Time", "America/Los_Angeles" },
+        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Los Angeles", "America/Los_Angeles" },
 
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
 
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
-        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
+        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
 
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
-        { "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
+        { "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "GMT-05:00", "-5:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
-        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
+        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "GMT-04:00", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "\\u12A9\\u1263", "America/Havana" },
-        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
+        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\\u12A9\\u1263", "America/Havana" },
 
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
-        { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
+        { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
-        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
+        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
-        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
+        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
 
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
-        { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
+        { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
-        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
+        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
-        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
+        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
 
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
-        { "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Greenwich Mean Time", "+0:00" },
+        { "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "GMT", "+0:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
@@ -3379,13 +3379,13 @@
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
-        { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
+        { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
-        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
+        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\\u1205\\u1295\\u12F2", "Alna/Calcutta" },
-        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
+        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\\u1205\\u1295\\u12F2", "Asia/Calcutta" },
 
         // Ticket#8589 Partial location name to use country name if the zone is the golden
         // zone for the time zone's country.
diff --git a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
index 16da6ab..b0dabe0 100644
--- a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
+++ b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
@@ -5,446 +5,450 @@
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
-#   Quantity;   Usage;  Region; Input (r);  Input (d);  Input Unit; Output (r); Output (d); Output Unit
+#	Quantity;	Usage;	Region;	Input (r);	Input (d);	Input Unit;	Output (r);	Output (d);	Output Unit
 #
 # Use: Convert the Input amount & unit according to the Usage and Region.
-#    The result should match the Output amount and unit.
-#    Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations
-#    have two options for testing based on the precision in their implementations. For example:
-#      3429 / 12500; 0.27432; meter;
-#    The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have
-#    both a rational and decimal amount; the others will have a single integer value, such as:
-#      length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch
-#    The input and output units are unit identifers; in particular, the output does not have further processing:
-#        • no localization
-#        • no adjustment for pluralization
-#        • no formatted with the skeleton
-#        • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
+#	 The result should match the Output amount and unit.
+#	 Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations
+#	 have two options for testing based on the precision in their implementations. For example:
+#	   3429 / 12500; 0.27432; meter;
+#	 The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have
+#	 both a rational and decimal amount; the others will have a single integer value, such as:
+#	   length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch
+#	 The input and output units are unit identifers; in particular, the output does not have further processing:
+#		 • no localization
+#		 • no adjustment for pluralization
+#		 • no formatted with the skeleton
+#		 • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
 #
 # Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestUnitPreferences results.
 
-area;   default;    001;    1100000;    1100000.0;  square-meter;   11 / 10;    1.1;    square-kilometer
-area;   default;    001;    1000000;    1000000.0;  square-meter;   1;  1.0;    square-kilometer
-area;   default;    001;    900000; 900000.0;   square-meter;   90; 90.0;   hectare
-area;   default;    001;    10000;  10000.0;    square-meter;   1;  1.0;    hectare
-area;   default;    001;    9000;   9000.0; square-meter;   9000;   9000.0; square-meter
-area;   default;    001;    1;  1.0;    square-meter;   1;  1.0;    square-meter
-area;   default;    001;    9 / 10; 0.9;    square-meter;   9000;   9000.0; square-centimeter
-area;   default;    001;    1 / 10000;  1.0E-4; square-meter;   1;  1.0;    square-centimeter
-area;   default;    001;    9 / 100000; 9.0E-5; square-meter;   9 / 10; 0.9;    square-centimeter
+area;	default;	001;	1100000;	1100000.0;	square-meter;	11 / 10;	1.1;	square-kilometer
+area;	default;	001;	1000000;	1000000.0;	square-meter;	1;	1.0;	square-kilometer
+area;	default;	001;	900000;	900000.0;	square-meter;	90;	90.0;	hectare
+area;	default;	001;	10000;	10000.0;	square-meter;	1;	1.0;	hectare
+area;	default;	001;	9000;	9000.0;	square-meter;	9000;	9000.0;	square-meter
+area;	default;	001;	1;	1.0;	square-meter;	1;	1.0;	square-meter
+area;	default;	001;	9 / 10;	0.9;	square-meter;	9000;	9000.0;	square-centimeter
+area;	default;	001;	1 / 10000;	1.0E-4;	square-meter;	1;	1.0;	square-centimeter
+area;	default;	001;	9 / 100000;	9.0E-5;	square-meter;	9 / 10;	0.9;	square-centimeter
 
-area;   default;    GB; 222577103232 / 78125;   2848986.9213696;    square-meter;   11 / 10;    1.1;    square-mile
-area;   default;    GB; 40468564224 / 15625;    2589988.110336; square-meter;   1;  1.0;    square-mile
-area;   default;    GB; 182108539008 / 78125;   2330989.2993024;    square-meter;   576;    576.0;  acre
-area;   default;    GB; 316160658 / 78125;  4046.8564224;   square-meter;   1;  1.0;    acre
-area;   default;    GB; 1422722961 / 390625;    3642.17078016;  square-meter;   39204;  39204.0;    square-foot
-area;   default;    GB; 145161 / 1562500;   0.09290304; square-meter;   1;  1.0;    square-foot
-area;   default;    GB; 1306449 / 15625000; 0.083612736;    square-meter;   648 / 5;    129.6;  square-inch
-area;   default;    GB; 16129 / 25000000;   6.4516E-4;  square-meter;   1;  1.0;    square-inch
-area;   default;    GB; 145161 / 250000000; 5.80644E-4; square-meter;   9 / 10; 0.9;    square-inch
+area;	default;	GB;	222577103232 / 78125;	2848986.9213696;	square-meter;	11 / 10;	1.1;	square-mile
+area;	default;	GB;	40468564224 / 15625;	2589988.110336;	square-meter;	1;	1.0;	square-mile
+area;	default;	GB;	182108539008 / 78125;	2330989.2993024;	square-meter;	576;	576.0;	acre
+area;	default;	GB;	316160658 / 78125;	4046.8564224;	square-meter;	1;	1.0;	acre
+area;	default;	GB;	1422722961 / 390625;	3642.17078016;	square-meter;	39204;	39204.0;	square-foot
+area;	default;	GB;	145161 / 1562500;	0.09290304;	square-meter;	1;	1.0;	square-foot
+area;	default;	GB;	1306449 / 15625000;	0.083612736;	square-meter;	648 / 5;	129.6;	square-inch
+area;	default;	GB;	16129 / 25000000;	6.4516E-4;	square-meter;	1;	1.0;	square-inch
+area;	default;	GB;	145161 / 250000000;	5.80644E-4;	square-meter;	9 / 10;	0.9;	square-inch
 
-area;   geograph;   001;    1100000;    1100000.0;  square-meter;   11 / 10;    1.1;    square-kilometer
-area;   geograph;   001;    1000000;    1000000.0;  square-meter;   1;  1.0;    square-kilometer
-area;   geograph;   001;    900000; 900000.0;   square-meter;   9 / 10; 0.9;    square-kilometer
+area;	geograph;	001;	1100000;	1100000.0;	square-meter;	11 / 10;	1.1;	square-kilometer
+area;	geograph;	001;	1000000;	1000000.0;	square-meter;	1;	1.0;	square-kilometer
+area;	geograph;	001;	900000;	900000.0;	square-meter;	9 / 10;	0.9;	square-kilometer
 
-area;   geograph;   GB; 222577103232 / 78125;   2848986.9213696;    square-meter;   11 / 10;    1.1;    square-mile
-area;   geograph;   GB; 40468564224 / 15625;    2589988.110336; square-meter;   1;  1.0;    square-mile
-area;   geograph;   GB; 182108539008 / 78125;   2330989.2993024;    square-meter;   9 / 10; 0.9;    square-mile
+area;	geograph;	GB;	222577103232 / 78125;	2848986.9213696;	square-meter;	11 / 10;	1.1;	square-mile
+area;	geograph;	GB;	40468564224 / 15625;	2589988.110336;	square-meter;	1;	1.0;	square-mile
+area;	geograph;	GB;	182108539008 / 78125;	2330989.2993024;	square-meter;	9 / 10;	0.9;	square-mile
 
-area;   land;   001;    11000;  11000.0;    square-meter;   11 / 10;    1.1;    hectare
-area;   land;   001;    10000;  10000.0;    square-meter;   1;  1.0;    hectare
-area;   land;   001;    9000;   9000.0; square-meter;   9 / 10; 0.9;    hectare
+area;	land;	001;	11000;	11000.0;	square-meter;	11 / 10;	1.1;	hectare
+area;	land;	001;	10000;	10000.0;	square-meter;	1;	1.0;	hectare
+area;	land;	001;	9000;	9000.0;	square-meter;	9 / 10;	0.9;	hectare
 
-area;   land;   GB; 1738883619 / 390625;    4451.54206464;  square-meter;   11 / 10;    1.1;    acre
-area;   land;   GB; 316160658 / 78125;  4046.8564224;   square-meter;   1;  1.0;    acre
-area;   land;   GB; 1422722961 / 390625;    3642.17078016;  square-meter;   9 / 10; 0.9;    acre
+area;	land;	GB;	1738883619 / 390625;	4451.54206464;	square-meter;	11 / 10;	1.1;	acre
+area;	land;	GB;	316160658 / 78125;	4046.8564224;	square-meter;	1;	1.0;	acre
+area;	land;	GB;	1422722961 / 390625;	3642.17078016;	square-meter;	9 / 10;	0.9;	acre
 
-concentration;  blood-glucose;  AG; 662435483600000000000000;   6.624354836E23; item-per-cubic-meter;   11 / 10;    1.1;    millimole-per-liter
-concentration;  blood-glucose;  AG; 602214076000000000000000;   6.02214076E23;  item-per-cubic-meter;   1;  1.0;    millimole-per-liter
-concentration;  blood-glucose;  AG; 541992668400000000000000;   5.419926684E23; item-per-cubic-meter;   9 / 10; 0.9;    millimole-per-liter
+concentration;	blood-glucose;	AG;	662435483600000000000000;	6.624354836E23;	item-per-cubic-meter;	11 / 10;	1.1;	millimole-per-liter
+concentration;	blood-glucose;	AG;	602214076000000000000000;	6.02214076E23;	item-per-cubic-meter;	1;	1.0;	millimole-per-liter
+concentration;	blood-glucose;	AG;	541992668400000000000000;	5.419926684E23;	item-per-cubic-meter;	9 / 10;	0.9;	millimole-per-liter
 
-concentration;  default;    001;    11 / 10;    1.1;    item-per-cubic-meter;   11 / 10;    1.1;    item-per-cubic-meter
-concentration;  default;    001;    1;  1.0;    item-per-cubic-meter;   1;  1.0;    item-per-cubic-meter
-concentration;  default;    001;    9 / 10; 0.9;    item-per-cubic-meter;   9 / 10; 0.9;    item-per-cubic-meter
+concentration;	default;	001;	11 / 10;	1.1;	item-per-cubic-meter;	11 / 10;	1.1;	item-per-cubic-meter
+concentration;	default;	001;	1;	1.0;	item-per-cubic-meter;	1;	1.0;	item-per-cubic-meter
+concentration;	default;	001;	9 / 10;	0.9;	item-per-cubic-meter;	9 / 10;	0.9;	item-per-cubic-meter
 
-consumption;    default;    001;    11 / 1000000000;    1.1E-8; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-100-kilometer
-consumption;    default;    001;    1 / 100000000;  1.0E-8; cubic-meter-per-meter;  1;  1.0;    liter-per-100-kilometer
-consumption;    default;    001;    9 / 1000000000; 9.0E-9; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-100-kilometer
+consumption;	default;	001;	11 / 1000000000;	1.1E-8;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-100-kilometer
+consumption;	default;	001;	1 / 100000000;	1.0E-8;	cubic-meter-per-meter;	1;	1.0;	liter-per-100-kilometer
+consumption;	default;	001;	9 / 1000000000;	9.0E-9;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-100-kilometer
 
-consumption;    vehicle-fuel;   001;    11 / 1000000000;    1.1E-8; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-100-kilometer
-consumption;    vehicle-fuel;   001;    1 / 100000000;  1.0E-8; cubic-meter-per-meter;  1;  1.0;    liter-per-100-kilometer
-consumption;    vehicle-fuel;   001;    9 / 1000000000; 9.0E-9; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	11 / 1000000000;	1.1E-8;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	1 / 100000000;	1.0E-8;	cubic-meter-per-meter;	1;	1.0;	liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	9 / 1000000000;	9.0E-9;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-100-kilometer
 
-consumption;    vehicle-fuel;   BR; 11 / 10000000;  1.1E-6; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-kilometer
-consumption;    vehicle-fuel;   BR; 1 / 1000000;    1.0E-6; cubic-meter-per-meter;  1;  1.0;    liter-per-kilometer
-consumption;    vehicle-fuel;   BR; 9 / 10000000;   9.0E-7; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	11 / 10000000;	1.1E-6;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	1 / 1000000;	1.0E-6;	cubic-meter-per-meter;	1;	1.0;	liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	9 / 10000000;	9.0E-7;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-kilometer
 
-consumption-inverse;    default;    001;    110000000;  1.1E8;  meter-per-cubic-meter;  11 / 10;    1.1;    kilometer-per-centiliter
-consumption-inverse;    default;    001;    100000000;  1.0E8;  meter-per-cubic-meter;  1;  1.0;    kilometer-per-centiliter
-consumption-inverse;    default;    001;    90000000;   9.0E7;  meter-per-cubic-meter;  9 / 10; 0.9;    kilometer-per-centiliter
+consumption-inverse;	default;	001;	110000000;	1.1E8;	meter-per-cubic-meter;	11 / 10;	1.1;	kilometer-per-centiliter
+consumption-inverse;	default;	001;	100000000;	1.0E8;	meter-per-cubic-meter;	1;	1.0;	kilometer-per-centiliter
+consumption-inverse;	default;	001;	90000000;	9.0E7;	meter-per-cubic-meter;	9 / 10;	0.9;	kilometer-per-centiliter
 
-consumption-inverse;    vehicle-fuel;   001;    110000000;  1.1E8;  meter-per-cubic-meter;  11 / 10;    1.1;    kilometer-per-centiliter
-consumption-inverse;    vehicle-fuel;   001;    100000000;  1.0E8;  meter-per-cubic-meter;  1;  1.0;    kilometer-per-centiliter
-consumption-inverse;    vehicle-fuel;   001;    90000000;   9.0E7;  meter-per-cubic-meter;  9 / 10; 0.9;    kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	110000000;	1.1E8;	meter-per-cubic-meter;	11 / 10;	1.1;	kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	100000000;	1.0E8;	meter-per-cubic-meter;	1;	1.0;	kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	90000000;	9.0E7;	meter-per-cubic-meter;	9 / 10;	0.9;	kilometer-per-centiliter
 
-consumption-inverse;    vehicle-fuel;   US; 52800000000 / 112903;   467658.0781732992;  meter-per-cubic-meter;  11 / 10;    1.1;    mile-per-gallon
-consumption-inverse;    vehicle-fuel;   US; 48000000000 / 112903;   425143.707430272;   meter-per-cubic-meter;  1;  1.0;    mile-per-gallon
-consumption-inverse;    vehicle-fuel;   US; 43200000000 / 112903;   382629.3366872448;  meter-per-cubic-meter;  9 / 10; 0.9;    mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	52800000000 / 112903;	467658.0781732992;	meter-per-cubic-meter;	11 / 10;	1.1;	mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	48000000000 / 112903;	425143.707430272;	meter-per-cubic-meter;	1;	1.0;	mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	43200000000 / 112903;	382629.3366872448;	meter-per-cubic-meter;	9 / 10;	0.9;	mile-per-gallon
 
-consumption-inverse;    vehicle-fuel;   CA; 177027840000 / 454609;  389406.8089281118;  meter-per-cubic-meter;  11 / 10;    1.1;    mile-per-gallon-imperial
-consumption-inverse;    vehicle-fuel;   CA; 160934400000 / 454609;  354006.1899346471;  meter-per-cubic-meter;  1;  1.0;    mile-per-gallon-imperial
-consumption-inverse;    vehicle-fuel;   CA; 144840960000 / 454609;  318605.5709411824;  meter-per-cubic-meter;  9 / 10; 0.9;    mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	177027840000 / 454609;	389406.8089281118;	meter-per-cubic-meter;	11 / 10;	1.1;	mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	160934400000 / 454609;	354006.1899346471;	meter-per-cubic-meter;	1;	1.0;	mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	144840960000 / 454609;	318605.5709411824;	meter-per-cubic-meter;	9 / 10;	0.9;	mile-per-gallon-imperial
 
-duration;   default;    001;    95040;  95040.0;    second; 11 / 10;    1.1;    day
-duration;   default;    001;    86400;  86400.0;    second; 1;  1.0;    day
-duration;   default;    001;    77760;  77760.0;    second; 108 / 5;    21.6;   hour
-duration;   default;    001;    3600;   3600.0; second; 1;  1.0;    hour
-duration;   default;    001;    3240;   3240.0; second; 54; 54.0;   minute
-duration;   default;    001;    60; 60.0;   second; 1;  1.0;    minute
-duration;   default;    001;    54; 54.0;   second; 54; 54.0;   second
-duration;   default;    001;    1;  1.0;    second; 1;  1.0;    second
-duration;   default;    001;    9 / 10; 0.9;    second; 900;    900.0;  millisecond
-duration;   default;    001;    1 / 1000;   0.001;  second; 1;  1.0;    millisecond
-duration;   default;    001;    9 / 10000;  9.0E-4; second; 900;    900.0;  microsecond
-duration;   default;    001;    1 / 1000000;    1.0E-6; second; 1;  1.0;    microsecond
-duration;   default;    001;    9 / 10000000;   9.0E-7; second; 900;    900.0;  nanosecond
-duration;   default;    001;    1 / 1000000000; 1.0E-9; second; 1;  1.0;    nanosecond
-duration;   default;    001;    9 / 10000000000;    9.0E-10;    second; 9 / 10; 0.9;    nanosecond
+duration;	default;	001;	95040;	95040.0;	second;	11 / 10;	1.1;	day
+duration;	default;	001;	86400;	86400.0;	second;	1;	1.0;	day
+duration;	default;	001;	77760;	77760.0;	second;	108 / 5;	21.6;	hour
+duration;	default;	001;	3600;	3600.0;	second;	1;	1.0;	hour
+duration;	default;	001;	3240;	3240.0;	second;	54;	54.0;	minute
+duration;	default;	001;	60;	60.0;	second;	1;	1.0;	minute
+duration;	default;	001;	54;	54.0;	second;	54;	54.0;	second
+duration;	default;	001;	1;	1.0;	second;	1;	1.0;	second
+duration;	default;	001;	9 / 10;	0.9;	second;	900;	900.0;	millisecond
+duration;	default;	001;	1 / 1000;	0.001;	second;	1;	1.0;	millisecond
+duration;	default;	001;	9 / 10000;	9.0E-4;	second;	900;	900.0;	microsecond
+duration;	default;	001;	1 / 1000000;	1.0E-6;	second;	1;	1.0;	microsecond
+duration;	default;	001;	9 / 10000000;	9.0E-7;	second;	900;	900.0;	nanosecond
+duration;	default;	001;	1 / 1000000000;	1.0E-9;	second;	1;	1.0;	nanosecond
+duration;	default;	001;	9 / 10000000000;	9.0E-10;	second;	9 / 10;	0.9;	nanosecond
 
-duration;   media;  001;    66; 66.0;   second; 1;  minute; 6;  6.0;    second
-duration;   media;  001;    60; 60.0;   second; 1;  minute; 0;  0.0;    second
-duration;   media;  001;    54; 54.0;   second; 54; 54.0;   second
-duration;   media;  001;    1;  1.0;    second; 1;  1.0;    second
-duration;   media;  001;    9 / 10; 0.9;    second; 9 / 10; 0.9;    second
+duration;	media;	001;	66;	66.0;	second;	1;	minute;	6;	6.0;	second
+duration;	media;	001;	60;	60.0;	second;	1;	minute;	0;	0.0;	second
+duration;	media;	001;	54;	54.0;	second;	54;	54.0;	second
+duration;	media;	001;	1;	1.0;	second;	1;	1.0;	second
+duration;	media;	001;	9 / 10;	0.9;	second;	9 / 10;	0.9;	second
 
-energy; default;    001;    3960000;    3960000.0;  kilogram-square-meter-per-square-second;    11 / 10;    1.1;    kilowatt-hour
-energy; default;    001;    3600000;    3600000.0;  kilogram-square-meter-per-square-second;    1;  1.0;    kilowatt-hour
-energy; default;    001;    3240000;    3240000.0;  kilogram-square-meter-per-square-second;    9 / 10; 0.9;    kilowatt-hour
+energy;	default;	001;	3960000;	3960000.0;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	kilowatt-hour
+energy;	default;	001;	3600000;	3600000.0;	kilogram-square-meter-per-square-second;	1;	1.0;	kilowatt-hour
+energy;	default;	001;	3240000;	3240000.0;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	kilowatt-hour
 
-energy; food;   US; 23012 / 5;  4602.4; kilogram-square-meter-per-square-second;    11 / 10;    1.1;    foodcalorie
-energy; food;   US; 4184;   4184.0; kilogram-square-meter-per-square-second;    1;  1.0;    foodcalorie
-energy; food;   US; 18828 / 5;  3765.6; kilogram-square-meter-per-square-second;    9 / 10; 0.9;    foodcalorie
+energy;	food;	US;	23012 / 5;	4602.4;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	foodcalorie
+energy;	food;	US;	4184;	4184.0;	kilogram-square-meter-per-square-second;	1;	1.0;	foodcalorie
+energy;	food;	US;	18828 / 5;	3765.6;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	foodcalorie
 
-energy; food;   001;    23012 / 5;  4602.4; kilogram-square-meter-per-square-second;    11 / 10;    1.1;    kilocalorie
-energy; food;   001;    4184;   4184.0; kilogram-square-meter-per-square-second;    1;  1.0;    kilocalorie
-energy; food;   001;    18828 / 5;  3765.6; kilogram-square-meter-per-square-second;    9 / 10; 0.9;    kilocalorie
+energy;	food;	001;	23012 / 5;	4602.4;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	kilocalorie
+energy;	food;	001;	4184;	4184.0;	kilogram-square-meter-per-square-second;	1;	1.0;	kilocalorie
+energy;	food;	001;	18828 / 5;	3765.6;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	kilocalorie
 
-length; default;    001;    1100;   1100.0; meter;  11 / 10;    1.1;    kilometer
-length; default;    001;    1000;   1000.0; meter;  1;  1.0;    kilometer
-length; default;    001;    900;    900.0;  meter;  900;    900.0;  meter
-length; default;    001;    1;  1.0;    meter;  1;  1.0;    meter
-length; default;    001;    9 / 10; 0.9;    meter;  90; 90.0;   centimeter
-length; default;    001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; default;    001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	default;	001;	1100;	1100.0;	meter;	11 / 10;	1.1;	kilometer
+length;	default;	001;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	default;	001;	900;	900.0;	meter;	900;	900.0;	meter
+length;	default;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	default;	001;	9 / 10;	0.9;	meter;	90;	90.0;	centimeter
+length;	default;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	default;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; default;    GB; 1106424 / 625;  1770.2784;  meter;  11 / 10;    1.1;    mile
-length; default;    GB; 201168 / 125;   1609.344;   meter;  1;  1.0;    mile
-length; default;    GB; 905256 / 625;   1448.4096;  meter;  4752;   4752.0; foot
-length; default;    GB; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; default;    GB; 3429 / 12500;   0.27432;    meter;  54 / 5; 10.8;   inch
-length; default;    GB; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; default;    GB; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	default;	GB;	1106424 / 625;	1770.2784;	meter;	11 / 10;	1.1;	mile
+length;	default;	GB;	201168 / 125;	1609.344;	meter;	1;	1.0;	mile
+length;	default;	GB;	905256 / 625;	1448.4096;	meter;	4752;	4752.0;	foot
+length;	default;	GB;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	default;	GB;	3429 / 12500;	0.27432;	meter;	54 / 5;	10.8;	inch
+length;	default;	GB;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	default;	GB;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; person; 001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; person; 001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; person; 001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	focal-length;	001;	11 / 10000;	0.0011;	meter;	11 / 10;	1.1;	millimeter
+length;	focal-length;	001;	1 / 1000;	0.001;	meter;	1;	1.0;	millimeter
+length;	focal-length;	001;	9 / 10000;	9.0E-4;	meter;	9 / 10;	0.9;	millimeter
 
-length; person; CA; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; person; CA; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; person; CA; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	person;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	person;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	person;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; person-height;  001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; person-height;  001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; person-height;  001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	person;	CA;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	person;	CA;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	person;	CA;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; person-height;  CA; 11811 / 12500;  0.94488;    meter;  3;  foot;   6 / 5;  1.2;    inch
-length; person-height;  CA; 1143 / 1250;    0.9144; meter;  3;  foot;   0;  0.0;    inch
-length; person-height;  CA; 11049 / 12500;  0.88392;    meter;  174 / 5;    34.8;   inch
-length; person-height;  CA; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; person-height;  CA; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	person-height;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	person-height;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	person-height;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; person-height;  AT; 11 / 10;    1.1;    meter;  1;  meter;  10; 10.0;   centimeter
-length; person-height;  AT; 1;  1.0;    meter;  1;  meter;  0;  0.0;    centimeter
-length; person-height;  AT; 9 / 10; 0.9;    meter;  0;  meter;  90; 90.0;   centimeter
+length;	person-height;	CA;	11811 / 12500;	0.94488;	meter;	3;	foot;	6 / 5;	1.2;	inch
+length;	person-height;	CA;	1143 / 1250;	0.9144;	meter;	3;	foot;	0;	0.0;	inch
+length;	person-height;	CA;	11049 / 12500;	0.88392;	meter;	174 / 5;	34.8;	inch
+length;	person-height;	CA;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	person-height;	CA;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; rainfall;   BR; 11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; rainfall;   BR; 1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; rainfall;   BR; 9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	person-height;	AT;	11 / 10;	1.1;	meter;	1;	meter;	10;	10.0;	centimeter
+length;	person-height;	AT;	1;	1.0;	meter;	1;	meter;	0;	0.0;	centimeter
+length;	person-height;	AT;	9 / 10;	0.9;	meter;	0;	meter;	90;	90.0;	centimeter
 
-length; rainfall;   US; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; rainfall;   US; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; rainfall;   US; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	rainfall;	BR;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	rainfall;	BR;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	rainfall;	BR;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; rainfall;   001;    11 / 10000; 0.0011; meter;  11 / 10;    1.1;    millimeter
-length; rainfall;   001;    1 / 1000;   0.001;  meter;  1;  1.0;    millimeter
-length; rainfall;   001;    9 / 10000;  9.0E-4; meter;  9 / 10; 0.9;    millimeter
+length;	rainfall;	US;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	rainfall;	US;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	rainfall;	US;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; road;   001;    1000;   1000.0; meter;  1;  1.0;    kilometer
-length; road;   001;    900;    900.0;  meter;  9 / 10; 0.9;    kilometer
-length; road;   001;    800;    800.0;  meter;  800;    800.0;  meter
-length; road;   001;    300;    300.0;  meter;  300;    300.0;  meter
-length; road;   001;    2999 / 10;  299.9;  meter;  2999 / 10;  299.9;  meter
-length; road;   001;    1;  1.0;    meter;  1;  1.0;    meter
-length; road;   001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	rainfall;	001;	11 / 10000;	0.0011;	meter;	11 / 10;	1.1;	millimeter
+length;	rainfall;	001;	1 / 1000;	0.001;	meter;	1;	1.0;	millimeter
+length;	rainfall;	001;	9 / 10000;	9.0E-4;	meter;	9 / 10;	0.9;	millimeter
 
-length; road;   US; 603504 / 625;   965.6064;   meter;  3 / 5;  0.6;    mile
-length; road;   US; 100584 / 125;   804.672;    meter;  1 / 2;  0.5;    mile
-length; road;   US; 402336 / 625;   643.7376;   meter;  2112;   2112.0; foot
-length; road;   US; 762 / 25;   30.48;  meter;  100;    100.0;  foot
-length; road;   US; 380619 / 12500; 30.44952;   meter;  999 / 10;   99.9;   foot
-length; road;   US; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; road;   US; 3429 / 12500;   0.27432;    meter;  9 / 10; 0.9;    foot
+length;	road;	001;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	road;	001;	900;	900.0;	meter;	9 / 10;	0.9;	kilometer
+length;	road;	001;	800;	800.0;	meter;	800;	800.0;	meter
+length;	road;	001;	300;	300.0;	meter;	300;	300.0;	meter
+length;	road;	001;	2999 / 10;	299.9;	meter;	2999 / 10;	299.9;	meter
+length;	road;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	road;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; road;   GB; 603504 / 625;   965.6064;   meter;  3 / 5;  0.6;    mile
-length; road;   GB; 100584 / 125;   804.672;    meter;  1 / 2;  0.5;    mile
-length; road;   GB; 402336 / 625;   643.7376;   meter;  704;    704.0;  yard
-length; road;   GB; 2286 / 25;  91.44;  meter;  100;    100.0;  yard
-length; road;   GB; 1141857 / 12500;    91.34856;   meter;  999 / 10;   99.9;   yard
-length; road;   GB; 1143 / 1250;    0.9144; meter;  1;  1.0;    yard
-length; road;   GB; 10287 / 12500;  0.82296;    meter;  9 / 10; 0.9;    yard
+length;	road;	US;	603504 / 625;	965.6064;	meter;	3 / 5;	0.6;	mile
+length;	road;	US;	100584 / 125;	804.672;	meter;	1 / 2;	0.5;	mile
+length;	road;	US;	402336 / 625;	643.7376;	meter;	2112;	2112.0;	foot
+length;	road;	US;	762 / 25;	30.48;	meter;	100;	100.0;	foot
+length;	road;	US;	380619 / 12500;	30.44952;	meter;	999 / 10;	99.9;	foot
+length;	road;	US;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	road;	US;	3429 / 12500;	0.27432;	meter;	9 / 10;	0.9;	foot
 
-length; road;   SE; 11000;  11000.0;    meter;  11 / 10;    1.1;    mile-scandinavian
-length; road;   SE; 10000;  10000.0;    meter;  1;  1.0;    mile-scandinavian
-length; road;   SE; 9000;   9000.0; meter;  9;  9.0;    kilometer
-length; road;   SE; 1000;   1000.0; meter;  1;  1.0;    kilometer
-length; road;   SE; 900;    900.0;  meter;  900;    900.0;  meter
-length; road;   SE; 300;    300.0;  meter;  300;    300.0;  meter
-length; road;   SE; 2999 / 10;  299.9;  meter;  2999 / 10;  299.9;  meter
-length; road;   SE; 1;  1.0;    meter;  1;  1.0;    meter
-length; road;   SE; 9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	road;	GB;	603504 / 625;	965.6064;	meter;	3 / 5;	0.6;	mile
+length;	road;	GB;	100584 / 125;	804.672;	meter;	1 / 2;	0.5;	mile
+length;	road;	GB;	402336 / 625;	643.7376;	meter;	704;	704.0;	yard
+length;	road;	GB;	2286 / 25;	91.44;	meter;	100;	100.0;	yard
+length;	road;	GB;	1141857 / 12500;	91.34856;	meter;	999 / 10;	99.9;	yard
+length;	road;	GB;	1143 / 1250;	0.9144;	meter;	1;	1.0;	yard
+length;	road;	GB;	10287 / 12500;	0.82296;	meter;	9 / 10;	0.9;	yard
 
-length; snowfall;   001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; snowfall;   001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; snowfall;   001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	road;	SE;	11000;	11000.0;	meter;	11 / 10;	1.1;	mile-scandinavian
+length;	road;	SE;	10000;	10000.0;	meter;	1;	1.0;	mile-scandinavian
+length;	road;	SE;	9000;	9000.0;	meter;	9;	9.0;	kilometer
+length;	road;	SE;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	road;	SE;	900;	900.0;	meter;	900;	900.0;	meter
+length;	road;	SE;	300;	300.0;	meter;	300;	300.0;	meter
+length;	road;	SE;	2999 / 10;	299.9;	meter;	2999 / 10;	299.9;	meter
+length;	road;	SE;	1;	1.0;	meter;	1;	1.0;	meter
+length;	road;	SE;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; snowfall;   US; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; snowfall;   US; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; snowfall;   US; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	snowfall;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	snowfall;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	snowfall;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; vehicle;    GB; 4191 / 12500;   0.33528;    meter;  1;  foot;   6 / 5;  1.2;    inch
-length; vehicle;    GB; 381 / 1250; 0.3048; meter;  1;  foot;   0;  0.0;    inch
-length; vehicle;    GB; 3429 / 12500;   0.27432;    meter;  0;  foot;   54 / 5; 10.8;   inch
+length;	snowfall;	US;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	snowfall;	US;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	snowfall;	US;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; vehicle;    001;    11 / 10;    1.1;    meter;  11 / 10;    1.1;    meter
-length; vehicle;    001;    1;  1.0;    meter;  1;  1.0;    meter
-length; vehicle;    001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	vehicle;	GB;	4191 / 12500;	0.33528;	meter;	1;	foot;	6 / 5;	1.2;	inch
+length;	vehicle;	GB;	381 / 1250;	0.3048;	meter;	1;	foot;	0;	0.0;	inch
+length;	vehicle;	GB;	3429 / 12500;	0.27432;	meter;	0;	foot;	54 / 5;	10.8;	inch
 
-length; vehicle;    MX; 11 / 10;    1.1;    meter;  1;  meter;  10; 10.0;   centimeter
-length; vehicle;    MX; 1;  1.0;    meter;  1;  meter;  0;  0.0;    centimeter
-length; vehicle;    MX; 9 / 10; 0.9;    meter;  0;  meter;  90; 90.0;   centimeter
+length;	vehicle;	001;	11 / 10;	1.1;	meter;	11 / 10;	1.1;	meter
+length;	vehicle;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	vehicle;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; visiblty;   001;    200;    200.0;  meter;  1 / 5;  0.2;    kilometer
-length; visiblty;   001;    100;    100.0;  meter;  1 / 10; 0.1;    kilometer
-length; visiblty;   001;    1;  1.0;    meter;  1;  1.0;    meter
-length; visiblty;   001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
-length; visiblty;   001;    0;  0.0;    meter;  0;  0.0;    meter
+length;	vehicle;	MX;	11 / 10;	1.1;	meter;	1;	meter;	10;	10.0;	centimeter
+length;	vehicle;	MX;	1;	1.0;	meter;	1;	meter;	0;	0.0;	centimeter
+length;	vehicle;	MX;	9 / 10;	0.9;	meter;	0;	meter;	90;	90.0;	centimeter
+
+length;	visiblty;	001;	200;	200.0;	meter;	1 / 5;	0.2;	kilometer
+length;	visiblty;	001;	100;	100.0;	meter;	1 / 10;	0.1;	kilometer
+length;	visiblty;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	visiblty;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
+length;	visiblty;	001;	0;	0.0;	meter;	0;	0.0;	meter
 
-length; visiblty;   DE; 11 / 10;    1.1;    meter;  11 / 10;    1.1;    meter
-length; visiblty;   DE; 1;  1.0;    meter;  1;  1.0;    meter
-length; visiblty;   DE; 9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	visiblty;	DE;	11 / 10;	1.1;	meter;	11 / 10;	1.1;	meter
+length;	visiblty;	DE;	1;	1.0;	meter;	1;	1.0;	meter
+length;	visiblty;	DE;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; visiblty;   GB; 1106424 / 625;  1770.2784;  meter;  11 / 10;    1.1;    mile
-length; visiblty;   GB; 201168 / 125;   1609.344;   meter;  1;  1.0;    mile
-length; visiblty;   GB; 905256 / 625;   1448.4096;  meter;  4752;   4752.0; foot
-length; visiblty;   GB; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; visiblty;   GB; 3429 / 12500;   0.27432;    meter;  9 / 10; 0.9;    foot
+length;	visiblty;	GB;	1106424 / 625;	1770.2784;	meter;	11 / 10;	1.1;	mile
+length;	visiblty;	GB;	201168 / 125;	1609.344;	meter;	1;	1.0;	mile
+length;	visiblty;	GB;	905256 / 625;	1448.4096;	meter;	4752;	4752.0;	foot
+length;	visiblty;	GB;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	visiblty;	GB;	3429 / 12500;	0.27432;	meter;	9 / 10;	0.9;	foot
 
-mass;   default;    001;    1100;   1100.0; kilogram;   11 / 10;    1.1;    metric-ton
-mass;   default;    001;    1000;   1000.0; kilogram;   1;  1.0;    metric-ton
-mass;   default;    001;    900;    900.0;  kilogram;   900;    900.0;  kilogram
-mass;   default;    001;    1;  1.0;    kilogram;   1;  1.0;    kilogram
-mass;   default;    001;    9 / 10; 0.9;    kilogram;   900;    900.0;  gram
-mass;   default;    001;    1 / 1000;   0.001;  kilogram;   1;  1.0;    gram
-mass;   default;    001;    9 / 10000;  9.0E-4; kilogram;   900;    900.0;  milligram
-mass;   default;    001;    1 / 1000000;    1.0E-6; kilogram;   1;  1.0;    milligram
-mass;   default;    001;    9 / 10000000;   9.0E-7; kilogram;   900;    900.0;  microgram
-mass;   default;    001;    1 / 1000000000; 1.0E-9; kilogram;   1;  1.0;    microgram
-mass;   default;    001;    9 / 10000000000;    9.0E-10;    kilogram;   9 / 10; 0.9;    microgram
+mass;	default;	001;	1100;	1100.0;	kilogram;	11 / 10;	1.1;	metric-ton
+mass;	default;	001;	1000;	1000.0;	kilogram;	1;	1.0;	metric-ton
+mass;	default;	001;	900;	900.0;	kilogram;	900;	900.0;	kilogram
+mass;	default;	001;	1;	1.0;	kilogram;	1;	1.0;	kilogram
+mass;	default;	001;	9 / 10;	0.9;	kilogram;	900;	900.0;	gram
+mass;	default;	001;	1 / 1000;	0.001;	kilogram;	1;	1.0;	gram
+mass;	default;	001;	9 / 10000;	9.0E-4;	kilogram;	900;	900.0;	milligram
+mass;	default;	001;	1 / 1000000;	1.0E-6;	kilogram;	1;	1.0;	milligram
+mass;	default;	001;	9 / 10000000;	9.0E-7;	kilogram;	900;	900.0;	microgram
+mass;	default;	001;	1 / 1000000000;	1.0E-9;	kilogram;	1;	1.0;	microgram
+mass;	default;	001;	9 / 10000000000;	9.0E-10;	kilogram;	9 / 10;	0.9;	microgram
 
-mass;   default;    GB; 498951607 / 500000; 997.903214; kilogram;   11 / 10;    1.1;    ton
-mass;   default;    GB; 45359237 / 50000;   907.18474;  kilogram;   1;  1.0;    ton
-mass;   default;    GB; 408233133 / 500000; 816.466266; kilogram;   1800;   1800.0; pound
-mass;   default;    GB; 45359237 / 100000000;   0.45359237; kilogram;   1;  1.0;    pound
-mass;   default;    GB; 408233133 / 1000000000; 0.408233133;    kilogram;   72 / 5; 14.4;   ounce
-mass;   default;    GB; 45359237 / 1600000000;  0.028349523125; kilogram;   1;  1.0;    ounce
-mass;   default;    GB; 408233133 / 16000000000;    0.0255145708125;    kilogram;   9 / 10; 0.9;    ounce
+mass;	default;	GB;	498951607 / 500000;	997.903214;	kilogram;	11 / 10;	1.1;	ton
+mass;	default;	GB;	45359237 / 50000;	907.18474;	kilogram;	1;	1.0;	ton
+mass;	default;	GB;	408233133 / 500000;	816.466266;	kilogram;	1800;	1800.0;	pound
+mass;	default;	GB;	45359237 / 100000000;	0.45359237;	kilogram;	1;	1.0;	pound
+mass;	default;	GB;	408233133 / 1000000000;	0.408233133;	kilogram;	72 / 5;	14.4;	ounce
+mass;	default;	GB;	45359237 / 1600000000;	0.028349523125;	kilogram;	1;	1.0;	ounce
+mass;	default;	GB;	408233133 / 16000000000;	0.0255145708125;	kilogram;	9 / 10;	0.9;	ounce
 
-mass;   person; 001;    11 / 10;    1.1;    kilogram;   11 / 10;    1.1;    kilogram
-mass;   person; 001;    1;  1.0;    kilogram;   1;  1.0;    kilogram
-mass;   person; 001;    9 / 10; 0.9;    kilogram;   900;    900.0;  gram
-mass;   person; 001;    1 / 1000;   0.001;  kilogram;   1;  1.0;    gram
-mass;   person; 001;    9 / 10000;  9.0E-4; kilogram;   9 / 10; 0.9;    gram
+mass;	person;	001;	11 / 10;	1.1;	kilogram;	11 / 10;	1.1;	kilogram
+mass;	person;	001;	1;	1.0;	kilogram;	1;	1.0;	kilogram
+mass;	person;	001;	9 / 10;	0.9;	kilogram;	900;	900.0;	gram
+mass;	person;	001;	1 / 1000;	0.001;	kilogram;	1;	1.0;	gram
+mass;	person;	001;	9 / 10000;	9.0E-4;	kilogram;	9 / 10;	0.9;	gram
 
-mass;   person; DZ; 11 / 10;    1.1;    kilogram;   1;  kilogram;   100;    100.0;  gram
-mass;   person; DZ; 1;  1.0;    kilogram;   1;  kilogram;   0;  0.0;    gram
-mass;   person; DZ; 9 / 10; 0.9;    kilogram;   0;  kilogram;   900;    900.0;  gram
+mass;	person;	DZ;	11 / 10;	1.1;	kilogram;	1;	kilogram;	100;	100.0;	gram
+mass;	person;	DZ;	1;	1.0;	kilogram;	1;	kilogram;	0;	0.0;	gram
+mass;	person;	DZ;	9 / 10;	0.9;	kilogram;	0;	kilogram;	900;	900.0;	gram
 
-mass;   person; US; 498951607 / 1000000000; 0.498951607;    kilogram;   11 / 10;    1.1;    pound
-mass;   person; US; 45359237 / 100000000;   0.45359237; kilogram;   1;  1.0;    pound
-mass;   person; US; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	US;	498951607 / 1000000000;	0.498951607;	kilogram;	11 / 10;	1.1;	pound
+mass;	person;	US;	45359237 / 100000000;	0.45359237;	kilogram;	1;	1.0;	pound
+mass;	person;	US;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass;   person; GB; 3492661249 / 500000000; 6.985322498;    kilogram;   1;  stone;  7 / 5;  1.4;    pound
-mass;   person; GB; 317514659 / 50000000;   6.35029318; kilogram;   1;  stone;  0;  0.0;    pound
-mass;   person; GB; 2857631931 / 500000000; 5.715263862;    kilogram;   12; pound;  48 / 5; 9.6;    ounce
-mass;   person; GB; 45359237 / 100000000;   0.45359237; kilogram;   1;  pound;  0;  0.0;    ounce
-mass;   person; GB; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	GB;	3492661249 / 500000000;	6.985322498;	kilogram;	1;	stone;	7 / 5;	1.4;	pound
+mass;	person;	GB;	317514659 / 50000000;	6.35029318;	kilogram;	1;	stone;	0;	0.0;	pound
+mass;	person;	GB;	2857631931 / 500000000;	5.715263862;	kilogram;	12;	pound;	48 / 5;	9.6;	ounce
+mass;	person;	GB;	45359237 / 100000000;	0.45359237;	kilogram;	1;	pound;	0;	0.0;	ounce
+mass;	person;	GB;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass;   person; HK; 498951607 / 1000000000; 0.498951607;    kilogram;   1;  pound;  8 / 5;  1.6;    ounce
-mass;   person; HK; 45359237 / 100000000;   0.45359237; kilogram;   1;  pound;  0;  0.0;    ounce
-mass;   person; HK; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	HK;	498951607 / 1000000000;	0.498951607;	kilogram;	1;	pound;	8 / 5;	1.6;	ounce
+mass;	person;	HK;	45359237 / 100000000;	0.45359237;	kilogram;	1;	pound;	0;	0.0;	ounce
+mass;	person;	HK;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass-density;   blood-glucose;  001;    11 / 1000;  0.011;  kilogram-per-cubic-meter;   11 / 10;    1.1;    milligram-per-deciliter
-mass-density;   blood-glucose;  001;    1 / 100;    0.01;   kilogram-per-cubic-meter;   1;  1.0;    milligram-per-deciliter
-mass-density;   blood-glucose;  001;    9 / 1000;   0.009;  kilogram-per-cubic-meter;   9 / 10; 0.9;    milligram-per-deciliter
+mass-density;	blood-glucose;	001;	11 / 1000;	0.011;	kilogram-per-cubic-meter;	11 / 10;	1.1;	milligram-per-deciliter
+mass-density;	blood-glucose;	001;	1 / 100;	0.01;	kilogram-per-cubic-meter;	1;	1.0;	milligram-per-deciliter
+mass-density;	blood-glucose;	001;	9 / 1000;	0.009;	kilogram-per-cubic-meter;	9 / 10;	0.9;	milligram-per-deciliter
 
-mass-density;   default;    001;    11 / 10;    1.1;    kilogram-per-cubic-meter;   11 / 10;    1.1;    kilogram-per-cubic-meter
-mass-density;   default;    001;    1;  1.0;    kilogram-per-cubic-meter;   1;  1.0;    kilogram-per-cubic-meter
-mass-density;   default;    001;    9 / 10; 0.9;    kilogram-per-cubic-meter;   9 / 10; 0.9;    kilogram-per-cubic-meter
+mass-density;	default;	001;	11 / 10;	1.1;	kilogram-per-cubic-meter;	11 / 10;	1.1;	kilogram-per-cubic-meter
+mass-density;	default;	001;	1;	1.0;	kilogram-per-cubic-meter;	1;	1.0;	kilogram-per-cubic-meter
+mass-density;	default;	001;	9 / 10;	0.9;	kilogram-per-cubic-meter;	9 / 10;	0.9;	kilogram-per-cubic-meter
 
-power;  default;    001;    1100000000; 1.1E9;  kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    gigawatt
-power;  default;    001;    1000000000; 1.0E9;  kilogram-square-meter-per-cubic-second; 1;  1.0;    gigawatt
-power;  default;    001;    900000000;  9.0E8;  kilogram-square-meter-per-cubic-second; 900;    900.0;  megawatt
-power;  default;    001;    1000000;    1000000.0;  kilogram-square-meter-per-cubic-second; 1;  1.0;    megawatt
-power;  default;    001;    900000; 900000.0;   kilogram-square-meter-per-cubic-second; 900;    900.0;  kilowatt
-power;  default;    001;    1000;   1000.0; kilogram-square-meter-per-cubic-second; 1;  1.0;    kilowatt
-power;  default;    001;    900;    900.0;  kilogram-square-meter-per-cubic-second; 900;    900.0;  watt
-power;  default;    001;    1;  1.0;    kilogram-square-meter-per-cubic-second; 1;  1.0;    watt
-power;  default;    001;    9 / 10; 0.9;    kilogram-square-meter-per-cubic-second; 900;    900.0;  milliwatt
-power;  default;    001;    1 / 1000;   0.001;  kilogram-square-meter-per-cubic-second; 1;  1.0;    milliwatt
-power;  default;    001;    9 / 10000;  9.0E-4; kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    milliwatt
+power;	default;	001;	1100000000;	1.1E9;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	gigawatt
+power;	default;	001;	1000000000;	1.0E9;	kilogram-square-meter-per-cubic-second;	1;	1.0;	gigawatt
+power;	default;	001;	900000000;	9.0E8;	kilogram-square-meter-per-cubic-second;	900;	900.0;	megawatt
+power;	default;	001;	1000000;	1000000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	megawatt
+power;	default;	001;	900000;	900000.0;	kilogram-square-meter-per-cubic-second;	900;	900.0;	kilowatt
+power;	default;	001;	1000;	1000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	kilowatt
+power;	default;	001;	900;	900.0;	kilogram-square-meter-per-cubic-second;	900;	900.0;	watt
+power;	default;	001;	1;	1.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	watt
+power;	default;	001;	9 / 10;	0.9;	kilogram-square-meter-per-cubic-second;	900;	900.0;	milliwatt
+power;	default;	001;	1 / 1000;	0.001;	kilogram-square-meter-per-cubic-second;	1;	1.0;	milliwatt
+power;	default;	001;	9 / 10000;	9.0E-4;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	milliwatt
 
-power;  engine; 001;    1100;   1100.0; kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    kilowatt
-power;  engine; 001;    1000;   1000.0; kilogram-square-meter-per-cubic-second; 1;  1.0;    kilowatt
-power;  engine; 001;    900;    900.0;  kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    kilowatt
+power;	engine;	001;	1100;	1100.0;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	kilowatt
+power;	engine;	001;	1000;	1000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	kilowatt
+power;	engine;	001;	900;	900.0;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	kilowatt
 
-power;  engine; GB; 410134929370248621 / 500000000000000;   820.2698587404972;  kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    horsepower
-power;  engine; GB; 37284993579113511 / 50000000000000; 745.6998715822702;  kilogram-square-meter-per-cubic-second; 1;  1.0;    horsepower
-power;  engine; GB; 335564942212021599 / 500000000000000;   671.1298844240432;  kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    horsepower
+power;	engine;	GB;	410134929370248621 / 500000000000000;	820.2698587404972;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	horsepower
+power;	engine;	GB;	37284993579113511 / 50000000000000;	745.6998715822702;	kilogram-square-meter-per-cubic-second;	1;	1.0;	horsepower
+power;	engine;	GB;	335564942212021599 / 500000000000000;	671.1298844240432;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	horsepower
 
-pressure;   baromtrc;   001;    110;    110.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    hectopascal
-pressure;   baromtrc;   001;    100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    hectopascal
-pressure;   baromtrc;   001;    90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    hectopascal
+pressure;	baromtrc;	001;	110;	110.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	hectopascal
+pressure;	baromtrc;	001;	100;	100.0;	kilogram-per-meter-square-second;	1;	1.0;	hectopascal
+pressure;	baromtrc;	001;	90;	90.0;	kilogram-per-meter-square-second;	9 / 10;	0.9;	hectopascal
 
-pressure;   baromtrc;   IN; 37250275043751 / 10000000000;   3725.0275043751;    kilogram-per-meter-square-second;   11 / 10;    1.1;    inch-ofhg
-pressure;   baromtrc;   IN; 3386388640341 / 1000000000; 3386.388640341; kilogram-per-meter-square-second;   1;  1.0;    inch-ofhg
-pressure;   baromtrc;   IN; 30477497763069 / 10000000000;   3047.7497763069;    kilogram-per-meter-square-second;   9 / 10; 0.9;    inch-ofhg
+pressure;	baromtrc;	IN;	37250275043751 / 10000000000;	3725.0275043751;	kilogram-per-meter-square-second;	11 / 10;	1.1;	inch-ofhg
+pressure;	baromtrc;	IN;	3386388640341 / 1000000000;	3386.388640341;	kilogram-per-meter-square-second;	1;	1.0;	inch-ofhg
+pressure;	baromtrc;	IN;	30477497763069 / 10000000000;	3047.7497763069;	kilogram-per-meter-square-second;	9 / 10;	0.9;	inch-ofhg
 
-pressure;   baromtrc;   BR; 110;    110.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    millibar
-pressure;   baromtrc;   BR; 100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    millibar
-pressure;   baromtrc;   BR; 90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    millibar
+pressure;	baromtrc;	BR;	110;	110.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	millibar
+pressure;	baromtrc;	BR;	100;	100.0;	kilogram-per-meter-square-second;	1;	1.0;	millibar
+pressure;	baromtrc;	BR;	90;	90.0;	kilogram-per-meter-square-second;	9 / 10;	0.9;	millibar
 
-pressure;   baromtrc;   MX; 293309252313 / 2000000000;  146.6546261565; kilogram-per-meter-square-second;   11 / 10;    1.1;    millimeter-ofhg
-pressure;   baromtrc;   MX; 26664477483 / 200000000;    133.322387415;  kilogram-per-meter-square-second;   1;  1.0;    millimeter-ofhg
-pressure;   baromtrc;   MX; 239980297347 / 2000000000;  119.9901486735; kilogram-per-meter-square-second;   9 / 10; 0.9;    millimeter-ofhg
+pressure;	baromtrc;	MX;	293309252313 / 2000000000;	146.6546261565;	kilogram-per-meter-square-second;	11 / 10;	1.1;	millimeter-ofhg
+pressure;	baromtrc;	MX;	26664477483 / 200000000;	133.322387415;	kilogram-per-meter-square-second;	1;	1.0;	millimeter-ofhg
+pressure;	baromtrc;	MX;	239980297347 / 2000000000;	119.9901486735;	kilogram-per-meter-square-second;	9 / 10;	0.9;	millimeter-ofhg
 
-pressure;   default;    001;    1100000;    1100000.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    megapascal
-pressure;   default;    001;    1000000;    1000000.0;  kilogram-per-meter-square-second;   1;  1.0;    megapascal
-pressure;   default;    001;    900000; 900000.0;   kilogram-per-meter-square-second;   900000; 900000.0;   pascal
-pressure;   default;    001;    1;  1.0;    kilogram-per-meter-square-second;   1;  1.0;    pascal
-pressure;   default;    001;    9 / 10; 0.9;    kilogram-per-meter-square-second;   9 / 10; 0.9;    pascal
+pressure;	default;	001;	1100000;	1100000.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	megapascal
+pressure;	default;	001;	1000000;	1000000.0;	kilogram-per-meter-square-second;	1;	1.0;	megapascal
+pressure;	default;	001;	900000;	900000.0;	kilogram-per-meter-square-second;	900000;	900000.0;	pascal
+pressure;	default;	001;	1;	1.0;	kilogram-per-meter-square-second;	1;	1.0;	pascal
+pressure;	default;	001;	9 / 10;	0.9;	kilogram-per-meter-square-second;	9 / 10;	0.9;	pascal
 
-pressure;   default;    GB; 97860875535731 / 12903200000;   7584.233022485197;  kilogram-per-meter-square-second;   11 / 10;    1.1;    pound-force-per-square-inch
-pressure;   default;    GB; 8896443230521 / 1290320000; 6894.757293168361;  kilogram-per-meter-square-second;   1;  1.0;    pound-force-per-square-inch
-pressure;   default;    GB; 80067989074689 / 12903200000;   6205.281563851525;  kilogram-per-meter-square-second;   9 / 10; 0.9;    pound-force-per-square-inch
+pressure;	default;	GB;	97860875535731 / 12903200000;	7584.233022485197;	kilogram-per-meter-square-second;	11 / 10;	1.1;	pound-force-per-square-inch
+pressure;	default;	GB;	8896443230521 / 1290320000;	6894.757293168361;	kilogram-per-meter-square-second;	1;	1.0;	pound-force-per-square-inch
+pressure;	default;	GB;	80067989074689 / 12903200000;	6205.281563851525;	kilogram-per-meter-square-second;	9 / 10;	0.9;	pound-force-per-square-inch
 
-speed;  default;    001;    11 / 36;    0.3055555555555556; meter-per-second;   11 / 10;    1.1;    kilometer-per-hour
-speed;  default;    001;    5 / 18; 0.2777777777777778; meter-per-second;   1;  1.0;    kilometer-per-hour
-speed;  default;    001;    1 / 4;  0.25;   meter-per-second;   9 / 10; 0.9;    kilometer-per-hour
+speed;	default;	001;	11 / 36;	0.3055555555555556;	meter-per-second;	11 / 10;	1.1;	kilometer-per-hour
+speed;	default;	001;	5 / 18;	0.2777777777777778;	meter-per-second;	1;	1.0;	kilometer-per-hour
+speed;	default;	001;	1 / 4;	0.25;	meter-per-second;	9 / 10;	0.9;	kilometer-per-hour
 
-speed;  default;    GB; 15367 / 31250;  0.491744;   meter-per-second;   11 / 10;    1.1;    mile-per-hour
-speed;  default;    GB; 1397 / 3125;    0.44704;    meter-per-second;   1;  1.0;    mile-per-hour
-speed;  default;    GB; 12573 / 31250;  0.402336;   meter-per-second;   9 / 10; 0.9;    mile-per-hour
+speed;	default;	GB;	15367 / 31250;	0.491744;	meter-per-second;	11 / 10;	1.1;	mile-per-hour
+speed;	default;	GB;	1397 / 3125;	0.44704;	meter-per-second;	1;	1.0;	mile-per-hour
+speed;	default;	GB;	12573 / 31250;	0.402336;	meter-per-second;	9 / 10;	0.9;	mile-per-hour
 
-speed;  wind;   001;    11 / 36;    0.3055555555555556; meter-per-second;   11 / 10;    1.1;    kilometer-per-hour
-speed;  wind;   001;    5 / 18; 0.2777777777777778; meter-per-second;   1;  1.0;    kilometer-per-hour
-speed;  wind;   001;    1 / 4;  0.25;   meter-per-second;   9 / 10; 0.9;    kilometer-per-hour
+speed;	wind;	001;	11 / 36;	0.3055555555555556;	meter-per-second;	11 / 10;	1.1;	kilometer-per-hour
+speed;	wind;	001;	5 / 18;	0.2777777777777778;	meter-per-second;	1;	1.0;	kilometer-per-hour
+speed;	wind;	001;	1 / 4;	0.25;	meter-per-second;	9 / 10;	0.9;	kilometer-per-hour
 
-speed;  wind;   FI; 11 / 10;    1.1;    meter-per-second;   11 / 10;    1.1;    meter-per-second
-speed;  wind;   FI; 1;  1.0;    meter-per-second;   1;  1.0;    meter-per-second
-speed;  wind;   FI; 9 / 10; 0.9;    meter-per-second;   9 / 10; 0.9;    meter-per-second
+speed;	wind;	FI;	11 / 10;	1.1;	meter-per-second;	11 / 10;	1.1;	meter-per-second
+speed;	wind;	FI;	1;	1.0;	meter-per-second;	1;	1.0;	meter-per-second
+speed;	wind;	FI;	9 / 10;	0.9;	meter-per-second;	9 / 10;	0.9;	meter-per-second
 
-speed;  wind;   US; 15367 / 31250;  0.491744;   meter-per-second;   11 / 10;    1.1;    mile-per-hour
-speed;  wind;   US; 1397 / 3125;    0.44704;    meter-per-second;   1;  1.0;    mile-per-hour
-speed;  wind;   US; 12573 / 31250;  0.402336;   meter-per-second;   9 / 10; 0.9;    mile-per-hour
+speed;	wind;	US;	15367 / 31250;	0.491744;	meter-per-second;	11 / 10;	1.1;	mile-per-hour
+speed;	wind;	US;	1397 / 3125;	0.44704;	meter-per-second;	1;	1.0;	mile-per-hour
+speed;	wind;	US;	12573 / 31250;	0.402336;	meter-per-second;	9 / 10;	0.9;	mile-per-hour
 
-temperature;    default;    001;    1097 / 4;   274.25; kelvin; 11 / 10;    1.1;    celsius
-temperature;    default;    001;    5483 / 20;  274.15; kelvin; 1;  1.0;    celsius
-temperature;    default;    001;    5481 / 20;  274.05; kelvin; 9 / 10; 0.9;    celsius
+temperature;	default;	001;	1097 / 4;	274.25;	kelvin;	11 / 10;	1.1;	celsius
+temperature;	default;	001;	5483 / 20;	274.15;	kelvin;	1;	1.0;	celsius
+temperature;	default;	001;	5481 / 20;	274.05;	kelvin;	9 / 10;	0.9;	celsius
 
-temperature;    default;    US; 15359 / 60; 255.9833333333333;  kelvin; 11 / 10;    1.1;    fahrenheit
-temperature;    default;    US; 46067 / 180;    255.9277777777778;  kelvin; 1;  1.0;    fahrenheit
-temperature;    default;    US; 46057 / 180;    255.8722222222222;  kelvin; 9 / 10; 0.9;    fahrenheit
+temperature;	default;	US;	15359 / 60;	255.9833333333333;	kelvin;	11 / 10;	1.1;	fahrenheit
+temperature;	default;	US;	46067 / 180;	255.9277777777778;	kelvin;	1;	1.0;	fahrenheit
+temperature;	default;	US;	46057 / 180;	255.8722222222222;	kelvin;	9 / 10;	0.9;	fahrenheit
 
-temperature;    weather;    001;    1097 / 4;   274.25; kelvin; 11 / 10;    1.1;    celsius
-temperature;    weather;    001;    5483 / 20;  274.15; kelvin; 1;  1.0;    celsius
-temperature;    weather;    001;    5481 / 20;  274.05; kelvin; 9 / 10; 0.9;    celsius
+temperature;	weather;	001;	1097 / 4;	274.25;	kelvin;	11 / 10;	1.1;	celsius
+temperature;	weather;	001;	5483 / 20;	274.15;	kelvin;	1;	1.0;	celsius
+temperature;	weather;	001;	5481 / 20;	274.05;	kelvin;	9 / 10;	0.9;	celsius
 
-temperature;    weather;    BS; 15359 / 60; 255.9833333333333;  kelvin; 11 / 10;    1.1;    fahrenheit
-temperature;    weather;    BS; 46067 / 180;    255.9277777777778;  kelvin; 1;  1.0;    fahrenheit
-temperature;    weather;    BS; 46057 / 180;    255.8722222222222;  kelvin; 9 / 10; 0.9;    fahrenheit
+temperature;	weather;	BS;	15359 / 60;	255.9833333333333;	kelvin;	11 / 10;	1.1;	fahrenheit
+temperature;	weather;	BS;	46067 / 180;	255.9277777777778;	kelvin;	1;	1.0;	fahrenheit
+temperature;	weather;	BS;	46057 / 180;	255.8722222222222;	kelvin;	9 / 10;	0.9;	fahrenheit
 
-volume; default;    001;    11 / 10;    1.1;    cubic-meter;    11 / 10;    1.1;    cubic-meter
-volume; default;    001;    1;  1.0;    cubic-meter;    1;  1.0;    cubic-meter
-volume; default;    001;    9 / 10; 0.9;    cubic-meter;    900000; 900000.0;   cubic-centimeter
-volume; default;    001;    1 / 1000000;    1.0E-6; cubic-meter;    1;  1.0;    cubic-centimeter
-volume; default;    001;    9 / 10000000;   9.0E-7; cubic-meter;    9 / 10; 0.9;    cubic-centimeter
+volume;	default;	001;	11 / 10;	1.1;	cubic-meter;	11 / 10;	1.1;	cubic-meter
+volume;	default;	001;	1;	1.0;	cubic-meter;	1;	1.0;	cubic-meter
+volume;	default;	001;	9 / 10;	0.9;	cubic-meter;	900000;	900000.0;	cubic-centimeter
+volume;	default;	001;	1 / 1000000;	1.0E-6;	cubic-meter;	1;	1.0;	cubic-centimeter
+volume;	default;	001;	9 / 10000000;	9.0E-7;	cubic-meter;	9 / 10;	0.9;	cubic-centimeter
 
-volume; default;    GB; 608369751 / 19531250000;    0.0311485312512;    cubic-meter;    11 / 10;    1.1;    cubic-foot
-volume; default;    GB; 55306341 / 1953125000;  0.028316846592; cubic-meter;    1;  1.0;    cubic-foot
-volume; default;    GB; 497757069 / 19531250000;    0.0254851619328;    cubic-meter;    7776 / 5;   1555.2; cubic-inch
-volume; default;    GB; 2048383 / 125000000000; 1.6387064E-5;   cubic-meter;    1;  1.0;    cubic-inch
-volume; default;    GB; 18435447 / 1250000000000;   1.47483576E-5;  cubic-meter;    9 / 10; 0.9;    cubic-inch
+volume;	default;	GB;	608369751 / 19531250000;	0.0311485312512;	cubic-meter;	11 / 10;	1.1;	cubic-foot
+volume;	default;	GB;	55306341 / 1953125000;	0.028316846592;	cubic-meter;	1;	1.0;	cubic-foot
+volume;	default;	GB;	497757069 / 19531250000;	0.0254851619328;	cubic-meter;	7776 / 5;	1555.2;	cubic-inch
+volume;	default;	GB;	2048383 / 125000000000;	1.6387064E-5;	cubic-meter;	1;	1.0;	cubic-inch
+volume;	default;	GB;	18435447 / 1250000000000;	1.47483576E-5;	cubic-meter;	9 / 10;	0.9;	cubic-inch
 
-volume; fluid;  001;    11 / 10000; 0.0011; cubic-meter;    11 / 10;    1.1;    liter
-volume; fluid;  001;    1 / 1000;   0.001;  cubic-meter;    1;  1.0;    liter
-volume; fluid;  001;    9 / 10000;  9.0E-4; cubic-meter;    900;    900.0;  milliliter
-volume; fluid;  001;    1 / 1000000;    1.0E-6; cubic-meter;    1;  1.0;    milliliter
-volume; fluid;  001;    9 / 10000000;   9.0E-7; cubic-meter;    9 / 10; 0.9;    milliliter
+volume;	fluid;	001;	11 / 10000;	0.0011;	cubic-meter;	11 / 10;	1.1;	liter
+volume;	fluid;	001;	1 / 1000;	0.001;	cubic-meter;	1;	1.0;	liter
+volume;	fluid;	001;	9 / 10000;	9.0E-4;	cubic-meter;	900;	900.0;	milliliter
+volume;	fluid;	001;	1 / 1000000;	1.0E-6;	cubic-meter;	1;	1.0;	milliliter
+volume;	fluid;	001;	9 / 10000000;	9.0E-7;	cubic-meter;	9 / 10;	0.9;	milliliter
 
-volume; fluid;  US; 5204941203 / 1250000000000; 0.0041639529624;    cubic-meter;    11 / 10;    1.1;    gallon
-volume; fluid;  US; 473176473 / 125000000000;   0.003785411784; cubic-meter;    1;  1.0;    gallon
-volume; fluid;  US; 4258588257 / 1250000000000; 0.0034068706056;    cubic-meter;    18 / 5; 3.6;    quart
-volume; fluid;  US; 473176473 / 500000000000;   9.46352946E-4;  cubic-meter;    1;  1.0;    quart
-volume; fluid;  US; 4258588257 / 5000000000000; 8.517176514E-4; cubic-meter;    9 / 5;  1.8;    pint
-volume; fluid;  US; 473176473 / 1000000000000;  4.73176473E-4;  cubic-meter;    1;  1.0;    pint
-volume; fluid;  US; 4258588257 / 10000000000000;    4.258588257E-4; cubic-meter;    9 / 5;  1.8;    cup
-volume; fluid;  US; 473176473 / 2000000000000;  2.365882365E-4; cubic-meter;    1;  1.0;    cup
-volume; fluid;  US; 4258588257 / 20000000000000;    2.1292941285E-4;    cubic-meter;    36 / 5; 7.2;    fluid-ounce
-volume; fluid;  US; 473176473 / 16000000000000; 2.95735295625E-5;   cubic-meter;    1;  1.0;    fluid-ounce
-volume; fluid;  US; 4258588257 / 160000000000000;   2.661617660625E-5;  cubic-meter;    9 / 5;  1.8;    tablespoon
-volume; fluid;  US; 473176473 / 32000000000000; 1.478676478125E-5;  cubic-meter;    1;  1.0;    tablespoon
-volume; fluid;  US; 4258588257 / 320000000000000;   1.3308088303125E-5; cubic-meter;    27 / 10;    2.7;    teaspoon
-volume; fluid;  US; 157725491 / 32000000000000; 4.92892159375E-6;   cubic-meter;    1;  1.0;    teaspoon
-volume; fluid;  US; 1419529419 / 320000000000000;   4.436029434375E-6;  cubic-meter;    9 / 10; 0.9;    teaspoon
+volume;	fluid;	US;	5204941203 / 1250000000000;	0.0041639529624;	cubic-meter;	11 / 10;	1.1;	gallon
+volume;	fluid;	US;	473176473 / 125000000000;	0.003785411784;	cubic-meter;	1;	1.0;	gallon
+volume;	fluid;	US;	4258588257 / 1250000000000;	0.0034068706056;	cubic-meter;	18 / 5;	3.6;	quart
+volume;	fluid;	US;	473176473 / 500000000000;	9.46352946E-4;	cubic-meter;	1;	1.0;	quart
+volume;	fluid;	US;	4258588257 / 5000000000000;	8.517176514E-4;	cubic-meter;	9 / 5;	1.8;	pint
+volume;	fluid;	US;	473176473 / 1000000000000;	4.73176473E-4;	cubic-meter;	1;	1.0;	pint
+volume;	fluid;	US;	4258588257 / 10000000000000;	4.258588257E-4;	cubic-meter;	9 / 5;	1.8;	cup
+volume;	fluid;	US;	473176473 / 2000000000000;	2.365882365E-4;	cubic-meter;	1;	1.0;	cup
+volume;	fluid;	US;	4258588257 / 20000000000000;	2.1292941285E-4;	cubic-meter;	36 / 5;	7.2;	fluid-ounce
+volume;	fluid;	US;	473176473 / 16000000000000;	2.95735295625E-5;	cubic-meter;	1;	1.0;	fluid-ounce
+volume;	fluid;	US;	4258588257 / 160000000000000;	2.661617660625E-5;	cubic-meter;	9 / 5;	1.8;	tablespoon
+volume;	fluid;	US;	473176473 / 32000000000000;	1.478676478125E-5;	cubic-meter;	1;	1.0;	tablespoon
+volume;	fluid;	US;	4258588257 / 320000000000000;	1.3308088303125E-5;	cubic-meter;	27 / 10;	2.7;	teaspoon
+volume;	fluid;	US;	157725491 / 32000000000000;	4.92892159375E-6;	cubic-meter;	1;	1.0;	teaspoon
+volume;	fluid;	US;	1419529419 / 320000000000000;	4.436029434375E-6;	cubic-meter;	9 / 10;	0.9;	teaspoon
 
-volume; fluid;  GB; 5000699 / 1000000000;   0.005000699;    cubic-meter;    11 / 10;    1.1;    gallon-imperial
-volume; fluid;  GB; 454609 / 100000000; 0.00454609; cubic-meter;    1;  1.0;    gallon-imperial
-volume; fluid;  GB; 4091481 / 1000000000;   0.004091481;    cubic-meter;    144;    144.0;  fluid-ounce-imperial
-volume; fluid;  GB; 454609 / 16000000000;   2.84130625E-5;  cubic-meter;    1;  1.0;    fluid-ounce-imperial
-volume; fluid;  GB; 4091481 / 160000000000; 2.557175625E-5; cubic-meter;    9 / 10; 0.9;    fluid-ounce-imperial
+volume;	fluid;	GB;	5000699 / 1000000000;	0.005000699;	cubic-meter;	11 / 10;	1.1;	gallon-imperial
+volume;	fluid;	GB;	454609 / 100000000;	0.00454609;	cubic-meter;	1;	1.0;	gallon-imperial
+volume;	fluid;	GB;	4091481 / 1000000000;	0.004091481;	cubic-meter;	144;	144.0;	fluid-ounce-imperial
+volume;	fluid;	GB;	454609 / 16000000000;	2.84130625E-5;	cubic-meter;	1;	1.0;	fluid-ounce-imperial
+volume;	fluid;	GB;	4091481 / 160000000000;	2.557175625E-5;	cubic-meter;	9 / 10;	0.9;	fluid-ounce-imperial
 
-volume; oil;    001;    109303765263 / 625000000000;    0.1748860244208;    cubic-meter;    11 / 10;    1.1;    barrel
-volume; oil;    001;    9936705933 / 62500000000;   0.158987294928; cubic-meter;    1;  1.0;    barrel
-volume; oil;    001;    89430353397 / 625000000000; 0.1430885654352;    cubic-meter;    9 / 10; 0.9;    barrel
+volume;	oil;	001;	109303765263 / 625000000000;	0.1748860244208;	cubic-meter;	11 / 10;	1.1;	barrel
+volume;	oil;	001;	9936705933 / 62500000000;	0.158987294928;	cubic-meter;	1;	1.0;	barrel
+volume;	oil;	001;	89430353397 / 625000000000;	0.1430885654352;	cubic-meter;	9 / 10;	0.9;	barrel
 
-volume; vehicle;    US; 5204941203 / 1250000000000; 0.0041639529624;    cubic-meter;    11 / 10;    1.1;    gallon
-volume; vehicle;    US; 473176473 / 125000000000;   0.003785411784; cubic-meter;    1;  1.0;    gallon
-volume; vehicle;    US; 4258588257 / 1250000000000; 0.0034068706056;    cubic-meter;    9 / 10; 0.9;    gallon
+volume;	vehicle;	US;	5204941203 / 1250000000000;	0.0041639529624;	cubic-meter;	11 / 10;	1.1;	gallon
+volume;	vehicle;	US;	473176473 / 125000000000;	0.003785411784;	cubic-meter;	1;	1.0;	gallon
+volume;	vehicle;	US;	4258588257 / 1250000000000;	0.0034068706056;	cubic-meter;	9 / 10;	0.9;	gallon
 
-volume; vehicle;    001;    11 / 10000; 0.0011; cubic-meter;    11 / 10;    1.1;    liter
-volume; vehicle;    001;    1 / 1000;   0.001;  cubic-meter;    1;  1.0;    liter
-volume; vehicle;    001;    9 / 10000;  9.0E-4; cubic-meter;    9 / 10; 0.9;    liter
+volume;	vehicle;	001;	11 / 10000;	0.0011;	cubic-meter;	11 / 10;	1.1;	liter
+volume;	vehicle;	001;	1 / 1000;	0.001;	cubic-meter;	1;	1.0;	liter
+volume;	vehicle;	001;	9 / 10000;	9.0E-4;	cubic-meter;	9 / 10;	0.9;	liter
 
-year-duration;  default;    001;    11 / 10;    1.1;    year;   11 / 10;    1.1;    year
-year-duration;  default;    001;    1;  1.0;    year;   1;  1.0;    year
-year-duration;  default;    001;    9 / 10; 0.9;    year;   54 / 5; 10.8;   month
-year-duration;  default;    001;    1 / 12; 0.08333333333333333;    year;   1;  1.0;    month
-year-duration;  default;    001;    3 / 40; 0.075;  year;   9 / 10; 0.9;    month
+year-duration;	default;	001;	11 / 10;	1.1;	year;	11 / 10;	1.1;	year
+year-duration;	default;	001;	1;	1.0;	year;	1;	1.0;	year
+year-duration;	default;	001;	9 / 10;	0.9;	year;	54 / 5;	10.8;	month
+year-duration;	default;	001;	1 / 12;	0.08333333333333333;	year;	1;	1.0;	month
+year-duration;	default;	001;	3 / 40;	0.075;	year;	9 / 10;	0.9;	month
 
-year-duration;  person-age; 001;    13 / 5; 2.6;    year;   13 / 5; 2.6;    year-person
-year-duration;  person-age; 001;    5 / 2;  2.5;    year;   5 / 2;  2.5;    year-person
-year-duration;  person-age; 001;    12 / 5; 2.4;    year;   2;  year-person;    24 / 5; 4.8;    month-person
-year-duration;  person-age; 001;    1;  1.0;    year;   1;  year-person;    0;  0.0;    month-person
-year-duration;  person-age; 001;    9 / 10; 0.9;    year;   54 / 5; 10.8;   month-person
-year-duration;  person-age; 001;    1 / 12; 0.08333333333333333;    year;   1;  1.0;    month-person
-year-duration;  person-age; 001;    3 / 40; 0.075;  year;   9 / 10; 0.9;    month-person
+year-duration;	person-age;	001;	13 / 5;	2.6;	year;	13 / 5;	2.6;	year-person
+year-duration;	person-age;	001;	5 / 2;	2.5;	year;	5 / 2;	2.5;	year-person
+year-duration;	person-age;	001;	12 / 5;	2.4;	year;	2;	year-person;	24 / 5;	4.8;	month-person
+year-duration;	person-age;	001;	1;	1.0;	year;	1;	year-person;	0;	0.0;	month-person
+year-duration;	person-age;	001;	9 / 10;	0.9;	year;	54 / 5;	10.8;	month-person
+year-duration;	person-age;	001;	1 / 12;	0.08333333333333333;	year;	1;	1.0;	month-person
+year-duration;	person-age;	001;	3 / 40;	0.075;	year;	9 / 10;	0.9;	month-person
diff --git a/icu4c/source/test/testdata/cldr/units/unitsTest.txt b/icu4c/source/test/testdata/cldr/units/unitsTest.txt
index 82b7f3a..d2facef 100644
--- a/icu4c/source/test/testdata/cldr/units/unitsTest.txt
+++ b/icu4c/source/test/testdata/cldr/units/unitsTest.txt
@@ -5,7 +5,7 @@
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
-#   Quantity    ;   x   ;   y   ;   conversion to y (rational)  ;   test: 1000 x ⟹ y
+#	Quantity	;	x	;	y	;	conversion to y (rational)	;	test: 1000 x ⟹ y
 #
 # Use: convert 1000 x units to the y unit; the result should match the final column,
 #   at the given precision. For example, when the last column is 159.1549,
@@ -14,181 +14,190 @@
 #
 # Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestParseUnit results.
 
-acceleration    ;   meter-per-square-second ;   meter-per-square-second ;   1 * x   ;   1,000.00
-acceleration    ;   g-force ;   meter-per-square-second ;   9.80665 * x ;   9806.65
-angle   ;   arc-second  ;   revolution  ;   0.0000625/81 * x    ;   7.716049E-4
-angle   ;   arc-minute  ;   revolution  ;   0.00125/27 * x  ;   0.0462963
-angle   ;   degree  ;   revolution  ;   0.025/9 * x ;   2.777778
-angle   ;   radian  ;   revolution  ;   65,501,488/411,557,987 * x  ;   159.1549
-angle   ;   revolution  ;   revolution  ;   1 * x   ;   1,000.00
-area    ;   square-centimeter   ;   square-meter    ;   0.0001 * x  ;   0.1
-area    ;   square-inch ;   square-meter    ;   0.00064516 * x  ;   0.64516
-area    ;   square-foot ;   square-meter    ;   0.09290304 * x  ;   92.90304
-area    ;   square-yard ;   square-meter    ;   0.83612736 * x  ;   836.1274
-area    ;   square-meter    ;   square-meter    ;   1 * x   ;   1,000.00
-area    ;   dunam   ;   square-meter    ;   1,000 * x   ;   1000000.0
-area    ;   acre    ;   square-meter    ;   4,046.8564224 * x   ;   4046856.0
-area    ;   hectare ;   square-meter    ;   10,000 * x  ;   1.0E7
-area    ;   square-kilometer    ;   square-meter    ;   1,000,000 * x   ;   1.0E9
-area    ;   square-mile ;   square-meter    ;   2,589,988.110336 * x    ;   2.589988E9
-concentration   ;   millimole-per-liter ;   item-per-cubic-meter    ;   602,214,076,000,000,000,000,000 * x ;   6.022141E26
-consumption ;   liter-per-100-kilometer ;   cubic-meter-per-meter   ;   0.00000001 * x  ;   1.0E-5
-consumption ;   liter-per-kilometer ;   cubic-meter-per-meter   ;   0.000001 * x    ;   0.001
-consumption-inverse ;   mile-per-gallon-imperial    ;   meter-per-cubic-meter   ;   160,934,400,000/454,609 * x ;   3.540062E8
-consumption-inverse ;   mile-per-gallon ;   meter-per-cubic-meter   ;   48,000,000,000/112,903 * x  ;   4.251437E8
-digital ;   bit ;   bit ;   1 * x   ;   1,000.00
-digital ;   byte    ;   bit ;   8 * x   ;   8000.0
-digital ;   kilobit ;   bit ;   1,000 * x   ;   1000000.0
-digital ;   kilobyte    ;   bit ;   8,000 * x   ;   8000000.0
-digital ;   megabit ;   bit ;   1,000,000 * x   ;   1.0E9
-digital ;   megabyte    ;   bit ;   8,000,000 * x   ;   8.0E9
-digital ;   gigabit ;   bit ;   1,000,000,000 * x   ;   1.0E12
-digital ;   gigabyte    ;   bit ;   8,000,000,000 * x   ;   8.0E12
-digital ;   terabit ;   bit ;   1,000,000,000,000 * x   ;   1.0E15
-digital ;   terabyte    ;   bit ;   8,000,000,000,000 * x   ;   8.0E15
-digital ;   petabyte    ;   bit ;   8,000,000,000,000,000 * x   ;   8.0E18
-duration    ;   nanosecond  ;   second  ;   0.000000001 * x ;   1.0E-6
-duration    ;   microsecond ;   second  ;   0.000001 * x    ;   0.001
-duration    ;   millisecond ;   second  ;   0.001 * x   ;   1.0
-duration    ;   second  ;   second  ;   1 * x   ;   1,000.00
-duration    ;   minute  ;   second  ;   60 * x  ;   60000.0
-duration    ;   hour    ;   second  ;   3,600 * x   ;   3600000.0
-duration    ;   day ;   second  ;   86,400 * x  ;   8.64E7
-duration    ;   day-person  ;   second  ;   86,400 * x  ;   8.64E7
-duration    ;   week    ;   second  ;   604,800 * x ;   6.048E8
-duration    ;   week-person ;   second  ;   604,800 * x ;   6.048E8
-electric-current    ;   milliampere ;   ampere  ;   0.001 * x   ;   1.0
-electric-current    ;   ampere  ;   ampere  ;   1 * x   ;   1,000.00
-electric-resistance ;   ohm ;   kilogram-square-meter-per-cubic-second-square-ampere    ;   1 * x   ;   1000.0
-energy  ;   electronvolt    ;   kilogram-square-meter-per-square-second ;   0.0000000000000000001602177 * x ;   1.602177E-16
-energy  ;   dalton  ;   kilogram-square-meter-per-square-second ;   0.00000000014924180856 * x  ;   1.492418E-7
-energy  ;   joule   ;   kilogram-square-meter-per-square-second ;   1 * x   ;   1000.0
-energy  ;   newton-meter    ;   kilogram-square-meter-per-square-second ;   1 * x   ;   1000.0
-energy  ;   pound-force-foot    ;   kilogram-square-meter-per-square-second ;   1.3558179483314004 * x  ;   1355.818
-energy  ;   calorie ;   kilogram-square-meter-per-square-second ;   4.184 * x   ;   4184.0
-energy  ;   kilojoule   ;   kilogram-square-meter-per-square-second ;   1,000 * x   ;   1000000.0
-energy  ;   british-thermal-unit    ;   kilogram-square-meter-per-square-second ;   9,489.1523804/9 * x ;   1054350.0
-energy  ;   foodcalorie ;   kilogram-square-meter-per-square-second ;   4,184 * x   ;   4184000.0
-energy  ;   kilocalorie ;   kilogram-square-meter-per-square-second ;   4,184 * x   ;   4184000.0
-energy  ;   kilowatt-hour   ;   kilogram-square-meter-second-per-cubic-second   ;   3,600,000 * x   ;   3.6E9
-energy  ;   therm-us    ;   kilogram-square-meter-per-square-second ;   105,480,400 * x ;   1.054804E11
-force   ;   newton  ;   kilogram-meter-per-square-second    ;   1 * x   ;   1000.0
-force   ;   pound-force ;   kilogram-meter-per-square-second    ;   4.4482216152605 * x ;   4448.222
-frequency   ;   hertz   ;   revolution-per-second   ;   1 * x   ;   1000.0
-frequency   ;   kilohertz   ;   revolution-per-second   ;   1,000 * x   ;   1000000.0
-frequency   ;   megahertz   ;   revolution-per-second   ;   1,000,000 * x   ;   1.0E9
-frequency   ;   gigahertz   ;   revolution-per-second   ;   1,000,000,000 * x   ;   1.0E12
-graphics    ;   dot ;   pixel   ;   1 * x   ;   1000.0
-graphics    ;   pixel   ;   pixel   ;   1 * x   ;   1,000.00
-graphics    ;   megapixel   ;   pixel   ;   1,000,000 * x   ;   1.0E9
-length  ;   picometer   ;   meter   ;   0.000000000001 * x  ;   1.0E-9
-length  ;   nanometer   ;   meter   ;   0.000000001 * x ;   1.0E-6
-length  ;   micrometer  ;   meter   ;   0.000001 * x    ;   0.001
-length  ;   point   ;   meter   ;   0.003175/9 * x  ;   0.3527778
-length  ;   millimeter  ;   meter   ;   0.001 * x   ;   1.0
-length  ;   centimeter  ;   meter   ;   0.01 * x    ;   10.0
-length  ;   inch    ;   meter   ;   0.0254 * x  ;   25.4
-length  ;   decimeter   ;   meter   ;   0.1 * x ;   100.0
-length  ;   foot    ;   meter   ;   0.3048 * x  ;   304.8
-length  ;   yard    ;   meter   ;   0.9144 * x  ;   914.4
-length  ;   meter   ;   meter   ;   1 * x   ;   1,000.00
-length  ;   fathom  ;   meter   ;   1.8288 * x  ;   1828.8
-length  ;   furlong ;   meter   ;   201.168 * x ;   201168.0
-length  ;   kilometer   ;   meter   ;   1,000 * x   ;   1000000.0
-length  ;   mile    ;   meter   ;   1,609.344 * x   ;   1609344.0
-length  ;   nautical-mile   ;   meter   ;   1,852 * x   ;   1852000.0
-length  ;   mile-scandinavian   ;   meter   ;   10,000 * x  ;   1.0E7
-length  ;   100-kilometer   ;   meter   ;   100,000 * x ;   1.0E8
-length  ;   earth-radius    ;   meter   ;   6,378,100 * x   ;   6.3781E9
-length  ;   solar-radius    ;   meter   ;   695,700,000 * x ;   6.957E11
-length  ;   astronomical-unit   ;   meter   ;   149,597,900,000 * x ;   1.495979E14
-length  ;   light-year  ;   meter   ;   9,460,730,000,000,000 * x   ;   9.46073E18
-length  ;   parsec  ;   meter   ;   30,856,780,000,000,000 * x  ;   3.085678E19
-luminous-flux   ;   lux ;   candela-square-meter-per-square-meter   ;   1 * x   ;   1000.0
-luminous-intensity  ;   candela ;   candela ;   1 * x   ;   1,000.00
-mass    ;   microgram   ;   kilogram    ;   0.000000001 * x ;   1.0E-6
-mass    ;   milligram   ;   kilogram    ;   0.000001 * x    ;   0.001
-mass    ;   carat   ;   kilogram    ;   0.0002 * x  ;   0.2
-mass    ;   gram    ;   kilogram    ;   0.001 * x   ;   1.0
-mass    ;   ounce   ;   kilogram    ;   0.028349523125 * x  ;   28.34952
-mass    ;   ounce-troy  ;   kilogram    ;   0.03110348 * x  ;   31.10348
-mass    ;   pound   ;   kilogram    ;   0.45359237 * x  ;   453.5924
-mass    ;   kilogram    ;   kilogram    ;   1 * x   ;   1,000.00
-mass    ;   stone   ;   kilogram    ;   6.35029318 * x  ;   6350.293
-mass    ;   ton ;   kilogram    ;   907.18474 * x   ;   907184.7
-mass    ;   metric-ton  ;   kilogram    ;   1,000 * x   ;   1000000.0
-mass    ;   earth-mass  ;   kilogram    ;   5,972,200,000,000,000,000,000,000 * x   ;   5.9722E27
-mass    ;   solar-mass  ;   kilogram    ;   1,988,470,000,000,000,000,000,000,000,000 * x   ;   1.98847E33
-mass-density    ;   milligram-per-deciliter ;   kilogram-per-cubic-meter    ;   0.01 * x    ;   10.0
-portion ;   permillion  ;   portion ;   0.000001 * x    ;   0.001
-portion ;   permyriad   ;   portion ;   0.0001 * x  ;   0.1
-portion ;   permille    ;   portion ;   0.001 * x   ;   1.0
-portion ;   percent ;   portion ;   0.01 * x    ;   10.0
-portion ;   karat   ;   portion ;   0.125/3 * x ;   41.66667
-portion ;   portion ;   portion ;   1 * x   ;   1,000.00
-power   ;   milliwatt   ;   kilogram-square-meter-per-cubic-second  ;   0.001 * x   ;   1.0
-power   ;   watt    ;   kilogram-square-meter-per-cubic-second  ;   1 * x   ;   1000.0
-power   ;   horsepower  ;   kilogram-square-meter-per-cubic-second  ;   745.69987158227022 * x  ;   745699.9
-power   ;   kilowatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000 * x   ;   1000000.0
-power   ;   megawatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000,000 * x   ;   1.0E9
-power   ;   gigawatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000,000,000 * x   ;   1.0E12
-power   ;   solar-luminosity    ;   kilogram-square-meter-per-cubic-second  ;   382,800,000,000,000,000,000,000,000 * x ;   3.828E29
-pressure    ;   pascal  ;   kilogram-per-meter-square-second    ;   1 * x   ;   1000.0
-pressure    ;   hectopascal ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
-pressure    ;   millibar    ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
-pressure    ;   millimeter-ofhg ;   kilogram-meter-per-square-meter-square-second   ;   133.322387415 * x   ;   133322.4
-pressure    ;   kilopascal  ;   kilogram-per-meter-square-second    ;   1,000 * x   ;   1000000.0
-pressure    ;   inch-ofhg   ;   kilogram-meter-per-square-meter-square-second   ;   3,386.388640341 * x ;   3386389.0
-pressure    ;   pound-force-per-square-inch ;   kilogram-meter-per-square-meter-square-second   ;   111,205,540.3815125/16,129 * x  ;   6894757.0
-pressure    ;   bar ;   kilogram-per-meter-square-second    ;   100,000 * x ;   1.0E8
-pressure    ;   atmosphere  ;   kilogram-per-meter-square-second    ;   101,325 * x ;   1.01325E8
-pressure    ;   megapascal  ;   kilogram-per-meter-square-second    ;   1,000,000 * x   ;   1.0E9
-pressure-per-length ;   ofhg    ;   kilogram-per-square-meter-square-second ;   133,322.387415 * x  ;   1.333224E8
-resolution  ;   dot-per-inch    ;   pixel-per-meter ;   5,000/127 * x   ;   39370.08
-resolution  ;   pixel-per-inch  ;   pixel-per-meter ;   5,000/127 * x   ;   39370.08
-resolution  ;   dot-per-centimeter  ;   pixel-per-meter ;   100 * x ;   100000.0
-resolution  ;   pixel-per-centimeter    ;   pixel-per-meter ;   100 * x ;   100000.0
-speed   ;   kilometer-per-hour  ;   meter-per-second    ;   2.5/9 * x   ;   277.7778
-speed   ;   mile-per-hour   ;   meter-per-second    ;   0.44704 * x ;   447.04
-speed   ;   knot    ;   meter-per-second    ;   4.63/9 * x  ;   514.4444
-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 ;   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
-typewidth   ;   em  ;   em  ;   1 * x   ;   1,000.00
-voltage ;   volt    ;   kilogram-square-meter-per-cubic-second-ampere   ;   1 * x   ;   1000.0
-volume  ;   cubic-centimeter    ;   cubic-meter ;   0.000001 * x    ;   0.001
-volume  ;   milliliter  ;   cubic-meter ;   0.000001 * x    ;   0.001
-volume  ;   teaspoon    ;   cubic-meter ;   0.00000492892159375 * x ;   0.004928922
-volume  ;   centiliter  ;   cubic-meter ;   0.00001 * x ;   0.01
-volume  ;   tablespoon  ;   cubic-meter ;   0.00001478676478125 * x ;   0.01478676
-volume  ;   cubic-inch  ;   cubic-meter ;   0.000016387064 * x  ;   0.01638706
-volume  ;   fluid-ounce-imperial    ;   cubic-meter ;   0.0000284130625 * x ;   0.02841306
-volume  ;   fluid-ounce ;   cubic-meter ;   0.0000295735295625 * x  ;   0.02957353
-volume  ;   deciliter   ;   cubic-meter ;   0.0001 * x  ;   0.1
-volume  ;   cup ;   cubic-meter ;   0.0002365882365 * x ;   0.2365882
-volume  ;   cup-metric  ;   cubic-meter ;   0.00025 * x ;   0.25
-volume  ;   pint    ;   cubic-meter ;   0.000473176473 * x  ;   0.4731765
-volume  ;   pint-metric ;   cubic-meter ;   0.0005 * x  ;   0.5
-volume  ;   quart   ;   cubic-meter ;   0.000946352946 * x  ;   0.9463529
-volume  ;   liter   ;   cubic-meter ;   0.001 * x   ;   1.0
-volume  ;   gallon  ;   cubic-meter ;   0.003785411784 * x  ;   3.785412
-volume  ;   gallon-imperial ;   cubic-meter ;   0.00454609 * x  ;   4.54609
-volume  ;   cubic-foot  ;   cubic-meter ;   0.028316846592 * x  ;   28.31685
-volume  ;   bushel  ;   cubic-meter ;   0.03523907016688 * x    ;   35.23907
-volume  ;   hectoliter  ;   cubic-meter ;   0.1 * x ;   100.0
-volume  ;   barrel  ;   cubic-meter ;   0.158987294928 * x  ;   158.9873
-volume  ;   cubic-yard  ;   cubic-meter ;   0.764554857984 * x  ;   764.5549
-volume  ;   cubic-meter ;   cubic-meter ;   1 * x   ;   1,000.00
-volume  ;   megaliter   ;   cubic-meter ;   1,000 * x   ;   1000000.0
-volume  ;   acre-foot   ;   cubic-meter ;   1,233.48183754752 * x   ;   1233482.0
-volume  ;   cubic-kilometer ;   cubic-meter ;   1,000,000,000 * x   ;   1.0E12
-volume  ;   cubic-mile  ;   cubic-meter ;   4,168,181,825.440579584 * x ;   4.168182E12
-year-duration   ;   month   ;   year    ;   0.25/3 * x  ;   83.33333
-year-duration   ;   month-person    ;   year    ;   0.25/3 * x  ;   83.33333
-year-duration   ;   year    ;   year    ;   1 * x   ;   1,000.00
-year-duration   ;   year-person ;   year    ;   1 * x   ;   1000.0
-year-duration   ;   decade  ;   year    ;   10 * x  ;   10000.0
-year-duration   ;   century ;   year    ;   100 * x ;   100000.0
+acceleration	;	meter-per-square-second	;	meter-per-square-second	;	1 * x	;	1,000.00
+acceleration	;	g-force	;	meter-per-square-second	;	9.80665 * x	;	9806.65
+angle	;	arc-second	;	revolution	;	0.0000625/81 * x	;	7.716049E-4
+angle	;	arc-minute	;	revolution	;	0.00125/27 * x	;	0.0462963
+angle	;	degree	;	revolution	;	0.025/9 * x	;	2.777778
+angle	;	radian	;	revolution	;	65,501,488/411,557,987 * x	;	159.1549
+angle	;	revolution	;	revolution	;	1 * x	;	1,000.00
+area	;	square-centimeter	;	square-meter	;	0.0001 * x	;	0.1
+area	;	square-inch	;	square-meter	;	0.00064516 * x	;	0.64516
+area	;	square-foot	;	square-meter	;	0.09290304 * x	;	92.90304
+area	;	square-yard	;	square-meter	;	0.83612736 * x	;	836.1274
+area	;	square-meter	;	square-meter	;	1 * x	;	1,000.00
+area	;	dunam	;	square-meter	;	1,000 * x	;	1000000.0
+area	;	acre	;	square-meter	;	4,046.8564224 * x	;	4046856.0
+area	;	hectare	;	square-meter	;	10,000 * x	;	1.0E7
+area	;	square-kilometer	;	square-meter	;	1,000,000 * x	;	1.0E9
+area	;	square-mile	;	square-meter	;	2,589,988.110336 * x	;	2.589988E9
+concentration	;	millimole-per-liter	;	item-per-cubic-meter	;	602,214,076,000,000,000,000,000 * x	;	6.022141E26
+consumption	;	liter-per-100-kilometer	;	cubic-meter-per-meter	;	0.00000001 * x	;	1.0E-5
+consumption	;	liter-per-kilometer	;	cubic-meter-per-meter	;	0.000001 * x	;	0.001
+consumption-inverse	;	mile-per-gallon-imperial	;	meter-per-cubic-meter	;	160,934,400,000/454,609 * x	;	3.540062E8
+consumption-inverse	;	mile-per-gallon	;	meter-per-cubic-meter	;	48,000,000,000/112,903 * x	;	4.251437E8
+digital	;	bit	;	bit	;	1 * x	;	1,000.00
+digital	;	byte	;	bit	;	8 * x	;	8000.0
+digital	;	kilobit	;	bit	;	1,000 * x	;	1000000.0
+digital	;	kilobyte	;	bit	;	8,000 * x	;	8000000.0
+digital	;	megabit	;	bit	;	1,000,000 * x	;	1.0E9
+digital	;	megabyte	;	bit	;	8,000,000 * x	;	8.0E9
+digital	;	gigabit	;	bit	;	1,000,000,000 * x	;	1.0E12
+digital	;	gigabyte	;	bit	;	8,000,000,000 * x	;	8.0E12
+digital	;	terabit	;	bit	;	1,000,000,000,000 * x	;	1.0E15
+digital	;	terabyte	;	bit	;	8,000,000,000,000 * x	;	8.0E15
+digital	;	petabyte	;	bit	;	8,000,000,000,000,000 * x	;	8.0E18
+duration	;	nanosecond	;	second	;	0.000000001 * x	;	1.0E-6
+duration	;	microsecond	;	second	;	0.000001 * x	;	0.001
+duration	;	millisecond	;	second	;	0.001 * x	;	1.0
+duration	;	second	;	second	;	1 * x	;	1,000.00
+duration	;	minute	;	second	;	60 * x	;	60000.0
+duration	;	hour	;	second	;	3,600 * x	;	3600000.0
+duration	;	day	;	second	;	86,400 * x	;	8.64E7
+duration	;	day-person	;	second	;	86,400 * x	;	8.64E7
+duration	;	week	;	second	;	604,800 * x	;	6.048E8
+duration	;	week-person	;	second	;	604,800 * x	;	6.048E8
+electric-current	;	milliampere	;	ampere	;	0.001 * x	;	1.0
+electric-current	;	ampere	;	ampere	;	1 * x	;	1,000.00
+electric-resistance	;	ohm	;	kilogram-square-meter-per-cubic-second-square-ampere	;	1 * x	;	1000.0
+energy	;	electronvolt	;	kilogram-square-meter-per-square-second	;	0.0000000000000000001602177 * x	;	1.602177E-16
+energy	;	dalton	;	kilogram-square-meter-per-square-second	;	0.00000000014924180856 * x	;	1.492418E-7
+energy	;	joule	;	kilogram-square-meter-per-square-second	;	1 * x	;	1000.0
+energy	;	newton-meter	;	kilogram-square-meter-per-square-second	;	1 * x	;	1000.0
+energy	;	pound-force-foot	;	kilogram-square-meter-per-square-second	;	1.3558179483314004 * x	;	1355.818
+energy	;	calorie	;	kilogram-square-meter-per-square-second	;	4.184 * x	;	4184.0
+energy	;	kilojoule	;	kilogram-square-meter-per-square-second	;	1,000 * x	;	1000000.0
+energy	;	british-thermal-unit	;	kilogram-square-meter-per-square-second	;	9,489.1523804/9 * x	;	1054350.0
+energy	;	foodcalorie	;	kilogram-square-meter-per-square-second	;	4,184 * x	;	4184000.0
+energy	;	kilocalorie	;	kilogram-square-meter-per-square-second	;	4,184 * x	;	4184000.0
+energy	;	kilowatt-hour	;	kilogram-square-meter-second-per-cubic-second	;	3,600,000 * x	;	3.6E9
+energy	;	therm-us	;	kilogram-square-meter-per-square-second	;	105,480,400 * x	;	1.054804E11
+force	;	newton	;	kilogram-meter-per-square-second	;	1 * x	;	1000.0
+force	;	pound-force	;	kilogram-meter-per-square-second	;	4.4482216152605 * x	;	4448.222
+frequency	;	hertz	;	revolution-per-second	;	1 * x	;	1000.0
+frequency	;	kilohertz	;	revolution-per-second	;	1,000 * x	;	1000000.0
+frequency	;	megahertz	;	revolution-per-second	;	1,000,000 * x	;	1.0E9
+frequency	;	gigahertz	;	revolution-per-second	;	1,000,000,000 * x	;	1.0E12
+graphics	;	dot	;	pixel	;	1 * x	;	1000.0
+graphics	;	pixel	;	pixel	;	1 * x	;	1,000.00
+graphics	;	megapixel	;	pixel	;	1,000,000 * x	;	1.0E9
+illuminance	;	lux	;	candela-per-square-meter	;	1 * x	;	1000.0
+length	;	picometer	;	meter	;	0.000000000001 * x	;	1.0E-9
+length	;	nanometer	;	meter	;	0.000000001 * x	;	1.0E-6
+length	;	micrometer	;	meter	;	0.000001 * x	;	0.001
+length	;	point	;	meter	;	0.003175/9 * x	;	0.3527778
+length	;	millimeter	;	meter	;	0.001 * x	;	1.0
+length	;	centimeter	;	meter	;	0.01 * x	;	10.0
+length	;	inch	;	meter	;	0.0254 * x	;	25.4
+length	;	decimeter	;	meter	;	0.1 * x	;	100.0
+length	;	foot	;	meter	;	0.3048 * x	;	304.8
+length	;	yard	;	meter	;	0.9144 * x	;	914.4
+length	;	meter	;	meter	;	1 * x	;	1,000.00
+length	;	fathom	;	meter	;	1.8288 * x	;	1828.8
+length	;	furlong	;	meter	;	201.168 * x	;	201168.0
+length	;	kilometer	;	meter	;	1,000 * x	;	1000000.0
+length	;	mile	;	meter	;	1,609.344 * x	;	1609344.0
+length	;	nautical-mile	;	meter	;	1,852 * x	;	1852000.0
+length	;	mile-scandinavian	;	meter	;	10,000 * x	;	1.0E7
+length	;	100-kilometer	;	meter	;	100,000 * x	;	1.0E8
+length	;	earth-radius	;	meter	;	6,378,100 * x	;	6.3781E9
+length	;	solar-radius	;	meter	;	695,700,000 * x	;	6.957E11
+length	;	astronomical-unit	;	meter	;	149,597,900,000 * x	;	1.495979E14
+length	;	light-year	;	meter	;	9,460,730,000,000,000 * x	;	9.46073E18
+length	;	parsec	;	meter	;	30,856,780,000,000,000 * x	;	3.085678E19
+luminous-flux	;	lumen	;	candela-square-meter-per-square-meter	;	1 * x	;	1000.0
+luminous-intensity	;	candela	;	candela	;	1 * x	;	1,000.00
+mass	;	microgram	;	kilogram	;	0.000000001 * x	;	1.0E-6
+mass	;	milligram	;	kilogram	;	0.000001 * x	;	0.001
+mass	;	grain	;	kilogram	;	0.00006479891 * x	;	0.06479891
+mass	;	carat	;	kilogram	;	0.0002 * x	;	0.2
+mass	;	gram	;	kilogram	;	0.001 * x	;	1.0
+mass	;	ounce	;	kilogram	;	0.028349523125 * x	;	28.34952
+mass	;	ounce-troy	;	kilogram	;	0.03110348 * x	;	31.10348
+mass	;	pound	;	kilogram	;	0.45359237 * x	;	453.5924
+mass	;	kilogram	;	kilogram	;	1 * x	;	1,000.00
+mass	;	stone	;	kilogram	;	6.35029318 * x	;	6350.293
+mass	;	ton	;	kilogram	;	907.18474 * x	;	907184.7
+mass	;	metric-ton	;	kilogram	;	1,000 * x	;	1000000.0
+mass	;	earth-mass	;	kilogram	;	5,972,200,000,000,000,000,000,000 * x	;	5.9722E27
+mass	;	solar-mass	;	kilogram	;	1,988,470,000,000,000,000,000,000,000,000 * x	;	1.98847E33
+mass-density	;	milligram-per-deciliter	;	kilogram-per-cubic-meter	;	0.01 * x	;	10.0
+portion	;	permillion	;	portion	;	0.000001 * x	;	0.001
+portion	;	permyriad	;	portion	;	0.0001 * x	;	0.1
+portion	;	permille	;	portion	;	0.001 * x	;	1.0
+portion	;	percent	;	portion	;	0.01 * x	;	10.0
+portion	;	karat	;	portion	;	0.125/3 * x	;	41.66667
+portion	;	portion	;	portion	;	1 * x	;	1,000.00
+power	;	milliwatt	;	kilogram-square-meter-per-cubic-second	;	0.001 * x	;	1.0
+power	;	watt	;	kilogram-square-meter-per-cubic-second	;	1 * x	;	1000.0
+power	;	horsepower	;	kilogram-square-meter-per-cubic-second	;	745.69987158227022 * x	;	745699.9
+power	;	kilowatt	;	kilogram-square-meter-per-cubic-second	;	1,000 * x	;	1000000.0
+power	;	megawatt	;	kilogram-square-meter-per-cubic-second	;	1,000,000 * x	;	1.0E9
+power	;	gigawatt	;	kilogram-square-meter-per-cubic-second	;	1,000,000,000 * x	;	1.0E12
+power	;	solar-luminosity	;	kilogram-square-meter-per-cubic-second	;	382,800,000,000,000,000,000,000,000 * x	;	3.828E29
+pressure	;	pascal	;	kilogram-per-meter-square-second	;	1 * x	;	1000.0
+pressure	;	hectopascal	;	kilogram-per-meter-square-second	;	100 * x	;	100000.0
+pressure	;	millibar	;	kilogram-per-meter-square-second	;	100 * x	;	100000.0
+pressure	;	millimeter-ofhg	;	kilogram-meter-per-square-meter-square-second	;	133.322387415 * x	;	133322.4
+pressure	;	kilopascal	;	kilogram-per-meter-square-second	;	1,000 * x	;	1000000.0
+pressure	;	inch-ofhg	;	kilogram-meter-per-square-meter-square-second	;	3,386.388640341 * x	;	3386389.0
+pressure	;	pound-force-per-square-inch	;	kilogram-meter-per-square-meter-square-second	;	111,205,540.3815125/16,129 * x	;	6894757.0
+pressure	;	bar	;	kilogram-per-meter-square-second	;	100,000 * x	;	1.0E8
+pressure	;	atmosphere	;	kilogram-per-meter-square-second	;	101,325 * x	;	1.01325E8
+pressure	;	megapascal	;	kilogram-per-meter-square-second	;	1,000,000 * x	;	1.0E9
+pressure-per-length	;	ofhg	;	kilogram-per-square-meter-square-second	;	133,322.387415 * x	;	1.333224E8
+resolution	;	dot-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
+resolution	;	pixel-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
+resolution	;	dot-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
+resolution	;	pixel-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
+speed	;	kilometer-per-hour	;	meter-per-second	;	2.5/9 * x	;	277.7778
+speed	;	mile-per-hour	;	meter-per-second	;	0.44704 * x	;	447.04
+speed	;	knot	;	meter-per-second	;	4.63/9 * x	;	514.4444
+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	;	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
+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
+volume	;	pinch	;	cubic-meter	;	0.00000023104319970703125 * x	;	2.310432E-4
+volume	;	cubic-centimeter	;	cubic-meter	;	0.000001 * x	;	0.001
+volume	;	milliliter	;	cubic-meter	;	0.000001 * x	;	0.001
+volume	;	dessert-spoon	;	cubic-meter	;	0.00000184834559765625 * x	;	0.001848346
+volume	;	dessert-spoon-imperial	;	cubic-meter	;	0.0000022197705078125 * x	;	0.002219771
+volume	;	dram	;	cubic-meter	;	0.0000036966911953125 * x	;	0.003696691
+volume	;	teaspoon	;	cubic-meter	;	0.00000492892159375 * x	;	0.004928922
+volume	;	centiliter	;	cubic-meter	;	0.00001 * x	;	0.01
+volume	;	tablespoon	;	cubic-meter	;	0.00001478676478125 * x	;	0.01478676
+volume	;	cubic-inch	;	cubic-meter	;	0.000016387064 * x	;	0.01638706
+volume	;	fluid-ounce-imperial	;	cubic-meter	;	0.0000284130625 * x	;	0.02841306
+volume	;	fluid-ounce	;	cubic-meter	;	0.0000295735295625 * x	;	0.02957353
+volume	;	jigger	;	cubic-meter	;	0.00004436029434375 * x	;	0.04436029
+volume	;	deciliter	;	cubic-meter	;	0.0001 * x	;	0.1
+volume	;	cup	;	cubic-meter	;	0.0002365882365 * x	;	0.2365882
+volume	;	cup-metric	;	cubic-meter	;	0.00025 * x	;	0.25
+volume	;	pint	;	cubic-meter	;	0.000473176473 * x	;	0.4731765
+volume	;	pint-metric	;	cubic-meter	;	0.0005 * x	;	0.5
+volume	;	quart	;	cubic-meter	;	0.000946352946 * x	;	0.9463529
+volume	;	liter	;	cubic-meter	;	0.001 * x	;	1.0
+volume	;	quart-imperial	;	cubic-meter	;	0.0011365225 * x	;	1.136522
+volume	;	gallon	;	cubic-meter	;	0.003785411784 * x	;	3.785412
+volume	;	gallon-imperial	;	cubic-meter	;	0.00454609 * x	;	4.54609
+volume	;	cubic-foot	;	cubic-meter	;	0.028316846592 * x	;	28.31685
+volume	;	bushel	;	cubic-meter	;	0.03523907016688 * x	;	35.23907
+volume	;	hectoliter	;	cubic-meter	;	0.1 * x	;	100.0
+volume	;	barrel	;	cubic-meter	;	0.158987294928 * x	;	158.9873
+volume	;	cubic-yard	;	cubic-meter	;	0.764554857984 * x	;	764.5549
+volume	;	cubic-meter	;	cubic-meter	;	1 * x	;	1,000.00
+volume	;	megaliter	;	cubic-meter	;	1,000 * x	;	1000000.0
+volume	;	acre-foot	;	cubic-meter	;	1,233.48183754752 * x	;	1233482.0
+volume	;	cubic-kilometer	;	cubic-meter	;	1,000,000,000 * x	;	1.0E12
+volume	;	cubic-mile	;	cubic-meter	;	4,168,181,825.440579584 * x	;	4.168182E12
+year-duration	;	month	;	year	;	0.25/3 * x	;	83.33333
+year-duration	;	month-person	;	year	;	0.25/3 * x	;	83.33333
+year-duration	;	year	;	year	;	1 * x	;	1,000.00
+year-duration	;	year-person	;	year	;	1 * x	;	1000.0
+year-duration	;	decade	;	year	;	10 * x	;	10000.0
+year-duration	;	century	;	year	;	100 * x	;	100000.0
\ No newline at end of file
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java
index 3d0ee66..50033b3 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java
@@ -64,6 +64,14 @@
         }
     }
 
+    private static class ScriptCodeTypeHandler extends SpecialTypeHandler {
+        private static final Pattern pat = Pattern.compile("[a-zA-Z]{4}(-[a-zA-Z]{4})*");
+        @Override
+        boolean isWellFormed(String value) {
+            return pat.matcher(value).matches();
+        }
+    }
+
     private static class SubdivisionKeyValueTypeHandler extends SpecialTypeHandler {
         private static final Pattern pat = Pattern.compile("([a-zA-Z]{2}|[0-9]{3})");
         @Override
@@ -84,6 +92,7 @@
         CODEPOINTS(new CodepointsTypeHandler()),
         REORDER_CODE(new ReorderCodeTypeHandler()),
         RG_KEY_VALUE(new RgKeyValueTypeHandler()),
+        SCRIPT_CODE(new ScriptCodeTypeHandler()),
         SUBDIVISION_CODE(new SubdivisionKeyValueTypeHandler()),
         PRIVATE_USE(new PrivateUseKeyValueTypeHandler()),
         ;
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 0b7fba3..d86fea4 100644
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e012a608ad9944c542f6a0f938033115a92399cc528cf3d7653409f991718c61
-size 13286293
+oid sha256:38a7eaf1957f9046905c0ac3971391e2f395eff34de90931f8dd2d9d9afb9d57
+size 13286134
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index a033020..1b37c13 100644
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa2a4f2dcb530a7e09cdf4fb048804541623c37913622ee69d24776e0d0d398a
+oid sha256:68c6016a0c662478c1999d66e4c5356df22d7c3204f8cc8e2d70d8412d4e8f70
 size 94526
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 1ffbdfb..fe7b491 100644
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55b13f508c1c0a203722814801f9e41419f8f8ee1cc9d88f0b2646c768cb9250
+oid sha256:180a28bb2feb7a4d5538f834e490e07b1ab913ce9545ea04cb48cc8438874e4e
 size 723505
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
index 16da6ab..b0dabe0 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
@@ -5,446 +5,450 @@
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
-#   Quantity;   Usage;  Region; Input (r);  Input (d);  Input Unit; Output (r); Output (d); Output Unit
+#	Quantity;	Usage;	Region;	Input (r);	Input (d);	Input Unit;	Output (r);	Output (d);	Output Unit
 #
 # Use: Convert the Input amount & unit according to the Usage and Region.
-#    The result should match the Output amount and unit.
-#    Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations
-#    have two options for testing based on the precision in their implementations. For example:
-#      3429 / 12500; 0.27432; meter;
-#    The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have
-#    both a rational and decimal amount; the others will have a single integer value, such as:
-#      length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch
-#    The input and output units are unit identifers; in particular, the output does not have further processing:
-#        • no localization
-#        • no adjustment for pluralization
-#        • no formatted with the skeleton
-#        • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
+#	 The result should match the Output amount and unit.
+#	 Both rational (r) and double64 (d) forms of the input and output amounts are supplied so that implementations
+#	 have two options for testing based on the precision in their implementations. For example:
+#	   3429 / 12500; 0.27432; meter;
+#	 The Output amount and Unit are repeated for mixed units. In such a case, only the smallest unit will have
+#	 both a rational and decimal amount; the others will have a single integer value, such as:
+#	   length; person-height; CA; 3429 / 12500; 0.27432; meter; 2; foot; 54 / 5; 10.8; inch
+#	 The input and output units are unit identifers; in particular, the output does not have further processing:
+#		 • no localization
+#		 • no adjustment for pluralization
+#		 • no formatted with the skeleton
+#		 • no suppression of zero values (for secondary -and- units such as pound in stone-and-pound)
 #
 # Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestUnitPreferences results.
 
-area;   default;    001;    1100000;    1100000.0;  square-meter;   11 / 10;    1.1;    square-kilometer
-area;   default;    001;    1000000;    1000000.0;  square-meter;   1;  1.0;    square-kilometer
-area;   default;    001;    900000; 900000.0;   square-meter;   90; 90.0;   hectare
-area;   default;    001;    10000;  10000.0;    square-meter;   1;  1.0;    hectare
-area;   default;    001;    9000;   9000.0; square-meter;   9000;   9000.0; square-meter
-area;   default;    001;    1;  1.0;    square-meter;   1;  1.0;    square-meter
-area;   default;    001;    9 / 10; 0.9;    square-meter;   9000;   9000.0; square-centimeter
-area;   default;    001;    1 / 10000;  1.0E-4; square-meter;   1;  1.0;    square-centimeter
-area;   default;    001;    9 / 100000; 9.0E-5; square-meter;   9 / 10; 0.9;    square-centimeter
+area;	default;	001;	1100000;	1100000.0;	square-meter;	11 / 10;	1.1;	square-kilometer
+area;	default;	001;	1000000;	1000000.0;	square-meter;	1;	1.0;	square-kilometer
+area;	default;	001;	900000;	900000.0;	square-meter;	90;	90.0;	hectare
+area;	default;	001;	10000;	10000.0;	square-meter;	1;	1.0;	hectare
+area;	default;	001;	9000;	9000.0;	square-meter;	9000;	9000.0;	square-meter
+area;	default;	001;	1;	1.0;	square-meter;	1;	1.0;	square-meter
+area;	default;	001;	9 / 10;	0.9;	square-meter;	9000;	9000.0;	square-centimeter
+area;	default;	001;	1 / 10000;	1.0E-4;	square-meter;	1;	1.0;	square-centimeter
+area;	default;	001;	9 / 100000;	9.0E-5;	square-meter;	9 / 10;	0.9;	square-centimeter
 
-area;   default;    GB; 222577103232 / 78125;   2848986.9213696;    square-meter;   11 / 10;    1.1;    square-mile
-area;   default;    GB; 40468564224 / 15625;    2589988.110336; square-meter;   1;  1.0;    square-mile
-area;   default;    GB; 182108539008 / 78125;   2330989.2993024;    square-meter;   576;    576.0;  acre
-area;   default;    GB; 316160658 / 78125;  4046.8564224;   square-meter;   1;  1.0;    acre
-area;   default;    GB; 1422722961 / 390625;    3642.17078016;  square-meter;   39204;  39204.0;    square-foot
-area;   default;    GB; 145161 / 1562500;   0.09290304; square-meter;   1;  1.0;    square-foot
-area;   default;    GB; 1306449 / 15625000; 0.083612736;    square-meter;   648 / 5;    129.6;  square-inch
-area;   default;    GB; 16129 / 25000000;   6.4516E-4;  square-meter;   1;  1.0;    square-inch
-area;   default;    GB; 145161 / 250000000; 5.80644E-4; square-meter;   9 / 10; 0.9;    square-inch
+area;	default;	GB;	222577103232 / 78125;	2848986.9213696;	square-meter;	11 / 10;	1.1;	square-mile
+area;	default;	GB;	40468564224 / 15625;	2589988.110336;	square-meter;	1;	1.0;	square-mile
+area;	default;	GB;	182108539008 / 78125;	2330989.2993024;	square-meter;	576;	576.0;	acre
+area;	default;	GB;	316160658 / 78125;	4046.8564224;	square-meter;	1;	1.0;	acre
+area;	default;	GB;	1422722961 / 390625;	3642.17078016;	square-meter;	39204;	39204.0;	square-foot
+area;	default;	GB;	145161 / 1562500;	0.09290304;	square-meter;	1;	1.0;	square-foot
+area;	default;	GB;	1306449 / 15625000;	0.083612736;	square-meter;	648 / 5;	129.6;	square-inch
+area;	default;	GB;	16129 / 25000000;	6.4516E-4;	square-meter;	1;	1.0;	square-inch
+area;	default;	GB;	145161 / 250000000;	5.80644E-4;	square-meter;	9 / 10;	0.9;	square-inch
 
-area;   geograph;   001;    1100000;    1100000.0;  square-meter;   11 / 10;    1.1;    square-kilometer
-area;   geograph;   001;    1000000;    1000000.0;  square-meter;   1;  1.0;    square-kilometer
-area;   geograph;   001;    900000; 900000.0;   square-meter;   9 / 10; 0.9;    square-kilometer
+area;	geograph;	001;	1100000;	1100000.0;	square-meter;	11 / 10;	1.1;	square-kilometer
+area;	geograph;	001;	1000000;	1000000.0;	square-meter;	1;	1.0;	square-kilometer
+area;	geograph;	001;	900000;	900000.0;	square-meter;	9 / 10;	0.9;	square-kilometer
 
-area;   geograph;   GB; 222577103232 / 78125;   2848986.9213696;    square-meter;   11 / 10;    1.1;    square-mile
-area;   geograph;   GB; 40468564224 / 15625;    2589988.110336; square-meter;   1;  1.0;    square-mile
-area;   geograph;   GB; 182108539008 / 78125;   2330989.2993024;    square-meter;   9 / 10; 0.9;    square-mile
+area;	geograph;	GB;	222577103232 / 78125;	2848986.9213696;	square-meter;	11 / 10;	1.1;	square-mile
+area;	geograph;	GB;	40468564224 / 15625;	2589988.110336;	square-meter;	1;	1.0;	square-mile
+area;	geograph;	GB;	182108539008 / 78125;	2330989.2993024;	square-meter;	9 / 10;	0.9;	square-mile
 
-area;   land;   001;    11000;  11000.0;    square-meter;   11 / 10;    1.1;    hectare
-area;   land;   001;    10000;  10000.0;    square-meter;   1;  1.0;    hectare
-area;   land;   001;    9000;   9000.0; square-meter;   9 / 10; 0.9;    hectare
+area;	land;	001;	11000;	11000.0;	square-meter;	11 / 10;	1.1;	hectare
+area;	land;	001;	10000;	10000.0;	square-meter;	1;	1.0;	hectare
+area;	land;	001;	9000;	9000.0;	square-meter;	9 / 10;	0.9;	hectare
 
-area;   land;   GB; 1738883619 / 390625;    4451.54206464;  square-meter;   11 / 10;    1.1;    acre
-area;   land;   GB; 316160658 / 78125;  4046.8564224;   square-meter;   1;  1.0;    acre
-area;   land;   GB; 1422722961 / 390625;    3642.17078016;  square-meter;   9 / 10; 0.9;    acre
+area;	land;	GB;	1738883619 / 390625;	4451.54206464;	square-meter;	11 / 10;	1.1;	acre
+area;	land;	GB;	316160658 / 78125;	4046.8564224;	square-meter;	1;	1.0;	acre
+area;	land;	GB;	1422722961 / 390625;	3642.17078016;	square-meter;	9 / 10;	0.9;	acre
 
-concentration;  blood-glucose;  AG; 662435483600000000000000;   6.624354836E23; item-per-cubic-meter;   11 / 10;    1.1;    millimole-per-liter
-concentration;  blood-glucose;  AG; 602214076000000000000000;   6.02214076E23;  item-per-cubic-meter;   1;  1.0;    millimole-per-liter
-concentration;  blood-glucose;  AG; 541992668400000000000000;   5.419926684E23; item-per-cubic-meter;   9 / 10; 0.9;    millimole-per-liter
+concentration;	blood-glucose;	AG;	662435483600000000000000;	6.624354836E23;	item-per-cubic-meter;	11 / 10;	1.1;	millimole-per-liter
+concentration;	blood-glucose;	AG;	602214076000000000000000;	6.02214076E23;	item-per-cubic-meter;	1;	1.0;	millimole-per-liter
+concentration;	blood-glucose;	AG;	541992668400000000000000;	5.419926684E23;	item-per-cubic-meter;	9 / 10;	0.9;	millimole-per-liter
 
-concentration;  default;    001;    11 / 10;    1.1;    item-per-cubic-meter;   11 / 10;    1.1;    item-per-cubic-meter
-concentration;  default;    001;    1;  1.0;    item-per-cubic-meter;   1;  1.0;    item-per-cubic-meter
-concentration;  default;    001;    9 / 10; 0.9;    item-per-cubic-meter;   9 / 10; 0.9;    item-per-cubic-meter
+concentration;	default;	001;	11 / 10;	1.1;	item-per-cubic-meter;	11 / 10;	1.1;	item-per-cubic-meter
+concentration;	default;	001;	1;	1.0;	item-per-cubic-meter;	1;	1.0;	item-per-cubic-meter
+concentration;	default;	001;	9 / 10;	0.9;	item-per-cubic-meter;	9 / 10;	0.9;	item-per-cubic-meter
 
-consumption;    default;    001;    11 / 1000000000;    1.1E-8; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-100-kilometer
-consumption;    default;    001;    1 / 100000000;  1.0E-8; cubic-meter-per-meter;  1;  1.0;    liter-per-100-kilometer
-consumption;    default;    001;    9 / 1000000000; 9.0E-9; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-100-kilometer
+consumption;	default;	001;	11 / 1000000000;	1.1E-8;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-100-kilometer
+consumption;	default;	001;	1 / 100000000;	1.0E-8;	cubic-meter-per-meter;	1;	1.0;	liter-per-100-kilometer
+consumption;	default;	001;	9 / 1000000000;	9.0E-9;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-100-kilometer
 
-consumption;    vehicle-fuel;   001;    11 / 1000000000;    1.1E-8; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-100-kilometer
-consumption;    vehicle-fuel;   001;    1 / 100000000;  1.0E-8; cubic-meter-per-meter;  1;  1.0;    liter-per-100-kilometer
-consumption;    vehicle-fuel;   001;    9 / 1000000000; 9.0E-9; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	11 / 1000000000;	1.1E-8;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	1 / 100000000;	1.0E-8;	cubic-meter-per-meter;	1;	1.0;	liter-per-100-kilometer
+consumption;	vehicle-fuel;	001;	9 / 1000000000;	9.0E-9;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-100-kilometer
 
-consumption;    vehicle-fuel;   BR; 11 / 10000000;  1.1E-6; cubic-meter-per-meter;  11 / 10;    1.1;    liter-per-kilometer
-consumption;    vehicle-fuel;   BR; 1 / 1000000;    1.0E-6; cubic-meter-per-meter;  1;  1.0;    liter-per-kilometer
-consumption;    vehicle-fuel;   BR; 9 / 10000000;   9.0E-7; cubic-meter-per-meter;  9 / 10; 0.9;    liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	11 / 10000000;	1.1E-6;	cubic-meter-per-meter;	11 / 10;	1.1;	liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	1 / 1000000;	1.0E-6;	cubic-meter-per-meter;	1;	1.0;	liter-per-kilometer
+consumption;	vehicle-fuel;	BR;	9 / 10000000;	9.0E-7;	cubic-meter-per-meter;	9 / 10;	0.9;	liter-per-kilometer
 
-consumption-inverse;    default;    001;    110000000;  1.1E8;  meter-per-cubic-meter;  11 / 10;    1.1;    kilometer-per-centiliter
-consumption-inverse;    default;    001;    100000000;  1.0E8;  meter-per-cubic-meter;  1;  1.0;    kilometer-per-centiliter
-consumption-inverse;    default;    001;    90000000;   9.0E7;  meter-per-cubic-meter;  9 / 10; 0.9;    kilometer-per-centiliter
+consumption-inverse;	default;	001;	110000000;	1.1E8;	meter-per-cubic-meter;	11 / 10;	1.1;	kilometer-per-centiliter
+consumption-inverse;	default;	001;	100000000;	1.0E8;	meter-per-cubic-meter;	1;	1.0;	kilometer-per-centiliter
+consumption-inverse;	default;	001;	90000000;	9.0E7;	meter-per-cubic-meter;	9 / 10;	0.9;	kilometer-per-centiliter
 
-consumption-inverse;    vehicle-fuel;   001;    110000000;  1.1E8;  meter-per-cubic-meter;  11 / 10;    1.1;    kilometer-per-centiliter
-consumption-inverse;    vehicle-fuel;   001;    100000000;  1.0E8;  meter-per-cubic-meter;  1;  1.0;    kilometer-per-centiliter
-consumption-inverse;    vehicle-fuel;   001;    90000000;   9.0E7;  meter-per-cubic-meter;  9 / 10; 0.9;    kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	110000000;	1.1E8;	meter-per-cubic-meter;	11 / 10;	1.1;	kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	100000000;	1.0E8;	meter-per-cubic-meter;	1;	1.0;	kilometer-per-centiliter
+consumption-inverse;	vehicle-fuel;	001;	90000000;	9.0E7;	meter-per-cubic-meter;	9 / 10;	0.9;	kilometer-per-centiliter
 
-consumption-inverse;    vehicle-fuel;   US; 52800000000 / 112903;   467658.0781732992;  meter-per-cubic-meter;  11 / 10;    1.1;    mile-per-gallon
-consumption-inverse;    vehicle-fuel;   US; 48000000000 / 112903;   425143.707430272;   meter-per-cubic-meter;  1;  1.0;    mile-per-gallon
-consumption-inverse;    vehicle-fuel;   US; 43200000000 / 112903;   382629.3366872448;  meter-per-cubic-meter;  9 / 10; 0.9;    mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	52800000000 / 112903;	467658.0781732992;	meter-per-cubic-meter;	11 / 10;	1.1;	mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	48000000000 / 112903;	425143.707430272;	meter-per-cubic-meter;	1;	1.0;	mile-per-gallon
+consumption-inverse;	vehicle-fuel;	US;	43200000000 / 112903;	382629.3366872448;	meter-per-cubic-meter;	9 / 10;	0.9;	mile-per-gallon
 
-consumption-inverse;    vehicle-fuel;   CA; 177027840000 / 454609;  389406.8089281118;  meter-per-cubic-meter;  11 / 10;    1.1;    mile-per-gallon-imperial
-consumption-inverse;    vehicle-fuel;   CA; 160934400000 / 454609;  354006.1899346471;  meter-per-cubic-meter;  1;  1.0;    mile-per-gallon-imperial
-consumption-inverse;    vehicle-fuel;   CA; 144840960000 / 454609;  318605.5709411824;  meter-per-cubic-meter;  9 / 10; 0.9;    mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	177027840000 / 454609;	389406.8089281118;	meter-per-cubic-meter;	11 / 10;	1.1;	mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	160934400000 / 454609;	354006.1899346471;	meter-per-cubic-meter;	1;	1.0;	mile-per-gallon-imperial
+consumption-inverse;	vehicle-fuel;	CA;	144840960000 / 454609;	318605.5709411824;	meter-per-cubic-meter;	9 / 10;	0.9;	mile-per-gallon-imperial
 
-duration;   default;    001;    95040;  95040.0;    second; 11 / 10;    1.1;    day
-duration;   default;    001;    86400;  86400.0;    second; 1;  1.0;    day
-duration;   default;    001;    77760;  77760.0;    second; 108 / 5;    21.6;   hour
-duration;   default;    001;    3600;   3600.0; second; 1;  1.0;    hour
-duration;   default;    001;    3240;   3240.0; second; 54; 54.0;   minute
-duration;   default;    001;    60; 60.0;   second; 1;  1.0;    minute
-duration;   default;    001;    54; 54.0;   second; 54; 54.0;   second
-duration;   default;    001;    1;  1.0;    second; 1;  1.0;    second
-duration;   default;    001;    9 / 10; 0.9;    second; 900;    900.0;  millisecond
-duration;   default;    001;    1 / 1000;   0.001;  second; 1;  1.0;    millisecond
-duration;   default;    001;    9 / 10000;  9.0E-4; second; 900;    900.0;  microsecond
-duration;   default;    001;    1 / 1000000;    1.0E-6; second; 1;  1.0;    microsecond
-duration;   default;    001;    9 / 10000000;   9.0E-7; second; 900;    900.0;  nanosecond
-duration;   default;    001;    1 / 1000000000; 1.0E-9; second; 1;  1.0;    nanosecond
-duration;   default;    001;    9 / 10000000000;    9.0E-10;    second; 9 / 10; 0.9;    nanosecond
+duration;	default;	001;	95040;	95040.0;	second;	11 / 10;	1.1;	day
+duration;	default;	001;	86400;	86400.0;	second;	1;	1.0;	day
+duration;	default;	001;	77760;	77760.0;	second;	108 / 5;	21.6;	hour
+duration;	default;	001;	3600;	3600.0;	second;	1;	1.0;	hour
+duration;	default;	001;	3240;	3240.0;	second;	54;	54.0;	minute
+duration;	default;	001;	60;	60.0;	second;	1;	1.0;	minute
+duration;	default;	001;	54;	54.0;	second;	54;	54.0;	second
+duration;	default;	001;	1;	1.0;	second;	1;	1.0;	second
+duration;	default;	001;	9 / 10;	0.9;	second;	900;	900.0;	millisecond
+duration;	default;	001;	1 / 1000;	0.001;	second;	1;	1.0;	millisecond
+duration;	default;	001;	9 / 10000;	9.0E-4;	second;	900;	900.0;	microsecond
+duration;	default;	001;	1 / 1000000;	1.0E-6;	second;	1;	1.0;	microsecond
+duration;	default;	001;	9 / 10000000;	9.0E-7;	second;	900;	900.0;	nanosecond
+duration;	default;	001;	1 / 1000000000;	1.0E-9;	second;	1;	1.0;	nanosecond
+duration;	default;	001;	9 / 10000000000;	9.0E-10;	second;	9 / 10;	0.9;	nanosecond
 
-duration;   media;  001;    66; 66.0;   second; 1;  minute; 6;  6.0;    second
-duration;   media;  001;    60; 60.0;   second; 1;  minute; 0;  0.0;    second
-duration;   media;  001;    54; 54.0;   second; 54; 54.0;   second
-duration;   media;  001;    1;  1.0;    second; 1;  1.0;    second
-duration;   media;  001;    9 / 10; 0.9;    second; 9 / 10; 0.9;    second
+duration;	media;	001;	66;	66.0;	second;	1;	minute;	6;	6.0;	second
+duration;	media;	001;	60;	60.0;	second;	1;	minute;	0;	0.0;	second
+duration;	media;	001;	54;	54.0;	second;	54;	54.0;	second
+duration;	media;	001;	1;	1.0;	second;	1;	1.0;	second
+duration;	media;	001;	9 / 10;	0.9;	second;	9 / 10;	0.9;	second
 
-energy; default;    001;    3960000;    3960000.0;  kilogram-square-meter-per-square-second;    11 / 10;    1.1;    kilowatt-hour
-energy; default;    001;    3600000;    3600000.0;  kilogram-square-meter-per-square-second;    1;  1.0;    kilowatt-hour
-energy; default;    001;    3240000;    3240000.0;  kilogram-square-meter-per-square-second;    9 / 10; 0.9;    kilowatt-hour
+energy;	default;	001;	3960000;	3960000.0;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	kilowatt-hour
+energy;	default;	001;	3600000;	3600000.0;	kilogram-square-meter-per-square-second;	1;	1.0;	kilowatt-hour
+energy;	default;	001;	3240000;	3240000.0;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	kilowatt-hour
 
-energy; food;   US; 23012 / 5;  4602.4; kilogram-square-meter-per-square-second;    11 / 10;    1.1;    foodcalorie
-energy; food;   US; 4184;   4184.0; kilogram-square-meter-per-square-second;    1;  1.0;    foodcalorie
-energy; food;   US; 18828 / 5;  3765.6; kilogram-square-meter-per-square-second;    9 / 10; 0.9;    foodcalorie
+energy;	food;	US;	23012 / 5;	4602.4;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	foodcalorie
+energy;	food;	US;	4184;	4184.0;	kilogram-square-meter-per-square-second;	1;	1.0;	foodcalorie
+energy;	food;	US;	18828 / 5;	3765.6;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	foodcalorie
 
-energy; food;   001;    23012 / 5;  4602.4; kilogram-square-meter-per-square-second;    11 / 10;    1.1;    kilocalorie
-energy; food;   001;    4184;   4184.0; kilogram-square-meter-per-square-second;    1;  1.0;    kilocalorie
-energy; food;   001;    18828 / 5;  3765.6; kilogram-square-meter-per-square-second;    9 / 10; 0.9;    kilocalorie
+energy;	food;	001;	23012 / 5;	4602.4;	kilogram-square-meter-per-square-second;	11 / 10;	1.1;	kilocalorie
+energy;	food;	001;	4184;	4184.0;	kilogram-square-meter-per-square-second;	1;	1.0;	kilocalorie
+energy;	food;	001;	18828 / 5;	3765.6;	kilogram-square-meter-per-square-second;	9 / 10;	0.9;	kilocalorie
 
-length; default;    001;    1100;   1100.0; meter;  11 / 10;    1.1;    kilometer
-length; default;    001;    1000;   1000.0; meter;  1;  1.0;    kilometer
-length; default;    001;    900;    900.0;  meter;  900;    900.0;  meter
-length; default;    001;    1;  1.0;    meter;  1;  1.0;    meter
-length; default;    001;    9 / 10; 0.9;    meter;  90; 90.0;   centimeter
-length; default;    001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; default;    001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	default;	001;	1100;	1100.0;	meter;	11 / 10;	1.1;	kilometer
+length;	default;	001;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	default;	001;	900;	900.0;	meter;	900;	900.0;	meter
+length;	default;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	default;	001;	9 / 10;	0.9;	meter;	90;	90.0;	centimeter
+length;	default;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	default;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; default;    GB; 1106424 / 625;  1770.2784;  meter;  11 / 10;    1.1;    mile
-length; default;    GB; 201168 / 125;   1609.344;   meter;  1;  1.0;    mile
-length; default;    GB; 905256 / 625;   1448.4096;  meter;  4752;   4752.0; foot
-length; default;    GB; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; default;    GB; 3429 / 12500;   0.27432;    meter;  54 / 5; 10.8;   inch
-length; default;    GB; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; default;    GB; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	default;	GB;	1106424 / 625;	1770.2784;	meter;	11 / 10;	1.1;	mile
+length;	default;	GB;	201168 / 125;	1609.344;	meter;	1;	1.0;	mile
+length;	default;	GB;	905256 / 625;	1448.4096;	meter;	4752;	4752.0;	foot
+length;	default;	GB;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	default;	GB;	3429 / 12500;	0.27432;	meter;	54 / 5;	10.8;	inch
+length;	default;	GB;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	default;	GB;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; person; 001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; person; 001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; person; 001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	focal-length;	001;	11 / 10000;	0.0011;	meter;	11 / 10;	1.1;	millimeter
+length;	focal-length;	001;	1 / 1000;	0.001;	meter;	1;	1.0;	millimeter
+length;	focal-length;	001;	9 / 10000;	9.0E-4;	meter;	9 / 10;	0.9;	millimeter
 
-length; person; CA; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; person; CA; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; person; CA; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	person;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	person;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	person;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; person-height;  001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; person-height;  001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; person-height;  001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	person;	CA;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	person;	CA;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	person;	CA;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; person-height;  CA; 11811 / 12500;  0.94488;    meter;  3;  foot;   6 / 5;  1.2;    inch
-length; person-height;  CA; 1143 / 1250;    0.9144; meter;  3;  foot;   0;  0.0;    inch
-length; person-height;  CA; 11049 / 12500;  0.88392;    meter;  174 / 5;    34.8;   inch
-length; person-height;  CA; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; person-height;  CA; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	person-height;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	person-height;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	person-height;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; person-height;  AT; 11 / 10;    1.1;    meter;  1;  meter;  10; 10.0;   centimeter
-length; person-height;  AT; 1;  1.0;    meter;  1;  meter;  0;  0.0;    centimeter
-length; person-height;  AT; 9 / 10; 0.9;    meter;  0;  meter;  90; 90.0;   centimeter
+length;	person-height;	CA;	11811 / 12500;	0.94488;	meter;	3;	foot;	6 / 5;	1.2;	inch
+length;	person-height;	CA;	1143 / 1250;	0.9144;	meter;	3;	foot;	0;	0.0;	inch
+length;	person-height;	CA;	11049 / 12500;	0.88392;	meter;	174 / 5;	34.8;	inch
+length;	person-height;	CA;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	person-height;	CA;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; rainfall;   BR; 11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; rainfall;   BR; 1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; rainfall;   BR; 9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	person-height;	AT;	11 / 10;	1.1;	meter;	1;	meter;	10;	10.0;	centimeter
+length;	person-height;	AT;	1;	1.0;	meter;	1;	meter;	0;	0.0;	centimeter
+length;	person-height;	AT;	9 / 10;	0.9;	meter;	0;	meter;	90;	90.0;	centimeter
 
-length; rainfall;   US; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; rainfall;   US; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; rainfall;   US; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	rainfall;	BR;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	rainfall;	BR;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	rainfall;	BR;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; rainfall;   001;    11 / 10000; 0.0011; meter;  11 / 10;    1.1;    millimeter
-length; rainfall;   001;    1 / 1000;   0.001;  meter;  1;  1.0;    millimeter
-length; rainfall;   001;    9 / 10000;  9.0E-4; meter;  9 / 10; 0.9;    millimeter
+length;	rainfall;	US;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	rainfall;	US;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	rainfall;	US;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; road;   001;    1000;   1000.0; meter;  1;  1.0;    kilometer
-length; road;   001;    900;    900.0;  meter;  9 / 10; 0.9;    kilometer
-length; road;   001;    800;    800.0;  meter;  800;    800.0;  meter
-length; road;   001;    300;    300.0;  meter;  300;    300.0;  meter
-length; road;   001;    2999 / 10;  299.9;  meter;  2999 / 10;  299.9;  meter
-length; road;   001;    1;  1.0;    meter;  1;  1.0;    meter
-length; road;   001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	rainfall;	001;	11 / 10000;	0.0011;	meter;	11 / 10;	1.1;	millimeter
+length;	rainfall;	001;	1 / 1000;	0.001;	meter;	1;	1.0;	millimeter
+length;	rainfall;	001;	9 / 10000;	9.0E-4;	meter;	9 / 10;	0.9;	millimeter
 
-length; road;   US; 603504 / 625;   965.6064;   meter;  3 / 5;  0.6;    mile
-length; road;   US; 100584 / 125;   804.672;    meter;  1 / 2;  0.5;    mile
-length; road;   US; 402336 / 625;   643.7376;   meter;  2112;   2112.0; foot
-length; road;   US; 762 / 25;   30.48;  meter;  100;    100.0;  foot
-length; road;   US; 380619 / 12500; 30.44952;   meter;  999 / 10;   99.9;   foot
-length; road;   US; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; road;   US; 3429 / 12500;   0.27432;    meter;  9 / 10; 0.9;    foot
+length;	road;	001;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	road;	001;	900;	900.0;	meter;	9 / 10;	0.9;	kilometer
+length;	road;	001;	800;	800.0;	meter;	800;	800.0;	meter
+length;	road;	001;	300;	300.0;	meter;	300;	300.0;	meter
+length;	road;	001;	2999 / 10;	299.9;	meter;	2999 / 10;	299.9;	meter
+length;	road;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	road;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; road;   GB; 603504 / 625;   965.6064;   meter;  3 / 5;  0.6;    mile
-length; road;   GB; 100584 / 125;   804.672;    meter;  1 / 2;  0.5;    mile
-length; road;   GB; 402336 / 625;   643.7376;   meter;  704;    704.0;  yard
-length; road;   GB; 2286 / 25;  91.44;  meter;  100;    100.0;  yard
-length; road;   GB; 1141857 / 12500;    91.34856;   meter;  999 / 10;   99.9;   yard
-length; road;   GB; 1143 / 1250;    0.9144; meter;  1;  1.0;    yard
-length; road;   GB; 10287 / 12500;  0.82296;    meter;  9 / 10; 0.9;    yard
+length;	road;	US;	603504 / 625;	965.6064;	meter;	3 / 5;	0.6;	mile
+length;	road;	US;	100584 / 125;	804.672;	meter;	1 / 2;	0.5;	mile
+length;	road;	US;	402336 / 625;	643.7376;	meter;	2112;	2112.0;	foot
+length;	road;	US;	762 / 25;	30.48;	meter;	100;	100.0;	foot
+length;	road;	US;	380619 / 12500;	30.44952;	meter;	999 / 10;	99.9;	foot
+length;	road;	US;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	road;	US;	3429 / 12500;	0.27432;	meter;	9 / 10;	0.9;	foot
 
-length; road;   SE; 11000;  11000.0;    meter;  11 / 10;    1.1;    mile-scandinavian
-length; road;   SE; 10000;  10000.0;    meter;  1;  1.0;    mile-scandinavian
-length; road;   SE; 9000;   9000.0; meter;  9;  9.0;    kilometer
-length; road;   SE; 1000;   1000.0; meter;  1;  1.0;    kilometer
-length; road;   SE; 900;    900.0;  meter;  900;    900.0;  meter
-length; road;   SE; 300;    300.0;  meter;  300;    300.0;  meter
-length; road;   SE; 2999 / 10;  299.9;  meter;  2999 / 10;  299.9;  meter
-length; road;   SE; 1;  1.0;    meter;  1;  1.0;    meter
-length; road;   SE; 9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	road;	GB;	603504 / 625;	965.6064;	meter;	3 / 5;	0.6;	mile
+length;	road;	GB;	100584 / 125;	804.672;	meter;	1 / 2;	0.5;	mile
+length;	road;	GB;	402336 / 625;	643.7376;	meter;	704;	704.0;	yard
+length;	road;	GB;	2286 / 25;	91.44;	meter;	100;	100.0;	yard
+length;	road;	GB;	1141857 / 12500;	91.34856;	meter;	999 / 10;	99.9;	yard
+length;	road;	GB;	1143 / 1250;	0.9144;	meter;	1;	1.0;	yard
+length;	road;	GB;	10287 / 12500;	0.82296;	meter;	9 / 10;	0.9;	yard
 
-length; snowfall;   001;    11 / 1000;  0.011;  meter;  11 / 10;    1.1;    centimeter
-length; snowfall;   001;    1 / 100;    0.01;   meter;  1;  1.0;    centimeter
-length; snowfall;   001;    9 / 1000;   0.009;  meter;  9 / 10; 0.9;    centimeter
+length;	road;	SE;	11000;	11000.0;	meter;	11 / 10;	1.1;	mile-scandinavian
+length;	road;	SE;	10000;	10000.0;	meter;	1;	1.0;	mile-scandinavian
+length;	road;	SE;	9000;	9000.0;	meter;	9;	9.0;	kilometer
+length;	road;	SE;	1000;	1000.0;	meter;	1;	1.0;	kilometer
+length;	road;	SE;	900;	900.0;	meter;	900;	900.0;	meter
+length;	road;	SE;	300;	300.0;	meter;	300;	300.0;	meter
+length;	road;	SE;	2999 / 10;	299.9;	meter;	2999 / 10;	299.9;	meter
+length;	road;	SE;	1;	1.0;	meter;	1;	1.0;	meter
+length;	road;	SE;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; snowfall;   US; 1397 / 50000;   0.02794;    meter;  11 / 10;    1.1;    inch
-length; snowfall;   US; 127 / 5000; 0.0254; meter;  1;  1.0;    inch
-length; snowfall;   US; 1143 / 50000;   0.02286;    meter;  9 / 10; 0.9;    inch
+length;	snowfall;	001;	11 / 1000;	0.011;	meter;	11 / 10;	1.1;	centimeter
+length;	snowfall;	001;	1 / 100;	0.01;	meter;	1;	1.0;	centimeter
+length;	snowfall;	001;	9 / 1000;	0.009;	meter;	9 / 10;	0.9;	centimeter
 
-length; vehicle;    GB; 4191 / 12500;   0.33528;    meter;  1;  foot;   6 / 5;  1.2;    inch
-length; vehicle;    GB; 381 / 1250; 0.3048; meter;  1;  foot;   0;  0.0;    inch
-length; vehicle;    GB; 3429 / 12500;   0.27432;    meter;  0;  foot;   54 / 5; 10.8;   inch
+length;	snowfall;	US;	1397 / 50000;	0.02794;	meter;	11 / 10;	1.1;	inch
+length;	snowfall;	US;	127 / 5000;	0.0254;	meter;	1;	1.0;	inch
+length;	snowfall;	US;	1143 / 50000;	0.02286;	meter;	9 / 10;	0.9;	inch
 
-length; vehicle;    001;    11 / 10;    1.1;    meter;  11 / 10;    1.1;    meter
-length; vehicle;    001;    1;  1.0;    meter;  1;  1.0;    meter
-length; vehicle;    001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	vehicle;	GB;	4191 / 12500;	0.33528;	meter;	1;	foot;	6 / 5;	1.2;	inch
+length;	vehicle;	GB;	381 / 1250;	0.3048;	meter;	1;	foot;	0;	0.0;	inch
+length;	vehicle;	GB;	3429 / 12500;	0.27432;	meter;	0;	foot;	54 / 5;	10.8;	inch
 
-length; vehicle;    MX; 11 / 10;    1.1;    meter;  1;  meter;  10; 10.0;   centimeter
-length; vehicle;    MX; 1;  1.0;    meter;  1;  meter;  0;  0.0;    centimeter
-length; vehicle;    MX; 9 / 10; 0.9;    meter;  0;  meter;  90; 90.0;   centimeter
+length;	vehicle;	001;	11 / 10;	1.1;	meter;	11 / 10;	1.1;	meter
+length;	vehicle;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	vehicle;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; visiblty;   001;    200;    200.0;  meter;  1 / 5;  0.2;    kilometer
-length; visiblty;   001;    100;    100.0;  meter;  1 / 10; 0.1;    kilometer
-length; visiblty;   001;    1;  1.0;    meter;  1;  1.0;    meter
-length; visiblty;   001;    9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
-length; visiblty;   001;    0;  0.0;    meter;  0;  0.0;    meter
+length;	vehicle;	MX;	11 / 10;	1.1;	meter;	1;	meter;	10;	10.0;	centimeter
+length;	vehicle;	MX;	1;	1.0;	meter;	1;	meter;	0;	0.0;	centimeter
+length;	vehicle;	MX;	9 / 10;	0.9;	meter;	0;	meter;	90;	90.0;	centimeter
+
+length;	visiblty;	001;	200;	200.0;	meter;	1 / 5;	0.2;	kilometer
+length;	visiblty;	001;	100;	100.0;	meter;	1 / 10;	0.1;	kilometer
+length;	visiblty;	001;	1;	1.0;	meter;	1;	1.0;	meter
+length;	visiblty;	001;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
+length;	visiblty;	001;	0;	0.0;	meter;	0;	0.0;	meter
 
-length; visiblty;   DE; 11 / 10;    1.1;    meter;  11 / 10;    1.1;    meter
-length; visiblty;   DE; 1;  1.0;    meter;  1;  1.0;    meter
-length; visiblty;   DE; 9 / 10; 0.9;    meter;  9 / 10; 0.9;    meter
+length;	visiblty;	DE;	11 / 10;	1.1;	meter;	11 / 10;	1.1;	meter
+length;	visiblty;	DE;	1;	1.0;	meter;	1;	1.0;	meter
+length;	visiblty;	DE;	9 / 10;	0.9;	meter;	9 / 10;	0.9;	meter
 
-length; visiblty;   GB; 1106424 / 625;  1770.2784;  meter;  11 / 10;    1.1;    mile
-length; visiblty;   GB; 201168 / 125;   1609.344;   meter;  1;  1.0;    mile
-length; visiblty;   GB; 905256 / 625;   1448.4096;  meter;  4752;   4752.0; foot
-length; visiblty;   GB; 381 / 1250; 0.3048; meter;  1;  1.0;    foot
-length; visiblty;   GB; 3429 / 12500;   0.27432;    meter;  9 / 10; 0.9;    foot
+length;	visiblty;	GB;	1106424 / 625;	1770.2784;	meter;	11 / 10;	1.1;	mile
+length;	visiblty;	GB;	201168 / 125;	1609.344;	meter;	1;	1.0;	mile
+length;	visiblty;	GB;	905256 / 625;	1448.4096;	meter;	4752;	4752.0;	foot
+length;	visiblty;	GB;	381 / 1250;	0.3048;	meter;	1;	1.0;	foot
+length;	visiblty;	GB;	3429 / 12500;	0.27432;	meter;	9 / 10;	0.9;	foot
 
-mass;   default;    001;    1100;   1100.0; kilogram;   11 / 10;    1.1;    metric-ton
-mass;   default;    001;    1000;   1000.0; kilogram;   1;  1.0;    metric-ton
-mass;   default;    001;    900;    900.0;  kilogram;   900;    900.0;  kilogram
-mass;   default;    001;    1;  1.0;    kilogram;   1;  1.0;    kilogram
-mass;   default;    001;    9 / 10; 0.9;    kilogram;   900;    900.0;  gram
-mass;   default;    001;    1 / 1000;   0.001;  kilogram;   1;  1.0;    gram
-mass;   default;    001;    9 / 10000;  9.0E-4; kilogram;   900;    900.0;  milligram
-mass;   default;    001;    1 / 1000000;    1.0E-6; kilogram;   1;  1.0;    milligram
-mass;   default;    001;    9 / 10000000;   9.0E-7; kilogram;   900;    900.0;  microgram
-mass;   default;    001;    1 / 1000000000; 1.0E-9; kilogram;   1;  1.0;    microgram
-mass;   default;    001;    9 / 10000000000;    9.0E-10;    kilogram;   9 / 10; 0.9;    microgram
+mass;	default;	001;	1100;	1100.0;	kilogram;	11 / 10;	1.1;	metric-ton
+mass;	default;	001;	1000;	1000.0;	kilogram;	1;	1.0;	metric-ton
+mass;	default;	001;	900;	900.0;	kilogram;	900;	900.0;	kilogram
+mass;	default;	001;	1;	1.0;	kilogram;	1;	1.0;	kilogram
+mass;	default;	001;	9 / 10;	0.9;	kilogram;	900;	900.0;	gram
+mass;	default;	001;	1 / 1000;	0.001;	kilogram;	1;	1.0;	gram
+mass;	default;	001;	9 / 10000;	9.0E-4;	kilogram;	900;	900.0;	milligram
+mass;	default;	001;	1 / 1000000;	1.0E-6;	kilogram;	1;	1.0;	milligram
+mass;	default;	001;	9 / 10000000;	9.0E-7;	kilogram;	900;	900.0;	microgram
+mass;	default;	001;	1 / 1000000000;	1.0E-9;	kilogram;	1;	1.0;	microgram
+mass;	default;	001;	9 / 10000000000;	9.0E-10;	kilogram;	9 / 10;	0.9;	microgram
 
-mass;   default;    GB; 498951607 / 500000; 997.903214; kilogram;   11 / 10;    1.1;    ton
-mass;   default;    GB; 45359237 / 50000;   907.18474;  kilogram;   1;  1.0;    ton
-mass;   default;    GB; 408233133 / 500000; 816.466266; kilogram;   1800;   1800.0; pound
-mass;   default;    GB; 45359237 / 100000000;   0.45359237; kilogram;   1;  1.0;    pound
-mass;   default;    GB; 408233133 / 1000000000; 0.408233133;    kilogram;   72 / 5; 14.4;   ounce
-mass;   default;    GB; 45359237 / 1600000000;  0.028349523125; kilogram;   1;  1.0;    ounce
-mass;   default;    GB; 408233133 / 16000000000;    0.0255145708125;    kilogram;   9 / 10; 0.9;    ounce
+mass;	default;	GB;	498951607 / 500000;	997.903214;	kilogram;	11 / 10;	1.1;	ton
+mass;	default;	GB;	45359237 / 50000;	907.18474;	kilogram;	1;	1.0;	ton
+mass;	default;	GB;	408233133 / 500000;	816.466266;	kilogram;	1800;	1800.0;	pound
+mass;	default;	GB;	45359237 / 100000000;	0.45359237;	kilogram;	1;	1.0;	pound
+mass;	default;	GB;	408233133 / 1000000000;	0.408233133;	kilogram;	72 / 5;	14.4;	ounce
+mass;	default;	GB;	45359237 / 1600000000;	0.028349523125;	kilogram;	1;	1.0;	ounce
+mass;	default;	GB;	408233133 / 16000000000;	0.0255145708125;	kilogram;	9 / 10;	0.9;	ounce
 
-mass;   person; 001;    11 / 10;    1.1;    kilogram;   11 / 10;    1.1;    kilogram
-mass;   person; 001;    1;  1.0;    kilogram;   1;  1.0;    kilogram
-mass;   person; 001;    9 / 10; 0.9;    kilogram;   900;    900.0;  gram
-mass;   person; 001;    1 / 1000;   0.001;  kilogram;   1;  1.0;    gram
-mass;   person; 001;    9 / 10000;  9.0E-4; kilogram;   9 / 10; 0.9;    gram
+mass;	person;	001;	11 / 10;	1.1;	kilogram;	11 / 10;	1.1;	kilogram
+mass;	person;	001;	1;	1.0;	kilogram;	1;	1.0;	kilogram
+mass;	person;	001;	9 / 10;	0.9;	kilogram;	900;	900.0;	gram
+mass;	person;	001;	1 / 1000;	0.001;	kilogram;	1;	1.0;	gram
+mass;	person;	001;	9 / 10000;	9.0E-4;	kilogram;	9 / 10;	0.9;	gram
 
-mass;   person; DZ; 11 / 10;    1.1;    kilogram;   1;  kilogram;   100;    100.0;  gram
-mass;   person; DZ; 1;  1.0;    kilogram;   1;  kilogram;   0;  0.0;    gram
-mass;   person; DZ; 9 / 10; 0.9;    kilogram;   0;  kilogram;   900;    900.0;  gram
+mass;	person;	DZ;	11 / 10;	1.1;	kilogram;	1;	kilogram;	100;	100.0;	gram
+mass;	person;	DZ;	1;	1.0;	kilogram;	1;	kilogram;	0;	0.0;	gram
+mass;	person;	DZ;	9 / 10;	0.9;	kilogram;	0;	kilogram;	900;	900.0;	gram
 
-mass;   person; US; 498951607 / 1000000000; 0.498951607;    kilogram;   11 / 10;    1.1;    pound
-mass;   person; US; 45359237 / 100000000;   0.45359237; kilogram;   1;  1.0;    pound
-mass;   person; US; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	US;	498951607 / 1000000000;	0.498951607;	kilogram;	11 / 10;	1.1;	pound
+mass;	person;	US;	45359237 / 100000000;	0.45359237;	kilogram;	1;	1.0;	pound
+mass;	person;	US;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass;   person; GB; 3492661249 / 500000000; 6.985322498;    kilogram;   1;  stone;  7 / 5;  1.4;    pound
-mass;   person; GB; 317514659 / 50000000;   6.35029318; kilogram;   1;  stone;  0;  0.0;    pound
-mass;   person; GB; 2857631931 / 500000000; 5.715263862;    kilogram;   12; pound;  48 / 5; 9.6;    ounce
-mass;   person; GB; 45359237 / 100000000;   0.45359237; kilogram;   1;  pound;  0;  0.0;    ounce
-mass;   person; GB; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	GB;	3492661249 / 500000000;	6.985322498;	kilogram;	1;	stone;	7 / 5;	1.4;	pound
+mass;	person;	GB;	317514659 / 50000000;	6.35029318;	kilogram;	1;	stone;	0;	0.0;	pound
+mass;	person;	GB;	2857631931 / 500000000;	5.715263862;	kilogram;	12;	pound;	48 / 5;	9.6;	ounce
+mass;	person;	GB;	45359237 / 100000000;	0.45359237;	kilogram;	1;	pound;	0;	0.0;	ounce
+mass;	person;	GB;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass;   person; HK; 498951607 / 1000000000; 0.498951607;    kilogram;   1;  pound;  8 / 5;  1.6;    ounce
-mass;   person; HK; 45359237 / 100000000;   0.45359237; kilogram;   1;  pound;  0;  0.0;    ounce
-mass;   person; HK; 408233133 / 1000000000; 0.408233133;    kilogram;   0;  pound;  72 / 5; 14.4;   ounce
+mass;	person;	HK;	498951607 / 1000000000;	0.498951607;	kilogram;	1;	pound;	8 / 5;	1.6;	ounce
+mass;	person;	HK;	45359237 / 100000000;	0.45359237;	kilogram;	1;	pound;	0;	0.0;	ounce
+mass;	person;	HK;	408233133 / 1000000000;	0.408233133;	kilogram;	0;	pound;	72 / 5;	14.4;	ounce
 
-mass-density;   blood-glucose;  001;    11 / 1000;  0.011;  kilogram-per-cubic-meter;   11 / 10;    1.1;    milligram-per-deciliter
-mass-density;   blood-glucose;  001;    1 / 100;    0.01;   kilogram-per-cubic-meter;   1;  1.0;    milligram-per-deciliter
-mass-density;   blood-glucose;  001;    9 / 1000;   0.009;  kilogram-per-cubic-meter;   9 / 10; 0.9;    milligram-per-deciliter
+mass-density;	blood-glucose;	001;	11 / 1000;	0.011;	kilogram-per-cubic-meter;	11 / 10;	1.1;	milligram-per-deciliter
+mass-density;	blood-glucose;	001;	1 / 100;	0.01;	kilogram-per-cubic-meter;	1;	1.0;	milligram-per-deciliter
+mass-density;	blood-glucose;	001;	9 / 1000;	0.009;	kilogram-per-cubic-meter;	9 / 10;	0.9;	milligram-per-deciliter
 
-mass-density;   default;    001;    11 / 10;    1.1;    kilogram-per-cubic-meter;   11 / 10;    1.1;    kilogram-per-cubic-meter
-mass-density;   default;    001;    1;  1.0;    kilogram-per-cubic-meter;   1;  1.0;    kilogram-per-cubic-meter
-mass-density;   default;    001;    9 / 10; 0.9;    kilogram-per-cubic-meter;   9 / 10; 0.9;    kilogram-per-cubic-meter
+mass-density;	default;	001;	11 / 10;	1.1;	kilogram-per-cubic-meter;	11 / 10;	1.1;	kilogram-per-cubic-meter
+mass-density;	default;	001;	1;	1.0;	kilogram-per-cubic-meter;	1;	1.0;	kilogram-per-cubic-meter
+mass-density;	default;	001;	9 / 10;	0.9;	kilogram-per-cubic-meter;	9 / 10;	0.9;	kilogram-per-cubic-meter
 
-power;  default;    001;    1100000000; 1.1E9;  kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    gigawatt
-power;  default;    001;    1000000000; 1.0E9;  kilogram-square-meter-per-cubic-second; 1;  1.0;    gigawatt
-power;  default;    001;    900000000;  9.0E8;  kilogram-square-meter-per-cubic-second; 900;    900.0;  megawatt
-power;  default;    001;    1000000;    1000000.0;  kilogram-square-meter-per-cubic-second; 1;  1.0;    megawatt
-power;  default;    001;    900000; 900000.0;   kilogram-square-meter-per-cubic-second; 900;    900.0;  kilowatt
-power;  default;    001;    1000;   1000.0; kilogram-square-meter-per-cubic-second; 1;  1.0;    kilowatt
-power;  default;    001;    900;    900.0;  kilogram-square-meter-per-cubic-second; 900;    900.0;  watt
-power;  default;    001;    1;  1.0;    kilogram-square-meter-per-cubic-second; 1;  1.0;    watt
-power;  default;    001;    9 / 10; 0.9;    kilogram-square-meter-per-cubic-second; 900;    900.0;  milliwatt
-power;  default;    001;    1 / 1000;   0.001;  kilogram-square-meter-per-cubic-second; 1;  1.0;    milliwatt
-power;  default;    001;    9 / 10000;  9.0E-4; kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    milliwatt
+power;	default;	001;	1100000000;	1.1E9;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	gigawatt
+power;	default;	001;	1000000000;	1.0E9;	kilogram-square-meter-per-cubic-second;	1;	1.0;	gigawatt
+power;	default;	001;	900000000;	9.0E8;	kilogram-square-meter-per-cubic-second;	900;	900.0;	megawatt
+power;	default;	001;	1000000;	1000000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	megawatt
+power;	default;	001;	900000;	900000.0;	kilogram-square-meter-per-cubic-second;	900;	900.0;	kilowatt
+power;	default;	001;	1000;	1000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	kilowatt
+power;	default;	001;	900;	900.0;	kilogram-square-meter-per-cubic-second;	900;	900.0;	watt
+power;	default;	001;	1;	1.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	watt
+power;	default;	001;	9 / 10;	0.9;	kilogram-square-meter-per-cubic-second;	900;	900.0;	milliwatt
+power;	default;	001;	1 / 1000;	0.001;	kilogram-square-meter-per-cubic-second;	1;	1.0;	milliwatt
+power;	default;	001;	9 / 10000;	9.0E-4;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	milliwatt
 
-power;  engine; 001;    1100;   1100.0; kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    kilowatt
-power;  engine; 001;    1000;   1000.0; kilogram-square-meter-per-cubic-second; 1;  1.0;    kilowatt
-power;  engine; 001;    900;    900.0;  kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    kilowatt
+power;	engine;	001;	1100;	1100.0;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	kilowatt
+power;	engine;	001;	1000;	1000.0;	kilogram-square-meter-per-cubic-second;	1;	1.0;	kilowatt
+power;	engine;	001;	900;	900.0;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	kilowatt
 
-power;  engine; GB; 410134929370248621 / 500000000000000;   820.2698587404972;  kilogram-square-meter-per-cubic-second; 11 / 10;    1.1;    horsepower
-power;  engine; GB; 37284993579113511 / 50000000000000; 745.6998715822702;  kilogram-square-meter-per-cubic-second; 1;  1.0;    horsepower
-power;  engine; GB; 335564942212021599 / 500000000000000;   671.1298844240432;  kilogram-square-meter-per-cubic-second; 9 / 10; 0.9;    horsepower
+power;	engine;	GB;	410134929370248621 / 500000000000000;	820.2698587404972;	kilogram-square-meter-per-cubic-second;	11 / 10;	1.1;	horsepower
+power;	engine;	GB;	37284993579113511 / 50000000000000;	745.6998715822702;	kilogram-square-meter-per-cubic-second;	1;	1.0;	horsepower
+power;	engine;	GB;	335564942212021599 / 500000000000000;	671.1298844240432;	kilogram-square-meter-per-cubic-second;	9 / 10;	0.9;	horsepower
 
-pressure;   baromtrc;   001;    110;    110.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    hectopascal
-pressure;   baromtrc;   001;    100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    hectopascal
-pressure;   baromtrc;   001;    90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    hectopascal
+pressure;	baromtrc;	001;	110;	110.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	hectopascal
+pressure;	baromtrc;	001;	100;	100.0;	kilogram-per-meter-square-second;	1;	1.0;	hectopascal
+pressure;	baromtrc;	001;	90;	90.0;	kilogram-per-meter-square-second;	9 / 10;	0.9;	hectopascal
 
-pressure;   baromtrc;   IN; 37250275043751 / 10000000000;   3725.0275043751;    kilogram-per-meter-square-second;   11 / 10;    1.1;    inch-ofhg
-pressure;   baromtrc;   IN; 3386388640341 / 1000000000; 3386.388640341; kilogram-per-meter-square-second;   1;  1.0;    inch-ofhg
-pressure;   baromtrc;   IN; 30477497763069 / 10000000000;   3047.7497763069;    kilogram-per-meter-square-second;   9 / 10; 0.9;    inch-ofhg
+pressure;	baromtrc;	IN;	37250275043751 / 10000000000;	3725.0275043751;	kilogram-per-meter-square-second;	11 / 10;	1.1;	inch-ofhg
+pressure;	baromtrc;	IN;	3386388640341 / 1000000000;	3386.388640341;	kilogram-per-meter-square-second;	1;	1.0;	inch-ofhg
+pressure;	baromtrc;	IN;	30477497763069 / 10000000000;	3047.7497763069;	kilogram-per-meter-square-second;	9 / 10;	0.9;	inch-ofhg
 
-pressure;   baromtrc;   BR; 110;    110.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    millibar
-pressure;   baromtrc;   BR; 100;    100.0;  kilogram-per-meter-square-second;   1;  1.0;    millibar
-pressure;   baromtrc;   BR; 90; 90.0;   kilogram-per-meter-square-second;   9 / 10; 0.9;    millibar
+pressure;	baromtrc;	BR;	110;	110.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	millibar
+pressure;	baromtrc;	BR;	100;	100.0;	kilogram-per-meter-square-second;	1;	1.0;	millibar
+pressure;	baromtrc;	BR;	90;	90.0;	kilogram-per-meter-square-second;	9 / 10;	0.9;	millibar
 
-pressure;   baromtrc;   MX; 293309252313 / 2000000000;  146.6546261565; kilogram-per-meter-square-second;   11 / 10;    1.1;    millimeter-ofhg
-pressure;   baromtrc;   MX; 26664477483 / 200000000;    133.322387415;  kilogram-per-meter-square-second;   1;  1.0;    millimeter-ofhg
-pressure;   baromtrc;   MX; 239980297347 / 2000000000;  119.9901486735; kilogram-per-meter-square-second;   9 / 10; 0.9;    millimeter-ofhg
+pressure;	baromtrc;	MX;	293309252313 / 2000000000;	146.6546261565;	kilogram-per-meter-square-second;	11 / 10;	1.1;	millimeter-ofhg
+pressure;	baromtrc;	MX;	26664477483 / 200000000;	133.322387415;	kilogram-per-meter-square-second;	1;	1.0;	millimeter-ofhg
+pressure;	baromtrc;	MX;	239980297347 / 2000000000;	119.9901486735;	kilogram-per-meter-square-second;	9 / 10;	0.9;	millimeter-ofhg
 
-pressure;   default;    001;    1100000;    1100000.0;  kilogram-per-meter-square-second;   11 / 10;    1.1;    megapascal
-pressure;   default;    001;    1000000;    1000000.0;  kilogram-per-meter-square-second;   1;  1.0;    megapascal
-pressure;   default;    001;    900000; 900000.0;   kilogram-per-meter-square-second;   900000; 900000.0;   pascal
-pressure;   default;    001;    1;  1.0;    kilogram-per-meter-square-second;   1;  1.0;    pascal
-pressure;   default;    001;    9 / 10; 0.9;    kilogram-per-meter-square-second;   9 / 10; 0.9;    pascal
+pressure;	default;	001;	1100000;	1100000.0;	kilogram-per-meter-square-second;	11 / 10;	1.1;	megapascal
+pressure;	default;	001;	1000000;	1000000.0;	kilogram-per-meter-square-second;	1;	1.0;	megapascal
+pressure;	default;	001;	900000;	900000.0;	kilogram-per-meter-square-second;	900000;	900000.0;	pascal
+pressure;	default;	001;	1;	1.0;	kilogram-per-meter-square-second;	1;	1.0;	pascal
+pressure;	default;	001;	9 / 10;	0.9;	kilogram-per-meter-square-second;	9 / 10;	0.9;	pascal
 
-pressure;   default;    GB; 97860875535731 / 12903200000;   7584.233022485197;  kilogram-per-meter-square-second;   11 / 10;    1.1;    pound-force-per-square-inch
-pressure;   default;    GB; 8896443230521 / 1290320000; 6894.757293168361;  kilogram-per-meter-square-second;   1;  1.0;    pound-force-per-square-inch
-pressure;   default;    GB; 80067989074689 / 12903200000;   6205.281563851525;  kilogram-per-meter-square-second;   9 / 10; 0.9;    pound-force-per-square-inch
+pressure;	default;	GB;	97860875535731 / 12903200000;	7584.233022485197;	kilogram-per-meter-square-second;	11 / 10;	1.1;	pound-force-per-square-inch
+pressure;	default;	GB;	8896443230521 / 1290320000;	6894.757293168361;	kilogram-per-meter-square-second;	1;	1.0;	pound-force-per-square-inch
+pressure;	default;	GB;	80067989074689 / 12903200000;	6205.281563851525;	kilogram-per-meter-square-second;	9 / 10;	0.9;	pound-force-per-square-inch
 
-speed;  default;    001;    11 / 36;    0.3055555555555556; meter-per-second;   11 / 10;    1.1;    kilometer-per-hour
-speed;  default;    001;    5 / 18; 0.2777777777777778; meter-per-second;   1;  1.0;    kilometer-per-hour
-speed;  default;    001;    1 / 4;  0.25;   meter-per-second;   9 / 10; 0.9;    kilometer-per-hour
+speed;	default;	001;	11 / 36;	0.3055555555555556;	meter-per-second;	11 / 10;	1.1;	kilometer-per-hour
+speed;	default;	001;	5 / 18;	0.2777777777777778;	meter-per-second;	1;	1.0;	kilometer-per-hour
+speed;	default;	001;	1 / 4;	0.25;	meter-per-second;	9 / 10;	0.9;	kilometer-per-hour
 
-speed;  default;    GB; 15367 / 31250;  0.491744;   meter-per-second;   11 / 10;    1.1;    mile-per-hour
-speed;  default;    GB; 1397 / 3125;    0.44704;    meter-per-second;   1;  1.0;    mile-per-hour
-speed;  default;    GB; 12573 / 31250;  0.402336;   meter-per-second;   9 / 10; 0.9;    mile-per-hour
+speed;	default;	GB;	15367 / 31250;	0.491744;	meter-per-second;	11 / 10;	1.1;	mile-per-hour
+speed;	default;	GB;	1397 / 3125;	0.44704;	meter-per-second;	1;	1.0;	mile-per-hour
+speed;	default;	GB;	12573 / 31250;	0.402336;	meter-per-second;	9 / 10;	0.9;	mile-per-hour
 
-speed;  wind;   001;    11 / 36;    0.3055555555555556; meter-per-second;   11 / 10;    1.1;    kilometer-per-hour
-speed;  wind;   001;    5 / 18; 0.2777777777777778; meter-per-second;   1;  1.0;    kilometer-per-hour
-speed;  wind;   001;    1 / 4;  0.25;   meter-per-second;   9 / 10; 0.9;    kilometer-per-hour
+speed;	wind;	001;	11 / 36;	0.3055555555555556;	meter-per-second;	11 / 10;	1.1;	kilometer-per-hour
+speed;	wind;	001;	5 / 18;	0.2777777777777778;	meter-per-second;	1;	1.0;	kilometer-per-hour
+speed;	wind;	001;	1 / 4;	0.25;	meter-per-second;	9 / 10;	0.9;	kilometer-per-hour
 
-speed;  wind;   FI; 11 / 10;    1.1;    meter-per-second;   11 / 10;    1.1;    meter-per-second
-speed;  wind;   FI; 1;  1.0;    meter-per-second;   1;  1.0;    meter-per-second
-speed;  wind;   FI; 9 / 10; 0.9;    meter-per-second;   9 / 10; 0.9;    meter-per-second
+speed;	wind;	FI;	11 / 10;	1.1;	meter-per-second;	11 / 10;	1.1;	meter-per-second
+speed;	wind;	FI;	1;	1.0;	meter-per-second;	1;	1.0;	meter-per-second
+speed;	wind;	FI;	9 / 10;	0.9;	meter-per-second;	9 / 10;	0.9;	meter-per-second
 
-speed;  wind;   US; 15367 / 31250;  0.491744;   meter-per-second;   11 / 10;    1.1;    mile-per-hour
-speed;  wind;   US; 1397 / 3125;    0.44704;    meter-per-second;   1;  1.0;    mile-per-hour
-speed;  wind;   US; 12573 / 31250;  0.402336;   meter-per-second;   9 / 10; 0.9;    mile-per-hour
+speed;	wind;	US;	15367 / 31250;	0.491744;	meter-per-second;	11 / 10;	1.1;	mile-per-hour
+speed;	wind;	US;	1397 / 3125;	0.44704;	meter-per-second;	1;	1.0;	mile-per-hour
+speed;	wind;	US;	12573 / 31250;	0.402336;	meter-per-second;	9 / 10;	0.9;	mile-per-hour
 
-temperature;    default;    001;    1097 / 4;   274.25; kelvin; 11 / 10;    1.1;    celsius
-temperature;    default;    001;    5483 / 20;  274.15; kelvin; 1;  1.0;    celsius
-temperature;    default;    001;    5481 / 20;  274.05; kelvin; 9 / 10; 0.9;    celsius
+temperature;	default;	001;	1097 / 4;	274.25;	kelvin;	11 / 10;	1.1;	celsius
+temperature;	default;	001;	5483 / 20;	274.15;	kelvin;	1;	1.0;	celsius
+temperature;	default;	001;	5481 / 20;	274.05;	kelvin;	9 / 10;	0.9;	celsius
 
-temperature;    default;    US; 15359 / 60; 255.9833333333333;  kelvin; 11 / 10;    1.1;    fahrenheit
-temperature;    default;    US; 46067 / 180;    255.9277777777778;  kelvin; 1;  1.0;    fahrenheit
-temperature;    default;    US; 46057 / 180;    255.8722222222222;  kelvin; 9 / 10; 0.9;    fahrenheit
+temperature;	default;	US;	15359 / 60;	255.9833333333333;	kelvin;	11 / 10;	1.1;	fahrenheit
+temperature;	default;	US;	46067 / 180;	255.9277777777778;	kelvin;	1;	1.0;	fahrenheit
+temperature;	default;	US;	46057 / 180;	255.8722222222222;	kelvin;	9 / 10;	0.9;	fahrenheit
 
-temperature;    weather;    001;    1097 / 4;   274.25; kelvin; 11 / 10;    1.1;    celsius
-temperature;    weather;    001;    5483 / 20;  274.15; kelvin; 1;  1.0;    celsius
-temperature;    weather;    001;    5481 / 20;  274.05; kelvin; 9 / 10; 0.9;    celsius
+temperature;	weather;	001;	1097 / 4;	274.25;	kelvin;	11 / 10;	1.1;	celsius
+temperature;	weather;	001;	5483 / 20;	274.15;	kelvin;	1;	1.0;	celsius
+temperature;	weather;	001;	5481 / 20;	274.05;	kelvin;	9 / 10;	0.9;	celsius
 
-temperature;    weather;    BS; 15359 / 60; 255.9833333333333;  kelvin; 11 / 10;    1.1;    fahrenheit
-temperature;    weather;    BS; 46067 / 180;    255.9277777777778;  kelvin; 1;  1.0;    fahrenheit
-temperature;    weather;    BS; 46057 / 180;    255.8722222222222;  kelvin; 9 / 10; 0.9;    fahrenheit
+temperature;	weather;	BS;	15359 / 60;	255.9833333333333;	kelvin;	11 / 10;	1.1;	fahrenheit
+temperature;	weather;	BS;	46067 / 180;	255.9277777777778;	kelvin;	1;	1.0;	fahrenheit
+temperature;	weather;	BS;	46057 / 180;	255.8722222222222;	kelvin;	9 / 10;	0.9;	fahrenheit
 
-volume; default;    001;    11 / 10;    1.1;    cubic-meter;    11 / 10;    1.1;    cubic-meter
-volume; default;    001;    1;  1.0;    cubic-meter;    1;  1.0;    cubic-meter
-volume; default;    001;    9 / 10; 0.9;    cubic-meter;    900000; 900000.0;   cubic-centimeter
-volume; default;    001;    1 / 1000000;    1.0E-6; cubic-meter;    1;  1.0;    cubic-centimeter
-volume; default;    001;    9 / 10000000;   9.0E-7; cubic-meter;    9 / 10; 0.9;    cubic-centimeter
+volume;	default;	001;	11 / 10;	1.1;	cubic-meter;	11 / 10;	1.1;	cubic-meter
+volume;	default;	001;	1;	1.0;	cubic-meter;	1;	1.0;	cubic-meter
+volume;	default;	001;	9 / 10;	0.9;	cubic-meter;	900000;	900000.0;	cubic-centimeter
+volume;	default;	001;	1 / 1000000;	1.0E-6;	cubic-meter;	1;	1.0;	cubic-centimeter
+volume;	default;	001;	9 / 10000000;	9.0E-7;	cubic-meter;	9 / 10;	0.9;	cubic-centimeter
 
-volume; default;    GB; 608369751 / 19531250000;    0.0311485312512;    cubic-meter;    11 / 10;    1.1;    cubic-foot
-volume; default;    GB; 55306341 / 1953125000;  0.028316846592; cubic-meter;    1;  1.0;    cubic-foot
-volume; default;    GB; 497757069 / 19531250000;    0.0254851619328;    cubic-meter;    7776 / 5;   1555.2; cubic-inch
-volume; default;    GB; 2048383 / 125000000000; 1.6387064E-5;   cubic-meter;    1;  1.0;    cubic-inch
-volume; default;    GB; 18435447 / 1250000000000;   1.47483576E-5;  cubic-meter;    9 / 10; 0.9;    cubic-inch
+volume;	default;	GB;	608369751 / 19531250000;	0.0311485312512;	cubic-meter;	11 / 10;	1.1;	cubic-foot
+volume;	default;	GB;	55306341 / 1953125000;	0.028316846592;	cubic-meter;	1;	1.0;	cubic-foot
+volume;	default;	GB;	497757069 / 19531250000;	0.0254851619328;	cubic-meter;	7776 / 5;	1555.2;	cubic-inch
+volume;	default;	GB;	2048383 / 125000000000;	1.6387064E-5;	cubic-meter;	1;	1.0;	cubic-inch
+volume;	default;	GB;	18435447 / 1250000000000;	1.47483576E-5;	cubic-meter;	9 / 10;	0.9;	cubic-inch
 
-volume; fluid;  001;    11 / 10000; 0.0011; cubic-meter;    11 / 10;    1.1;    liter
-volume; fluid;  001;    1 / 1000;   0.001;  cubic-meter;    1;  1.0;    liter
-volume; fluid;  001;    9 / 10000;  9.0E-4; cubic-meter;    900;    900.0;  milliliter
-volume; fluid;  001;    1 / 1000000;    1.0E-6; cubic-meter;    1;  1.0;    milliliter
-volume; fluid;  001;    9 / 10000000;   9.0E-7; cubic-meter;    9 / 10; 0.9;    milliliter
+volume;	fluid;	001;	11 / 10000;	0.0011;	cubic-meter;	11 / 10;	1.1;	liter
+volume;	fluid;	001;	1 / 1000;	0.001;	cubic-meter;	1;	1.0;	liter
+volume;	fluid;	001;	9 / 10000;	9.0E-4;	cubic-meter;	900;	900.0;	milliliter
+volume;	fluid;	001;	1 / 1000000;	1.0E-6;	cubic-meter;	1;	1.0;	milliliter
+volume;	fluid;	001;	9 / 10000000;	9.0E-7;	cubic-meter;	9 / 10;	0.9;	milliliter
 
-volume; fluid;  US; 5204941203 / 1250000000000; 0.0041639529624;    cubic-meter;    11 / 10;    1.1;    gallon
-volume; fluid;  US; 473176473 / 125000000000;   0.003785411784; cubic-meter;    1;  1.0;    gallon
-volume; fluid;  US; 4258588257 / 1250000000000; 0.0034068706056;    cubic-meter;    18 / 5; 3.6;    quart
-volume; fluid;  US; 473176473 / 500000000000;   9.46352946E-4;  cubic-meter;    1;  1.0;    quart
-volume; fluid;  US; 4258588257 / 5000000000000; 8.517176514E-4; cubic-meter;    9 / 5;  1.8;    pint
-volume; fluid;  US; 473176473 / 1000000000000;  4.73176473E-4;  cubic-meter;    1;  1.0;    pint
-volume; fluid;  US; 4258588257 / 10000000000000;    4.258588257E-4; cubic-meter;    9 / 5;  1.8;    cup
-volume; fluid;  US; 473176473 / 2000000000000;  2.365882365E-4; cubic-meter;    1;  1.0;    cup
-volume; fluid;  US; 4258588257 / 20000000000000;    2.1292941285E-4;    cubic-meter;    36 / 5; 7.2;    fluid-ounce
-volume; fluid;  US; 473176473 / 16000000000000; 2.95735295625E-5;   cubic-meter;    1;  1.0;    fluid-ounce
-volume; fluid;  US; 4258588257 / 160000000000000;   2.661617660625E-5;  cubic-meter;    9 / 5;  1.8;    tablespoon
-volume; fluid;  US; 473176473 / 32000000000000; 1.478676478125E-5;  cubic-meter;    1;  1.0;    tablespoon
-volume; fluid;  US; 4258588257 / 320000000000000;   1.3308088303125E-5; cubic-meter;    27 / 10;    2.7;    teaspoon
-volume; fluid;  US; 157725491 / 32000000000000; 4.92892159375E-6;   cubic-meter;    1;  1.0;    teaspoon
-volume; fluid;  US; 1419529419 / 320000000000000;   4.436029434375E-6;  cubic-meter;    9 / 10; 0.9;    teaspoon
+volume;	fluid;	US;	5204941203 / 1250000000000;	0.0041639529624;	cubic-meter;	11 / 10;	1.1;	gallon
+volume;	fluid;	US;	473176473 / 125000000000;	0.003785411784;	cubic-meter;	1;	1.0;	gallon
+volume;	fluid;	US;	4258588257 / 1250000000000;	0.0034068706056;	cubic-meter;	18 / 5;	3.6;	quart
+volume;	fluid;	US;	473176473 / 500000000000;	9.46352946E-4;	cubic-meter;	1;	1.0;	quart
+volume;	fluid;	US;	4258588257 / 5000000000000;	8.517176514E-4;	cubic-meter;	9 / 5;	1.8;	pint
+volume;	fluid;	US;	473176473 / 1000000000000;	4.73176473E-4;	cubic-meter;	1;	1.0;	pint
+volume;	fluid;	US;	4258588257 / 10000000000000;	4.258588257E-4;	cubic-meter;	9 / 5;	1.8;	cup
+volume;	fluid;	US;	473176473 / 2000000000000;	2.365882365E-4;	cubic-meter;	1;	1.0;	cup
+volume;	fluid;	US;	4258588257 / 20000000000000;	2.1292941285E-4;	cubic-meter;	36 / 5;	7.2;	fluid-ounce
+volume;	fluid;	US;	473176473 / 16000000000000;	2.95735295625E-5;	cubic-meter;	1;	1.0;	fluid-ounce
+volume;	fluid;	US;	4258588257 / 160000000000000;	2.661617660625E-5;	cubic-meter;	9 / 5;	1.8;	tablespoon
+volume;	fluid;	US;	473176473 / 32000000000000;	1.478676478125E-5;	cubic-meter;	1;	1.0;	tablespoon
+volume;	fluid;	US;	4258588257 / 320000000000000;	1.3308088303125E-5;	cubic-meter;	27 / 10;	2.7;	teaspoon
+volume;	fluid;	US;	157725491 / 32000000000000;	4.92892159375E-6;	cubic-meter;	1;	1.0;	teaspoon
+volume;	fluid;	US;	1419529419 / 320000000000000;	4.436029434375E-6;	cubic-meter;	9 / 10;	0.9;	teaspoon
 
-volume; fluid;  GB; 5000699 / 1000000000;   0.005000699;    cubic-meter;    11 / 10;    1.1;    gallon-imperial
-volume; fluid;  GB; 454609 / 100000000; 0.00454609; cubic-meter;    1;  1.0;    gallon-imperial
-volume; fluid;  GB; 4091481 / 1000000000;   0.004091481;    cubic-meter;    144;    144.0;  fluid-ounce-imperial
-volume; fluid;  GB; 454609 / 16000000000;   2.84130625E-5;  cubic-meter;    1;  1.0;    fluid-ounce-imperial
-volume; fluid;  GB; 4091481 / 160000000000; 2.557175625E-5; cubic-meter;    9 / 10; 0.9;    fluid-ounce-imperial
+volume;	fluid;	GB;	5000699 / 1000000000;	0.005000699;	cubic-meter;	11 / 10;	1.1;	gallon-imperial
+volume;	fluid;	GB;	454609 / 100000000;	0.00454609;	cubic-meter;	1;	1.0;	gallon-imperial
+volume;	fluid;	GB;	4091481 / 1000000000;	0.004091481;	cubic-meter;	144;	144.0;	fluid-ounce-imperial
+volume;	fluid;	GB;	454609 / 16000000000;	2.84130625E-5;	cubic-meter;	1;	1.0;	fluid-ounce-imperial
+volume;	fluid;	GB;	4091481 / 160000000000;	2.557175625E-5;	cubic-meter;	9 / 10;	0.9;	fluid-ounce-imperial
 
-volume; oil;    001;    109303765263 / 625000000000;    0.1748860244208;    cubic-meter;    11 / 10;    1.1;    barrel
-volume; oil;    001;    9936705933 / 62500000000;   0.158987294928; cubic-meter;    1;  1.0;    barrel
-volume; oil;    001;    89430353397 / 625000000000; 0.1430885654352;    cubic-meter;    9 / 10; 0.9;    barrel
+volume;	oil;	001;	109303765263 / 625000000000;	0.1748860244208;	cubic-meter;	11 / 10;	1.1;	barrel
+volume;	oil;	001;	9936705933 / 62500000000;	0.158987294928;	cubic-meter;	1;	1.0;	barrel
+volume;	oil;	001;	89430353397 / 625000000000;	0.1430885654352;	cubic-meter;	9 / 10;	0.9;	barrel
 
-volume; vehicle;    US; 5204941203 / 1250000000000; 0.0041639529624;    cubic-meter;    11 / 10;    1.1;    gallon
-volume; vehicle;    US; 473176473 / 125000000000;   0.003785411784; cubic-meter;    1;  1.0;    gallon
-volume; vehicle;    US; 4258588257 / 1250000000000; 0.0034068706056;    cubic-meter;    9 / 10; 0.9;    gallon
+volume;	vehicle;	US;	5204941203 / 1250000000000;	0.0041639529624;	cubic-meter;	11 / 10;	1.1;	gallon
+volume;	vehicle;	US;	473176473 / 125000000000;	0.003785411784;	cubic-meter;	1;	1.0;	gallon
+volume;	vehicle;	US;	4258588257 / 1250000000000;	0.0034068706056;	cubic-meter;	9 / 10;	0.9;	gallon
 
-volume; vehicle;    001;    11 / 10000; 0.0011; cubic-meter;    11 / 10;    1.1;    liter
-volume; vehicle;    001;    1 / 1000;   0.001;  cubic-meter;    1;  1.0;    liter
-volume; vehicle;    001;    9 / 10000;  9.0E-4; cubic-meter;    9 / 10; 0.9;    liter
+volume;	vehicle;	001;	11 / 10000;	0.0011;	cubic-meter;	11 / 10;	1.1;	liter
+volume;	vehicle;	001;	1 / 1000;	0.001;	cubic-meter;	1;	1.0;	liter
+volume;	vehicle;	001;	9 / 10000;	9.0E-4;	cubic-meter;	9 / 10;	0.9;	liter
 
-year-duration;  default;    001;    11 / 10;    1.1;    year;   11 / 10;    1.1;    year
-year-duration;  default;    001;    1;  1.0;    year;   1;  1.0;    year
-year-duration;  default;    001;    9 / 10; 0.9;    year;   54 / 5; 10.8;   month
-year-duration;  default;    001;    1 / 12; 0.08333333333333333;    year;   1;  1.0;    month
-year-duration;  default;    001;    3 / 40; 0.075;  year;   9 / 10; 0.9;    month
+year-duration;	default;	001;	11 / 10;	1.1;	year;	11 / 10;	1.1;	year
+year-duration;	default;	001;	1;	1.0;	year;	1;	1.0;	year
+year-duration;	default;	001;	9 / 10;	0.9;	year;	54 / 5;	10.8;	month
+year-duration;	default;	001;	1 / 12;	0.08333333333333333;	year;	1;	1.0;	month
+year-duration;	default;	001;	3 / 40;	0.075;	year;	9 / 10;	0.9;	month
 
-year-duration;  person-age; 001;    13 / 5; 2.6;    year;   13 / 5; 2.6;    year-person
-year-duration;  person-age; 001;    5 / 2;  2.5;    year;   5 / 2;  2.5;    year-person
-year-duration;  person-age; 001;    12 / 5; 2.4;    year;   2;  year-person;    24 / 5; 4.8;    month-person
-year-duration;  person-age; 001;    1;  1.0;    year;   1;  year-person;    0;  0.0;    month-person
-year-duration;  person-age; 001;    9 / 10; 0.9;    year;   54 / 5; 10.8;   month-person
-year-duration;  person-age; 001;    1 / 12; 0.08333333333333333;    year;   1;  1.0;    month-person
-year-duration;  person-age; 001;    3 / 40; 0.075;  year;   9 / 10; 0.9;    month-person
+year-duration;	person-age;	001;	13 / 5;	2.6;	year;	13 / 5;	2.6;	year-person
+year-duration;	person-age;	001;	5 / 2;	2.5;	year;	5 / 2;	2.5;	year-person
+year-duration;	person-age;	001;	12 / 5;	2.4;	year;	2;	year-person;	24 / 5;	4.8;	month-person
+year-duration;	person-age;	001;	1;	1.0;	year;	1;	year-person;	0;	0.0;	month-person
+year-duration;	person-age;	001;	9 / 10;	0.9;	year;	54 / 5;	10.8;	month-person
+year-duration;	person-age;	001;	1 / 12;	0.08333333333333333;	year;	1;	1.0;	month-person
+year-duration;	person-age;	001;	3 / 40;	0.075;	year;	9 / 10;	0.9;	month-person
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
index 82b7f3a..d2facef 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
@@ -5,7 +5,7 @@
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
-#   Quantity    ;   x   ;   y   ;   conversion to y (rational)  ;   test: 1000 x ⟹ y
+#	Quantity	;	x	;	y	;	conversion to y (rational)	;	test: 1000 x ⟹ y
 #
 # Use: convert 1000 x units to the y unit; the result should match the final column,
 #   at the given precision. For example, when the last column is 159.1549,
@@ -14,181 +14,190 @@
 #
 # Generation: Set GENERATE_TESTS in TestUnits.java, and look at TestParseUnit results.
 
-acceleration    ;   meter-per-square-second ;   meter-per-square-second ;   1 * x   ;   1,000.00
-acceleration    ;   g-force ;   meter-per-square-second ;   9.80665 * x ;   9806.65
-angle   ;   arc-second  ;   revolution  ;   0.0000625/81 * x    ;   7.716049E-4
-angle   ;   arc-minute  ;   revolution  ;   0.00125/27 * x  ;   0.0462963
-angle   ;   degree  ;   revolution  ;   0.025/9 * x ;   2.777778
-angle   ;   radian  ;   revolution  ;   65,501,488/411,557,987 * x  ;   159.1549
-angle   ;   revolution  ;   revolution  ;   1 * x   ;   1,000.00
-area    ;   square-centimeter   ;   square-meter    ;   0.0001 * x  ;   0.1
-area    ;   square-inch ;   square-meter    ;   0.00064516 * x  ;   0.64516
-area    ;   square-foot ;   square-meter    ;   0.09290304 * x  ;   92.90304
-area    ;   square-yard ;   square-meter    ;   0.83612736 * x  ;   836.1274
-area    ;   square-meter    ;   square-meter    ;   1 * x   ;   1,000.00
-area    ;   dunam   ;   square-meter    ;   1,000 * x   ;   1000000.0
-area    ;   acre    ;   square-meter    ;   4,046.8564224 * x   ;   4046856.0
-area    ;   hectare ;   square-meter    ;   10,000 * x  ;   1.0E7
-area    ;   square-kilometer    ;   square-meter    ;   1,000,000 * x   ;   1.0E9
-area    ;   square-mile ;   square-meter    ;   2,589,988.110336 * x    ;   2.589988E9
-concentration   ;   millimole-per-liter ;   item-per-cubic-meter    ;   602,214,076,000,000,000,000,000 * x ;   6.022141E26
-consumption ;   liter-per-100-kilometer ;   cubic-meter-per-meter   ;   0.00000001 * x  ;   1.0E-5
-consumption ;   liter-per-kilometer ;   cubic-meter-per-meter   ;   0.000001 * x    ;   0.001
-consumption-inverse ;   mile-per-gallon-imperial    ;   meter-per-cubic-meter   ;   160,934,400,000/454,609 * x ;   3.540062E8
-consumption-inverse ;   mile-per-gallon ;   meter-per-cubic-meter   ;   48,000,000,000/112,903 * x  ;   4.251437E8
-digital ;   bit ;   bit ;   1 * x   ;   1,000.00
-digital ;   byte    ;   bit ;   8 * x   ;   8000.0
-digital ;   kilobit ;   bit ;   1,000 * x   ;   1000000.0
-digital ;   kilobyte    ;   bit ;   8,000 * x   ;   8000000.0
-digital ;   megabit ;   bit ;   1,000,000 * x   ;   1.0E9
-digital ;   megabyte    ;   bit ;   8,000,000 * x   ;   8.0E9
-digital ;   gigabit ;   bit ;   1,000,000,000 * x   ;   1.0E12
-digital ;   gigabyte    ;   bit ;   8,000,000,000 * x   ;   8.0E12
-digital ;   terabit ;   bit ;   1,000,000,000,000 * x   ;   1.0E15
-digital ;   terabyte    ;   bit ;   8,000,000,000,000 * x   ;   8.0E15
-digital ;   petabyte    ;   bit ;   8,000,000,000,000,000 * x   ;   8.0E18
-duration    ;   nanosecond  ;   second  ;   0.000000001 * x ;   1.0E-6
-duration    ;   microsecond ;   second  ;   0.000001 * x    ;   0.001
-duration    ;   millisecond ;   second  ;   0.001 * x   ;   1.0
-duration    ;   second  ;   second  ;   1 * x   ;   1,000.00
-duration    ;   minute  ;   second  ;   60 * x  ;   60000.0
-duration    ;   hour    ;   second  ;   3,600 * x   ;   3600000.0
-duration    ;   day ;   second  ;   86,400 * x  ;   8.64E7
-duration    ;   day-person  ;   second  ;   86,400 * x  ;   8.64E7
-duration    ;   week    ;   second  ;   604,800 * x ;   6.048E8
-duration    ;   week-person ;   second  ;   604,800 * x ;   6.048E8
-electric-current    ;   milliampere ;   ampere  ;   0.001 * x   ;   1.0
-electric-current    ;   ampere  ;   ampere  ;   1 * x   ;   1,000.00
-electric-resistance ;   ohm ;   kilogram-square-meter-per-cubic-second-square-ampere    ;   1 * x   ;   1000.0
-energy  ;   electronvolt    ;   kilogram-square-meter-per-square-second ;   0.0000000000000000001602177 * x ;   1.602177E-16
-energy  ;   dalton  ;   kilogram-square-meter-per-square-second ;   0.00000000014924180856 * x  ;   1.492418E-7
-energy  ;   joule   ;   kilogram-square-meter-per-square-second ;   1 * x   ;   1000.0
-energy  ;   newton-meter    ;   kilogram-square-meter-per-square-second ;   1 * x   ;   1000.0
-energy  ;   pound-force-foot    ;   kilogram-square-meter-per-square-second ;   1.3558179483314004 * x  ;   1355.818
-energy  ;   calorie ;   kilogram-square-meter-per-square-second ;   4.184 * x   ;   4184.0
-energy  ;   kilojoule   ;   kilogram-square-meter-per-square-second ;   1,000 * x   ;   1000000.0
-energy  ;   british-thermal-unit    ;   kilogram-square-meter-per-square-second ;   9,489.1523804/9 * x ;   1054350.0
-energy  ;   foodcalorie ;   kilogram-square-meter-per-square-second ;   4,184 * x   ;   4184000.0
-energy  ;   kilocalorie ;   kilogram-square-meter-per-square-second ;   4,184 * x   ;   4184000.0
-energy  ;   kilowatt-hour   ;   kilogram-square-meter-second-per-cubic-second   ;   3,600,000 * x   ;   3.6E9
-energy  ;   therm-us    ;   kilogram-square-meter-per-square-second ;   105,480,400 * x ;   1.054804E11
-force   ;   newton  ;   kilogram-meter-per-square-second    ;   1 * x   ;   1000.0
-force   ;   pound-force ;   kilogram-meter-per-square-second    ;   4.4482216152605 * x ;   4448.222
-frequency   ;   hertz   ;   revolution-per-second   ;   1 * x   ;   1000.0
-frequency   ;   kilohertz   ;   revolution-per-second   ;   1,000 * x   ;   1000000.0
-frequency   ;   megahertz   ;   revolution-per-second   ;   1,000,000 * x   ;   1.0E9
-frequency   ;   gigahertz   ;   revolution-per-second   ;   1,000,000,000 * x   ;   1.0E12
-graphics    ;   dot ;   pixel   ;   1 * x   ;   1000.0
-graphics    ;   pixel   ;   pixel   ;   1 * x   ;   1,000.00
-graphics    ;   megapixel   ;   pixel   ;   1,000,000 * x   ;   1.0E9
-length  ;   picometer   ;   meter   ;   0.000000000001 * x  ;   1.0E-9
-length  ;   nanometer   ;   meter   ;   0.000000001 * x ;   1.0E-6
-length  ;   micrometer  ;   meter   ;   0.000001 * x    ;   0.001
-length  ;   point   ;   meter   ;   0.003175/9 * x  ;   0.3527778
-length  ;   millimeter  ;   meter   ;   0.001 * x   ;   1.0
-length  ;   centimeter  ;   meter   ;   0.01 * x    ;   10.0
-length  ;   inch    ;   meter   ;   0.0254 * x  ;   25.4
-length  ;   decimeter   ;   meter   ;   0.1 * x ;   100.0
-length  ;   foot    ;   meter   ;   0.3048 * x  ;   304.8
-length  ;   yard    ;   meter   ;   0.9144 * x  ;   914.4
-length  ;   meter   ;   meter   ;   1 * x   ;   1,000.00
-length  ;   fathom  ;   meter   ;   1.8288 * x  ;   1828.8
-length  ;   furlong ;   meter   ;   201.168 * x ;   201168.0
-length  ;   kilometer   ;   meter   ;   1,000 * x   ;   1000000.0
-length  ;   mile    ;   meter   ;   1,609.344 * x   ;   1609344.0
-length  ;   nautical-mile   ;   meter   ;   1,852 * x   ;   1852000.0
-length  ;   mile-scandinavian   ;   meter   ;   10,000 * x  ;   1.0E7
-length  ;   100-kilometer   ;   meter   ;   100,000 * x ;   1.0E8
-length  ;   earth-radius    ;   meter   ;   6,378,100 * x   ;   6.3781E9
-length  ;   solar-radius    ;   meter   ;   695,700,000 * x ;   6.957E11
-length  ;   astronomical-unit   ;   meter   ;   149,597,900,000 * x ;   1.495979E14
-length  ;   light-year  ;   meter   ;   9,460,730,000,000,000 * x   ;   9.46073E18
-length  ;   parsec  ;   meter   ;   30,856,780,000,000,000 * x  ;   3.085678E19
-luminous-flux   ;   lux ;   candela-square-meter-per-square-meter   ;   1 * x   ;   1000.0
-luminous-intensity  ;   candela ;   candela ;   1 * x   ;   1,000.00
-mass    ;   microgram   ;   kilogram    ;   0.000000001 * x ;   1.0E-6
-mass    ;   milligram   ;   kilogram    ;   0.000001 * x    ;   0.001
-mass    ;   carat   ;   kilogram    ;   0.0002 * x  ;   0.2
-mass    ;   gram    ;   kilogram    ;   0.001 * x   ;   1.0
-mass    ;   ounce   ;   kilogram    ;   0.028349523125 * x  ;   28.34952
-mass    ;   ounce-troy  ;   kilogram    ;   0.03110348 * x  ;   31.10348
-mass    ;   pound   ;   kilogram    ;   0.45359237 * x  ;   453.5924
-mass    ;   kilogram    ;   kilogram    ;   1 * x   ;   1,000.00
-mass    ;   stone   ;   kilogram    ;   6.35029318 * x  ;   6350.293
-mass    ;   ton ;   kilogram    ;   907.18474 * x   ;   907184.7
-mass    ;   metric-ton  ;   kilogram    ;   1,000 * x   ;   1000000.0
-mass    ;   earth-mass  ;   kilogram    ;   5,972,200,000,000,000,000,000,000 * x   ;   5.9722E27
-mass    ;   solar-mass  ;   kilogram    ;   1,988,470,000,000,000,000,000,000,000,000 * x   ;   1.98847E33
-mass-density    ;   milligram-per-deciliter ;   kilogram-per-cubic-meter    ;   0.01 * x    ;   10.0
-portion ;   permillion  ;   portion ;   0.000001 * x    ;   0.001
-portion ;   permyriad   ;   portion ;   0.0001 * x  ;   0.1
-portion ;   permille    ;   portion ;   0.001 * x   ;   1.0
-portion ;   percent ;   portion ;   0.01 * x    ;   10.0
-portion ;   karat   ;   portion ;   0.125/3 * x ;   41.66667
-portion ;   portion ;   portion ;   1 * x   ;   1,000.00
-power   ;   milliwatt   ;   kilogram-square-meter-per-cubic-second  ;   0.001 * x   ;   1.0
-power   ;   watt    ;   kilogram-square-meter-per-cubic-second  ;   1 * x   ;   1000.0
-power   ;   horsepower  ;   kilogram-square-meter-per-cubic-second  ;   745.69987158227022 * x  ;   745699.9
-power   ;   kilowatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000 * x   ;   1000000.0
-power   ;   megawatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000,000 * x   ;   1.0E9
-power   ;   gigawatt    ;   kilogram-square-meter-per-cubic-second  ;   1,000,000,000 * x   ;   1.0E12
-power   ;   solar-luminosity    ;   kilogram-square-meter-per-cubic-second  ;   382,800,000,000,000,000,000,000,000 * x ;   3.828E29
-pressure    ;   pascal  ;   kilogram-per-meter-square-second    ;   1 * x   ;   1000.0
-pressure    ;   hectopascal ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
-pressure    ;   millibar    ;   kilogram-per-meter-square-second    ;   100 * x ;   100000.0
-pressure    ;   millimeter-ofhg ;   kilogram-meter-per-square-meter-square-second   ;   133.322387415 * x   ;   133322.4
-pressure    ;   kilopascal  ;   kilogram-per-meter-square-second    ;   1,000 * x   ;   1000000.0
-pressure    ;   inch-ofhg   ;   kilogram-meter-per-square-meter-square-second   ;   3,386.388640341 * x ;   3386389.0
-pressure    ;   pound-force-per-square-inch ;   kilogram-meter-per-square-meter-square-second   ;   111,205,540.3815125/16,129 * x  ;   6894757.0
-pressure    ;   bar ;   kilogram-per-meter-square-second    ;   100,000 * x ;   1.0E8
-pressure    ;   atmosphere  ;   kilogram-per-meter-square-second    ;   101,325 * x ;   1.01325E8
-pressure    ;   megapascal  ;   kilogram-per-meter-square-second    ;   1,000,000 * x   ;   1.0E9
-pressure-per-length ;   ofhg    ;   kilogram-per-square-meter-square-second ;   133,322.387415 * x  ;   1.333224E8
-resolution  ;   dot-per-inch    ;   pixel-per-meter ;   5,000/127 * x   ;   39370.08
-resolution  ;   pixel-per-inch  ;   pixel-per-meter ;   5,000/127 * x   ;   39370.08
-resolution  ;   dot-per-centimeter  ;   pixel-per-meter ;   100 * x ;   100000.0
-resolution  ;   pixel-per-centimeter    ;   pixel-per-meter ;   100 * x ;   100000.0
-speed   ;   kilometer-per-hour  ;   meter-per-second    ;   2.5/9 * x   ;   277.7778
-speed   ;   mile-per-hour   ;   meter-per-second    ;   0.44704 * x ;   447.04
-speed   ;   knot    ;   meter-per-second    ;   4.63/9 * x  ;   514.4444
-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 ;   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
-typewidth   ;   em  ;   em  ;   1 * x   ;   1,000.00
-voltage ;   volt    ;   kilogram-square-meter-per-cubic-second-ampere   ;   1 * x   ;   1000.0
-volume  ;   cubic-centimeter    ;   cubic-meter ;   0.000001 * x    ;   0.001
-volume  ;   milliliter  ;   cubic-meter ;   0.000001 * x    ;   0.001
-volume  ;   teaspoon    ;   cubic-meter ;   0.00000492892159375 * x ;   0.004928922
-volume  ;   centiliter  ;   cubic-meter ;   0.00001 * x ;   0.01
-volume  ;   tablespoon  ;   cubic-meter ;   0.00001478676478125 * x ;   0.01478676
-volume  ;   cubic-inch  ;   cubic-meter ;   0.000016387064 * x  ;   0.01638706
-volume  ;   fluid-ounce-imperial    ;   cubic-meter ;   0.0000284130625 * x ;   0.02841306
-volume  ;   fluid-ounce ;   cubic-meter ;   0.0000295735295625 * x  ;   0.02957353
-volume  ;   deciliter   ;   cubic-meter ;   0.0001 * x  ;   0.1
-volume  ;   cup ;   cubic-meter ;   0.0002365882365 * x ;   0.2365882
-volume  ;   cup-metric  ;   cubic-meter ;   0.00025 * x ;   0.25
-volume  ;   pint    ;   cubic-meter ;   0.000473176473 * x  ;   0.4731765
-volume  ;   pint-metric ;   cubic-meter ;   0.0005 * x  ;   0.5
-volume  ;   quart   ;   cubic-meter ;   0.000946352946 * x  ;   0.9463529
-volume  ;   liter   ;   cubic-meter ;   0.001 * x   ;   1.0
-volume  ;   gallon  ;   cubic-meter ;   0.003785411784 * x  ;   3.785412
-volume  ;   gallon-imperial ;   cubic-meter ;   0.00454609 * x  ;   4.54609
-volume  ;   cubic-foot  ;   cubic-meter ;   0.028316846592 * x  ;   28.31685
-volume  ;   bushel  ;   cubic-meter ;   0.03523907016688 * x    ;   35.23907
-volume  ;   hectoliter  ;   cubic-meter ;   0.1 * x ;   100.0
-volume  ;   barrel  ;   cubic-meter ;   0.158987294928 * x  ;   158.9873
-volume  ;   cubic-yard  ;   cubic-meter ;   0.764554857984 * x  ;   764.5549
-volume  ;   cubic-meter ;   cubic-meter ;   1 * x   ;   1,000.00
-volume  ;   megaliter   ;   cubic-meter ;   1,000 * x   ;   1000000.0
-volume  ;   acre-foot   ;   cubic-meter ;   1,233.48183754752 * x   ;   1233482.0
-volume  ;   cubic-kilometer ;   cubic-meter ;   1,000,000,000 * x   ;   1.0E12
-volume  ;   cubic-mile  ;   cubic-meter ;   4,168,181,825.440579584 * x ;   4.168182E12
-year-duration   ;   month   ;   year    ;   0.25/3 * x  ;   83.33333
-year-duration   ;   month-person    ;   year    ;   0.25/3 * x  ;   83.33333
-year-duration   ;   year    ;   year    ;   1 * x   ;   1,000.00
-year-duration   ;   year-person ;   year    ;   1 * x   ;   1000.0
-year-duration   ;   decade  ;   year    ;   10 * x  ;   10000.0
-year-duration   ;   century ;   year    ;   100 * x ;   100000.0
+acceleration	;	meter-per-square-second	;	meter-per-square-second	;	1 * x	;	1,000.00
+acceleration	;	g-force	;	meter-per-square-second	;	9.80665 * x	;	9806.65
+angle	;	arc-second	;	revolution	;	0.0000625/81 * x	;	7.716049E-4
+angle	;	arc-minute	;	revolution	;	0.00125/27 * x	;	0.0462963
+angle	;	degree	;	revolution	;	0.025/9 * x	;	2.777778
+angle	;	radian	;	revolution	;	65,501,488/411,557,987 * x	;	159.1549
+angle	;	revolution	;	revolution	;	1 * x	;	1,000.00
+area	;	square-centimeter	;	square-meter	;	0.0001 * x	;	0.1
+area	;	square-inch	;	square-meter	;	0.00064516 * x	;	0.64516
+area	;	square-foot	;	square-meter	;	0.09290304 * x	;	92.90304
+area	;	square-yard	;	square-meter	;	0.83612736 * x	;	836.1274
+area	;	square-meter	;	square-meter	;	1 * x	;	1,000.00
+area	;	dunam	;	square-meter	;	1,000 * x	;	1000000.0
+area	;	acre	;	square-meter	;	4,046.8564224 * x	;	4046856.0
+area	;	hectare	;	square-meter	;	10,000 * x	;	1.0E7
+area	;	square-kilometer	;	square-meter	;	1,000,000 * x	;	1.0E9
+area	;	square-mile	;	square-meter	;	2,589,988.110336 * x	;	2.589988E9
+concentration	;	millimole-per-liter	;	item-per-cubic-meter	;	602,214,076,000,000,000,000,000 * x	;	6.022141E26
+consumption	;	liter-per-100-kilometer	;	cubic-meter-per-meter	;	0.00000001 * x	;	1.0E-5
+consumption	;	liter-per-kilometer	;	cubic-meter-per-meter	;	0.000001 * x	;	0.001
+consumption-inverse	;	mile-per-gallon-imperial	;	meter-per-cubic-meter	;	160,934,400,000/454,609 * x	;	3.540062E8
+consumption-inverse	;	mile-per-gallon	;	meter-per-cubic-meter	;	48,000,000,000/112,903 * x	;	4.251437E8
+digital	;	bit	;	bit	;	1 * x	;	1,000.00
+digital	;	byte	;	bit	;	8 * x	;	8000.0
+digital	;	kilobit	;	bit	;	1,000 * x	;	1000000.0
+digital	;	kilobyte	;	bit	;	8,000 * x	;	8000000.0
+digital	;	megabit	;	bit	;	1,000,000 * x	;	1.0E9
+digital	;	megabyte	;	bit	;	8,000,000 * x	;	8.0E9
+digital	;	gigabit	;	bit	;	1,000,000,000 * x	;	1.0E12
+digital	;	gigabyte	;	bit	;	8,000,000,000 * x	;	8.0E12
+digital	;	terabit	;	bit	;	1,000,000,000,000 * x	;	1.0E15
+digital	;	terabyte	;	bit	;	8,000,000,000,000 * x	;	8.0E15
+digital	;	petabyte	;	bit	;	8,000,000,000,000,000 * x	;	8.0E18
+duration	;	nanosecond	;	second	;	0.000000001 * x	;	1.0E-6
+duration	;	microsecond	;	second	;	0.000001 * x	;	0.001
+duration	;	millisecond	;	second	;	0.001 * x	;	1.0
+duration	;	second	;	second	;	1 * x	;	1,000.00
+duration	;	minute	;	second	;	60 * x	;	60000.0
+duration	;	hour	;	second	;	3,600 * x	;	3600000.0
+duration	;	day	;	second	;	86,400 * x	;	8.64E7
+duration	;	day-person	;	second	;	86,400 * x	;	8.64E7
+duration	;	week	;	second	;	604,800 * x	;	6.048E8
+duration	;	week-person	;	second	;	604,800 * x	;	6.048E8
+electric-current	;	milliampere	;	ampere	;	0.001 * x	;	1.0
+electric-current	;	ampere	;	ampere	;	1 * x	;	1,000.00
+electric-resistance	;	ohm	;	kilogram-square-meter-per-cubic-second-square-ampere	;	1 * x	;	1000.0
+energy	;	electronvolt	;	kilogram-square-meter-per-square-second	;	0.0000000000000000001602177 * x	;	1.602177E-16
+energy	;	dalton	;	kilogram-square-meter-per-square-second	;	0.00000000014924180856 * x	;	1.492418E-7
+energy	;	joule	;	kilogram-square-meter-per-square-second	;	1 * x	;	1000.0
+energy	;	newton-meter	;	kilogram-square-meter-per-square-second	;	1 * x	;	1000.0
+energy	;	pound-force-foot	;	kilogram-square-meter-per-square-second	;	1.3558179483314004 * x	;	1355.818
+energy	;	calorie	;	kilogram-square-meter-per-square-second	;	4.184 * x	;	4184.0
+energy	;	kilojoule	;	kilogram-square-meter-per-square-second	;	1,000 * x	;	1000000.0
+energy	;	british-thermal-unit	;	kilogram-square-meter-per-square-second	;	9,489.1523804/9 * x	;	1054350.0
+energy	;	foodcalorie	;	kilogram-square-meter-per-square-second	;	4,184 * x	;	4184000.0
+energy	;	kilocalorie	;	kilogram-square-meter-per-square-second	;	4,184 * x	;	4184000.0
+energy	;	kilowatt-hour	;	kilogram-square-meter-second-per-cubic-second	;	3,600,000 * x	;	3.6E9
+energy	;	therm-us	;	kilogram-square-meter-per-square-second	;	105,480,400 * x	;	1.054804E11
+force	;	newton	;	kilogram-meter-per-square-second	;	1 * x	;	1000.0
+force	;	pound-force	;	kilogram-meter-per-square-second	;	4.4482216152605 * x	;	4448.222
+frequency	;	hertz	;	revolution-per-second	;	1 * x	;	1000.0
+frequency	;	kilohertz	;	revolution-per-second	;	1,000 * x	;	1000000.0
+frequency	;	megahertz	;	revolution-per-second	;	1,000,000 * x	;	1.0E9
+frequency	;	gigahertz	;	revolution-per-second	;	1,000,000,000 * x	;	1.0E12
+graphics	;	dot	;	pixel	;	1 * x	;	1000.0
+graphics	;	pixel	;	pixel	;	1 * x	;	1,000.00
+graphics	;	megapixel	;	pixel	;	1,000,000 * x	;	1.0E9
+illuminance	;	lux	;	candela-per-square-meter	;	1 * x	;	1000.0
+length	;	picometer	;	meter	;	0.000000000001 * x	;	1.0E-9
+length	;	nanometer	;	meter	;	0.000000001 * x	;	1.0E-6
+length	;	micrometer	;	meter	;	0.000001 * x	;	0.001
+length	;	point	;	meter	;	0.003175/9 * x	;	0.3527778
+length	;	millimeter	;	meter	;	0.001 * x	;	1.0
+length	;	centimeter	;	meter	;	0.01 * x	;	10.0
+length	;	inch	;	meter	;	0.0254 * x	;	25.4
+length	;	decimeter	;	meter	;	0.1 * x	;	100.0
+length	;	foot	;	meter	;	0.3048 * x	;	304.8
+length	;	yard	;	meter	;	0.9144 * x	;	914.4
+length	;	meter	;	meter	;	1 * x	;	1,000.00
+length	;	fathom	;	meter	;	1.8288 * x	;	1828.8
+length	;	furlong	;	meter	;	201.168 * x	;	201168.0
+length	;	kilometer	;	meter	;	1,000 * x	;	1000000.0
+length	;	mile	;	meter	;	1,609.344 * x	;	1609344.0
+length	;	nautical-mile	;	meter	;	1,852 * x	;	1852000.0
+length	;	mile-scandinavian	;	meter	;	10,000 * x	;	1.0E7
+length	;	100-kilometer	;	meter	;	100,000 * x	;	1.0E8
+length	;	earth-radius	;	meter	;	6,378,100 * x	;	6.3781E9
+length	;	solar-radius	;	meter	;	695,700,000 * x	;	6.957E11
+length	;	astronomical-unit	;	meter	;	149,597,900,000 * x	;	1.495979E14
+length	;	light-year	;	meter	;	9,460,730,000,000,000 * x	;	9.46073E18
+length	;	parsec	;	meter	;	30,856,780,000,000,000 * x	;	3.085678E19
+luminous-flux	;	lumen	;	candela-square-meter-per-square-meter	;	1 * x	;	1000.0
+luminous-intensity	;	candela	;	candela	;	1 * x	;	1,000.00
+mass	;	microgram	;	kilogram	;	0.000000001 * x	;	1.0E-6
+mass	;	milligram	;	kilogram	;	0.000001 * x	;	0.001
+mass	;	grain	;	kilogram	;	0.00006479891 * x	;	0.06479891
+mass	;	carat	;	kilogram	;	0.0002 * x	;	0.2
+mass	;	gram	;	kilogram	;	0.001 * x	;	1.0
+mass	;	ounce	;	kilogram	;	0.028349523125 * x	;	28.34952
+mass	;	ounce-troy	;	kilogram	;	0.03110348 * x	;	31.10348
+mass	;	pound	;	kilogram	;	0.45359237 * x	;	453.5924
+mass	;	kilogram	;	kilogram	;	1 * x	;	1,000.00
+mass	;	stone	;	kilogram	;	6.35029318 * x	;	6350.293
+mass	;	ton	;	kilogram	;	907.18474 * x	;	907184.7
+mass	;	metric-ton	;	kilogram	;	1,000 * x	;	1000000.0
+mass	;	earth-mass	;	kilogram	;	5,972,200,000,000,000,000,000,000 * x	;	5.9722E27
+mass	;	solar-mass	;	kilogram	;	1,988,470,000,000,000,000,000,000,000,000 * x	;	1.98847E33
+mass-density	;	milligram-per-deciliter	;	kilogram-per-cubic-meter	;	0.01 * x	;	10.0
+portion	;	permillion	;	portion	;	0.000001 * x	;	0.001
+portion	;	permyriad	;	portion	;	0.0001 * x	;	0.1
+portion	;	permille	;	portion	;	0.001 * x	;	1.0
+portion	;	percent	;	portion	;	0.01 * x	;	10.0
+portion	;	karat	;	portion	;	0.125/3 * x	;	41.66667
+portion	;	portion	;	portion	;	1 * x	;	1,000.00
+power	;	milliwatt	;	kilogram-square-meter-per-cubic-second	;	0.001 * x	;	1.0
+power	;	watt	;	kilogram-square-meter-per-cubic-second	;	1 * x	;	1000.0
+power	;	horsepower	;	kilogram-square-meter-per-cubic-second	;	745.69987158227022 * x	;	745699.9
+power	;	kilowatt	;	kilogram-square-meter-per-cubic-second	;	1,000 * x	;	1000000.0
+power	;	megawatt	;	kilogram-square-meter-per-cubic-second	;	1,000,000 * x	;	1.0E9
+power	;	gigawatt	;	kilogram-square-meter-per-cubic-second	;	1,000,000,000 * x	;	1.0E12
+power	;	solar-luminosity	;	kilogram-square-meter-per-cubic-second	;	382,800,000,000,000,000,000,000,000 * x	;	3.828E29
+pressure	;	pascal	;	kilogram-per-meter-square-second	;	1 * x	;	1000.0
+pressure	;	hectopascal	;	kilogram-per-meter-square-second	;	100 * x	;	100000.0
+pressure	;	millibar	;	kilogram-per-meter-square-second	;	100 * x	;	100000.0
+pressure	;	millimeter-ofhg	;	kilogram-meter-per-square-meter-square-second	;	133.322387415 * x	;	133322.4
+pressure	;	kilopascal	;	kilogram-per-meter-square-second	;	1,000 * x	;	1000000.0
+pressure	;	inch-ofhg	;	kilogram-meter-per-square-meter-square-second	;	3,386.388640341 * x	;	3386389.0
+pressure	;	pound-force-per-square-inch	;	kilogram-meter-per-square-meter-square-second	;	111,205,540.3815125/16,129 * x	;	6894757.0
+pressure	;	bar	;	kilogram-per-meter-square-second	;	100,000 * x	;	1.0E8
+pressure	;	atmosphere	;	kilogram-per-meter-square-second	;	101,325 * x	;	1.01325E8
+pressure	;	megapascal	;	kilogram-per-meter-square-second	;	1,000,000 * x	;	1.0E9
+pressure-per-length	;	ofhg	;	kilogram-per-square-meter-square-second	;	133,322.387415 * x	;	1.333224E8
+resolution	;	dot-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
+resolution	;	pixel-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
+resolution	;	dot-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
+resolution	;	pixel-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
+speed	;	kilometer-per-hour	;	meter-per-second	;	2.5/9 * x	;	277.7778
+speed	;	mile-per-hour	;	meter-per-second	;	0.44704 * x	;	447.04
+speed	;	knot	;	meter-per-second	;	4.63/9 * x	;	514.4444
+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	;	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
+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
+volume	;	pinch	;	cubic-meter	;	0.00000023104319970703125 * x	;	2.310432E-4
+volume	;	cubic-centimeter	;	cubic-meter	;	0.000001 * x	;	0.001
+volume	;	milliliter	;	cubic-meter	;	0.000001 * x	;	0.001
+volume	;	dessert-spoon	;	cubic-meter	;	0.00000184834559765625 * x	;	0.001848346
+volume	;	dessert-spoon-imperial	;	cubic-meter	;	0.0000022197705078125 * x	;	0.002219771
+volume	;	dram	;	cubic-meter	;	0.0000036966911953125 * x	;	0.003696691
+volume	;	teaspoon	;	cubic-meter	;	0.00000492892159375 * x	;	0.004928922
+volume	;	centiliter	;	cubic-meter	;	0.00001 * x	;	0.01
+volume	;	tablespoon	;	cubic-meter	;	0.00001478676478125 * x	;	0.01478676
+volume	;	cubic-inch	;	cubic-meter	;	0.000016387064 * x	;	0.01638706
+volume	;	fluid-ounce-imperial	;	cubic-meter	;	0.0000284130625 * x	;	0.02841306
+volume	;	fluid-ounce	;	cubic-meter	;	0.0000295735295625 * x	;	0.02957353
+volume	;	jigger	;	cubic-meter	;	0.00004436029434375 * x	;	0.04436029
+volume	;	deciliter	;	cubic-meter	;	0.0001 * x	;	0.1
+volume	;	cup	;	cubic-meter	;	0.0002365882365 * x	;	0.2365882
+volume	;	cup-metric	;	cubic-meter	;	0.00025 * x	;	0.25
+volume	;	pint	;	cubic-meter	;	0.000473176473 * x	;	0.4731765
+volume	;	pint-metric	;	cubic-meter	;	0.0005 * x	;	0.5
+volume	;	quart	;	cubic-meter	;	0.000946352946 * x	;	0.9463529
+volume	;	liter	;	cubic-meter	;	0.001 * x	;	1.0
+volume	;	quart-imperial	;	cubic-meter	;	0.0011365225 * x	;	1.136522
+volume	;	gallon	;	cubic-meter	;	0.003785411784 * x	;	3.785412
+volume	;	gallon-imperial	;	cubic-meter	;	0.00454609 * x	;	4.54609
+volume	;	cubic-foot	;	cubic-meter	;	0.028316846592 * x	;	28.31685
+volume	;	bushel	;	cubic-meter	;	0.03523907016688 * x	;	35.23907
+volume	;	hectoliter	;	cubic-meter	;	0.1 * x	;	100.0
+volume	;	barrel	;	cubic-meter	;	0.158987294928 * x	;	158.9873
+volume	;	cubic-yard	;	cubic-meter	;	0.764554857984 * x	;	764.5549
+volume	;	cubic-meter	;	cubic-meter	;	1 * x	;	1,000.00
+volume	;	megaliter	;	cubic-meter	;	1,000 * x	;	1000000.0
+volume	;	acre-foot	;	cubic-meter	;	1,233.48183754752 * x	;	1233482.0
+volume	;	cubic-kilometer	;	cubic-meter	;	1,000,000,000 * x	;	1.0E12
+volume	;	cubic-mile	;	cubic-meter	;	4,168,181,825.440579584 * x	;	4.168182E12
+year-duration	;	month	;	year	;	0.25/3 * x	;	83.33333
+year-duration	;	month-person	;	year	;	0.25/3 * x	;	83.33333
+year-duration	;	year	;	year	;	1 * x	;	1,000.00
+year-duration	;	year-person	;	year	;	1 * x	;	1000.0
+year-duration	;	decade	;	year	;	10 * x	;	10000.0
+year-duration	;	century	;	year	;	100 * x	;	100000.0
\ No newline at end of file
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
index dedd2df..1e2d55d 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/CompactDecimalFormatTest.java
@@ -698,9 +698,9 @@
         // Check currency formatting as well
         cdf = CompactDecimalFormat.getInstance(new ULocale("ar-EG"), CompactDecimalFormat.CompactStyle.SHORT);
         result = cdf.format(new CurrencyAmount(43000f, Currency.getInstance("USD")));
-        assertEquals("CDF should correctly format 43000 with currency in 'ar-EG'", " ٤٣ ألف US$", result); // see CLDR-14149, may be error
+        assertEquals("CDF should correctly format 43000 with currency in 'ar-EG'", "٤٣ ألف US$", result);
         result = cdf.format(new CurrencyAmount(-43000f, Currency.getInstance("USD")));
-        assertEquals("CDF should correctly format -43000 with currency in 'ar-EG'", "؜- ٤٣ ألف US$", result); // see CLDR-14149, may be error
+        assertEquals("CDF should correctly format -43000 with currency in 'ar-EG'", "؜-٤٣ ألف US$", result);
 
         // Extra locale with different positive/negative formats
         cdf = CompactDecimalFormat.getInstance(new ULocale("fi"), CompactDecimalFormat.CompactStyle.SHORT);
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
index dc6f9b5..99826cf 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java
@@ -1529,73 +1529,73 @@
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "Z", "-0800", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-08:00", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "z", "GMT-8", "-8:00" },
-        { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "Pacific Standard Time", "-8:00" },
+        { "ti", "America/Los_Angeles", "2004-01-15T00:00:00Z", "zzzz", "GMT-08:00", "-8:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "Z", "-0700", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-07:00", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "z", "GMT-7", "-7:00" },
-        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "Pacific Daylight Time", "-7:00" },
+        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "zzzz", "GMT-07:00", "-7:00" },
         { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "v", "Los Angeles", "America/Los_Angeles" },
-        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Pacific Time", "America/Los_Angeles" },
+        { "ti", "America/Los_Angeles", "2004-07-15T00:00:00Z", "vvvv", "Los Angeles", "America/Los_Angeles" },
 
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
-        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
+        { "ti", "America/Argentina/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
 
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Buenos_Aires", "2004-01-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "Z", "-0300", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "z", "GMT-3", "-3:00" },
-        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "Argentina Standard Time", "-3:00" },
+        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "zzzz", "GMT-03:00", "-3:00" },
         { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "v", "Buenos Aires", "America/Buenos_Aires" },
-        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Argentina Standard Time", "America/Buenos_Aires" },
+        { "ti", "America/Buenos_Aires", "2004-07-15T00:00:00Z", "vvvv", "Buenos Aires", "America/Buenos_Aires" },
 
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "Z", "-0500", "-5:00" },
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "ZZZZ", "GMT-05:00", "-5:00" },
         { "ti", "America/Havana", "2004-01-15T00:00:00Z", "z", "GMT-5", "-5:00" },
-        { "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "Cuba Standard Time", "-5:00" },
+        { "ti", "America/Havana", "2004-01-15T00:00:00Z", "zzzz", "GMT-05:00", "-5:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "Z", "-0400", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "ZZZZ", "GMT-04:00", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "z", "GMT-4", "-4:00" },
-        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "Cuba Daylight Time", "-4:00" },
+        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "zzzz", "GMT-04:00", "-4:00" },
         { "ti", "America/Havana", "2004-07-15T00:00:00Z", "v", "\u12A9\u1263", "America/Havana" },
-        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "Cuba Time", "America/Havana" },
+        { "ti", "America/Havana", "2004-07-15T00:00:00Z", "vvvv", "\u12A9\u1263", "America/Havana" },
 
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
         { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
-        { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
+        { "ti", "Australia/ACT", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
-        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
+        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
         { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
-        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
+        { "ti", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
 
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" },
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+11:00", "+11:00" },
         { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "z", "GMT+11", "+11:00" },
-        { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "Australian Eastern Daylight Time", "+11:00" },
+        { "ti", "Australia/Sydney", "2004-01-15T00:00:00Z", "zzzz", "GMT+11:00", "+11:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "Z", "+1000", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+10:00", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" },
-        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" },
+        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "GMT+10:00", "+10:00" },
         { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney", "Australia/Sydney" },
-        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" },
+        { "ti", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Sydney", "Australia/Sydney" },
 
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" },
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "ZZZZ", "GMT", "+0:00" },
         { "ti", "Europe/London", "2004-01-15T00:00:00Z", "z", "GMT", "+0:00" },
-        { "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "Greenwich Mean Time", "+0:00" },
+        { "ti", "Europe/London", "2004-01-15T00:00:00Z", "zzzz", "GMT", "+0:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "Z", "+0100", "+1:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+01:00", "+1:00" },
         { "ti", "Europe/London", "2004-07-15T00:00:00Z", "z", "GMT+1", "+1:00" },
@@ -1618,13 +1618,13 @@
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "z", "GMT+5:30", "+5:30" },
-        { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
+        { "ti", "Asia/Calcutta", "2004-01-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "Z", "+0530", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "ZZZZ", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "z", "GMT+5:30", "+05:30" },
-        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "India Standard Time", "+5:30" },
+        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "zzzz", "GMT+05:30", "+5:30" },
         { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "v", "\u1205\u1295\u12F2", "Asia/Calcutta" },
-        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "India Standard Time", "Asia/Calcutta" },
+        { "ti", "Asia/Calcutta", "2004-07-15T00:00:00Z", "vvvv", "\u1205\u1295\u12F2", "Asia/Calcutta" },
 
         // Ticket#8589 Partial location name to use country name if the zone is the golden
         // zone for the time zone's country.
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
index ebce864..6461d4a 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/PluralRulesTest.java
@@ -866,7 +866,7 @@
                     for (String keyword : rules.getKeywords()) {
                         boolean isLimited = rules.isLimited(keyword, sampleType);
                         boolean computeLimited = rules.computeLimited(keyword, sampleType);
-                        if (!keyword.equals("other")) {
+                        if (!keyword.equals("other") && !(locale.getLanguage().equals("fr") && logKnownIssue("ICU-21270", "fr plurals many case computeLimited == isLimited"))) {
                             assertEquals(getAssertMessage("computeLimited == isLimited", locale, rules, keyword),
                                     computeLimited, isLimited);
                         }
@@ -1112,7 +1112,7 @@
 
             // [one, other]
             "am,bn,fa,gu,hi,kn,mr,zu; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …",
-            "ff,fr,hy,kab; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …",
+            "ff,hy,kab; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …",
             "ast,ca,de,en,et,fi,fy,gl,it,ji,nl,sv,sw,ur,yi; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …",
             "pt; one: @integer 1; other: @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …",
             "si; one: @integer 0, 1; other: @integer 2~17, 100, 1000, 10000, 100000, 1000000, …",
@@ -1133,6 +1133,9 @@
             // [one, two, other]
             "iu,naq,se,sma,smi,smj,smn,sms; one: @integer 1; two: @integer 2; other: @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …",
 
+            // [one, many, other]
+            "fr; one: @integer 0, 1; many: @integer 1000000; other: @integer 2~17, 100, 1000, 10000, 100000, …",
+
             // [one, few, other]
             "shi; one: @integer 0, 1; few: @integer 2~10; other: @integer 11~26, 100, 1000, 10000, 100000, 1000000, …",
             "mo,ro; one: @integer 1; few: @integer 0, 2~16, 102, 1002, …; other: @integer 20~35, 100, 1000, 10000, 100000, 1000000, …",
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
index 30b5b36..d299eb5 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestLocaleValidity.java
@@ -60,6 +60,7 @@
                 {"OK", "en-u-co-big5han"},
                 {"OK", "en-u-cu-adp"},
                 {"OK", "en-u-fw-fri"},
+                {"OK", "en-u-dx-thai"},
                 {"OK", "en-u-hc-h11"},
                 {"OK", "en-u-ka-noignore"},
                 {"OK", "en-u-kb-false"},