From f7d261ebbc3ce654d008d8f6bc69985a4f4e0459 Mon Sep 17 00:00:00 2001
From: John Emmons <emmo@us.ibm.com>
Date: Fri, 5 Feb 2016 04:12:07 +0000
Subject: [PATCH] ICU-12091 Merge preliminary CLDR 29 data for 57m1

X-SVN-Rev: 38287
---
 icu4c/source/data/brkitr/brkfiles.mk        |    2 +-
 icu4c/source/data/brkitr/de.txt             |    2 +-
 icu4c/source/data/brkitr/el.txt             |    2 +-
 icu4c/source/data/brkitr/en.txt             |    2 +-
 icu4c/source/data/brkitr/en_US.txt          |    2 +-
 icu4c/source/data/brkitr/en_US_POSIX.txt    |    2 +-
 icu4c/source/data/brkitr/es.txt             |    2 +-
 icu4c/source/data/brkitr/fi.txt             |    2 +-
 icu4c/source/data/brkitr/fr.txt             |    2 +-
 icu4c/source/data/brkitr/it.txt             |    2 +-
 icu4c/source/data/brkitr/ja.txt             |    2 +-
 icu4c/source/data/brkitr/pt.txt             |    2 +-
 icu4c/source/data/brkitr/root.txt           |    4 +-
 icu4c/source/data/brkitr/ru.txt             |    2 +-
 icu4c/source/data/brkitr/zh.txt             |    2 +-
 icu4c/source/data/brkitr/zh_Hant.txt        |    2 +-
 icu4c/source/data/icu-config.xml            |    6 +-
 icu4c/source/data/misc/dayPeriods.txt       | 2303 +++---
 icu4c/source/data/misc/genderList.txt       |    2 +-
 icu4c/source/data/misc/keyTypeData.txt      |  127 +
 icu4c/source/data/misc/likelySubtags.txt    |    5 +-
 icu4c/source/data/misc/metadata.txt         |   68 +-
 icu4c/source/data/misc/numberingSystems.txt |    2 +-
 icu4c/source/data/misc/plurals.txt          |    2 +-
 icu4c/source/data/misc/supplementalData.txt | 7865 +++++++++++--------
 icu4c/source/data/misc/timezoneTypes.txt    |    2 +-
 icu4c/source/test/cintltst/uregiontest.c    |    4 +-
 icu4c/source/test/intltest/dtfmttst.cpp     |    6 +-
 icu4c/source/test/intltest/regiontst.cpp    |    4 +-
 icu4c/source/test/testdata/root.txt         |    6 +-
 icu4c/source/test/testdata/structLocale.txt |  352 +-
 31 files changed, 6055 insertions(+), 4733 deletions(-)

diff --git a/icu4c/source/data/brkitr/brkfiles.mk b/icu4c/source/data/brkitr/brkfiles.mk
index 3aed6ddcb04..7cce1000290 100644
--- a/icu4c/source/data/brkitr/brkfiles.mk
+++ b/icu4c/source/data/brkitr/brkfiles.mk
@@ -1,4 +1,4 @@
-# *   Copyright (C) 1998-2015, International Business Machines
+# *   Copyright (C) 1998-2016, International Business Machines
 # *   Corporation and others.  All Rights Reserved.
 BRK_RES_CLDR_VERSION = %version%
 # A list of txt's to build
diff --git a/icu4c/source/data/brkitr/de.txt b/icu4c/source/data/brkitr/de.txt
index 20a046b237f..0fb9436390c 100755
--- a/icu4c/source/data/brkitr/de.txt
+++ b/icu4c/source/data/brkitr/de.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/de.xml ../../xml/brkitr/de.xml
diff --git a/icu4c/source/data/brkitr/el.txt b/icu4c/source/data/brkitr/el.txt
index d7d1502c413..a4d0a42e0dc 100644
--- a/icu4c/source/data/brkitr/el.txt
+++ b/icu4c/source/data/brkitr/el.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/el.xml ../../xml/brkitr/el.xml
diff --git a/icu4c/source/data/brkitr/en.txt b/icu4c/source/data/brkitr/en.txt
index f9fcfcc014f..69dc0c286f4 100644
--- a/icu4c/source/data/brkitr/en.txt
+++ b/icu4c/source/data/brkitr/en.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/en.xml ../../xml/brkitr/en.xml
diff --git a/icu4c/source/data/brkitr/en_US.txt b/icu4c/source/data/brkitr/en_US.txt
index 7fcd7c2c7a1..2a845a12724 100644
--- a/icu4c/source/data/brkitr/en_US.txt
+++ b/icu4c/source/data/brkitr/en_US.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/en_US.xml ../../xml/brkitr/en_US.xml
diff --git a/icu4c/source/data/brkitr/en_US_POSIX.txt b/icu4c/source/data/brkitr/en_US_POSIX.txt
index c080a02a8b1..4183b47c1be 100644
--- a/icu4c/source/data/brkitr/en_US_POSIX.txt
+++ b/icu4c/source/data/brkitr/en_US_POSIX.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/en_US_POSIX.xml ../../xml/brkitr/en_US_POSIX.xml
diff --git a/icu4c/source/data/brkitr/es.txt b/icu4c/source/data/brkitr/es.txt
index 5af7fa07d07..24a6485e4e7 100755
--- a/icu4c/source/data/brkitr/es.txt
+++ b/icu4c/source/data/brkitr/es.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/es.xml ../../xml/brkitr/es.xml
diff --git a/icu4c/source/data/brkitr/fi.txt b/icu4c/source/data/brkitr/fi.txt
index fddbbb98a00..996c44a887c 100644
--- a/icu4c/source/data/brkitr/fi.txt
+++ b/icu4c/source/data/brkitr/fi.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/fi.xml ../../xml/brkitr/fi.xml
diff --git a/icu4c/source/data/brkitr/fr.txt b/icu4c/source/data/brkitr/fr.txt
index 03acc964c4b..896059397fc 100755
--- a/icu4c/source/data/brkitr/fr.txt
+++ b/icu4c/source/data/brkitr/fr.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/fr.xml ../../xml/brkitr/fr.xml
diff --git a/icu4c/source/data/brkitr/it.txt b/icu4c/source/data/brkitr/it.txt
index bf336068678..9dcdb2355f7 100755
--- a/icu4c/source/data/brkitr/it.txt
+++ b/icu4c/source/data/brkitr/it.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/it.xml ../../xml/brkitr/it.xml
diff --git a/icu4c/source/data/brkitr/ja.txt b/icu4c/source/data/brkitr/ja.txt
index 616db6355f2..60bbdf9b056 100644
--- a/icu4c/source/data/brkitr/ja.txt
+++ b/icu4c/source/data/brkitr/ja.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/ja.xml ../../xml/brkitr/ja.xml
diff --git a/icu4c/source/data/brkitr/pt.txt b/icu4c/source/data/brkitr/pt.txt
index 295b995b08e..66cbfd9178a 100755
--- a/icu4c/source/data/brkitr/pt.txt
+++ b/icu4c/source/data/brkitr/pt.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/pt.xml ../../xml/brkitr/pt.xml
diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt
index 193f7c2d867..5faaffb049b 100644
--- a/icu4c/source/data/brkitr/root.txt
+++ b/icu4c/source/data/brkitr/root.txt
@@ -1,13 +1,13 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/root.xml ../../xml/brkitr/root.xml
 // *
 // ***************************************************************************
 root{
-    Version{"2.1.20.0"}
+    Version{"2.1.23.21"}
     boundaries{
         grapheme:process(dependency){"char.brk"}
         line:process(dependency){"line.brk"}
diff --git a/icu4c/source/data/brkitr/ru.txt b/icu4c/source/data/brkitr/ru.txt
index 2df6e305c76..22b19330479 100755
--- a/icu4c/source/data/brkitr/ru.txt
+++ b/icu4c/source/data/brkitr/ru.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/ru.xml ../../xml/brkitr/ru.xml
diff --git a/icu4c/source/data/brkitr/zh.txt b/icu4c/source/data/brkitr/zh.txt
index 47b5fce063d..32a1557d4c5 100644
--- a/icu4c/source/data/brkitr/zh.txt
+++ b/icu4c/source/data/brkitr/zh.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/zh.xml ../../xml/brkitr/zh.xml
diff --git a/icu4c/source/data/brkitr/zh_Hant.txt b/icu4c/source/data/brkitr/zh_Hant.txt
index 36e91464216..fe9a175be31 100644
--- a/icu4c/source/data/brkitr/zh_Hant.txt
+++ b/icu4c/source/data/brkitr/zh_Hant.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/segments/zh_Hant.xml ../../xml/brkitr/zh_Hant.xml
diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml
index 0a20dd41ac5..98dd78b51a9 100644
--- a/icu4c/source/data/icu-config.xml
+++ b/icu4c/source/data/icu-config.xml
@@ -1,7 +1,7 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2005-2015, International Business Machines Corporation and    *
+* Copyright (C) 2005-2016, International Business Machines Corporation and    *
 * others. All Rights Reserved.	                                         *
 *******************************************************************************
 */
@@ -51,6 +51,8 @@
 		<include locales="as_IN"/>
 		<include locales="asa"/>
 		<include locales="asa_TZ"/>
+		<include locales="ast"/>
+		<include locales="ast_ES"/>
 		<include locales="az"/>
 		<include locales="az_AZ"/>
 		<include locales="az_Cyrl"/>
@@ -721,6 +723,8 @@
 		<include locales="yo"/>
 		<include locales="yo_BJ"/>
 		<include locales="yo_NG"/>
+		<include locales="yue"/>
+		<include locales="yue_HK"/>
 		<include locales="zgh"/>
 		<include locales="zgh_MA"/>
 		<include locales="zh"/>
diff --git a/icu4c/source/data/misc/dayPeriods.txt b/icu4c/source/data/misc/dayPeriods.txt
index 6f999f15005..ca56bf2ca3e 100644
--- a/icu4c/source/data/misc/dayPeriods.txt
+++ b/icu4c/source/data/misc/dayPeriods.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/dayPeriods.xml
@@ -9,54 +9,54 @@
 dayPeriods:table(nofallback){
     locales{
         af{"set3"}
-        am{"set66"}
-        ar{"set64"}
-        az{"set60"}
+        am{"set67"}
+        ar{"set65"}
+        az{"set61"}
         bg{"set20"}
         bn{"set33"}
         bs{"set24"}
         ca{"set14"}
-        chr{"set74"}
+        chr{"set75"}
         cs{"set26"}
         da{"set6"}
         de{"set5"}
-        ee{"set75"}
+        ee{"set76"}
         el{"set39"}
         en{"set2"}
         es{"set12"}
         es_CO{"set13"}
         et{"set48"}
-        eu{"set72"}
+        eu{"set73"}
         fa{"set42"}
         fi{"set47"}
-        fil{"set58"}
+        fil{"set59"}
         fr{"set17"}
         gl{"set11"}
         gu{"set34"}
-        he{"set65"}
+        he{"set66"}
         hi{"set32"}
         hr{"set23"}
         hu{"set49"}
         hy{"set41"}
-        id{"set56"}
+        id{"set57"}
         is{"set9"}
         it{"set15"}
-        ja{"set51"}
-        ka{"set71"}
-        kk{"set61"}
-        km{"set68"}
+        ja{"set52"}
+        ka{"set72"}
+        kk{"set62"}
+        km{"set69"}
         kn{"set46"}
-        ko{"set52"}
-        ky{"set62"}
-        lo{"set55"}
+        ko{"set53"}
+        ky{"set63"}
+        lo{"set56"}
         lt{"set29"}
         lv{"set30"}
         mk{"set21"}
         ml{"set45"}
-        mn{"set73"}
+        mn{"set74"}
         mr{"set35"}
-        ms{"set57"}
-        my{"set53"}
+        ms{"set58"}
+        my{"set54"}
         nb{"set7"}
         ne{"set36"}
         nl{"set4"}
@@ -72,113 +72,127 @@ dayPeriods:table(nofallback){
         sq{"set40"}
         sr{"set22"}
         sv{"set8"}
-        sw{"set69"}
+        sw{"set70"}
         ta{"set43"}
         te{"set44"}
-        th{"set54"}
-        tr{"set59"}
+        th{"set55"}
+        tr{"set60"}
         uk{"set19"}
         ur{"set31"}
-        uz{"set63"}
-        vi{"set67"}
+        uz{"set64"}
+        vi{"set68"}
+        yue{"set51"}
         zh{"set50"}
-        zu{"set70"}
+        zu{"set71"}
     }
     locales_selection{
-        af{"set78"}
-        am{"set145"}
-        ar{"set136"}
-        az{"set127"}
-        bg{"set100"}
-        bn{"set113"}
-        bs{"set94"}
-        ca{"set89"}
-        cs{"set97"}
-        da{"set81"}
-        de{"set80"}
-        el{"set106"}
-        en{"set77"}
-        es{"set87"}
-        es_CO{"set88"}
-        et{"set131"}
-        eu{"set146"}
-        fa{"set107"}
-        fi{"set132"}
-        fil{"set140"}
-        fr{"set92"}
-        gl{"set86"}
-        gu{"set114"}
-        he{"set137"}
-        hi{"set112"}
-        hr{"set93"}
-        hu{"set133"}
-        hy{"set108"}
-        id{"set138"}
-        is{"set84"}
-        it{"set90"}
-        ja{"set124"}
-        ka{"set109"}
-        kk{"set128"}
-        km{"set142"}
-        kn{"set122"}
-        ko{"set125"}
-        ky{"set129"}
-        lo{"set135"}
-        lt{"set104"}
-        lv{"set105"}
-        mk{"set101"}
-        ml{"set121"}
-        mn{"set147"}
-        mr{"set115"}
-        ms{"set139"}
-        my{"set148"}
-        nb{"set82"}
-        ne{"set116"}
-        nl{"set79"}
-        pa{"set117"}
-        pl{"set99"}
-        pt{"set85"}
-        ro{"set91"}
-        root{"set76"}
-        ru{"set102"}
-        si{"set118"}
-        sk{"set98"}
-        sl{"set96"}
-        sq{"set110"}
-        sr{"set95"}
-        sv{"set83"}
-        sw{"set143"}
-        ta{"set119"}
-        te{"set120"}
-        th{"set134"}
-        tr{"set126"}
-        uk{"set103"}
-        ur{"set111"}
-        uz{"set130"}
-        vi{"set141"}
-        zh{"set123"}
-        zu{"set144"}
+        af{"set79"}
+        am{"set147"}
+        ar{"set138"}
+        az{"set129"}
+        bg{"set101"}
+        bn{"set114"}
+        bs{"set95"}
+        ca{"set90"}
+        chr{"set151"}
+        cs{"set98"}
+        da{"set82"}
+        de{"set81"}
+        ee{"set152"}
+        el{"set107"}
+        en{"set78"}
+        es{"set88"}
+        es_CO{"set89"}
+        et{"set133"}
+        eu{"set148"}
+        fa{"set108"}
+        fi{"set134"}
+        fil{"set142"}
+        fr{"set93"}
+        gl{"set87"}
+        gu{"set115"}
+        he{"set139"}
+        hi{"set113"}
+        hr{"set94"}
+        hu{"set135"}
+        hy{"set109"}
+        id{"set140"}
+        is{"set85"}
+        it{"set91"}
+        ja{"set126"}
+        ka{"set110"}
+        kk{"set130"}
+        km{"set144"}
+        kn{"set123"}
+        ko{"set127"}
+        ky{"set131"}
+        lo{"set137"}
+        lt{"set105"}
+        lv{"set106"}
+        mk{"set102"}
+        ml{"set122"}
+        mn{"set149"}
+        mr{"set116"}
+        ms{"set141"}
+        my{"set150"}
+        nb{"set83"}
+        ne{"set117"}
+        nl{"set80"}
+        pa{"set118"}
+        pl{"set100"}
+        pt{"set86"}
+        ro{"set92"}
+        root{"set77"}
+        ru{"set103"}
+        si{"set119"}
+        sk{"set99"}
+        sl{"set97"}
+        sq{"set111"}
+        sr{"set96"}
+        sv{"set84"}
+        sw{"set145"}
+        ta{"set120"}
+        te{"set121"}
+        th{"set136"}
+        tr{"set128"}
+        uk{"set104"}
+        ur{"set112"}
+        uz{"set132"}
+        vi{"set143"}
+        yue{"set125"}
+        zh{"set124"}
+        zu{"set146"}
     }
     rules{
+        set1{
+            am{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            pm{
+                before{"24:00"}
+                from{"12:00"}
+            }
+        }
         set10{
             afternoon1{
-                after{"12:00"}
                 before{"19:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"19:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -187,51 +201,45 @@ dayPeriods:table(nofallback){
         set100{
             afternoon1{
                 before{"18:00"}
-                from{"14:00"}
+                from{"12:00"}
             }
             evening1{
-                before{"22:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
             morning1{
-                before{"11:00"}
-                from{"4:00"}
+                before{"10:00"}
+                from{"06:00"}
             }
             morning2{
-                before{"14:00"}
-                from{"11:00"}
+                before{"12:00"}
+                from{"10:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
         set101{
             afternoon1{
                 before{"18:00"}
-                from{"12:00"}
+                from{"14:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"4:00"}
+                before{"11:00"}
+                from{"04:00"}
             }
             morning2{
-                before{"12:00"}
-                from{"10:00"}
+                before{"14:00"}
+                from{"11:00"}
             }
             night1{
-                before{"4:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"22:00"}
             }
         }
         set102{
@@ -244,12 +252,16 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
+                before{"10:00"}
+                from{"04:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"4:00"}
+                from{"10:00"}
             }
             night1{
-                before{"4:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
         set103{
@@ -263,11 +275,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{"4:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
         set104{
@@ -281,11 +293,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"04:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
         set105{
@@ -294,46 +306,34 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"23:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "23:00",
-                }
+                before{"06:00"}
+                from{"00:00"}
             }
         }
         set106{
             afternoon1{
-                before{"17:00"}
+                before{"18:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"20:00"}
-                from{"17:00"}
+                before{"23:00"}
+                from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"06:00"}
+                from{"23:00"}
             }
         }
         set107{
@@ -342,40 +342,34 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"19:00"}
+                before{"20:00"}
                 from{"17:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "19:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
         set108{
             afternoon1{
-                before{"18:00"}
+                before{"17:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
-                from{"18:00"}
+                before{"19:00"}
+                from{"17:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"04:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"19:00"}
             }
         }
         set109{
@@ -384,22 +378,16 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"00:00"}
             }
         }
         set11{
@@ -412,15 +400,15 @@ dayPeriods:table(nofallback){
                 from{"13:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
@@ -428,6 +416,24 @@ dayPeriods:table(nofallback){
             }
         }
         set110{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
+            evening1{
+                before{"21:00"}
+                from{"18:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"05:00"}
+            }
+            night1{
+                before{"05:00"}
+                from{"21:00"}
+            }
+        }
+        set111{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -437,19 +443,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                before{"4:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
-        set111{
+        set112{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -464,20 +470,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
-        set112{
+        set113{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -488,20 +488,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
-        set113{
+        set114{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -515,25 +509,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
-        set114{
+        set115{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -544,20 +532,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
-        set115{
+        set116{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -571,25 +553,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
         }
-        set116{
+        set117{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -604,20 +580,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"04:00"}
+                from{"22:00"}
             }
         }
-        set117{
+        set118{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -628,20 +598,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
         }
-        set118{
+        set119{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -651,23 +615,44 @@ dayPeriods:table(nofallback){
                 from{"14:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"1:00"}
+                before{"06:00"}
+                from{"01:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"18:00"}
             }
             night2{
-                before{"1:00"}
-                from{"0:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
         }
-        set119{
+        set12{
+            evening1{
+                before{"20:00"}
+                from{"12:00"}
+            }
+            morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
+            }
+            night1{
+                before{"24:00"}
+                from{"20:00"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set120{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -685,46 +670,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"5:00"}
-                from{"3:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"5:00"}
-            }
-            night1{
-                before{
-                    "3:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
-            }
-        }
-        set12{
-            evening1{
-                after{"12:00"}
-                before{"20:00"}
-            }
-            morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"05:00"}
             }
             night1{
-                before{"24:00"}
-                from{"20:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"03:00"}
+                from{"21:00"}
             }
         }
-        set120{
+        set121{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -735,20 +693,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set121{
+        set122{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -766,25 +718,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "3:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "19:00",
-                }
+                before{"03:00"}
+                from{"19:00"}
             }
         }
-        set122{
+        set123{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -795,20 +741,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set123{
+        set124{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -822,19 +762,45 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
             morning1{
-                before{"8:00"}
-                from{"5:00"}
+                before{"08:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"8:00"}
+                from{"08:00"}
             }
             night1{
-                before{"5:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set124{
+        set125{
+            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"}
+            }
+        }
+        set126{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -845,24 +811,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
                 before{"23:00"}
                 from{"19:00"}
             }
             night2{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "23:00",
-                }
+                before{"04:00"}
+                from{"23:00"}
             }
         }
-        set125{
+        set127{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -872,25 +832,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "3:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"03:00"}
+                from{"21:00"}
             }
         }
-        set126{
+        set128{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -905,24 +859,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"11:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"11:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set127{
+        set129{
             afternoon1{
                 before{"17:00"}
                 from{"12:00"}
@@ -932,47 +880,40 @@ dayPeriods:table(nofallback){
                 from{"17:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
             night2{
-                before{"4:00"}
-                from{"0:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
         }
-        set128{
-            afternoon1{
-                before{"18:00"}
-                from{"12:00"}
-            }
+        set13{
             evening1{
-                before{"21:00"}
-                from{"18:00"}
+                before{"20:00"}
+                from{"12:00"}
             }
-            morning1{
+            morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"00:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"24:00"}
+                from{"20:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set129{
+        set130{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -983,37 +924,32 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set13{
+        set131{
+            afternoon1{
+                before{"18:00"}
+                from{"12:00"}
+            }
             evening1{
-                after{"12:00"}
-                before{"20:00"}
+                before{"21:00"}
+                from{"18:00"}
             }
-            morning2{
+            morning1{
                 before{"12:00"}
-                from{"0:00"}
+                from{"06:00"}
             }
             night1{
-                before{"24:00"}
-                from{"20:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set130{
+        set132{
             afternoon1{
                 before{"18:00"}
                 from{"11:00"}
@@ -1024,20 +960,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"11:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"06:00"}
+                from{"22:00"}
             }
         }
-        set131{
+        set133{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1048,20 +978,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "23:00",
-                }
+                before{"05:00"}
+                from{"23:00"}
             }
         }
-        set132{
+        set134{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1072,24 +996,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "23:00",
-                }
+                before{"05:00"}
+                from{"23:00"}
             }
         }
-        set133{
+        set135{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1099,29 +1017,23 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"6:00"}
+                before{"09:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
             night2{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
         }
-        set134{
+        set136{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1140,20 +1052,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set135{
+        set137{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1164,20 +1070,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"05:00"}
+                from{"20:00"}
             }
         }
-        set136{
+        set138{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -1191,23 +1091,23 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"1:00"}
-                from{"0:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
             night2{
-                before{"3:00"}
-                from{"1:00"}
+                before{"03:00"}
+                from{"01:00"}
             }
         }
-        set137{
+        set139{
             afternoon1{
                 before{"15:00"}
                 from{"11:00"}
@@ -1222,89 +1122,83 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"11:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"05:00"}
+                from{"22:00"}
             }
         }
-        set138{
+        set14{
             afternoon1{
-                before{"15:00"}
-                from{"10:00"}
+                before{"13:00"}
+                from{"12:00"}
+            }
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
             }
             evening1{
-                before{"18:00"}
-                from{"15:00"}
+                before{"21:00"}
+                from{"19:00"}
+            }
+            midnight{
+                at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
+                before{"12:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
-                from{"18:00"}
+                from{"21:00"}
             }
         }
-        set139{
+        set140{
             afternoon1{
-                before{"14:00"}
-                from{"12:00"}
+                before{"15:00"}
+                from{"10:00"}
             }
             evening1{
-                before{"19:00"}
-                from{"14:00"}
+                before{"18:00"}
+                from{"15:00"}
             }
             morning1{
-                before{"1:00"}
-                from{"0:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"1:00"}
+                before{"10:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
-                from{"19:00"}
+                from{"18:00"}
             }
         }
-        set14{
+        set141{
             afternoon1{
-                before{"13:00"}
+                before{"14:00"}
                 from{"12:00"}
             }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
             evening1{
-                before{"21:00"}
-                from{"19:00"}
-            }
-            midnight{
-                at{"0:00"}
+                before{"19:00"}
+                from{"14:00"}
             }
             morning1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"01:00"}
             }
             night1{
                 before{"24:00"}
-                from{"21:00"}
+                from{"19:00"}
             }
         }
-        set140{
+        set142{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1314,19 +1208,19 @@ dayPeriods:table(nofallback){
                 from{"16:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"18:00"}
             }
         }
-        set141{
+        set143{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1337,20 +1231,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
         }
-        set142{
+        set144{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1361,14 +1249,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"0:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
                 from{"21:00"}
             }
         }
-        set143{
+        set145{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1378,25 +1266,19 @@ dayPeriods:table(nofallback){
                 from{"16:00"}
             }
             morning1{
-                before{"7:00"}
-                from{"4:00"}
+                before{"07:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"7:00"}
+                from{"07:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "19:00",
-                }
+                before{"04:00"}
+                from{"19:00"}
             }
         }
-        set144{
+        set146{
             afternoon1{
                 before{"13:00"}
                 from{"10:00"}
@@ -1406,19 +1288,19 @@ dayPeriods:table(nofallback){
                 from{"13:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"10:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
         }
-        set145{
+        set147{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1429,14 +1311,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set146{
+        set148{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -1450,19 +1332,19 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"21:00"}
             }
         }
-        set147{
+        set149{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -1473,20 +1355,38 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set148{
+        set15{
+            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"}
+            }
+            noon{
+                at{"12:00"}
+            }
+        }
+        set150{
             afternoon1{
                 before{"16:00"}
                 from{"12:00"}
@@ -1497,59 +1397,67 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"0:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
         }
-        set15{
+        set151{
             afternoon1{
-                after{"12:00"}
+                before{"24:00"}
+                from{"12:00"}
+            }
+            morning1{
+                before{"12:00"}
+                from{"00:00"}
+            }
+        }
+        set152{
+            afternoon1{
+                before{"14:00"}
+                from{"12:00"}
+            }
+            afternoon2{
                 before{"18:00"}
+                from{"14:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
-            midnight{
-                at{"0:00"}
-            }
             morning1{
+                before{"05:00"}
+                from{"04:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"04:00"}
+                from{"21:00"}
             }
         }
         set16{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"22:00"}
             }
             noon{
@@ -1558,23 +1466,23 @@ dayPeriods:table(nofallback){
         }
         set17{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1582,23 +1490,23 @@ dayPeriods:table(nofallback){
         }
         set18{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1606,23 +1514,23 @@ dayPeriods:table(nofallback){
         }
         set19{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1630,26 +1538,22 @@ dayPeriods:table(nofallback){
         }
         set2{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
@@ -1666,48 +1570,44 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"11:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"14:00"}
                 from{"11:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"22:00"}
             }
         }
         set21{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"10:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1715,26 +1615,22 @@ dayPeriods:table(nofallback){
         }
         set22{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
@@ -1743,26 +1639,22 @@ dayPeriods:table(nofallback){
         }
         set23{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
             noon{
@@ -1771,26 +1663,22 @@ dayPeriods:table(nofallback){
         }
         set24{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
             noon{
@@ -1799,30 +1687,26 @@ dayPeriods:table(nofallback){
         }
         set25{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"10:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"22:00"}
             }
             noon{
@@ -1831,30 +1715,26 @@ dayPeriods:table(nofallback){
         }
         set26{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"22:00"}
             }
             noon{
@@ -1863,30 +1743,26 @@ dayPeriods:table(nofallback){
         }
         set27{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"22:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"22:00"}
             }
             noon{
@@ -1895,30 +1771,26 @@ dayPeriods:table(nofallback){
         }
         set28{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"10:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
@@ -1927,23 +1799,23 @@ dayPeriods:table(nofallback){
         }
         set29{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -1959,39 +1831,35 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{"5:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
         set30{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"23:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"23:00"}
             }
             noon{
@@ -2012,18 +1880,14 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"20:00"}
             }
         }
@@ -2037,18 +1901,14 @@ dayPeriods:table(nofallback){
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"20:00"}
             }
         }
@@ -2066,22 +1926,16 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
         set34{
@@ -2094,25 +1948,21 @@ dayPeriods:table(nofallback){
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"20:00"}
             }
         }
         set35{
             afternoon1{
-                after{"12:00"}
                 before{"16:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"18:00"}
@@ -2123,22 +1973,18 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
             noon{
@@ -2147,8 +1993,8 @@ dayPeriods:table(nofallback){
         }
         set36{
             afternoon1{
-                after{"12:00"}
                 before{"16:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"19:00"}
@@ -2159,18 +2005,14 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"22:00"}
             }
             noon{
@@ -2187,48 +2029,44 @@ dayPeriods:table(nofallback){
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
         }
         set38{
             afternoon1{
-                after{"12:00"}
                 before{"14:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"18:00"}
                 from{"14:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"1:00"}
+                before{"06:00"}
+                from{"01:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"18:00"}
             }
             night2{
-                after{"0:00"}
-                before{"1:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -2245,17 +2083,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "20:00",
-                }
+                before{"04:00"}
+                from{"20:00"}
             }
         }
         set4{
@@ -2268,40 +2100,40 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
         set40{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -2309,23 +2141,23 @@ dayPeriods:table(nofallback){
         }
         set41{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -2333,26 +2165,22 @@ dayPeriods:table(nofallback){
         }
         set42{
             afternoon1{
-                after{"12:00"}
                 before{"17:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"19:00"}
                 from{"17:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"19:00"}
             }
             noon{
@@ -2361,8 +2189,8 @@ dayPeriods:table(nofallback){
         }
         set43{
             afternoon1{
-                after{"12:00"}
                 before{"14:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"16:00"}
@@ -2377,22 +2205,18 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"5:00"}
-                from{"3:00"}
+                before{"05:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "3:00",
-                    "24:00",
-                }
+                before{"03:00"}
                 from{"21:00"}
             }
             noon{
@@ -2409,25 +2233,21 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
         }
         set45{
             afternoon1{
-                after{"12:00"}
                 before{"14:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"15:00"}
@@ -2442,22 +2262,18 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "3:00",
-                    "24:00",
-                }
+                before{"03:00"}
                 from{"19:00"}
             }
             noon{
@@ -2474,47 +2290,39 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
         }
         set47{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"23:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"23:00"}
             }
             noon{
@@ -2523,26 +2331,22 @@ dayPeriods:table(nofallback){
         }
         set48{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"23:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"23:00"}
             }
             noon{
@@ -2551,35 +2355,31 @@ dayPeriods:table(nofallback){
         }
         set49{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"6:00"}
+                before{"09:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
             night2{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             noon{
                 at{"12:00"}
@@ -2599,19 +2399,19 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{"5:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
         set50{
@@ -2628,100 +2428,121 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"8:00"}
-                from{"5:00"}
+                before{"08:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"8:00"}
+                from{"08:00"}
             }
             night1{
-                after{"0:00"}
-                before{"5:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
         set51{
             afternoon1{
-                after{"12:00"}
+                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{"16:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"19:00"}
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
                 before{"23:00"}
                 from{"19:00"}
             }
             night2{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"23:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set52{
+        set53{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "3:00",
-                    "24:00",
-                }
+                before{"03:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set53{
+        set54{
             afternoon1{
-                after{"12:00"}
                 before{"16:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"19:00"}
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
                 before{"12:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
@@ -2731,10 +2552,10 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set54{
+        set55{
             afternoon1{
-                after{"12:00"}
                 before{"13:00"}
+                from{"12:00"}
             }
             afternoon2{
                 before{"16:00"}
@@ -2749,59 +2570,47 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set55{
+        set56{
             afternoon1{
-                after{"12:00"}
                 before{"16:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"20:00"}
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"20:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set56{
+        set57{
             afternoon1{
-                after{"12:00"}
-                before{
-                    "12:00",
-                    "15:00",
-                }
+                before{"15:00"}
                 from{"10:00"}
             }
             evening1{
@@ -2809,11 +2618,11 @@ dayPeriods:table(nofallback){
                 from{"15:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
                 before{"10:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
@@ -2823,7 +2632,7 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set57{
+        set58{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -2833,37 +2642,37 @@ dayPeriods:table(nofallback){
                 from{"14:00"}
             }
             morning1{
-                before{"1:00"}
-                from{"0:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"1:00"}
+                from{"01:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
         }
-        set58{
+        set59{
             afternoon1{
-                after{"12:00"}
                 before{"16:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"18:00"}
                 from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
@@ -2873,162 +2682,146 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set59{
+        set6{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"18:00"}
+                from{"12:00"}
             }
             evening1{
-                before{"21:00"}
-                from{"19:00"}
+                before{"24:00"}
+                from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"11:00"}
-                from{"6:00"}
+                before{"10:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"11:00"}
+                from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{"21:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set6{
+        set60{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
             }
-            evening1{
-                before{"24:00"}
+            afternoon2{
+                before{"19:00"}
                 from{"18:00"}
             }
+            evening1{
+                before{"21:00"}
+                from{"19:00"}
+            }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"5:00"}
+                before{"11:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"11:00"}
             }
             night1{
-                after{"0:00"}
-                before{"5:00"}
+                before{"06:00"}
+                from{"21:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set60{
+        set61{
             afternoon1{
-                after{"12:00"}
                 before{"17:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"19:00"}
                 from{"17:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"4:00"}
+                before{"06:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
             night2{
-                after{"0:00"}
-                before{"4:00"}
+                before{"04:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set61{
+        set62{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set62{
+        set63{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set63{
+        set64{
             afternoon1{
-                after{"12:00"}
-                before{
-                    "12:00",
-                    "18:00",
-                }
+                before{"18:00"}
                 from{"11:00"}
             }
             evening1{
@@ -3036,25 +2829,21 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"11:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"22:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set64{
+        set65{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3068,23 +2857,23 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"3:00"}
+                before{"06:00"}
+                from{"03:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"1:00"}
-                from{"0:00"}
+                before{"01:00"}
+                from{"00:00"}
             }
             night2{
-                before{"3:00"}
-                from{"1:00"}
+                before{"03:00"}
+                from{"01:00"}
             }
         }
-        set65{
+        set66{
             afternoon1{
                 before{"15:00"}
                 from{"11:00"}
@@ -3098,88 +2887,80 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"11:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"22:00"}
             }
         }
-        set66{
+        set67{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set67{
+        set68{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
+                before{"04:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set68{
+        set69{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
                 before{"12:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
@@ -3189,64 +2970,60 @@ dayPeriods:table(nofallback){
                 at{"12:00"}
             }
         }
-        set69{
+        set7{
             afternoon1{
-                after{"12:00"}
-                before{"16:00"}
+                before{"18:00"}
+                from{"12:00"}
             }
             evening1{
-                before{"19:00"}
-                from{"16:00"}
+                before{"24:00"}
+                from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"7:00"}
-                from{"4:00"}
+                before{"10:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"7:00"}
+                from{"10:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{"19:00"}
-            }
-            noon{
-                at{"12:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set7{
+        set70{
             afternoon1{
-                before{"18:00"}
+                before{"16:00"}
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
-                from{"18:00"}
+                before{"19:00"}
+                from{"16:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"6:00"}
+                before{"07:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"07:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"04:00"}
+                from{"19:00"}
+            }
+            noon{
+                at{"12:00"}
             }
         }
-        set70{
+        set71{
             afternoon1{
                 before{"13:00"}
                 from{"10:00"}
@@ -3256,47 +3033,43 @@ dayPeriods:table(nofallback){
                 from{"13:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"10:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"19:00"}
             }
         }
-        set71{
+        set72{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "5:00",
-                    "24:00",
-                }
+                before{"05:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set72{
+        set73{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3310,63 +3083,59 @@ dayPeriods:table(nofallback){
                 from{"19:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"21:00"}
             }
         }
-        set73{
+        set74{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"21:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{
-                    "6:00",
-                    "24:00",
-                }
+                before{"06:00"}
                 from{"21:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set74{
+        set75{
             afternoon1{
-                after{"12:00"}
                 before{"24:00"}
+                from{"12:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"0:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
             }
         }
-        set75{
+        set76{
             afternoon1{
                 before{"14:00"}
                 from{"12:00"}
@@ -3388,11 +3157,21 @@ dayPeriods:table(nofallback){
                 from{"05:00"}
             }
             night1{
-                before{"4:00"}
+                before{"04:00"}
                 from{"21:00"}
             }
         }
         set77{
+            am{
+                before{"12:00"}
+                from{"00:00"}
+            }
+            pm{
+                before{"24:00"}
+                from{"12:00"}
+            }
+        }
+        set78{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3403,20 +3182,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
-        set78{
+        set79{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3427,14 +3200,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             night1{
-                before{"5:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set79{
+        set8{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3443,16 +3216,23 @@ dayPeriods:table(nofallback){
                 before{"24:00"}
                 from{"18:00"}
             }
+            midnight{
+                at{"00:00"}
+            }
             morning1{
+                before{"10:00"}
+                from{"05:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"10:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set8{
+        set80{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3461,23 +3241,16 @@ dayPeriods:table(nofallback){
                 before{"24:00"}
                 from{"18:00"}
             }
-            midnight{
-                at{"0:00"}
-            }
             morning1{
-                before{"10:00"}
-                from{"5:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"5:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set80{
+        set81{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3492,18 +3265,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                before{"5:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set81{
+        set82{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3514,18 +3287,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                before{"5:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set82{
+        set83{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3536,18 +3309,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"10:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set83{
+        set84{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3558,18 +3331,18 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"10:00"}
-                from{"5:00"}
+                from{"05:00"}
             }
             morning2{
                 before{"12:00"}
                 from{"10:00"}
             }
             night1{
-                before{"5:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"00:00"}
             }
         }
-        set84{
+        set85{
             afternoon1{
                 before{"18:00"}
                 from{"12:00"}
@@ -3580,14 +3353,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set85{
+        set86{
             afternoon1{
                 before{"19:00"}
                 from{"12:00"}
@@ -3598,14 +3371,14 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
         }
-        set86{
+        set87{
             afternoon1{
                 before{"13:00"}
                 from{"12:00"}
@@ -3615,95 +3388,69 @@ dayPeriods:table(nofallback){
                 from{"13:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"21:00"}
             }
         }
-        set87{
+        set88{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
             }
             morning1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
                 before{"24:00"}
                 from{"20:00"}
             }
         }
-        set88{
+        set89{
             evening1{
                 before{"20:00"}
                 from{"12:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"0:00"}
+                from{"00:00"}
             }
             night1{
                 before{"24:00"}
                 from{"20:00"}
             }
         }
-        set89{
-            afternoon1{
-                before{"13:00"}
-                from{"12:00"}
-            }
-            afternoon2{
-                before{"19:00"}
-                from{"13:00"}
-            }
-            evening1{
-                before{"21:00"}
-                from{"19:00"}
-            }
-            morning1{
-                before{"6:00"}
-                from{"0:00"}
-            }
-            morning2{
-                before{"12:00"}
-                from{"6:00"}
-            }
-            night1{
-                before{"24:00"}
-                from{"21:00"}
-            }
-        }
         set9{
             afternoon1{
-                after{"12:00"}
                 before{"18:00"}
+                from{"12:00"}
             }
             evening1{
                 before{"24:00"}
                 from{"18:00"}
             }
             midnight{
-                at{"0:00"}
+                at{"00:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                after{"0:00"}
-                before{"6:00"}
+                before{"06:00"}
+                from{"00:00"}
             }
             noon{
                 at{"12:00"}
@@ -3711,20 +3458,28 @@ dayPeriods:table(nofallback){
         }
         set90{
             afternoon1{
-                before{"18:00"}
+                before{"13:00"}
                 from{"12:00"}
             }
+            afternoon2{
+                before{"19:00"}
+                from{"13:00"}
+            }
             evening1{
-                before{"24:00"}
-                from{"18:00"}
+                before{"21:00"}
+                from{"19:00"}
             }
             morning1{
+                before{"06:00"}
+                from{"00:00"}
+            }
+            morning2{
                 before{"12:00"}
-                from{"6:00"}
+                from{"06:00"}
             }
             night1{
-                before{"6:00"}
-                from{"0:00"}
+                before{"24:00"}
+                from{"21:00"}
             }
         }
         set91{
@@ -3733,22 +3488,16 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"22:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"5:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "5:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"06:00"}
+                from{"00:00"}
             }
         }
         set92{
@@ -3757,16 +3506,16 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"24:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"05:00"}
             }
             night1{
-                before{"4:00"}
-                from{"0:00"}
+                before{"05:00"}
+                from{"22:00"}
             }
         }
         set93{
@@ -3775,22 +3524,16 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
+                before{"24:00"}
                 from{"18:00"}
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"00:00"}
             }
         }
         set94{
@@ -3804,17 +3547,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"4:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
         }
         set95{
@@ -3828,17 +3565,11 @@ dayPeriods:table(nofallback){
             }
             morning1{
                 before{"12:00"}
-                from{"6:00"}
+                from{"04:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"21:00"}
             }
         }
         set96{
@@ -3847,26 +3578,16 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"22:00"}
+                before{"21:00"}
                 from{"18:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"6:00"}
-            }
-            morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"06:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"06:00"}
+                from{"21:00"}
             }
         }
         set97{
@@ -3879,22 +3600,16 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"10:00"}
+                from{"06:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"10:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"06:00"}
+                from{"22:00"}
             }
         }
         set98{
@@ -3907,22 +3622,16 @@ dayPeriods:table(nofallback){
                 from{"18:00"}
             }
             morning1{
-                before{"9:00"}
-                from{"4:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"9:00"}
+                from{"09:00"}
             }
             night1{
-                before{
-                    "4:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "22:00",
-                }
+                before{"04:00"}
+                from{"22:00"}
             }
         }
         set99{
@@ -3931,26 +3640,20 @@ dayPeriods:table(nofallback){
                 from{"12:00"}
             }
             evening1{
-                before{"21:00"}
+                before{"22:00"}
                 from{"18:00"}
             }
             morning1{
-                before{"10:00"}
-                from{"6:00"}
+                before{"09:00"}
+                from{"04:00"}
             }
             morning2{
                 before{"12:00"}
-                from{"10:00"}
+                from{"09:00"}
             }
             night1{
-                before{
-                    "6:00",
-                    "24:00",
-                }
-                from{
-                    "0:00",
-                    "21:00",
-                }
+                before{"04:00"}
+                from{"22:00"}
             }
         }
     }
diff --git a/icu4c/source/data/misc/genderList.txt b/icu4c/source/data/misc/genderList.txt
index 3ec89466cdb..46102a31f57 100644
--- a/icu4c/source/data/misc/genderList.txt
+++ b/icu4c/source/data/misc/genderList.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/genderList.xml
diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt
index 951bd703bd8..d3d02edaa39 100644
--- a/icu4c/source/data/misc/keyTypeData.txt
+++ b/icu4c/source/data/misc/keyTypeData.txt
@@ -13,6 +13,18 @@ keyTypeData:table(nofallback){
         }
         tz:alias{"/ICUDATA/timezoneTypes/bcpTypeAlias/tz"}
     }
+    keyInfo{
+        deprecated{
+            kh{"true"}
+            vt{"true"}
+        }
+        valueType{
+            ca{"incremental"}
+            kr{"multiple"}
+            vt{"multiple"}
+            x0{"any"}
+        }
+    }
     keyMap{
         calendar{"ca"}
         cf{""}
@@ -27,19 +39,27 @@ keyTypeData:table(nofallback){
         colreorder{"kr"}
         colstrength{"ks"}
         currency{"cu"}
+        d0{""}
         em{""}
         fw{""}
         hours{"hc"}
+        i0{""}
+        k0{""}
         kv{""}
         lb{""}
         lw{""}
+        m0{""}
+        measure{"ms"}
         numbers{"nu"}
         rg{""}
+        s0{""}
         sd{""}
         ss{""}
+        t0{""}
         timezone{"tz"}
         va{""}
         variabletop{"vt"}
+        x0{""}
     }
     typeAlias{
         colstrength{
@@ -47,6 +67,16 @@ keyTypeData:table(nofallback){
         }
         timezone:alias{"/ICUDATA/timezoneTypes/typeAlias/timezone"}
     }
+    typeInfo{
+        deprecated{
+            co{
+                direct{"true"}
+            }
+            tz{
+                camtr{"true"}
+            }
+        }
+    }
     typeMap{
         calendar{
             buddhist{""}
@@ -431,6 +461,29 @@ keyTypeData:table(nofallback){
             zwl{""}
             zwr{""}
         }
+        d0{
+            accents{""}
+            ascii{""}
+            casefold{""}
+            digit{""}
+            fcc{""}
+            fcd{""}
+            fullwidth{"fwidth"}
+            halfwidth{"hwidth"}
+            hex{""}
+            lower{""}
+            name{"charname"}
+            nfc{""}
+            nfd{""}
+            nfkc{""}
+            nfkd{""}
+            null{""}
+            numericPinyin{"npinyin"}
+            publishing{"publish"}
+            remove{""}
+            title{""}
+            upper{""}
+        }
         em{
             default{""}
             emoji{""}
@@ -451,6 +504,43 @@ keyTypeData:table(nofallback){
             h23{""}
             h24{""}
         }
+        i0{
+            handwrit{""}
+            pinyin{""}
+            und{""}
+            wubi{""}
+        }
+        k0{
+            101key{""}
+            102key{""}
+            600dpi{""}
+            768dpi{""}
+            android{""}
+            azerty{""}
+            chromeos{""}
+            colemak{""}
+            dvorak{""}
+            dvorakl{""}
+            dvorakr{""}
+            el220{""}
+            el319{""}
+            extended{""}
+            googlevk{""}
+            isiri{""}
+            legacy{""}
+            lt1205{""}
+            lt1582{""}
+            nutaaq{""}
+            osx{""}
+            patta{""}
+            qwerty{""}
+            qwertz{""}
+            ta99{""}
+            und{""}
+            var{""}
+            viqr{""}
+            windows{""}
+        }
         kv{
             currency{""}
             punct{""}
@@ -467,6 +557,33 @@ keyTypeData:table(nofallback){
             keepall{""}
             normal{""}
         }
+        m0{
+            alaloc{""}
+            bgn{""}
+            buckwalt{""}
+            c{"c11"}
+            css{""}
+            din{""}
+            gost{""}
+            iso{""}
+            java{""}
+            mcst{""}
+            mns{""}
+            names{"prprname"}
+            percent{""}
+            perl{""}
+            plain{""}
+            satts{""}
+            ungegn{""}
+            unicode{""}
+            xml{""}
+            xml10{""}
+        }
+        measure{
+            imperial{"uksystem"}
+            metric{""}
+            ussystem{""}
+        }
         numbers{
             ahom{""}
             arab{""}
@@ -549,6 +666,13 @@ keyTypeData:table(nofallback){
         rg{
             RG_KEY_VALUE{""}
         }
+        s0{
+            accents{""}
+            ascii{""}
+            hex{""}
+            numericPinyin{"npinyin"}
+            publishing{"publish"}
+        }
         sd{
             SUBDIVISION_CODE{""}
         }
@@ -556,6 +680,9 @@ keyTypeData:table(nofallback){
             none{""}
             standard{""}
         }
+        t0{
+            und{""}
+        }
         timezone:alias{"/ICUDATA/timezoneTypes/typeMap/timezone"}
         va{
             posix{""}
diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt
index ed77e611677..ad5d108f9d4 100644
--- a/icu4c/source/data/misc/likelySubtags.txt
+++ b/icu4c/source/data/misc/likelySubtags.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/likelySubtags.xml
@@ -1155,6 +1155,9 @@ likelySubtags:table(nofallback){
     yo{"yo_Latn_NG"}
     yrl{"yrl_Latn_BR"}
     yua{"yua_Latn_MX"}
+    yue{"yue_Hant_HK"}
+    yue_CN{"yue_Hans_CN"}
+    yue_Hans{"yue_Hans_CN"}
     za{"za_Latn_CN"}
     zag{"zag_Latn_SD"}
     zdj{"zdj_Arab_KM"}
diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt
index 6b0d8bba5ff..9a9031c5042 100755
--- a/icu4c/source/data/misc/metadata.txt
+++ b/icu4c/source/data/misc/metadata.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/supplementalMetadata.xml
@@ -1401,6 +1401,26 @@ metadata:table(nofallback){
                 reason{"overlong"}
                 replacement{"YT"}
             }
+            LA-XN{
+                reason{"deprecated"}
+                replacement{"LA-XS"}
+            }
+            LU-D{
+                reason{"deprecated"}
+                replacement{"LU-CL LU-DI LU-RD LU-VD LU-WI"}
+            }
+            LU-G{
+                reason{"deprecated"}
+                replacement{"LU-EC LU-GR LU-RM"}
+            }
+            LU-L{
+                reason{"deprecated"}
+                replacement{"LU-CA LU-ES LU-LU LU-ME"}
+            }
+            MR-NKC{
+                reason{"deprecated"}
+                replacement{"MR-13 MR-14 MR-15"}
+            }
             NL-AW{
                 reason{"overlong"}
                 replacement{"AW"}
@@ -1413,6 +1433,50 @@ metadata:table(nofallback){
                 reason{"overlong"}
                 replacement{"SX"}
             }
+            NZ-N{
+                reason{"deprecated"}
+                replacement{"NZ-AUK NZ-BOP NZ-GIS NZ-HKB NZ-MWT NZ-NTL NZ-TKI NZ-WGN NZ-WKO"}
+            }
+            NZ-S{
+                reason{"deprecated"}
+                replacement{"NZ-CAN NZ-MBH NZ-NSN NZ-OTA NZ-STL NZ-TAS NZ-WTC"}
+            }
+            OM-BA{
+                reason{"deprecated"}
+                replacement{"OM-BJ OM-BS"}
+            }
+            OM-SH{
+                reason{"deprecated"}
+                replacement{"OM-SJ OM-SS"}
+            }
+            TT-ETO{
+                reason{"deprecated"}
+                replacement{"TT-TOB"}
+            }
+            TT-RCM{
+                reason{"deprecated"}
+                replacement{"TT-MRC"}
+            }
+            TT-WTO{
+                reason{"deprecated"}
+                replacement{"TT-TOB"}
+            }
+            TW-KHQ{
+                reason{"deprecated"}
+                replacement{"TW-KHH"}
+            }
+            TW-TNQ{
+                reason{"deprecated"}
+                replacement{"TW-TNN"}
+            }
+            TW-TPQ{
+                reason{"deprecated"}
+                replacement{"TW-NWT"}
+            }
+            TW-TXQ{
+                reason{"deprecated"}
+                replacement{"TW-TXG"}
+            }
             US-AS{
                 reason{"overlong"}
                 replacement{"AS"}
@@ -4282,6 +4346,8 @@ metadata:table(nofallback){
         "yav_CM",
         "yi_001",
         "yo_NG",
+        "yue_HK",
+        "yue_Hans_CN",
         "zgh_MA",
         "zh_Hans",
         "zh_Hans_CN",
diff --git a/icu4c/source/data/misc/numberingSystems.txt b/icu4c/source/data/misc/numberingSystems.txt
index 4e91ba0d17e..df73110db38 100644
--- a/icu4c/source/data/misc/numberingSystems.txt
+++ b/icu4c/source/data/misc/numberingSystems.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/numberingSystems.xml
diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt
index 9216e02eaa0..51e43956942 100644
--- a/icu4c/source/data/misc/plurals.txt
+++ b/icu4c/source/data/misc/plurals.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/plurals.xml, ordinals.xml
diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
index e67f372ddb1..bc2add12d11 100644
--- a/icu4c/source/data/misc/supplementalData.txt
+++ b/icu4c/source/data/misc/supplementalData.txt
@@ -1847,7 +1847,7 @@ supplementalData:table(nofallback){
             "islamic-tbla",
         }
     }
-    cldrVersion{"28"}
+    cldrVersion{"29"}
     codeMappings{
         {
             "AA",
@@ -4367,7 +4367,7 @@ supplementalData:table(nofallback){
                 "ZAR",
                 "ZMW",
             }
-            special{"XXX"}
+            unknown{"XXX"}
         }
         language{
             deprecated{
@@ -6982,7 +6982,6 @@ supplementalData:table(nofallback){
             special{
                 "mis",
                 "mul",
-                "root",
                 "zxx",
             }
             unknown{"und"}
@@ -7301,6 +7300,7 @@ supplementalData:table(nofallback){
             }
             special{
                 "Zmth",
+                "Zsye",
                 "Zsym",
                 "Zxxx",
             }
@@ -7308,6 +7308,44 @@ supplementalData:table(nofallback){
         }
         subdivision{
             deprecated{
+                "AL-BR",
+                "AL-BU",
+                "AL-DI",
+                "AL-DL",
+                "AL-DR",
+                "AL-DV",
+                "AL-EL",
+                "AL-ER",
+                "AL-FR",
+                "AL-GJ",
+                "AL-GR",
+                "AL-HA",
+                "AL-KA~C",
+                "AL-KO",
+                "AL-KR",
+                "AL-KU",
+                "AL-LB",
+                "AL-LE",
+                "AL-LU",
+                "AL-MK",
+                "AL-MM",
+                "AL-MR",
+                "AL-MT",
+                "AL-PG",
+                "AL-PQ~R",
+                "AL-PU",
+                "AL-SH",
+                "AL-SK",
+                "AL-SR",
+                "AL-TE",
+                "AL-TP",
+                "AL-TR",
+                "AL-VL",
+                "BA-01~9",
+                "BA-10",
+                "BH-16",
+                "CI-01~9",
+                "CI-10~9",
                 "CN-71",
                 "CN-91~2",
                 "FR-BL",
@@ -7322,11 +7360,63 @@ supplementalData:table(nofallback){
                 "FR-TF",
                 "FR-WF",
                 "FR-YT",
+                "GB-ANT",
+                "GB-ARD",
+                "GB-ARM",
+                "GB-BLA",
+                "GB-BLY",
+                "GB-BNB",
+                "GB-CGV",
+                "GB-CKF",
+                "GB-CKT",
+                "GB-CLR",
+                "GB-CSR",
+                "GB-DGN",
+                "GB-DOW",
+                "GB-DRY",
+                "GB-FER",
+                "GB-LMV",
+                "GB-LRN",
+                "GB-LSB",
+                "GB-MFT",
+                "GB-MYL",
+                "GB-NDN",
+                "GB-NTA",
+                "GB-NYM",
+                "GB-OMH",
+                "GB-STB",
+                "IS-0",
+                "LA-XN",
+                "LU-D",
+                "LU-G",
+                "LU-L",
+                "MK-01",
+                "MK-09",
+                "MK-15",
+                "MK-17",
+                "MK-28~9",
+                "MK-31",
+                "MK-38~9",
+                "MK-57",
+                "MK-68",
+                "MK-77",
+                "MK-79",
+                "MK-84",
+                "MR-NKC",
                 "NL-AW",
-                "NL-BQ1~3",
                 "NL-CW",
                 "NL-SX",
-                "NO-21~2",
+                "NZ-N",
+                "NZ-S",
+                "OM-BA",
+                "OM-SH",
+                "TT-ETO",
+                "TT-RCM",
+                "TT-WTO",
+                "TW-KHQ",
+                "TW-TNQ",
+                "TW-TPQ",
+                "TW-TXQ",
                 "US-AS",
                 "US-GU",
                 "US-MP",
@@ -7380,39 +7470,6 @@ supplementalData:table(nofallback){
                 "AG-10~1",
                 "AL-01~9",
                 "AL-10~2",
-                "AL-BR",
-                "AL-BU",
-                "AL-DI",
-                "AL-DL",
-                "AL-DR",
-                "AL-DV",
-                "AL-EL",
-                "AL-ER",
-                "AL-FR",
-                "AL-GJ",
-                "AL-GR",
-                "AL-HA",
-                "AL-KA~C",
-                "AL-KO",
-                "AL-KR",
-                "AL-KU",
-                "AL-LB",
-                "AL-LE",
-                "AL-LU",
-                "AL-MK",
-                "AL-MM",
-                "AL-MR",
-                "AL-MT",
-                "AL-PG",
-                "AL-PQ~R",
-                "AL-PU",
-                "AL-SH",
-                "AL-SK",
-                "AL-SR",
-                "AL-TE",
-                "AL-TP",
-                "AL-TR",
-                "AL-VL",
                 "AM-AG",
                 "AM-AR",
                 "AM-AV",
@@ -7529,8 +7586,6 @@ supplementalData:table(nofallback){
                 "AZ-YEV",
                 "AZ-ZAN",
                 "AZ-ZAQ~R",
-                "BA-01~9",
-                "BA-10",
                 "BA-BIH",
                 "BA-BRC",
                 "BA-SRP",
@@ -7604,7 +7659,8 @@ supplementalData:table(nofallback){
                 "BG-01~9",
                 "BG-10~9",
                 "BG-20~8",
-                "BH-13~7",
+                "BH-13~5",
+                "BH-17",
                 "BI-BB",
                 "BI-BL~M",
                 "BI-BR",
@@ -7619,6 +7675,7 @@ supplementalData:table(nofallback){
                 "BI-MW",
                 "BI-MY",
                 "BI-NG",
+                "BI-RM",
                 "BI-RT",
                 "BI-RY",
                 "BJ-AK~L",
@@ -7799,8 +7856,20 @@ supplementalData:table(nofallback){
                 "CH-VD",
                 "CH-VS",
                 "CH-ZG~H",
-                "CI-01~9",
-                "CI-10~9",
+                "CI-AB",
+                "CI-BS",
+                "CI-CM",
+                "CI-DN",
+                "CI-GD",
+                "CI-LC",
+                "CI-LG",
+                "CI-MG",
+                "CI-SM",
+                "CI-SV",
+                "CI-VB",
+                "CI-WR",
+                "CI-YM",
+                "CI-ZZ",
                 "CL-AI",
                 "CL-AN",
                 "CL-AP",
@@ -8112,12 +8181,12 @@ supplementalData:table(nofallback){
                 "FR-CP",
                 "FR-D~V",
                 "GA-1~9",
-                "GB-ABD~E",
+                "GB-ABC~E",
                 "GB-AGB",
                 "GB-AGY",
-                "GB-ANS~T",
-                "GB-ARD",
-                "GB-ARM",
+                "GB-AND",
+                "GB-ANN",
+                "GB-ANS",
                 "GB-BAS",
                 "GB-BBD",
                 "GB-BDF~G",
@@ -8128,10 +8197,7 @@ supplementalData:table(nofallback){
                 "GB-BGW",
                 "GB-BIR",
                 "GB-BKM",
-                "GB-BLA",
-                "GB-BLY",
                 "GB-BMH",
-                "GB-BNB",
                 "GB-BNE",
                 "GB-BNH",
                 "GB-BNS",
@@ -8144,15 +8210,12 @@ supplementalData:table(nofallback){
                 "GB-CAM",
                 "GB-CAY",
                 "GB-CBF",
+                "GB-CCG",
                 "GB-CGN",
-                "GB-CGV",
                 "GB-CHE",
                 "GB-CHW",
-                "GB-CKF",
-                "GB-CKT",
                 "GB-CLD",
                 "GB-CLK",
-                "GB-CLR",
                 "GB-CMA",
                 "GB-CMD",
                 "GB-CMN",
@@ -8160,19 +8223,16 @@ supplementalData:table(nofallback){
                 "GB-COV",
                 "GB-CRF",
                 "GB-CRY",
-                "GB-CSR",
                 "GB-CWY",
                 "GB-DAL",
                 "GB-DBY",
                 "GB-DEN",
                 "GB-DER",
                 "GB-DEV",
-                "GB-DGN",
                 "GB-DGY",
                 "GB-DNC~D",
                 "GB-DOR",
-                "GB-DOW",
-                "GB-DRY",
+                "GB-DRS",
                 "GB-DUD",
                 "GB-DUR",
                 "GB-EAL",
@@ -8188,9 +8248,9 @@ supplementalData:table(nofallback){
                 "GB-ESS",
                 "GB-ESX",
                 "GB-FAL",
-                "GB-FER",
                 "GB-FIF",
                 "GB-FLN",
+                "GB-FMO",
                 "GB-GAT",
                 "GB-GBN",
                 "GB-GLG",
@@ -8220,6 +8280,7 @@ supplementalData:table(nofallback){
                 "GB-KTT",
                 "GB-KWL",
                 "GB-LAN",
+                "GB-LBC",
                 "GB-LBH",
                 "GB-LCE",
                 "GB-LDS",
@@ -8227,25 +8288,21 @@ supplementalData:table(nofallback){
                 "GB-LEW",
                 "GB-LIN",
                 "GB-LIV",
-                "GB-LMV",
                 "GB-LND",
-                "GB-LRN",
-                "GB-LSB",
                 "GB-LUT",
                 "GB-MAN",
                 "GB-MDB",
                 "GB-MDW",
-                "GB-MFT",
+                "GB-MEA",
                 "GB-MIK",
                 "GB-MLN",
                 "GB-MON",
                 "GB-MRT",
                 "GB-MRY",
                 "GB-MTY",
-                "GB-MYL",
+                "GB-MUL",
                 "GB-NAY",
                 "GB-NBL",
-                "GB-NDN",
                 "GB-NEL",
                 "GB-NET",
                 "GB-NFK",
@@ -8253,8 +8310,8 @@ supplementalData:table(nofallback){
                 "GB-NIR",
                 "GB-NLK",
                 "GB-NLN",
+                "GB-NMD",
                 "GB-NSM",
-                "GB-NTA",
                 "GB-NTH",
                 "GB-NTL",
                 "GB-NTT",
@@ -8262,9 +8319,7 @@ supplementalData:table(nofallback){
                 "GB-NWM",
                 "GB-NWP",
                 "GB-NYK",
-                "GB-NYM",
                 "GB-OLD",
-                "GB-OMH",
                 "GB-ORK",
                 "GB-OXF",
                 "GB-PEM",
@@ -8300,7 +8355,6 @@ supplementalData:table(nofallback){
                 "GB-SOL~M",
                 "GB-SOS",
                 "GB-SRY",
-                "GB-STB",
                 "GB-STE",
                 "GB-STG~H",
                 "GB-STN",
@@ -8658,7 +8712,7 @@ supplementalData:table(nofallback){
                 "IR-10~9",
                 "IR-20~9",
                 "IR-30~2",
-                "IS-0~8",
+                "IS-1~8",
                 "IT-21",
                 "IT-23",
                 "IT-25",
@@ -8790,7 +8844,7 @@ supplementalData:table(nofallback){
                 "KH-1",
                 "KH-10~9",
                 "KH-2",
-                "KH-20~4",
+                "KH-20~5",
                 "KH-3~9",
                 "KI-G",
                 "KI-L",
@@ -8849,7 +8903,7 @@ supplementalData:table(nofallback){
                 "LA-XA",
                 "LA-XE",
                 "LA-XI",
-                "LA-XN",
+                "LA-XS",
                 "LB-AK",
                 "LB-AS",
                 "LB-BA",
@@ -8914,9 +8968,18 @@ supplementalData:table(nofallback){
                 "LT-TE",
                 "LT-UT",
                 "LT-VL",
-                "LU-D",
-                "LU-G",
-                "LU-L",
+                "LU-CA",
+                "LU-CL",
+                "LU-DI",
+                "LU-EC",
+                "LU-ES",
+                "LU-GR",
+                "LU-LU",
+                "LU-ME",
+                "LU-RD",
+                "LU-RM",
+                "LU-VD",
+                "LU-WI",
                 "LV-001~9",
                 "LV-010~9",
                 "LV-020~9",
@@ -9102,15 +9165,22 @@ supplementalData:table(nofallback){
                 "MH-UTI",
                 "MH-WTH",
                 "MH-WTJ",
-                "MK-01~9",
-                "MK-10~9",
-                "MK-20~9",
-                "MK-30~9",
+                "MK-02~8",
+                "MK-10~4",
+                "MK-16",
+                "MK-18~9",
+                "MK-20~7",
+                "MK-30",
+                "MK-32~7",
                 "MK-40~9",
-                "MK-50~9",
-                "MK-60~9",
-                "MK-70~9",
-                "MK-80~4",
+                "MK-50~6",
+                "MK-58~9",
+                "MK-60~7",
+                "MK-69",
+                "MK-70~6",
+                "MK-78",
+                "MK-80~3",
+                "MK-85",
                 "ML-1~8",
                 "ML-BKO",
                 "MM-01~7",
@@ -9135,8 +9205,7 @@ supplementalData:table(nofallback){
                 "MN-073",
                 "MN-1",
                 "MR-01~9",
-                "MR-10~2",
-                "MR-NKC",
+                "MR-10~5",
                 "MT-01~9",
                 "MT-10~9",
                 "MT-20~9",
@@ -9311,6 +9380,7 @@ supplementalData:table(nofallback){
                 "NI-NS",
                 "NI-RI",
                 "NI-SJ",
+                "NL-BQ1~3",
                 "NL-DR",
                 "NL-FL",
                 "NL-FR",
@@ -9326,7 +9396,7 @@ supplementalData:table(nofallback){
                 "NO-01~9",
                 "NO-10~2",
                 "NO-14~9",
-                "NO-20",
+                "NO-20~2",
                 "NP-1~5",
                 "NP-BA",
                 "NP-BH",
@@ -9352,23 +9422,23 @@ supplementalData:table(nofallback){
                 "NZ-HKB",
                 "NZ-MBH",
                 "NZ-MWT",
-                "NZ-N",
                 "NZ-NSN",
                 "NZ-NTL",
                 "NZ-OTA",
-                "NZ-S",
                 "NZ-STL",
                 "NZ-TAS",
                 "NZ-TKI",
                 "NZ-WGN",
                 "NZ-WKO",
                 "NZ-WTC",
-                "OM-BA",
+                "OM-BJ",
+                "OM-BS",
                 "OM-BU",
                 "OM-DA",
                 "OM-MA",
                 "OM-MU",
-                "OM-SH",
+                "OM-SJ",
+                "OM-SS",
                 "OM-WU",
                 "OM-ZA",
                 "OM-ZU",
@@ -9455,6 +9525,7 @@ supplementalData:table(nofallback){
                 "PH-DAS",
                 "PH-DAV",
                 "PH-DIN",
+                "PH-DVO",
                 "PH-EAS",
                 "PH-GUI",
                 "PH-IFU",
@@ -9720,6 +9791,7 @@ supplementalData:table(nofallback){
                 "SD-DS",
                 "SD-DW",
                 "SD-GD",
+                "SD-GK",
                 "SD-GZ",
                 "SD-KA",
                 "SD-KH",
@@ -9943,18 +10015,17 @@ supplementalData:table(nofallback){
                 "TT-CHA",
                 "TT-CTT",
                 "TT-DMN",
-                "TT-ETO",
+                "TT-MRC",
                 "TT-PED",
                 "TT-POS",
                 "TT-PRT",
                 "TT-PTF",
-                "TT-RCM",
                 "TT-SFO",
                 "TT-SGE",
                 "TT-SIP",
                 "TT-SJL",
+                "TT-TOB",
                 "TT-TUP",
-                "TT-WTO",
                 "TV-FUN",
                 "TV-NIT",
                 "TV-NKF",
@@ -9972,19 +10043,18 @@ supplementalData:table(nofallback){
                 "TW-ILA",
                 "TW-KEE",
                 "TW-KHH",
-                "TW-KHQ",
+                "TW-KIN",
+                "TW-LIE",
                 "TW-MIA",
                 "TW-NAN",
+                "TW-NWT",
                 "TW-PEN",
                 "TW-PIF",
                 "TW-TAO",
                 "TW-TNN",
-                "TW-TNQ",
                 "TW-TPE",
-                "TW-TPQ",
                 "TW-TTT",
                 "TW-TXG",
-                "TW-TXQ",
                 "TW-YUN",
                 "TZ-01~9",
                 "TZ-10~9",
@@ -10149,6 +10219,9 @@ supplementalData:table(nofallback){
                 "VU-SEE",
                 "VU-TAE",
                 "VU-TOB",
+                "WF-AL",
+                "WF-SG",
+                "WF-UV",
                 "WS-AA",
                 "WS-AL",
                 "WS-AT",
@@ -10180,6 +10253,7 @@ supplementalData:table(nofallback){
                 "YE-SD",
                 "YE-SH",
                 "YE-SN",
+                "YE-SU",
                 "YE-TA",
                 "ZA-EC",
                 "ZA-FS",
@@ -10202,7 +10276,7 @@ supplementalData:table(nofallback){
                 "ZW-MS",
                 "ZW-MV~W",
             }
-            special{
+            unknown{
                 "AC-ZZZZ",
                 "AD-ZZZZ",
                 "AE-ZZZZ",
@@ -10479,9 +10553,14 @@ supplementalData:table(nofallback){
                 "area-square-meter",
                 "area-square-mile",
                 "area-square-yard",
+                "concentr-karat",
+                "concentr-milligram-per-deciliter",
+                "concentr-millimole-per-liter",
+                "concentr-part-per-million",
                 "consumption-liter-per-100kilometers",
                 "consumption-liter-per-kilometer",
                 "consumption-mile-per-gallon",
+                "consumption-mile-per-gallon-imperial",
                 "digital-bit",
                 "digital-byte",
                 "digital-gigabit",
@@ -10563,7 +10642,6 @@ supplementalData:table(nofallback){
                 "pressure-millibar",
                 "pressure-millimeter-of-mercury",
                 "pressure-pound-per-square-inch",
-                "proportion-karat",
                 "speed-kilometer-per-hour",
                 "speed-knot",
                 "speed-meter-per-second",
@@ -10587,6 +10665,7 @@ supplementalData:table(nofallback){
                 "volume-deciliter",
                 "volume-fluid-ounce",
                 "volume-gallon",
+                "volume-gallon-imperial",
                 "volume-hectoliter",
                 "volume-liter",
                 "volume-megaliter",
@@ -15201,7 +15280,10 @@ supplementalData:table(nofallback){
         }
         yue{
             primary{
-                scripts{"Hans"}
+                scripts{
+                    "Hant",
+                    "Hans",
+                }
             }
         }
         za{
@@ -16466,6 +16548,7 @@ supplementalData:table(nofallback){
         es_419{
             "es_AR",
             "es_BO",
+            "es_BR",
             "es_CL",
             "es_CO",
             "es_CR",
@@ -16487,8 +16570,11 @@ supplementalData:table(nofallback){
         }
         pt_PT{
             "pt_AO",
+            "pt_CH",
             "pt_CV",
+            "pt_GQ",
             "pt_GW",
+            "pt_LU",
             "pt_MO",
             "pt_MZ",
             "pt_ST",
@@ -16512,420 +16598,349 @@ supplementalData:table(nofallback){
             "uz_Cyrl",
             "vai_Latn",
             "zh_Hant",
+            "yue_Hans",
         }
         zh_Hant_HK{"zh_Hant_MO"}
     }
     subdivisionContainment{
         AD{
             "02",
-            "06",
-            "08",
             "03",
-            "07",
             "04",
             "05",
+            "06",
+            "07",
+            "08",
         }
         AE{
+            "AJ",
+            "AZ",
+            "DU",
+            "FU",
             "RK",
             "SH",
-            "FU",
-            "DU",
-            "AZ",
             "UQ",
-            "AJ",
         }
         AF{
+            "BAL",
             "BAM",
-            "KAB",
-            "KAP",
-            "KHO",
-            "KNR",
-            "KAN",
-            "LOG",
-            "PIA",
-            "SAM",
-            "URU",
+            "BDG",
             "BDS",
+            "BGL",
+            "DAY",
+            "FRA",
             "FYB",
+            "GHA",
+            "GHO",
+            "HEL",
+            "HER",
             "JOW",
+            "KAB",
+            "KAN",
+            "KAP",
             "KDZ",
+            "KHO",
+            "KNR",
             "LAG",
+            "LOG",
+            "NAN",
             "NIM",
-            "BGL",
-            "FRA",
-            "HEL",
+            "NUR",
+            "PAN",
+            "PAR",
+            "PIA",
             "PKA",
+            "SAM",
             "SAR",
-            "BDG",
-            "GHA",
-            "PAN",
             "TAK",
+            "URU",
             "WAR",
-            "BAL",
-            "GHO",
-            "DAY",
-            "HER",
-            "NAN",
-            "NUR",
-            "PAR",
             "ZAB",
         }
         AG{
-            "04",
-            "11",
             "03",
+            "04",
+            "05",
             "06",
-            "10",
             "07",
             "08",
-            "05",
+            "10",
+            "11",
         }
         AL{
-            "04",
-            "11",
-            "12",
-            "03",
-            "09",
             "01",
             "02",
-            "08",
-            "10",
+            "03",
+            "04",
             "05",
             "06",
             "07",
+            "08",
+            "09",
+            "10",
+            "11",
+            "12",
         }
-        AL-01{
-            "BR",
-            "KC",
-            "SK",
-        }
-        AL-02{
-            "KR",
-            "DR",
-        }
-        AL-03{
-            "LB",
+        AM{
+            "AG",
+            "AR",
+            "AV",
+            "ER",
             "GR",
-            "EL",
-            "PQ",
-        }
-        AL-04{
-            "FR",
-            "MK",
-            "LU",
-        }
-        AL-05{
-            "TE",
-            "GJ",
-            "PR",
-        }
-        AL-06{
-            "DV",
-            "ER",
-            "KO",
-            "PG",
-        }
-        AL-07{
-            "TP",
-            "HA",
-            "KU",
-        }
-        AL-08{
-            "LE",
-            "MR",
-            "KB",
-        }
-        AL-09{
-            "DI",
-            "BU",
-            "MT",
-        }
-        AL-10{
-            "PU",
-            "MM",
-            "SH",
-        }
-        AL-11{
-            "TR",
-            "KA",
-        }
-        AL-12{
-            "DL",
-            "SR",
-            "VL",
-        }
-        AM{
-            "AR",
-            "AG",
-            "AV",
             "KT",
-            "GR",
+            "LO",
             "SH",
             "SU",
             "TV",
-            "LO",
-            "ER",
             "VD",
         }
         AO{
+            "BGO",
+            "BGU",
             "BIE",
             "CAB",
             "CCU",
-            "ZAI",
+            "CNN",
+            "CNO",
+            "CUS",
+            "HUA",
+            "HUI",
             "LNO",
             "LSU",
+            "LUA",
+            "MAL",
             "MOX",
             "NAM",
             "UIG",
-            "CNO",
-            "HUI",
-            "LUA",
-            "MAL",
-            "BGO",
-            "BGU",
-            "CNN",
-            "CUS",
-            "HUA",
+            "ZAI",
         }
         AR{
-            "D",
-            "L",
-            "M",
-            "Q",
-            "R",
-            "Y",
-            "N",
-            "S",
-            "Z",
             "A",
+            "B",
             "C",
+            "D",
+            "E",
             "F",
-            "B",
             "G",
             "H",
-            "P",
-            "X",
             "J",
-            "T",
-            "E",
             "K",
+            "L",
+            "M",
+            "N",
+            "P",
+            "Q",
+            "R",
+            "S",
+            "T",
+            "U",
             "V",
             "W",
-            "U",
+            "X",
+            "Y",
+            "Z",
         }
         AT{
-            "9",
+            "1",
+            "2",
             "3",
             "4",
             "5",
-            "8",
-            "1",
-            "7",
-            "2",
             "6",
+            "7",
+            "8",
+            "9",
         }
         AU{
-            "VIC",
-            "NT",
-            "QLD",
-            "TAS",
             "ACT",
             "NSW",
+            "NT",
+            "QLD",
             "SA",
+            "TAS",
+            "VIC",
             "WA",
         }
         AZ{
-            "GOR",
-            "NA",
-            "QBI",
-            "SA",
-            "SMI",
-            "TOV",
-            "YE",
             "ABS",
+            "AGA",
+            "AGC",
+            "AGM",
+            "AGS",
+            "AGU",
+            "AST",
             "BA",
             "BAL",
             "BAR",
-            "GOY",
-            "MAS",
-            "SKR",
-            "SR",
-            "XA",
-            "XIZ",
-            "AGC",
-            "AGU",
+            "BEY",
             "BIL",
-            "GA",
-            "QAB",
-            "SMX",
-            "XAC",
-            "YAR",
-            "ZAN",
-            "AGA",
+            "CAB",
+            "CAL",
+            "DAS",
             "FUZ",
+            "GA",
             "GAD",
-            "LAC",
-            "QAX",
-            "AGM",
-            "DAS",
+            "GOR",
+            "GOY",
             "GYG",
-            "LA",
-            "LAN",
-            "OGU",
-            "QBA",
-            "QUS",
-            "SAB",
-            "CAB",
-            "KUR",
-            "SAL",
-            "SBN",
-            "SM",
-            "UCA",
-            "XCI",
-            "YEV",
-            "AGS",
-            "AST",
-            "BEY",
             "HAC",
             "IMI",
             "ISM",
+            "KAL",
+            "KUR",
+            "LA",
+            "LAC",
+            "LAN",
             "LER",
+            "MAS",
             "MI",
+            "NA",
             "NEF",
             "NX",
+            "OGU",
+            "QAB",
+            "QAX",
             "QAZ",
+            "QBA",
+            "QBI",
+            "QOB",
+            "QUS",
+            "SA",
+            "SAB",
             "SAK",
+            "SAL",
             "SAT",
-            "TAR",
-            "XVD",
-            "ZAR",
-            "CAL",
-            "KAL",
-            "QOB",
+            "SBN",
             "SIY",
+            "SKR",
+            "SM",
+            "SMI",
+            "SMX",
+            "SR",
             "SUS",
+            "TAR",
+            "TOV",
+            "UCA",
+            "XA",
+            "XAC",
+            "XCI",
+            "XIZ",
+            "XVD",
+            "YAR",
+            "YE",
+            "YEV",
+            "ZAN",
             "ZAQ",
+            "ZAR",
         }
         AZ-NX{
-            "KAN",
+            "BAB",
             "CUL",
+            "KAN",
+            "NV",
             "ORD",
             "SAD",
             "SAH",
-            "BAB",
             "SAR",
-            "NV",
         }
         BA{
-            "BRC",
             "BIH",
+            "BRC",
             "SRP",
         }
-        BA-BIH{
+        BB{
+            "01",
             "02",
             "03",
-            "07",
-            "01",
-            "05",
-            "08",
-            "10",
             "04",
+            "05",
             "06",
-            "09",
-        }
-        BB{
             "07",
-            "03",
-            "05",
-            "02",
-            "10",
-            "11",
             "08",
-            "04",
             "09",
-            "01",
-            "06",
+            "10",
+            "11",
         }
         BD{
+            "A",
             "B",
             "C",
-            "A",
             "D",
             "E",
-            "G",
             "F",
+            "G",
         }
         BD-A{
             "02",
-            "25",
-            "50",
             "06",
             "07",
+            "25",
+            "50",
             "51",
         }
         BD-B{
+            "01",
             "04",
-            "47",
+            "08",
+            "09",
             "10",
             "11",
-            "56",
             "16",
-            "31",
-            "09",
-            "08",
             "29",
-            "01",
-        }
+            "31",
+            "47",
+            "56",
+        }
         BD-C{
-            "36",
-            "62",
-            "63",
-            "34",
-            "57",
-            "26",
-            "21",
-            "41",
-            "42",
             "13",
             "15",
             "17",
-            "53",
             "18",
+            "21",
+            "26",
             "33",
+            "34",
             "35",
+            "36",
             "40",
+            "41",
+            "42",
+            "53",
+            "57",
+            "62",
+            "63",
         }
         BD-D{
-            "43",
-            "30",
-            "39",
+            "05",
             "12",
             "22",
-            "58",
-            "37",
-            "05",
             "23",
             "27",
+            "30",
+            "37",
+            "39",
+            "43",
+            "58",
         }
         BD-E{
+            "03",
+            "24",
             "44",
             "45",
             "48",
-            "55",
             "49",
             "54",
-            "24",
+            "55",
             "59",
-            "03",
         }
         BD-F{
+            "14",
             "19",
-            "64",
             "28",
-            "52",
-            "14",
             "32",
             "46",
+            "52",
+            "64",
         }
         BD-G{
             "20",
@@ -16934,42 +16949,46 @@ supplementalData:table(nofallback){
             "61",
         }
         BE{
-            "WAL",
-            "WBR",
-            "WLG",
             "BRU",
             "VLG",
-            "VBR",
-            "VWV",
-            "WLX",
+            "WAL",
+        }
+        BE-VLG{
             "VAN",
+            "VBR",
             "VLI",
             "VOV",
-            "WNA",
+            "VWV",
+        }
+        BE-WAL{
+            "WBR",
             "WHT",
+            "WLG",
+            "WLX",
+            "WNA",
         }
         BF{
-            "05",
             "01",
-            "10",
             "02",
             "03",
             "04",
+            "05",
             "06",
             "07",
             "08",
             "09",
+            "10",
             "11",
             "12",
             "13",
         }
         BF-01{
+            "BAL",
             "BAN",
+            "KOS",
             "MOU",
             "NAY",
             "SOR",
-            "BAL",
-            "KOS",
         }
         BF-02{
             "COM",
@@ -16978,41 +16997,41 @@ supplementalData:table(nofallback){
         BF-03{"KAD"}
         BF-04{
             "BLG",
-            "KOT",
             "KOP",
+            "KOT",
         }
         BF-05{
             "BAM",
-            "SMT",
             "NAM",
+            "SMT",
         }
         BF-06{
-            "SNG",
+            "BLK",
             "SIS",
+            "SNG",
             "ZIR",
-            "BLK",
         }
         BF-07{
-            "ZOU",
-            "NAO",
             "BAZ",
+            "NAO",
+            "ZOU",
         }
         BF-08{
-            "GOU",
             "GNA",
+            "GOU",
             "KMD",
             "KMP",
             "TAP",
         }
         BF-09{
             "HOU",
-            "TUI",
             "KEN",
+            "TUI",
         }
         BF-10{
-            "YAT",
             "LOR",
             "PAS",
+            "YAT",
             "ZON",
         }
         BF-11{
@@ -17021,103 +17040,103 @@ supplementalData:table(nofallback){
             "OUB",
         }
         BF-12{
-            "SEN",
             "OUD",
+            "SEN",
             "SOM",
             "YAG",
         }
         BF-13{
-            "PON",
             "BGR",
-            "NOU",
             "IOB",
+            "NOU",
+            "PON",
         }
         BG{
+            "01",
+            "02",
+            "03",
+            "04",
             "05",
             "06",
             "07",
             "08",
-            "26",
-            "04",
             "09",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
             "15",
             "16",
-            "28",
-            "13",
+            "17",
             "18",
-            "21",
-            "22",
-            "27",
-            "02",
-            "14",
             "19",
-            "25",
-            "03",
-            "24",
-            "01",
-            "10",
-            "12",
             "20",
+            "21",
+            "22",
             "23",
-            "11",
-            "17",
+            "24",
+            "25",
+            "26",
+            "27",
+            "28",
         }
         BH{
+            "13",
+            "14",
             "15",
             "17",
-            "14",
-            "16",
-            "13",
         }
         BI{
             "BB",
+            "BL",
             "BM",
-            "KR",
-            "MY",
-            "KI",
             "BR",
+            "CA",
             "CI",
             "GI",
+            "KI",
+            "KR",
+            "KY",
             "MA",
             "MU",
-            "NG",
-            "RY",
-            "KY",
             "MW",
-            "CA",
-            "BL",
+            "MY",
+            "NG",
+            "RM",
             "RT",
+            "RY",
         }
         BJ{
+            "AK",
             "AL",
+            "AQ",
+            "BO",
+            "CO",
             "DO",
             "KO",
-            "PL",
-            "ZO",
-            "AK",
-            "CO",
-            "BO",
-            "OU",
             "LI",
-            "AQ",
             "MO",
+            "OU",
+            "PL",
+            "ZO",
         }
         BN{
-            "TU",
-            "BM",
             "BE",
+            "BM",
             "TE",
+            "TU",
         }
         BO{
+            "B",
             "C",
+            "H",
             "L",
-            "B",
+            "N",
             "O",
-            "S",
             "P",
+            "S",
             "T",
-            "H",
-            "N",
         }
         BQ{
             "BO",
@@ -17126,358 +17145,353 @@ supplementalData:table(nofallback){
         }
         BR{
             "AC",
+            "AL",
             "AM",
+            "AP",
+            "BA",
             "CE",
-            "RR",
+            "DF",
+            "ES",
             "GO",
+            "MA",
             "MG",
-            "TO",
-            "ES",
-            "AP",
-            "BA",
             "MS",
-            "PR",
-            "RN",
             "MT",
+            "PA",
             "PB",
             "PE",
+            "PI",
+            "PR",
             "RJ",
+            "RN",
             "RO",
-            "SC",
-            "SP",
-            "AL",
-            "DF",
-            "MA",
-            "PA",
-            "PI",
+            "RR",
             "RS",
+            "SC",
             "SE",
+            "SP",
+            "TO",
         }
         BS{
-            "CK",
-            "HT",
-            "RI",
-            "CO",
-            "EG",
-            "HI",
-            "MI",
-            "SS",
-            "SW",
             "AK",
-            "LI",
+            "BI",
+            "BP",
             "BY",
-            "FP",
-            "NS",
-            "RC",
-            "SO",
             "CE",
             "CI",
+            "CK",
+            "CO",
             "CS",
+            "EG",
             "EX",
+            "FP",
+            "GC",
+            "HI",
+            "HT",
             "IN",
+            "LI",
             "MC",
-            "SA",
-            "GC",
             "MG",
-            "WG",
-            "BI",
-            "BP",
+            "MI",
             "NE",
             "NO",
+            "NS",
+            "RC",
+            "RI",
+            "SA",
             "SE",
+            "SO",
+            "SS",
+            "SW",
+            "WG",
         }
         BT{
             "11",
-            "42",
-            "45",
             "12",
+            "13",
+            "14",
+            "15",
+            "21",
+            "22",
             "23",
             "24",
-            "21",
+            "31",
+            "32",
             "33",
             "34",
-            "31",
-            "14",
-            "15",
-            "44",
-            "TY",
-            "13",
             "41",
-            "GA",
-            "22",
-            "32",
+            "42",
             "43",
+            "44",
+            "45",
+            "GA",
+            "TY",
         }
         BW{
-            "NE",
-            "KL",
-            "GH",
-            "NW",
-            "SO",
-            "KW",
+            "CE",
             "CH",
-            "LO",
-            "SP",
-            "JW",
-            "ST",
             "FR",
             "GA",
+            "GH",
+            "JW",
             "KG",
-            "CE",
+            "KL",
+            "KW",
+            "LO",
+            "NE",
+            "NW",
             "SE",
+            "SO",
+            "SP",
+            "ST",
         }
         BY{
-            "MA",
-            "VI",
             "BR",
             "HM",
             "HO",
             "HR",
+            "MA",
             "MI",
+            "VI",
         }
         BZ{
             "BZ",
             "CY",
-            "OW",
             "CZL",
+            "OW",
             "SC",
             "TOL",
         }
         CA{
+            "AB",
             "BC",
             "MB",
             "NB",
-            "SK",
-            "AB",
-            "ON",
-            "YT",
+            "NL",
+            "NS",
             "NT",
             "NU",
-            "NL",
+            "ON",
             "PE",
-            "NS",
             "QC",
+            "SK",
+            "YT",
         }
         CD{
-            "MA",
-            "EQ",
             "BC",
-            "OR",
-            "SK",
             "BN",
-            "KW",
+            "EQ",
             "KA",
-            "NK",
             "KE",
             "KN",
+            "KW",
+            "MA",
+            "NK",
+            "OR",
+            "SK",
         }
         CF{
+            "AC",
+            "BB",
+            "BGF",
             "BK",
+            "HK",
             "HM",
             "HS",
-            "LB",
-            "AC",
             "KB",
-            "BB",
-            "MP",
-            "HK",
             "KG",
+            "LB",
             "MB",
+            "MP",
             "NM",
-            "SE",
-            "VK",
-            "BGF",
             "OP",
+            "SE",
             "UK",
+            "VK",
         }
         CG{
-            "14",
             "2",
+            "5",
+            "7",
             "8",
             "9",
-            "16",
-            "15",
-            "5",
             "11",
-            "BZV",
             "12",
             "13",
-            "7",
+            "14",
+            "15",
+            "16",
+            "BZV",
         }
         CH{
-            "BL",
-            "UR",
-            "JU",
-            "LU",
-            "SO",
-            "TG",
-            "BS",
-            "SZ",
-            "ZG",
             "AG",
+            "AI",
+            "AR",
             "BE",
+            "BL",
+            "BS",
             "FR",
-            "NE",
-            "OW",
-            "TI",
-            "VD",
-            "AR",
             "GE",
             "GL",
-            "SG",
             "GR",
+            "JU",
+            "LU",
+            "NE",
             "NW",
+            "OW",
+            "SG",
             "SH",
-            "ZH",
-            "AI",
+            "SO",
+            "SZ",
+            "TG",
+            "TI",
+            "UR",
+            "VD",
             "VS",
+            "ZG",
+            "ZH",
         }
         CI{
-            "18",
-            "08",
-            "14",
-            "01",
-            "06",
-            "10",
-            "15",
-            "11",
-            "12",
-            "16",
-            "19",
-            "03",
-            "04",
-            "05",
-            "07",
-            "09",
-            "13",
-            "17",
-            "02",
+            "AB",
+            "BS",
+            "CM",
+            "DN",
+            "GD",
+            "LC",
+            "LG",
+            "MG",
+            "SM",
+            "SV",
+            "VB",
+            "WR",
+            "YM",
+            "ZZ",
         }
         CL{
-            "MA",
+            "AI",
             "AN",
-            "RM",
-            "TA",
-            "BI",
             "AP",
+            "AR",
             "AT",
+            "BI",
+            "CO",
+            "LI",
             "LL",
             "LR",
+            "MA",
             "ML",
-            "AR",
-            "LI",
-            "AI",
+            "RM",
+            "TA",
             "VS",
-            "CO",
         }
         CM{
-            "SU",
-            "SW",
-            "NW",
-            "OU",
             "AD",
-            "LT",
-            "NO",
             "CE",
             "EN",
             "ES",
+            "LT",
+            "NO",
+            "NW",
+            "OU",
+            "SU",
+            "SW",
         }
         CN{
-            "36",
-            "43",
-            "53",
-            "31",
-            "32",
-            "37",
+            "11",
             "12",
+            "13",
+            "14",
             "15",
+            "21",
+            "22",
             "23",
+            "31",
+            "32",
+            "33",
+            "34",
+            "35",
+            "36",
+            "37",
             "41",
-            "92",
-            "50",
-            "62",
-            "63",
-            "11",
-            "14",
-            "22",
             "42",
+            "43",
             "44",
-            "71",
-            "91",
-            "51",
-            "64",
-            "65",
-            "13",
-            "21",
-            "34",
-            "46",
-            "61",
-            "33",
-            "35",
             "45",
+            "46",
+            "50",
+            "51",
             "52",
+            "53",
             "54",
+            "61",
+            "62",
+            "63",
+            "64",
+            "65",
+            "71",
+            "91",
+            "92",
         }
         CO{
+            "AMA",
+            "ANT",
+            "ARA",
+            "ATL",
+            "BOL",
             "BOY",
+            "CAL",
             "CAQ",
+            "CAS",
+            "CAU",
+            "CES",
+            "CHO",
+            "COR",
             "CUN",
-            "NAR",
-            "BOL",
+            "DC",
+            "GUA",
+            "GUV",
+            "HUI",
+            "LAG",
             "MAG",
             "MET",
+            "NAR",
+            "NSA",
             "PUT",
-            "VID",
-            "AMA",
-            "CAL",
-            "CAU",
-            "CES",
-            "DC",
-            "LAG",
-            "ARA",
-            "NSA",
-            "TOL",
-            "VAC",
-            "GUV",
-            "HUI",
-            "SUC",
-            "CAS",
-            "CHO",
-            "GUA",
             "QUI",
             "RIS",
             "SAN",
-            "VAU",
-            "ANT",
-            "ATL",
-            "COR",
             "SAP",
+            "SUC",
+            "TOL",
+            "VAC",
+            "VAU",
+            "VID",
         }
         CR{
+            "A",
+            "C",
+            "G",
             "H",
             "L",
-            "G",
             "P",
-            "A",
-            "C",
             "SJ",
         }
         CU{
+            "01",
+            "03",
             "04",
+            "05",
             "06",
-            "03",
             "07",
-            "12",
-            "05",
-            "11",
             "08",
             "09",
             "10",
+            "11",
+            "12",
             "13",
+            "14",
             "15",
             "16",
-            "01",
-            "14",
             "99",
         }
         CV{
@@ -17485,72 +17499,72 @@ supplementalData:table(nofallback){
             "S",
         }
         CV-B{
+            "BV",
+            "PA",
             "PN",
+            "RB",
             "RG",
-            "SV",
-            "BV",
             "SL",
+            "SV",
             "TS",
-            "PA",
-            "RB",
         }
         CV-S{
-            "CF",
             "BR",
+            "CA",
+            "CF",
+            "CR",
             "MA",
+            "MO",
             "PR",
             "RS",
-            "SS",
-            "TA",
-            "CR",
             "SD",
             "SF",
-            "CA",
-            "MO",
             "SM",
             "SO",
+            "SS",
+            "TA",
         }
         CY{
-            "03",
-            "06",
             "01",
+            "02",
+            "03",
             "04",
             "05",
-            "02",
+            "06",
         }
         CZ{
-            "ST",
-            "VY",
-            "PA",
-            "MO",
             "JC",
-            "OL",
             "JM",
-            "ZL",
-            "US",
             "KA",
             "KR",
             "LI",
+            "MO",
+            "OL",
+            "PA",
             "PL",
             "PR",
+            "ST",
+            "US",
+            "VY",
+            "ZL",
         }
         CZ-JC{
             "311",
+            "312",
+            "313",
             "314",
             "315",
-            "312",
             "316",
             "317",
-            "313",
         }
         CZ-JM{
-            "627",
-            "623",
-            "624",
-            "626",
             "621",
             "622",
+            "623",
+            "624",
             "625",
+            "626",
+            "627",
         }
         CZ-KA{
             "411",
@@ -17558,145 +17572,145 @@ supplementalData:table(nofallback){
             "413",
         }
         CZ-KR{
-            "523",
             "521",
-            "524",
             "522",
+            "523",
+            "524",
             "525",
         }
         CZ-LI{
             "511",
-            "514",
             "512",
             "513",
+            "514",
         }
         CZ-MO{
             "801",
             "802",
             "803",
-            "806",
             "804",
             "805",
+            "806",
         }
         CZ-OL{
+            "711",
+            "712",
             "713",
             "714",
-            "712",
-            "711",
             "715",
         }
         CZ-PA{
             "531",
             "532",
-            "534",
             "533",
+            "534",
         }
         CZ-PL{
-            "322",
             "321",
-            "327",
-            "325",
-            "324",
+            "322",
             "323",
+            "324",
+            "325",
             "326",
+            "327",
         }
         CZ-PR{
-            "101",
-            "104",
-            "108",
-            "109",
+            "10A",
+            "10B",
+            "10C",
+            "10D",
+            "10E",
             "10F",
+            "101",
+            "102",
             "103",
-            "106",
-            "10E",
-            "10B",
+            "104",
             "105",
+            "106",
             "107",
-            "10A",
-            "10C",
-            "102",
-            "10D",
+            "108",
+            "109",
         }
         CZ-ST{
-            "208",
-            "205",
-            "20C",
-            "203",
-            "207",
-            "206",
             "20A",
             "20B",
+            "20C",
             "201",
             "202",
+            "203",
             "204",
+            "205",
+            "206",
+            "207",
+            "208",
             "209",
         }
         CZ-US{
-            "425",
-            "423",
             "421",
             "422",
+            "423",
             "424",
+            "425",
             "426",
             "427",
         }
         CZ-VY{
             "611",
             "612",
-            "614",
             "613",
+            "614",
             "615",
         }
         CZ-ZL{
-            "724",
             "721",
             "722",
             "723",
+            "724",
         }
         DE{
-            "RP",
-            "SN",
-            "BW",
-            "MV",
-            "NW",
-            "SL",
-            "TH",
-            "ST",
-            "HH",
             "BB",
             "BE",
+            "BW",
             "BY",
             "HB",
             "HE",
+            "HH",
+            "MV",
             "NI",
+            "NW",
+            "RP",
             "SH",
+            "SL",
+            "SN",
+            "ST",
+            "TH",
         }
         DJ{
-            "TA",
-            "OB",
             "AR",
+            "AS",
             "DI",
             "DJ",
-            "AS",
+            "OB",
+            "TA",
         }
         DK{
-            "83",
-            "82",
-            "85",
             "81",
+            "82",
+            "83",
             "84",
+            "85",
         }
         DM{
+            "02",
+            "03",
+            "04",
             "05",
-            "07",
             "06",
+            "07",
             "08",
             "09",
-            "03",
-            "02",
-            "11",
-            "04",
             "10",
+            "11",
         }
         DO{
             "33",
@@ -17711,16 +17725,16 @@ supplementalData:table(nofallback){
             "42",
         }
         DO-33{
+            "06",
+            "14",
             "19",
             "20",
-            "14",
-            "06",
         }
         DO-34{
-            "26",
-            "27",
             "05",
             "15",
+            "26",
+            "27",
         }
         DO-35{
             "09",
@@ -17728,8 +17742,8 @@ supplementalData:table(nofallback){
             "25",
         }
         DO-36{
-            "24",
             "13",
+            "24",
             "28",
         }
         DO-37{
@@ -17738,235 +17752,235 @@ supplementalData:table(nofallback){
         }
         DO-38{
             "03",
-            "16",
             "04",
             "10",
+            "16",
         }
         DO-39{
             "23",
-            "30",
             "29",
+            "30",
         }
         DO-40{
-            "32",
             "01",
+            "32",
         }
         DO-41{
+            "02",
             "17",
             "21",
             "31",
-            "02",
         }
         DO-42{
-            "11",
             "08",
+            "11",
             "12",
         }
         DZ{
-            "12",
-            "26",
-            "29",
-            "34",
-            "37",
+            "01",
+            "02",
+            "03",
+            "04",
+            "05",
             "06",
+            "07",
+            "08",
+            "09",
+            "10",
             "11",
+            "12",
             "13",
-            "27",
-            "40",
-            "03",
-            "09",
             "14",
             "15",
+            "16",
+            "17",
+            "18",
             "19",
             "20",
-            "35",
-            "41",
-            "42",
-            "44",
-            "02",
-            "04",
-            "05",
+            "21",
+            "22",
             "23",
-            "39",
-            "01",
-            "08",
-            "16",
-            "28",
-            "31",
-            "07",
             "24",
+            "25",
+            "26",
+            "27",
+            "28",
+            "29",
+            "30",
+            "31",
+            "32",
             "33",
+            "34",
+            "35",
             "36",
+            "37",
             "38",
-            "45",
-            "10",
-            "21",
-            "25",
-            "32",
+            "39",
+            "40",
+            "41",
+            "42",
             "43",
+            "44",
+            "45",
             "46",
-            "48",
-            "17",
-            "18",
-            "22",
-            "30",
             "47",
+            "48",
         }
         EC{
+            "A",
             "B",
-            "R",
+            "C",
+            "D",
             "E",
+            "F",
             "G",
-            "X",
-            "Y",
-            "A",
-            "D",
-            "L",
-            "O",
-            "SE",
-            "Z",
             "H",
-            "SD",
             "I",
+            "L",
             "M",
+            "N",
+            "O",
             "P",
-            "W",
-            "C",
-            "F",
+            "R",
             "S",
-            "U",
-            "N",
+            "SD",
+            "SE",
             "T",
+            "U",
+            "W",
+            "X",
+            "Y",
+            "Z",
         }
         EE{
-            "65",
+            "37",
             "39",
-            "78",
+            "44",
             "49",
             "51",
-            "70",
-            "84",
-            "37",
-            "44",
             "57",
             "59",
+            "65",
             "67",
+            "70",
             "74",
+            "78",
             "82",
+            "84",
             "86",
         }
         EG{
             "ALX",
             "ASN",
-            "JS",
-            "KFS",
-            "MN",
             "AST",
+            "BA",
+            "BH",
             "BNS",
             "C",
-            "FYM",
-            "PTS",
+            "DK",
             "DT",
+            "FYM",
+            "GH",
             "GZ",
             "IS",
-            "SHG",
-            "BA",
+            "JS",
             "KB",
-            "SHR",
-            "DK",
-            "LX",
-            "SIN",
-            "WAD",
-            "GH",
+            "KFS",
             "KN",
+            "LX",
+            "MN",
             "MNF",
-            "SUZ",
-            "BH",
             "MT",
+            "PTS",
+            "SHG",
+            "SHR",
+            "SIN",
+            "SUZ",
+            "WAD",
         }
         ER{
+            "AN",
+            "DK",
+            "DU",
             "GB",
             "MA",
             "SK",
-            "DK",
-            "DU",
-            "AN",
         }
         ES{
             "AN",
-            "PV",
-            "CB",
-            "MC",
             "AR",
             "AS",
+            "CB",
             "CE",
-            "GA",
-            "RI",
-            "VC",
-            "CT",
-            "IB",
+            "CL",
             "CM",
+            "CN",
+            "CT",
             "EX",
+            "GA",
+            "IB",
+            "MC",
             "MD",
             "ML",
-            "CL",
-            "CN",
             "NC",
+            "PV",
+            "RI",
+            "VC",
         }
         ES-AN{
             "AL",
-            "J",
-            "SE",
             "CA",
+            "CO",
             "GR",
             "H",
+            "J",
             "MA",
-            "CO",
+            "SE",
         }
         ES-AR{
-            "Z",
             "HU",
             "TE",
+            "Z",
         }
         ES-AS{"O"}
         ES-CB{"S"}
         ES-CL{
-            "SA",
             "AV",
-            "SO",
-            "P",
-            "VA",
             "BU",
+            "LE",
+            "P",
+            "SA",
             "SG",
+            "SO",
+            "VA",
             "ZA",
-            "LE",
         }
         ES-CM{
-            "CR",
-            "GU",
             "AB",
+            "CR",
             "CU",
+            "GU",
             "TO",
         }
         ES-CN{
-            "TF",
             "GC",
+            "TF",
         }
         ES-CT{
-            "T",
-            "GI",
             "B",
+            "GI",
             "L",
+            "T",
         }
         ES-EX{
-            "CC",
             "BA",
+            "CC",
         }
         ES-GA{
-            "PO",
             "C",
             "LU",
             "OR",
+            "PO",
         }
         ES-IB{"PM"}
         ES-MC{"MU"}
@@ -17979,106 +17993,106 @@ supplementalData:table(nofallback){
         }
         ES-RI{"LO"}
         ES-VC{
-            "V",
-            "CS",
             "A",
+            "CS",
+            "V",
         }
         ET{
+            "AA",
+            "AF",
+            "AM",
             "BE",
-            "HA",
-            "SO",
             "DD",
             "GA",
-            "AM",
-            "AA",
-            "AF",
+            "HA",
             "OR",
-            "TI",
             "SN",
+            "SO",
+            "TI",
         }
         FI{
-            "02",
-            "16",
-            "06",
-            "08",
-            "13",
-            "18",
             "01",
-            "15",
-            "14",
+            "02",
+            "03",
             "04",
+            "05",
+            "06",
             "07",
+            "08",
             "09",
+            "10",
             "11",
             "12",
-            "19",
+            "13",
+            "14",
+            "15",
+            "16",
             "17",
-            "03",
-            "05",
-            "10",
+            "18",
+            "19",
         }
         FJ{
-            "C",
-            "R",
-            "W",
-            "N",
-            "02",
             "01",
+            "02",
             "03",
             "04",
             "05",
             "06",
             "07",
             "08",
-            "11",
             "09",
             "10",
+            "11",
             "12",
             "13",
             "14",
+            "C",
             "E",
+            "N",
+            "R",
+            "W",
         }
         FM{
-            "TRK",
-            "PNI",
             "KSA",
+            "PNI",
+            "TRK",
             "YAP",
         }
         FR{
-            "BL",
-            "G",
-            "PF",
-            "RE",
             "A",
+            "B",
+            "BL",
+            "C",
             "CP",
-            "H",
-            "M",
-            "MF",
-            "N",
-            "Q",
-            "R",
-            "U",
+            "D",
+            "E",
             "F",
+            "G",
+            "GF",
             "GP",
+            "H",
+            "I",
             "J",
-            "O",
+            "K",
             "L",
+            "M",
+            "MF",
             "MQ",
-            "V",
-            "C",
-            "GF",
+            "N",
             "NC",
+            "O",
+            "P",
+            "PF",
             "PM",
+            "Q",
+            "R",
+            "RE",
             "S",
             "T",
             "TF",
+            "U",
+            "V",
             "WF",
-            "B",
-            "P",
-            "D",
-            "E",
-            "I",
-            "K",
             "YT",
         }
         FR-A{
@@ -18086,42 +18100,42 @@ supplementalData:table(nofallback){
             "68",
         }
         FR-B{
-            "64",
-            "40",
             "24",
-            "47",
             "33",
+            "40",
+            "47",
+            "64",
         }
         FR-C{
-            "63",
             "03",
             "15",
             "43",
+            "63",
         }
         FR-D{
-            "71",
             "21",
-            "89",
             "58",
+            "71",
+            "89",
         }
         FR-E{
             "22",
             "29",
-            "56",
             "35",
+            "56",
         }
         FR-F{
             "18",
+            "28",
+            "36",
+            "37",
             "41",
             "45",
-            "37",
-            "36",
-            "28",
         }
         FR-G{
             "08",
-            "51",
             "10",
+            "51",
             "52",
         }
         FR-H{
@@ -18130,748 +18144,733 @@ supplementalData:table(nofallback){
         }
         FR-I{
             "25",
+            "39",
             "70",
             "90",
-            "39",
         }
         FR-J{
-            "93",
+            "75",
             "77",
             "78",
-            "95",
-            "92",
-            "75",
             "91",
+            "92",
+            "93",
             "94",
+            "95",
         }
         FR-K{
-            "30",
             "11",
-            "48",
+            "30",
             "34",
+            "48",
             "66",
         }
         FR-L{
-            "23",
             "19",
+            "23",
             "87",
         }
         FR-M{
-            "88",
+            "54",
             "55",
             "57",
-            "54",
+            "88",
         }
         FR-N{
+            "09",
             "12",
             "31",
             "32",
-            "09",
-            "65",
             "46",
-            "82",
+            "65",
             "81",
+            "82",
         }
         FR-O{
             "59",
             "62",
         }
         FR-P{
-            "61",
             "14",
             "50",
+            "61",
         }
         FR-Q{
-            "76",
             "27",
+            "76",
         }
         FR-R{
             "44",
-            "85",
-            "53",
             "49",
+            "53",
             "72",
+            "85",
         }
         FR-S{
-            "60",
             "02",
+            "60",
             "80",
         }
         FR-T{
             "16",
-            "79",
             "17",
+            "79",
             "86",
         }
         FR-U{
-            "13",
             "04",
             "05",
-            "83",
             "06",
+            "13",
+            "83",
             "84",
         }
         FR-V{
-            "42",
-            "26",
-            "07",
             "01",
+            "07",
+            "26",
             "38",
-            "74",
+            "42",
             "69",
             "73",
+            "74",
         }
         GA{
+            "1",
+            "2",
             "3",
+            "4",
             "5",
-            "1",
             "6",
             "7",
             "8",
-            "2",
-            "4",
             "9",
         }
         GB{
-            "UKM",
-            "GBN",
-            "SCT",
             "EAW",
             "ENG",
-            "WLS",
+            "GBN",
             "NIR",
+            "SCT",
+            "UKM",
+            "WLS",
         }
         GB-ENG{
-            "GRE",
-            "HAL",
-            "HRY",
-            "KHL",
-            "NEL",
-            "NFK",
-            "POR",
-            "SGC",
-            "WBK",
-            "WND",
-            "WRT",
-            "IOS",
+            "BAS",
+            "BBD",
             "BDF",
             "BDG",
+            "BEN",
+            "BEX",
+            "BIR",
             "BKM",
+            "BMH",
+            "BNE",
+            "BNH",
+            "BNS",
+            "BOL",
+            "BPL",
+            "BRC",
+            "BRD",
+            "BRY",
             "BST",
+            "BUR",
             "CAM",
+            "CBF",
+            "CHE",
+            "CHW",
+            "CLD",
+            "CMA",
+            "CMD",
+            "CON",
+            "COV",
+            "CRY",
+            "DAL",
+            "DBY",
+            "DER",
+            "DEV",
             "DNC",
+            "DOR",
+            "DUD",
+            "DUR",
+            "EAL",
+            "ENF",
+            "ERY",
+            "ESS",
+            "ESX",
+            "GAT",
+            "GLS",
+            "GRE",
+            "HAL",
+            "HAM",
+            "HAV",
+            "HCK",
+            "HEF",
+            "HIL",
+            "HMF",
+            "HNS",
+            "HPL",
+            "HRT",
+            "HRW",
+            "HRY",
+            "IOS",
+            "IOW",
+            "ISL",
+            "KEC",
+            "KEN",
+            "KHL",
             "KIR",
+            "KTT",
+            "KWL",
+            "LAN",
+            "LBH",
+            "LCE",
+            "LDS",
+            "LEC",
+            "LEW",
+            "LIN",
+            "LIV",
             "LND",
             "LUT",
             "MAN",
+            "MDB",
+            "MDW",
             "MIK",
+            "MRT",
+            "NBL",
+            "NEL",
+            "NET",
+            "NFK",
+            "NGM",
             "NLN",
             "NSM",
+            "NTH",
+            "NTT",
             "NTY",
+            "NWM",
+            "NYK",
+            "OLD",
+            "OXF",
             "PLY",
-            "RDG",
-            "SHR",
-            "SND",
-            "STY",
-            "SWK",
-            "WRL",
-            "WSM",
-            "BAS",
-            "BIR",
-            "BPL",
-            "CHW",
-            "HNS",
-            "HRT",
-            "KTT",
-            "LEC",
+            "POL",
+            "POR",
+            "PTE",
+            "RCC",
             "RCH",
+            "RDB",
+            "RDG",
+            "RIC",
             "ROT",
+            "RUT",
+            "SAW",
             "SFK",
+            "SFT",
+            "SGC",
+            "SHF",
+            "SHN",
+            "SHR",
+            "SKP",
+            "SLF",
+            "SLG",
+            "SND",
+            "SOL",
+            "SOM",
+            "SOS",
             "SRY",
+            "STE",
             "STH",
+            "STN",
+            "STS",
             "STT",
+            "STY",
             "SWD",
+            "SWK",
+            "TAM",
             "TFW",
-            "WNM",
-            "WOR",
-            "WSX",
-            "BEX",
-            "BMH",
-            "BRD",
-            "BUR",
-            "CHE",
-            "CON",
-            "HAM",
-            "LIV",
-            "NYK",
-            "OXF",
-            "RIC",
-            "RUT",
-            "SAW",
-            "SHF",
-            "SLG",
             "THR",
             "TOB",
+            "TRF",
+            "TWH",
+            "WAR",
+            "WBK",
             "WFT",
+            "WGN",
             "WIL",
             "WKF",
+            "WLL",
+            "WLV",
+            "WND",
+            "WNM",
+            "WOK",
+            "WOR",
+            "WRL",
+            "WRT",
+            "WSM",
+            "WSX",
             "YOR",
-            "CLD",
-            "COV",
-            "DER",
-            "DEV",
-            "DUD",
-            "GLS",
-            "HCK",
-            "HRW",
-            "IOW",
-            "ISL",
-            "KEC",
-            "LBH",
-            "LDS",
-            "NET",
-            "NGM",
-            "SLF",
-            "SOL",
-            "STE",
-            "WLV",
-            "WOK",
-            "BNE",
-            "BNH",
-            "BNS",
-            "DAL",
-            "ERY",
-            "ESS",
-            "HAV",
-            "HIL",
-            "HPL",
-            "KEN",
-            "LCE",
-            "MDB",
-            "MRT",
-            "RDB",
-            "SFT",
-            "SHN",
-            "TRF",
-            "TWH",
-            "WAR",
-            "WLL",
-            "DBY",
-            "DOR",
-            "ENF",
-            "GAT",
-            "HMF",
-            "KWL",
-            "LAN",
-            "LEW",
-            "LIN",
-            "NBL",
-            "POL",
-            "RCC",
-            "STS",
-            "TAM",
-            "WGN",
-            "BBD",
-            "BEN",
-            "BOL",
-            "BRC",
-            "CBF",
-            "CMA",
-            "CMD",
-            "CRY",
-            "DUR",
-            "ESX",
-            "HEF",
-            "MDW",
-            "NTH",
-            "NTT",
-            "NWM",
-            "OLD",
-            "PTE",
-            "SKP",
-            "SOM",
-            "SOS",
-            "STN",
-            "BRY",
-            "EAL",
         }
         GB-NIR{
-            "NDN",
-            "NYM",
-            "ANT",
-            "DOW",
-            "DRY",
-            "FER",
-            "NTA",
-            "ARD",
-            "CGV",
-            "LSB",
-            "BNB",
-            "CSR",
-            "MYL",
-            "OMH",
-            "CKF",
-            "MFT",
-            "ARM",
-            "BLA",
-            "LMV",
-            "STB",
-            "CKT",
-            "DGN",
-            "LRN",
+            "ABC",
+            "AND",
+            "ANN",
             "BFS",
-            "BLY",
-            "CLR",
+            "CCG",
+            "DRS",
+            "FMO",
+            "LBC",
+            "MEA",
+            "MUL",
+            "NMD",
         }
         GB-SCT{
-            "NLK",
-            "RFW",
-            "PKN",
-            "ANS",
-            "FAL",
-            "GLG",
-            "MRY",
-            "DGY",
-            "ELN",
-            "SAY",
             "ABD",
-            "ELS",
-            "NAY",
-            "WLN",
+            "ABE",
             "AGB",
+            "ANS",
             "CLK",
+            "DGY",
+            "DND",
+            "EAY",
+            "EDH",
             "EDU",
+            "ELN",
+            "ELS",
+            "ERW",
+            "FAL",
             "FIF",
+            "GLG",
+            "HLD",
+            "IVC",
             "MLN",
+            "MRY",
+            "NAY",
+            "NLK",
             "ORK",
+            "PKN",
+            "RFW",
+            "SAY",
             "SCB",
             "SLK",
             "STG",
-            "ZET",
             "WDU",
-            "ABE",
-            "DND",
-            "EAY",
-            "ERW",
-            "HLD",
-            "IVC",
-            "EDH",
+            "WLN",
+            "ZET",
         }
         GB-WLS{
-            "NTL",
-            "RCT",
+            "AGY",
             "BGE",
-            "NWP",
             "BGW",
+            "CAY",
+            "CGN",
             "CMN",
+            "CRF",
+            "CWY",
             "DEN",
             "FLN",
-            "MTY",
-            "POW",
-            "VGL",
-            "AGY",
-            "CAY",
             "GWN",
-            "WRX",
-            "CGN",
             "MON",
+            "MTY",
+            "NTL",
+            "NWP",
             "PEM",
-            "TOF",
-            "CRF",
+            "POW",
+            "RCT",
             "SWA",
-            "CWY",
+            "TOF",
+            "VGL",
+            "WRX",
         }
         GD{
-            "04",
-            "10",
-            "02",
-            "05",
             "01",
+            "02",
             "03",
+            "04",
+            "05",
             "06",
+            "10",
         }
         GE{
             "AB",
             "AJ",
+            "GU",
+            "IM",
+            "KA",
+            "KK",
             "MM",
-            "SZ",
+            "RL",
             "SJ",
             "SK",
-            "IM",
-            "GU",
-            "RL",
+            "SZ",
             "TB",
-            "KA",
-            "KK",
         }
         GH{
-            "WP",
-            "EP",
+            "AA",
+            "AH",
             "BA",
-            "TV",
-            "UW",
             "CP",
+            "EP",
             "NP",
-            "AH",
-            "AA",
+            "TV",
             "UE",
+            "UW",
+            "WP",
         }
         GL{
-            "QE",
-            "QA",
             "KU",
+            "QA",
+            "QE",
             "SM",
         }
         GM{
+            "B",
+            "L",
             "M",
+            "N",
             "U",
             "W",
-            "L",
-            "B",
-            "N",
         }
         GN{
-            "M",
             "B",
-            "F",
             "C",
+            "D",
+            "F",
             "K",
             "L",
-            "D",
+            "M",
             "N",
         }
         GN-B{
-            "BK",
             "BF",
-            "GA",
+            "BK",
             "FR",
+            "GA",
             "KN",
         }
         GN-D{
-            "KD",
-            "DU",
             "CO",
+            "DU",
             "FO",
+            "KD",
             "TE",
         }
         GN-F{
-            "FA",
             "DB",
-            "KS",
             "DI",
+            "FA",
+            "KS",
         }
         GN-K{
-            "SI",
-            "MD",
             "KA",
             "KE",
             "KO",
+            "MD",
+            "SI",
         }
         GN-L{
             "KB",
             "LA",
+            "LE",
             "ML",
             "TO",
-            "LE",
         }
         GN-M{
             "DL",
-            "PI",
             "MM",
+            "PI",
         }
         GN-N{
-            "MC",
-            "LO",
-            "YO",
             "BE",
             "GU",
+            "LO",
+            "MC",
             "NZ",
+            "YO",
         }
         GQ{
             "C",
             "I",
         }
         GQ-C{
-            "KN",
             "CS",
+            "KN",
             "LI",
             "WN",
         }
         GQ-I{
-            "BS",
             "AN",
             "BN",
+            "BS",
         }
         GR{
-            "C",
-            "H",
-            "I",
-            "L",
+            "69",
             "A",
             "B",
-            "F",
-            "69",
-            "E",
-            "K",
+            "C",
             "D",
+            "E",
+            "F",
             "G",
+            "H",
+            "I",
             "J",
+            "K",
+            "L",
             "M",
         }
         GR-A{
-            "71",
+            "52",
             "55",
+            "71",
             "72",
             "73",
-            "52",
         }
         GR-B{
             "53",
+            "54",
+            "57",
             "59",
             "61",
-            "64",
-            "54",
             "62",
-            "57",
+            "64",
         }
         GR-C{
+            "51",
             "56",
             "58",
-            "51",
             "63",
         }
         GR-D{
-            "34",
+            "31",
             "32",
             "33",
-            "31",
+            "34",
         }
         GR-E{
             "41",
+            "42",
             "43",
             "44",
-            "42",
         }
         GR-F{
-            "24",
+            "21",
             "22",
             "23",
-            "21",
+            "24",
         }
         GR-G{
-            "13",
             "01",
+            "13",
             "14",
         }
         GR-H{
-            "07",
             "03",
+            "04",
             "05",
             "06",
-            "04",
+            "07",
         }
         GR-I{"A1"}
         GR-J{
-            "16",
-            "17",
             "11",
-            "15",
             "12",
+            "15",
+            "16",
+            "17",
         }
         GR-K{
-            "84",
             "83",
+            "84",
             "85",
         }
         GR-L{
-            "82",
             "81",
+            "82",
         }
         GR-M{
+            "91",
             "92",
             "93",
             "94",
-            "91",
         }
         GT{
+            "AV",
+            "BV",
             "CM",
+            "CQ",
             "ES",
-            "IZ",
-            "PE",
-            "TO",
             "GU",
-            "ZA",
+            "HU",
+            "IZ",
             "JA",
             "JU",
-            "SA",
-            "SM",
+            "PE",
+            "PR",
+            "QC",
             "QZ",
             "RE",
-            "HU",
+            "SA",
+            "SM",
             "SO",
             "SR",
             "SU",
-            "PR",
-            "CQ",
-            "QC",
-            "AV",
-            "BV",
+            "TO",
+            "ZA",
         }
         GW{
-            "L",
             "BS",
+            "L",
             "N",
             "S",
         }
         GW-L{
-            "GA",
             "BA",
+            "GA",
         }
         GW-N{
             "BM",
-            "OI",
             "CA",
+            "OI",
         }
         GW-S{
-            "TO",
             "BL",
             "QU",
+            "TO",
         }
         GY{
-            "EB",
-            "UD",
             "BA",
             "CU",
             "DE",
-            "PT",
-            "PM",
-            "UT",
+            "EB",
             "ES",
             "MA",
+            "PM",
+            "PT",
+            "UD",
+            "UT",
         }
         HN{
-            "CP",
-            "LP",
-            "SB",
-            "CL",
-            "YO",
+            "AT",
             "CH",
-            "GD",
-            "IB",
-            "OL",
-            "VA",
+            "CL",
             "CM",
-            "LE",
-            "EP",
-            "AT",
+            "CP",
             "CR",
+            "EP",
             "FM",
+            "GD",
+            "IB",
             "IN",
+            "LE",
+            "LP",
             "OC",
+            "OL",
+            "SB",
+            "VA",
+            "YO",
         }
         HR{
-            "13",
             "01",
-            "06",
-            "17",
-            "21",
+            "02",
             "03",
+            "04",
             "05",
+            "06",
+            "07",
             "08",
-            "15",
-            "04",
-            "19",
+            "09",
             "10",
+            "11",
+            "12",
+            "13",
             "14",
+            "15",
             "16",
-            "02",
-            "09",
-            "12",
+            "17",
             "18",
-            "07",
+            "19",
             "20",
-            "11",
+            "21",
         }
         HT{
-            "NO",
-            "NI",
-            "NE",
-            "OU",
+            "AR",
+            "CE",
             "GA",
             "ND",
+            "NE",
+            "NI",
+            "NO",
+            "OU",
             "SD",
             "SE",
-            "AR",
-            "CE",
         }
         HU{
-            "NY",
-            "TB",
-            "FE",
-            "GS",
-            "MI",
-            "PS",
-            "ST",
-            "VA",
-            "BZ",
-            "ER",
-            "NK",
-            "NO",
             "BA",
             "BC",
+            "BE",
+            "BK",
+            "BU",
+            "BZ",
             "CS",
             "DE",
-            "HB",
-            "PE",
-            "SN",
-            "SO",
-            "BE",
-            "JN",
-            "SD",
-            "VE",
-            "ZA",
-            "ZE",
             "DU",
-            "KE",
-            "SF",
-            "SS",
-            "BK",
             "EG",
+            "ER",
+            "FE",
+            "GS",
             "GY",
+            "HB",
             "HE",
-            "KM",
-            "SZ",
-            "TO",
-            "BU",
             "HV",
+            "JN",
+            "KE",
+            "KM",
             "KV",
+            "MI",
+            "NK",
+            "NO",
+            "NY",
+            "PE",
+            "PS",
+            "SD",
+            "SF",
             "SH",
             "SK",
+            "SN",
+            "SO",
+            "SS",
+            "ST",
+            "SZ",
+            "TB",
+            "TO",
+            "VA",
+            "VE",
             "VM",
+            "ZA",
+            "ZE",
         }
         ID{
-            "KA",
             "JW",
+            "KA",
+            "ML",
             "NU",
-            "SM",
             "PP",
-            "ML",
             "SL",
+            "SM",
         }
         ID-JW{
+            "BT",
             "JB",
-            "JT",
-            "JK",
             "JI",
-            "BT",
+            "JK",
+            "JT",
             "YO",
         }
         ID-KA{
-            "KU",
-            "KT",
             "KB",
-            "KS",
             "KI",
+            "KS",
+            "KT",
+            "KU",
         }
         ID-ML{
             "MA",
@@ -18879,8 +18878,8 @@ supplementalData:table(nofallback){
         }
         ID-NU{
             "BA",
-            "NT",
             "NB",
+            "NT",
         }
         ID-PP{
             "PA",
@@ -18889,421 +18888,420 @@ supplementalData:table(nofallback){
         ID-SL{
             "GO",
             "SA",
-            "SR",
-            "ST",
             "SG",
             "SN",
+            "SR",
+            "ST",
         }
         ID-SM{
+            "AC",
             "BB",
+            "BE",
             "JA",
-            "AC",
+            "KR",
+            "LA",
             "RI",
-            "SS",
-            "BE",
             "SB",
+            "SS",
             "SU",
-            "LA",
-            "KR",
         }
         IE{
             "C",
             "L",
-            "U",
             "M",
+            "U",
         }
         IE-C{
             "G",
-            "RN",
-            "SO",
             "LM",
             "MO",
+            "RN",
+            "SO",
         }
         IE-L{
+            "CW",
             "D",
-            "OY",
             "KE",
-            "LD",
-            "CW",
             "KK",
+            "LD",
+            "LH",
             "LS",
             "MH",
+            "OY",
+            "WH",
             "WW",
             "WX",
-            "LH",
-            "WH",
         }
         IE-M{
             "CE",
             "CO",
+            "KY",
+            "LK",
             "TA",
             "WD",
-            "LK",
-            "KY",
         }
         IE-U{
-            "MN",
             "CN",
             "DL",
+            "MN",
         }
         IL{
-            "M",
-            "Z",
             "D",
             "HA",
             "JM",
+            "M",
             "TA",
+            "Z",
         }
         IN{
             "AN",
             "AP",
             "AR",
-            "KA",
-            "KL",
-            "LD",
-            "MH",
-            "OR",
+            "AS",
             "BR",
-            "TR",
-            "WB",
-            "GJ",
-            "ML",
-            "MP",
+            "CH",
             "CT",
-            "HR",
-            "UP",
             "DD",
+            "DL",
+            "DN",
+            "GA",
+            "GJ",
             "HP",
+            "HR",
             "JH",
             "JK",
-            "NL",
-            "CH",
-            "GA",
+            "KA",
+            "KL",
+            "LD",
+            "MH",
+            "ML",
+            "MN",
+            "MP",
             "MZ",
+            "NL",
+            "OR",
+            "PB",
             "PY",
+            "RJ",
             "SK",
-            "UT",
             "TG",
-            "DL",
-            "AS",
-            "DN",
-            "MN",
-            "PB",
-            "RJ",
             "TN",
+            "TR",
+            "UP",
+            "UT",
+            "WB",
         }
         IQ{
-            "BB",
-            "MU",
-            "WA",
+            "AN",
             "AR",
             "BA",
+            "BB",
+            "BG",
             "DA",
-            "QA",
-            "SU",
-            "SD",
             "DI",
-            "AN",
             "DQ",
             "KA",
-            "NA",
             "KI",
-            "NI",
-            "BG",
             "MA",
+            "MU",
+            "NA",
+            "NI",
+            "QA",
+            "SD",
+            "SU",
+            "WA",
         }
         IR{
-            "10",
-            "16",
-            "19",
-            "25",
             "01",
-            "13",
-            "20",
-            "21",
-            "26",
             "02",
+            "03",
             "04",
+            "05",
+            "06",
             "07",
+            "08",
+            "10",
             "11",
+            "12",
+            "13",
+            "14",
             "15",
-            "05",
+            "16",
             "17",
             "18",
-            "28",
-            "12",
-            "14",
+            "19",
+            "20",
+            "21",
             "22",
+            "23",
             "24",
-            "06",
+            "25",
+            "26",
             "27",
-            "30",
-            "32",
-            "23",
+            "28",
             "29",
+            "30",
             "31",
-            "03",
-            "08",
+            "32",
         }
         IS{
-            "4",
-            "3",
-            "2",
-            "7",
-            "0",
             "1",
+            "2",
+            "3",
+            "4",
             "5",
             "6",
+            "7",
             "8",
         }
         IT{
-            "67",
+            "21",
             "23",
             "25",
-            "36",
             "32",
-            "62",
             "34",
+            "36",
             "42",
             "45",
-            "77",
-            "82",
-            "88",
+            "52",
             "55",
+            "57",
+            "62",
+            "65",
+            "67",
             "72",
-            "52",
             "75",
+            "77",
             "78",
-            "21",
-            "57",
-            "65",
+            "82",
+            "88",
         }
         IT-21{
-            "VC",
-            "BI",
-            "NO",
-            "VB",
-            "TO",
             "AL",
             "AT",
+            "BI",
             "CN",
+            "NO",
+            "TO",
+            "VB",
+            "VC",
         }
         IT-23{"AO"}
         IT-25{
+            "BG",
+            "BS",
+            "CO",
             "CR",
             "LC",
-            "PV",
+            "LO",
             "MB",
-            "BS",
-            "SO",
+            "MI",
             "MN",
-            "BG",
+            "PV",
+            "SO",
             "VA",
-            "CO",
-            "LO",
-            "MI",
         }
         IT-32{
-            "TN",
             "BZ",
+            "TN",
         }
         IT-34{
-            "VE",
-            "VI",
+            "BL",
             "PD",
             "RO",
-            "BL",
             "TV",
+            "VE",
+            "VI",
             "VR",
         }
         IT-36{
+            "GO",
+            "PN",
             "TS",
             "UD",
-            "PN",
-            "GO",
         }
         IT-42{
+            "GE",
             "IM",
             "SP",
             "SV",
-            "GE",
         }
         IT-45{
+            "BO",
             "FC",
             "FE",
+            "MO",
             "PC",
-            "RA",
-            "RN",
             "PR",
+            "RA",
             "RE",
-            "BO",
-            "MO",
+            "RN",
         }
         IT-52{
+            "AR",
+            "FI",
             "GR",
-            "PO",
-            "PT",
+            "LI",
             "LU",
-            "SI",
             "MS",
             "PI",
-            "FI",
-            "AR",
-            "LI",
+            "PO",
+            "PT",
+            "SI",
         }
         IT-55{
             "PG",
             "TR",
         }
         IT-57{
-            "FM",
-            "AP",
             "AN",
+            "AP",
+            "FM",
             "MC",
             "PU",
         }
         IT-62{
             "FR",
-            "RM",
-            "VT",
             "LT",
             "RI",
+            "RM",
+            "VT",
         }
         IT-65{
-            "PE",
             "AQ",
             "CH",
+            "PE",
             "TE",
         }
         IT-67{
-            "IS",
             "CB",
+            "IS",
         }
         IT-72{
-            "NA",
             "AV",
             "BN",
-            "SA",
             "CE",
+            "NA",
+            "SA",
         }
         IT-75{
+            "BA",
+            "BR",
             "BT",
             "FG",
-            "TA",
             "LE",
-            "BA",
-            "BR",
+            "TA",
         }
         IT-77{
             "MT",
             "PZ",
         }
         IT-78{
+            "CS",
+            "CZ",
             "KR",
             "RC",
             "VV",
-            "CS",
-            "CZ",
         }
         IT-82{
             "AG",
-            "PA",
-            "TP",
             "CL",
-            "RG",
-            "SR",
+            "CT",
             "EN",
             "ME",
-            "CT",
+            "PA",
+            "RG",
+            "SR",
+            "TP",
         }
         IT-88{
             "CA",
             "CI",
+            "NU",
             "OG",
             "OR",
             "OT",
-            "VS",
             "SS",
-            "NU",
+            "VS",
         }
         JM{
-            "06",
-            "13",
+            "01",
             "02",
             "03",
+            "04",
+            "05",
+            "06",
+            "07",
             "08",
-            "01",
-            "12",
-            "14",
+            "09",
             "10",
             "11",
-            "07",
-            "09",
-            "04",
-            "05",
+            "12",
+            "13",
+            "14",
         }
         JO{
+            "AJ",
+            "AM",
             "AQ",
+            "AT",
             "AZ",
+            "BA",
             "IR",
-            "MN",
-            "AT",
             "JA",
             "KA",
-            "AJ",
             "MA",
-            "AM",
-            "BA",
             "MD",
+            "MN",
         }
         JP{
-            "11",
-            "16",
-            "17",
-            "19",
-            "22",
-            "24",
-            "26",
-            "32",
-            "36",
-            "44",
-            "03",
-            "25",
-            "28",
-            "41",
             "01",
+            "02",
+            "03",
+            "04",
             "05",
+            "06",
+            "07",
+            "08",
+            "09",
+            "10",
+            "11",
+            "12",
             "13",
+            "14",
+            "15",
+            "16",
+            "17",
+            "18",
+            "19",
+            "20",
+            "21",
+            "22",
             "23",
+            "24",
+            "25",
+            "26",
+            "27",
+            "28",
             "29",
             "30",
+            "31",
+            "32",
             "33",
+            "34",
+            "35",
+            "36",
             "37",
-            "10",
-            "12",
-            "14",
-            "39",
-            "45",
-            "20",
-            "31",
             "38",
+            "39",
             "40",
+            "41",
             "42",
-            "02",
-            "07",
-            "09",
-            "18",
-            "21",
-            "34",
-            "35",
             "43",
+            "44",
+            "45",
             "46",
             "47",
-            "04",
-            "06",
-            "08",
-            "15",
-            "27",
         }
         KE{
             "01",
@@ -19355,224 +19353,225 @@ supplementalData:table(nofallback){
             "47",
         }
         KG{
-            "N",
+            "B",
+            "C",
             "GB",
+            "GO",
             "J",
-            "Y",
+            "N",
             "O",
             "T",
-            "B",
-            "GO",
-            "C",
+            "Y",
         }
         KH{
             "1",
-            "21",
-            "16",
-            "17",
-            "18",
-            "20",
-            "15",
+            "2",
             "3",
-            "8",
-            "11",
-            "23",
             "4",
-            "6",
-            "2",
             "5",
-            "9",
-            "24",
-            "19",
-            "22",
+            "6",
             "7",
+            "8",
+            "9",
             "10",
+            "11",
             "12",
             "13",
             "14",
+            "15",
+            "16",
+            "17",
+            "18",
+            "19",
+            "20",
+            "21",
+            "22",
+            "23",
+            "24",
+            "25",
         }
         KI{
+            "G",
             "L",
             "P",
-            "G",
         }
         KM{
+            "A",
             "G",
             "M",
-            "A",
         }
         KN{
-            "N",
             "K",
+            "N",
         }
         KN-K{
-            "08",
-            "02",
-            "11",
             "01",
-            "15",
+            "02",
+            "03",
             "06",
+            "08",
             "09",
+            "11",
             "13",
-            "03",
+            "15",
         }
         KN-N{
+            "04",
             "05",
             "07",
-            "12",
             "10",
-            "04",
+            "12",
         }
         KP{
-            "05",
-            "06",
-            "10",
-            "02",
             "01",
+            "02",
             "03",
             "04",
-            "09",
-            "13",
+            "05",
+            "06",
             "07",
             "08",
+            "09",
+            "10",
+            "13",
         }
         KR{
-            "45",
-            "48",
             "11",
             "26",
             "27",
-            "29",
-            "44",
             "28",
+            "29",
             "30",
+            "31",
+            "41",
             "42",
             "43",
+            "44",
+            "45",
+            "46",
             "47",
+            "48",
             "49",
             "50",
-            "31",
-            "46",
-            "41",
         }
         KW{
+            "AH",
+            "FA",
+            "HA",
             "JA",
             "KU",
             "MU",
-            "FA",
-            "HA",
-            "AH",
         }
         KZ{
             "AKM",
-            "KZY",
-            "VOS",
-            "ALM",
-            "SEV",
-            "YUZ",
-            "ZAP",
-            "KAR",
-            "PAV",
+            "AKT",
             "ALA",
-            "KUS",
+            "ALM",
             "AST",
-            "AKT",
             "ATY",
+            "KAR",
+            "KUS",
+            "KZY",
             "MAN",
+            "PAV",
+            "SEV",
+            "VOS",
+            "YUZ",
+            "ZAP",
             "ZHA",
         }
         LA{
-            "BL",
-            "XE",
+            "AT",
             "BK",
+            "BL",
             "CH",
-            "SV",
-            "XI",
-            "AT",
-            "PH",
             "HO",
             "KH",
-            "SL",
-            "VI",
-            "XA",
-            "XN",
             "LM",
             "LP",
             "OU",
+            "PH",
+            "SL",
+            "SV",
+            "VI",
             "VT",
+            "XA",
+            "XE",
+            "XI",
+            "XS",
         }
         LB{
-            "NA",
+            "AK",
             "AS",
+            "BA",
             "BH",
+            "BI",
             "JA",
             "JL",
-            "BA",
-            "BI",
-            "AK",
+            "NA",
         }
         LC{
             "01",
-            "06",
-            "07",
-            "03",
             "02",
+            "03",
             "05",
+            "06",
+            "07",
             "08",
-            "12",
             "10",
             "11",
+            "12",
         }
         LI{
+            "01",
             "02",
-            "08",
-            "11",
-            "04",
-            "07",
             "03",
+            "04",
             "05",
             "06",
-            "01",
+            "07",
+            "08",
             "09",
             "10",
+            "11",
         }
         LK{
+            "1",
             "2",
             "3",
-            "8",
-            "1",
             "4",
-            "9",
+            "5",
             "6",
             "7",
-            "5",
+            "8",
+            "9",
         }
         LK-1{
             "52",
-            "81",
             "71",
+            "81",
         }
         LK-2{
-            "31",
             "11",
+            "31",
             "51",
         }
         LK-3{
+            "12",
             "33",
             "41",
-            "12",
         }
         LK-4{
-            "61",
-            "42",
-            "92",
             "13",
             "21",
+            "42",
+            "61",
+            "92",
         }
         LK-5{
             "22",
-            "43",
             "32",
+            "43",
         }
         LK-6{
             "45",
@@ -19587,88 +19586,59 @@ supplementalData:table(nofallback){
             "91",
         }
         LK-9{
-            "53",
             "44",
+            "53",
         }
         LR{
+            "BG",
             "BM",
+            "CM",
             "GB",
             "GG",
-            "LO",
-            "RI",
-            "CM",
+            "GK",
             "GP",
+            "LO",
             "MG",
             "MO",
-            "BG",
             "MY",
             "NI",
-            "SI",
             "RG",
-            "GK",
+            "RI",
+            "SI",
         }
         LS{
-            "G",
+            "A",
+            "B",
+            "C",
             "D",
             "E",
-            "J",
-            "K",
-            "A",
             "F",
-            "C",
+            "G",
             "H",
-            "B",
+            "J",
+            "K",
         }
         LT{
-            "MR",
-            "PN",
-            "SA",
-            "45",
-            "46",
-            "47",
-            "48",
-            "49",
-            "50",
-            "51",
-            "52",
-            "53",
-            "54",
-            "55",
-            "56",
-            "58",
-            "60",
-            "05",
-            "07",
-            "08",
-            "14",
-            "17",
-            "28",
-            "29",
-            "39",
-            "59",
-            "TE",
-            "AL",
-            "KU",
-            "UT",
+            "01",
             "02",
-            "15",
-            "20",
-            "31",
-            "43",
             "03",
-            "57",
-            "32",
-            "01",
             "04",
+            "05",
             "06",
+            "07",
+            "08",
             "09",
             "10",
             "11",
             "12",
             "13",
+            "14",
+            "15",
             "16",
+            "17",
             "18",
             "19",
+            "20",
             "21",
             "22",
             "23",
@@ -19676,199 +19646,237 @@ supplementalData:table(nofallback){
             "25",
             "26",
             "27",
+            "28",
+            "29",
             "30",
+            "31",
+            "32",
             "33",
             "34",
             "35",
             "36",
             "37",
             "38",
+            "39",
             "40",
             "41",
             "42",
+            "43",
             "44",
+            "45",
+            "46",
+            "47",
+            "48",
+            "49",
+            "50",
+            "51",
+            "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "57",
+            "58",
+            "59",
+            "60",
+            "AL",
             "KL",
+            "KU",
+            "MR",
+            "PN",
+            "SA",
             "TA",
+            "TE",
+            "UT",
             "VL",
         }
         LU{
-            "D",
-            "L",
-            "G",
+            "CA",
+            "CL",
+            "DI",
+            "EC",
+            "ES",
+            "GR",
+            "LU",
+            "ME",
+            "RD",
+            "RM",
+            "VD",
+            "WI",
         }
         LV{
             "001",
-            "032",
-            "033",
-            "046",
-            "049",
-            "053",
-            "061",
-            "071",
-            "073",
-            "081",
-            "090",
-            "098",
-            "JKB",
-            "VEN",
+            "002",
+            "003",
+            "004",
+            "005",
+            "006",
+            "007",
+            "008",
+            "009",
             "010",
-            "017",
-            "035",
-            "068",
-            "075",
-            "076",
-            "088",
-            "097",
-            "107",
-            "JEL",
-            "VMR",
+            "011",
             "012",
+            "013",
             "014",
+            "015",
+            "016",
+            "017",
+            "018",
             "019",
             "020",
+            "021",
             "022",
-            "031",
-            "051",
-            "058",
-            "063",
-            "066",
-            "067",
-            "070",
-            "093",
-            "095",
-            "096",
-            "099",
-            "102",
-            "006",
+            "023",
+            "024",
+            "025",
+            "026",
+            "027",
+            "028",
+            "029",
             "030",
+            "031",
+            "032",
+            "033",
+            "034",
+            "035",
+            "036",
             "037",
+            "038",
             "039",
+            "040",
+            "041",
+            "042",
             "043",
+            "044",
+            "045",
+            "046",
+            "047",
+            "048",
+            "049",
             "050",
+            "051",
+            "052",
+            "053",
+            "054",
             "055",
+            "056",
+            "057",
+            "058",
+            "059",
+            "060",
+            "061",
+            "062",
+            "063",
+            "064",
             "065",
+            "066",
+            "067",
+            "068",
+            "069",
+            "070",
+            "071",
             "072",
+            "073",
+            "074",
+            "075",
+            "076",
             "077",
+            "078",
             "079",
+            "080",
+            "081",
+            "082",
+            "083",
+            "084",
+            "085",
+            "086",
             "087",
+            "088",
             "089",
+            "090",
             "091",
+            "092",
+            "093",
             "094",
+            "095",
+            "096",
+            "097",
+            "098",
+            "099",
             "100",
-            "104",
-            "REZ",
-            "013",
-            "023",
-            "025",
-            "026",
-            "029",
-            "045",
-            "059",
-            "069",
-            "082",
-            "085",
-            "092",
-            "103",
-            "JUR",
-            "004",
-            "011",
-            "018",
-            "028",
-            "064",
             "101",
+            "102",
+            "103",
+            "104",
             "105",
+            "106",
+            "107",
             "108",
+            "109",
+            "110",
             "DGV",
+            "JEL",
+            "JKB",
+            "JUR",
             "LPX",
+            "REZ",
             "RIX",
-            "002",
-            "005",
-            "007",
-            "008",
-            "015",
-            "024",
-            "027",
-            "036",
-            "047",
-            "048",
-            "054",
-            "056",
-            "060",
-            "078",
-            "080",
-            "083",
-            "086",
-            "110",
-            "003",
-            "009",
-            "016",
-            "021",
-            "034",
-            "038",
-            "040",
-            "041",
-            "042",
-            "044",
-            "052",
-            "057",
-            "062",
-            "074",
-            "084",
-            "106",
-            "109",
+            "VEN",
+            "VMR",
         }
         LY{
             "BA",
             "BU",
             "DR",
+            "GT",
             "JA",
-            "KF",
-            "MQ",
+            "JG",
             "JI",
+            "JU",
+            "KF",
+            "MB",
             "MI",
+            "MJ",
+            "MQ",
             "NL",
             "NQ",
+            "SB",
             "SR",
-            "ZA",
-            "JU",
-            "MB",
-            "WD",
-            "GT",
             "TB",
-            "JG",
-            "WS",
-            "MJ",
-            "SB",
             "WA",
+            "WD",
+            "WS",
+            "ZA",
         }
         MA{
-            "16",
-            "05",
-            "03",
-            "08",
-            "12",
-            "13",
-            "11",
-            "15",
             "01",
-            "09",
             "02",
+            "03",
+            "04",
+            "05",
             "06",
+            "07",
+            "08",
+            "09",
             "10",
+            "11",
+            "12",
+            "13",
             "14",
-            "04",
-            "07",
+            "15",
+            "16",
         }
         MA-01{
             "CHE",
             "FAH",
-            "TNG",
-            "TET",
             "LAR",
+            "TET",
+            "TNG",
         }
         MA-02{
-            "SIK",
             "KEN",
+            "SIK",
         }
         MA-03{
             "HOC",
@@ -19876,31 +19884,31 @@ supplementalData:table(nofallback){
             "TAZ",
         }
         MA-04{
-            "NAD",
-            "TAI",
             "BER",
-            "OUJ",
-            "JRA",
             "FIG",
+            "JRA",
+            "NAD",
+            "OUJ",
+            "TAI",
         }
         MA-05{
-            "MOU",
+            "BOM",
             "FES",
+            "MOU",
             "SEF",
-            "BOM",
         }
         MA-06{
             "ERR",
-            "KHN",
-            "IFR",
             "HAJ",
+            "IFR",
+            "KHN",
             "MEK",
         }
         MA-07{
+            "KHE",
             "RAB",
-            "SKH",
             "SAL",
-            "KHE",
+            "SKH",
         }
         MA-08{
             "CAS",
@@ -19914,435 +19922,424 @@ supplementalData:table(nofallback){
             "SET",
         }
         MA-10{
-            "SAF",
             "JDI",
+            "SAF",
         }
         MA-11{
             "CHI",
+            "ESI",
+            "HAO",
             "KES",
             "MMD",
-            "HAO",
-            "ESI",
-            "SYB",
             "MMN",
+            "SYB",
         }
         MA-12{
-            "BEM",
             "AZI",
+            "BEM",
         }
         MA-13{
+            "AGD",
+            "CHT",
             "INE",
             "OUA",
-            "AGD",
-            "ZAG",
             "TAR",
             "TIZ",
-            "CHT",
+            "ZAG",
         }
         MA-14{
-            "ESM",
             "ASZ",
-            "TNT",
+            "ESM",
             "GUE",
             "TAT",
+            "TNT",
         }
         MA-15{
-            "LAA",
             "BOD",
+            "LAA",
         }
         MA-16{
             "AOU",
             "OUD",
         }
         MC{
-            "MO",
-            "PH",
-            "SR",
-            "VR",
-            "LA",
-            "SD",
-            "SO",
             "CL",
+            "CO",
+            "FO",
             "GA",
             "JE",
+            "LA",
             "MA",
-            "SP",
             "MC",
             "MG",
-            "CO",
-            "FO",
+            "MO",
             "MU",
+            "PH",
+            "SD",
+            "SO",
+            "SP",
+            "SR",
+            "VR",
         }
         MD{
-            "ED",
-            "HI",
-            "NI",
-            "RE",
-            "SN",
-            "SV",
-            "BR",
-            "FA",
+            "AN",
             "BA",
+            "BD",
+            "BR",
             "BS",
             "CA",
-            "SD",
-            "SI",
+            "CL",
             "CM",
-            "FL",
-            "LE",
-            "OR",
-            "AN",
             "CR",
+            "CS",
             "CT",
-            "GL",
-            "RI",
-            "ST",
-            "CL",
+            "CU",
+            "DO",
             "DR",
+            "DU",
+            "ED",
+            "FA",
+            "FL",
             "GA",
+            "GL",
+            "HI",
+            "IA",
+            "LE",
+            "NI",
             "OC",
+            "OR",
+            "RE",
+            "RI",
+            "SD",
+            "SI",
+            "SN",
             "SO",
+            "ST",
+            "SV",
             "TA",
             "TE",
-            "BD",
-            "CS",
-            "CU",
-            "DO",
-            "DU",
-            "IA",
             "UN",
         }
         ME{
             "01",
-            "07",
-            "10",
-            "17",
-            "22",
-            "23",
-            "05",
-            "15",
-            "19",
-            "06",
-            "09",
-            "14",
-            "18",
-            "21",
             "02",
+            "03",
             "04",
+            "05",
+            "06",
+            "07",
             "08",
+            "09",
+            "10",
             "11",
-            "03",
+            "12",
+            "13",
+            "14",
+            "15",
             "16",
+            "17",
+            "18",
+            "19",
             "20",
-            "13",
-            "12",
+            "21",
+            "22",
+            "23",
         }
         MG{
-            "U",
-            "T",
             "A",
+            "D",
             "F",
             "M",
-            "D",
+            "T",
+            "U",
         }
         MH{
-            "T",
             "L",
+            "T",
         }
         MH-L{
-            "NMK",
-            "RON",
+            "ALL",
             "EBO",
             "ENI",
-            "WTH",
-            "KWA",
-            "ALL",
-            "KIL",
-            "LAE",
-            "NMU",
             "JAB",
             "JAL",
+            "KIL",
+            "KWA",
+            "LAE",
             "LIB",
+            "NMK",
+            "NMU",
+            "RON",
             "UJA",
+            "WTH",
         }
         MH-T{
-            "UTI",
-            "LIK",
-            "MAJ",
+            "ALK",
             "ARN",
             "AUR",
+            "LIK",
+            "MAJ",
             "MAL",
             "MEJ",
             "MIL",
+            "UTI",
             "WTJ",
-            "ALK",
         }
         MK{
+            "02",
+            "03",
+            "04",
             "05",
+            "06",
+            "07",
             "08",
+            "10",
+            "11",
+            "12",
+            "13",
             "14",
+            "16",
+            "18",
+            "19",
+            "20",
             "21",
+            "22",
             "23",
+            "24",
+            "25",
+            "26",
             "27",
+            "30",
             "32",
+            "33",
+            "34",
+            "35",
+            "36",
             "37",
-            "55",
-            "64",
-            "71",
-            "77",
-            "01",
-            "02",
-            "04",
-            "07",
-            "19",
-            "28",
-            "30",
             "40",
-            "51",
-            "53",
-            "66",
-            "67",
-            "75",
-            "84",
-            "03",
-            "10",
-            "11",
-            "26",
-            "44",
-            "54",
-            "56",
-            "60",
-            "78",
-            "80",
-            "81",
-            "06",
-            "16",
-            "25",
-            "31",
-            "35",
-            "38",
             "41",
-            "58",
-            "62",
-            "68",
-            "73",
-            "79",
-            "18",
-            "22",
-            "24",
-            "36",
-            "39",
-            "43",
-            "50",
-            "57",
-            "61",
-            "69",
-            "34",
             "42",
+            "43",
+            "44",
             "45",
             "46",
-            "48",
-            "63",
-            "74",
-            "76",
-            "12",
-            "17",
-            "20",
             "47",
-            "65",
-            "72",
-            "83",
-            "09",
-            "13",
-            "15",
-            "29",
-            "33",
+            "48",
             "49",
+            "50",
+            "51",
             "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "58",
             "59",
+            "60",
+            "61",
+            "62",
+            "63",
+            "64",
+            "65",
+            "66",
+            "67",
+            "69",
             "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "75",
+            "76",
+            "78",
+            "80",
+            "81",
             "82",
+            "83",
+            "85",
         }
         ML{
-            "4",
+            "1",
             "2",
+            "3",
+            "4",
             "5",
-            "BKO",
             "6",
-            "3",
-            "8",
-            "1",
             "7",
+            "8",
+            "BKO",
         }
         MM{
-            "16",
-            "18",
+            "01",
             "02",
-            "12",
+            "03",
+            "04",
             "05",
+            "06",
+            "07",
             "11",
+            "12",
             "13",
+            "14",
             "15",
-            "01",
-            "04",
-            "06",
+            "16",
             "17",
-            "03",
-            "14",
-            "07",
+            "18",
         }
         MN{
-            "046",
-            "065",
-            "043",
-            "071",
-            "041",
-            "053",
-            "061",
-            "067",
-            "055",
-            "069",
+            "1",
+            "035",
+            "037",
             "039",
+            "041",
+            "043",
+            "046",
             "047",
             "049",
+            "051",
+            "053",
+            "055",
             "057",
             "059",
-            "035",
-            "037",
-            "064",
-            "051",
+            "061",
             "063",
+            "064",
+            "065",
+            "067",
+            "069",
+            "071",
             "073",
-            "1",
         }
         MR{
             "01",
-            "05",
-            "12",
             "02",
-            "08",
             "03",
-            "07",
-            "NKC",
             "04",
-            "10",
+            "05",
             "06",
+            "07",
+            "08",
             "09",
+            "10",
             "11",
+            "12",
+            "13",
+            "14",
+            "15",
         }
         MT{
-            "32",
-            "33",
-            "43",
-            "48",
-            "08",
-            "34",
-            "35",
-            "37",
-            "46",
+            "01",
+            "02",
+            "03",
             "04",
+            "05",
+            "06",
+            "07",
+            "08",
+            "09",
+            "10",
+            "11",
+            "12",
+            "13",
             "14",
+            "15",
             "16",
+            "17",
             "18",
+            "19",
+            "20",
+            "21",
             "22",
+            "23",
+            "24",
+            "25",
             "26",
-            "13",
-            "15",
-            "20",
             "27",
+            "28",
+            "29",
+            "30",
+            "31",
+            "32",
+            "33",
+            "34",
+            "35",
             "36",
+            "37",
+            "38",
+            "39",
             "40",
+            "41",
+            "42",
+            "43",
             "44",
+            "45",
+            "46",
+            "47",
+            "48",
             "49",
             "50",
             "51",
-            "61",
-            "63",
-            "67",
-            "05",
-            "06",
-            "12",
-            "64",
-            "02",
-            "03",
-            "19",
-            "24",
-            "25",
-            "39",
             "52",
+            "53",
+            "54",
             "55",
             "56",
-            "66",
-            "68",
-            "38",
-            "41",
-            "54",
+            "57",
             "58",
-            "60",
-            "07",
-            "11",
-            "21",
-            "31",
-            "47",
             "59",
+            "60",
+            "61",
             "62",
+            "63",
+            "64",
             "65",
-            "09",
-            "30",
-            "42",
-            "45",
-            "53",
-            "57",
-            "01",
-            "10",
-            "17",
-            "23",
-            "28",
-            "29",
+            "66",
+            "67",
+            "68",
         }
         MU{
             "AG",
+            "BL",
             "BR",
-            "RO",
-            "SA",
-            "PW",
             "CC",
-            "GP",
             "CU",
-            "PA",
-            "PL",
-            "BL",
             "FL",
-            "QB",
+            "GP",
             "MO",
+            "PA",
+            "PL",
             "PU",
+            "PW",
+            "QB",
+            "RO",
             "RR",
+            "SA",
             "VP",
         }
         MV{
             "CE",
-            "NC",
-            "SU",
-            "SC",
             "MLE",
+            "NC",
             "NO",
+            "SC",
+            "SU",
             "UN",
             "US",
         }
         MV-CE{
-            "14",
             "12",
+            "14",
             "17",
         }
         MV-NC{
-            "04",
-            "26",
             "00",
             "02",
+            "04",
+            "26",
         }
         MV-NO{
-            "13",
             "03",
+            "13",
             "20",
             "25",
         }
@@ -20351,13 +20348,13 @@ supplementalData:table(nofallback){
             "28",
         }
         MV-SU{
-            "29",
             "01",
+            "29",
         }
         MV-UN{
+            "07",
             "23",
             "24",
-            "07",
         }
         MV-US{
             "05",
@@ -20369,247 +20366,247 @@ supplementalData:table(nofallback){
             "S",
         }
         MW-C{
-            "LI",
+            "DE",
+            "DO",
             "KS",
-            "NK",
+            "LI",
             "MC",
             "NI",
-            "SA",
-            "DE",
-            "DO",
+            "NK",
             "NU",
+            "SA",
         }
         MW-N{
-            "RU",
             "CT",
             "KR",
             "LK",
-            "NB",
             "MZ",
+            "NB",
+            "RU",
         }
         MW-S{
-            "CR",
-            "MU",
-            "NS",
-            "PH",
-            "ZO",
             "BA",
+            "BL",
             "CK",
+            "CR",
             "MG",
-            "MW",
-            "TH",
-            "BL",
             "MH",
+            "MU",
+            "MW",
             "NE",
+            "NS",
+            "PH",
+            "TH",
+            "ZO",
         }
         MX{
             "AGU",
             "BCN",
-            "CAM",
-            "DIF",
-            "GUA",
-            "MOR",
             "BCS",
-            "GRO",
-            "HID",
-            "SON",
-            "ZAC",
+            "CAM",
+            "CHH",
+            "CHP",
             "COA",
             "COL",
+            "DIF",
             "DUR",
-            "QUE",
-            "SIN",
-            "VER",
-            "CHP",
+            "GRO",
+            "GUA",
+            "HID",
             "JAL",
-            "PUE",
-            "ROO",
-            "TLA",
             "MEX",
+            "MIC",
+            "MOR",
             "NAY",
+            "NLE",
             "OAX",
+            "PUE",
+            "QUE",
+            "ROO",
+            "SIN",
             "SLP",
+            "SON",
             "TAB",
-            "CHH",
-            "NLE",
             "TAM",
+            "TLA",
+            "VER",
             "YUC",
-            "MIC",
+            "ZAC",
         }
         MY{
-            "12",
-            "13",
+            "01",
+            "02",
+            "03",
+            "04",
             "05",
-            "09",
+            "06",
             "07",
-            "01",
             "08",
+            "09",
             "10",
-            "14",
-            "16",
-            "03",
-            "04",
-            "02",
             "11",
-            "06",
+            "12",
+            "13",
+            "14",
             "15",
+            "16",
         }
         MZ{
-            "I",
-            "MPM",
             "A",
+            "B",
+            "G",
+            "I",
             "L",
+            "MPM",
+            "N",
+            "P",
             "Q",
             "S",
-            "B",
             "T",
-            "P",
-            "N",
-            "G",
         }
         NA{
-            "ON",
-            "KE",
-            "KW",
-            "HA",
-            "KH",
             "CA",
             "ER",
+            "HA",
+            "KA",
+            "KE",
+            "KH",
             "KU",
-            "OS",
-            "OW",
+            "KW",
             "OD",
-            "KA",
             "OH",
+            "ON",
+            "OS",
             "OT",
+            "OW",
         }
         NE{
             "1",
-            "6",
-            "5",
             "2",
-            "7",
             "3",
             "4",
+            "5",
+            "6",
+            "7",
             "8",
         }
         NG{
-            "BY",
-            "KN",
-            "KT",
+            "AB",
+            "AD",
+            "AK",
+            "AN",
+            "BA",
+            "BE",
             "BO",
+            "BY",
+            "CR",
+            "DE",
             "EB",
+            "ED",
+            "EK",
+            "EN",
             "FC",
+            "GO",
+            "IM",
+            "JI",
+            "KD",
             "KE",
+            "KN",
+            "KO",
+            "KT",
+            "KW",
+            "LA",
             "NA",
             "NI",
+            "OG",
             "ON",
             "OS",
             "OY",
-            "DE",
-            "EK",
-            "KO",
-            "LA",
-            "TA",
-            "KD",
-            "OG",
+            "PL",
+            "RI",
             "SO",
+            "TA",
             "YO",
             "ZA",
-            "AK",
-            "EN",
-            "IM",
-            "BE",
-            "CR",
-            "JI",
-            "AD",
-            "AN",
-            "AB",
-            "BA",
-            "ED",
-            "GO",
-            "KW",
-            "PL",
-            "RI",
         }
         NI{
+            "AN",
+            "AS",
+            "BO",
             "CA",
+            "CI",
+            "CO",
             "ES",
+            "GR",
+            "JI",
+            "LE",
+            "MD",
             "MN",
             "MS",
-            "AN",
+            "MT",
+            "NS",
             "RI",
             "SJ",
-            "AS",
-            "GR",
-            "MD",
-            "LE",
-            "NS",
-            "CI",
-            "JI",
-            "CO",
-            "BO",
-            "MT",
         }
         NL{
-            "NB",
-            "NH",
-            "ZH",
+            "AW",
+            "BQ1",
+            "BQ2",
+            "BQ3",
             "CW",
+            "DR",
+            "FL",
+            "FR",
+            "GE",
             "GR",
             "LI",
+            "NB",
+            "NH",
             "OV",
-            "AW",
-            "DR",
-            "BQ3",
-            "GE",
+            "SX",
             "UT",
-            "FL",
-            "FR",
-            "BQ1",
             "ZE",
-            "SX",
-            "BQ2",
+            "ZH",
         }
         NO{
-            "04",
-            "12",
-            "14",
-            "22",
+            "01",
             "02",
             "03",
+            "04",
             "05",
+            "06",
             "07",
-            "20",
-            "01",
-            "10",
-            "19",
             "08",
-            "06",
             "09",
+            "10",
+            "11",
+            "12",
+            "14",
+            "15",
             "16",
             "17",
-            "21",
             "18",
-            "11",
-            "15",
+            "19",
+            "20",
+            "21",
+            "22",
         }
         NP{
+            "1",
             "2",
             "3",
             "4",
             "5",
-            "1",
         }
         NP-1{
-            "JA",
             "BA",
+            "JA",
             "NA",
         }
         NP-2{
-            "RA",
             "BH",
             "KA",
+            "RA",
         }
         NP-3{
             "DH",
@@ -20617,181 +20614,177 @@ supplementalData:table(nofallback){
             "LU",
         }
         NP-4{
-            "ME",
             "KO",
+            "ME",
             "SA",
         }
         NP-5{
-            "SE",
             "MA",
+            "SE",
         }
         NR{
-            "02",
-            "04",
             "01",
+            "02",
             "03",
+            "04",
+            "05",
+            "06",
+            "07",
             "08",
-            "10",
             "09",
+            "10",
+            "11",
             "12",
-            "14",
-            "07",
             "13",
-            "05",
-            "06",
-            "11",
+            "14",
         }
         NZ{
-            "S",
-            "N",
-            "CIT",
-        }
-        NZ-N{
             "AUK",
-            "WKO",
-            "NTL",
-            "TKI",
-            "HKB",
-            "GIS",
-            "MWT",
             "BOP",
-            "WGN",
-        }
-        NZ-S{
-            "TAS",
-            "MBH",
-            "STL",
-            "OTA",
             "CAN",
+            "CIT",
+            "GIS",
+            "HKB",
+            "MBH",
+            "MWT",
             "NSN",
+            "NTL",
+            "OTA",
+            "STL",
+            "TAS",
+            "TKI",
+            "WGN",
+            "WKO",
             "WTC",
         }
         OM{
-            "SH",
-            "ZA",
+            "BJ",
+            "BS",
+            "BU",
             "DA",
             "MA",
-            "ZU",
-            "BA",
-            "BU",
             "MU",
+            "SJ",
+            "SS",
             "WU",
+            "ZA",
+            "ZU",
         }
         PA{
-            "10",
             "1",
             "2",
-            "5",
-            "NB",
+            "3",
             "4",
+            "5",
+            "6",
             "7",
             "8",
-            "6",
-            "3",
-            "KY",
-            "EM",
             "9",
+            "10",
+            "EM",
+            "KY",
+            "NB",
         }
         PE{
-            "ICA",
-            "LIM",
-            "MDD",
-            "CAL",
+            "AMA",
+            "ANC",
+            "APU",
+            "ARE",
             "AYA",
+            "CAJ",
+            "CAL",
+            "CUS",
             "HUC",
-            "ANC",
             "HUV",
-            "LAM",
-            "TAC",
-            "APU",
+            "ICA",
+            "JUN",
             "LAL",
+            "LAM",
+            "LIM",
+            "LMA",
+            "LOR",
+            "MDD",
+            "MOQ",
             "PAS",
             "PIU",
-            "CUS",
-            "MOQ",
             "PUN",
             "SAM",
-            "AMA",
-            "ARE",
+            "TAC",
             "TUM",
-            "CAJ",
-            "JUN",
-            "LMA",
-            "LOR",
             "UCA",
         }
         PG{
-            "WHM",
-            "HLA",
-            "JWK",
-            "NCD",
-            "WPD",
-            "ESW",
-            "GPK",
-            "NSB",
+            "CPK",
+            "CPM",
             "EBR",
-            "NIK",
-            "SAN",
             "EHG",
             "EPW",
-            "MRL",
-            "NPP",
-            "WBK",
+            "ESW",
+            "GPK",
+            "HLA",
+            "JWK",
             "MBA",
             "MPL",
-            "SHM",
-            "CPK",
-            "CPM",
             "MPM",
+            "MRL",
+            "NCD",
+            "NIK",
+            "NPP",
+            "NSB",
+            "SAN",
+            "SHM",
+            "WBK",
+            "WHM",
+            "WPD",
         }
         PH{
-            "06",
-            "11",
-            "13",
-            "01",
-            "03",
-            "08",
-            "10",
             "00",
+            "01",
             "02",
-            "07",
+            "03",
             "05",
+            "06",
+            "07",
+            "08",
             "09",
+            "10",
+            "11",
             "12",
+            "13",
             "14",
             "15",
             "40",
             "41",
         }
         PH-01{
-            "ILS",
             "ILN",
+            "ILS",
             "LUN",
             "PAN",
         }
         PH-02{
             "BTN",
             "CAG",
+            "ISA",
             "NUV",
             "QUI",
-            "ISA",
         }
         PH-03{
-            "BAN",
             "AUR",
-            "PAM",
+            "BAN",
             "BUL",
             "NUE",
+            "PAM",
             "TAR",
             "ZMB",
         }
         PH-05{
+            "ALB",
+            "CAN",
+            "CAS",
             "CAT",
             "MAS",
-            "CAN",
             "SOR",
-            "ALB",
-            "CAS",
         }
         PH-06{
             "AKL",
@@ -20803,49 +20796,50 @@ supplementalData:table(nofallback){
         }
         PH-07{
             "BOH",
+            "CEB",
             "NER",
             "SIG",
-            "CEB",
         }
         PH-08{
-            "LEY",
-            "SLE",
             "BIL",
             "EAS",
+            "LEY",
             "NSA",
+            "SLE",
             "WSA",
         }
         PH-09{
             "BAS",
-            "ZAS",
             "ZAN",
+            "ZAS",
             "ZSI",
         }
         PH-10{
-            "MSR",
-            "MSC",
-            "CAM",
             "BUK",
+            "CAM",
+            "MSC",
+            "MSR",
         }
         PH-11{
             "COM",
-            "DAV",
-            "SCO",
-            "SAR",
             "DAO",
             "DAS",
+            "DAV",
+            "DVO",
+            "SAR",
+            "SCO",
         }
         PH-12{
             "LAN",
-            "SUK",
             "NCO",
+            "SUK",
         }
         PH-13{
-            "SUN",
+            "AGN",
+            "AGS",
             "DIN",
+            "SUN",
             "SUR",
-            "AGS",
-            "AGN",
         }
         PH-14{
             "LAS",
@@ -20855,1547 +20849,1552 @@ supplementalData:table(nofallback){
         }
         PH-15{
             "ABR",
+            "APA",
+            "BEN",
             "IFU",
             "KAL",
-            "BEN",
             "MOU",
-            "APA",
         }
         PH-40{
+            "BTG",
+            "CAV",
             "LAG",
             "QUE",
             "RIZ",
-            "BTG",
-            "CAV",
         }
         PH-41{
-            "ROM",
             "MAD",
             "MDC",
             "MDR",
             "PLW",
+            "ROM",
         }
         PK{
+            "BA",
             "GB",
-            "SD",
+            "IS",
+            "JK",
             "KP",
-            "TA",
             "PB",
-            "JK",
-            "BA",
-            "IS",
+            "SD",
+            "TA",
         }
         PL{
             "DS",
-            "PD",
-            "SK",
-            "SL",
-            "WN",
-            "ZP",
+            "KP",
+            "LB",
+            "LD",
             "LU",
             "MA",
             "MZ",
-            "LB",
+            "OP",
+            "PD",
             "PK",
             "PM",
-            "KP",
-            "OP",
+            "SK",
+            "SL",
+            "WN",
             "WP",
-            "LD",
+            "ZP",
         }
         PS{
+            "BTH",
             "DEB",
-            "QQA",
-            "RFH",
+            "GZA",
             "HBN",
+            "JEM",
             "JEN",
-            "NGZ",
-            "RBH",
-            "TBS",
-            "GZA",
             "JRH",
+            "KYS",
             "NBS",
-            "BTH",
-            "JEM",
+            "NGZ",
+            "QQA",
+            "RBH",
+            "RFH",
             "SLT",
+            "TBS",
             "TKM",
-            "KYS",
         }
         PT{
             "01",
             "02",
-            "05",
-            "09",
-            "12",
+            "03",
             "04",
+            "05",
             "06",
+            "07",
+            "08",
+            "09",
             "10",
             "11",
+            "12",
+            "13",
+            "14",
             "15",
             "16",
-            "30",
-            "03",
             "17",
-            "07",
-            "13",
-            "14",
-            "08",
             "18",
             "20",
+            "30",
         }
         PW{
-            "212",
-            "214",
-            "224",
-            "228",
-            "218",
-            "004",
-            "227",
-            "350",
             "002",
+            "004",
             "010",
+            "050",
+            "100",
             "150",
+            "212",
+            "214",
+            "218",
             "222",
+            "224",
             "226",
+            "227",
+            "228",
+            "350",
             "370",
-            "050",
-            "100",
         }
         PY{
-            "12",
-            "15",
+            "1",
+            "2",
             "3",
-            "8",
-            "9",
-            "19",
-            "6",
-            "7",
-            "ASU",
             "4",
-            "1",
             "5",
-            "13",
-            "16",
-            "2",
+            "6",
+            "7",
+            "8",
+            "9",
             "10",
             "11",
+            "12",
+            "13",
             "14",
+            "15",
+            "16",
+            "19",
+            "ASU",
         }
         QA{
-            "US",
-            "WA",
-            "ZA",
-            "RA",
             "DA",
             "KH",
             "MS",
+            "RA",
+            "US",
+            "WA",
+            "ZA",
         }
         RO{
-            "BH",
-            "IF",
-            "IS",
-            "VS",
+            "AB",
+            "AG",
+            "AR",
             "B",
-            "GL",
-            "SM",
-            "SV",
-            "TR",
-            "VL",
-            "VN",
+            "BC",
+            "BH",
+            "BN",
             "BR",
+            "BT",
+            "BV",
+            "BZ",
+            "CJ",
+            "CL",
+            "CS",
             "CT",
+            "CV",
+            "DB",
+            "DJ",
+            "GJ",
+            "GL",
+            "GR",
+            "HD",
+            "HR",
+            "IF",
             "IL",
+            "IS",
             "MH",
             "MM",
+            "MS",
+            "NT",
             "OT",
             "PH",
-            "BZ",
-            "DJ",
-            "HD",
-            "HR",
-            "TM",
-            "AG",
-            "BC",
-            "GJ",
+            "SB",
             "SJ",
-            "BV",
-            "GR",
-            "NT",
+            "SM",
+            "SV",
             "TL",
-            "BN",
-            "CL",
-            "CS",
-            "CV",
-            "DB",
-            "MS",
-            "AB",
-            "AR",
-            "BT",
-            "CJ",
-            "SB",
+            "TM",
+            "TR",
+            "VL",
+            "VN",
+            "VS",
         }
         RS{
+            "00",
+            "08",
+            "09",
+            "10",
             "11",
+            "12",
             "13",
+            "14",
+            "15",
             "16",
-            "KM",
-            "VO",
+            "17",
+            "18",
+            "19",
             "20",
             "21",
             "22",
-            "24",
-            "09",
-            "10",
-            "19",
-            "00",
-            "12",
-            "14",
-            "15",
             "23",
-            "08",
-            "18",
-            "17",
+            "24",
+            "KM",
+            "VO",
         }
         RS-KM{
-            "27",
             "25",
             "26",
+            "27",
             "28",
             "29",
         }
         RS-VO{
             "01",
-            "05",
+            "02",
             "03",
             "04",
-            "02",
-            "07",
+            "05",
             "06",
+            "07",
         }
         RU{
-            "UD",
+            "AD",
+            "AL",
+            "ALT",
+            "AMU",
+            "ARK",
+            "AST",
+            "BA",
+            "BEL",
+            "BRY",
+            "BU",
+            "CE",
+            "CHE",
+            "CHU",
             "CU",
             "DA",
+            "IN",
             "IRK",
-            "KAM",
-            "KHA",
-            "MAG",
-            "NGR",
-            "NIZ",
-            "ORE",
-            "ORL",
-            "PSK",
-            "SVE",
-            "YAR",
-            "ZAB",
-            "TYU",
-            "ALT",
             "IVA",
+            "KAM",
+            "KB",
+            "KC",
             "KDA",
             "KEM",
+            "KGD",
+            "KGN",
+            "KHA",
             "KHM",
+            "KIR",
             "KK",
+            "KL",
+            "KLU",
+            "KO",
+            "KOS",
+            "KR",
+            "KRS",
+            "KYA",
+            "LEN",
             "LIP",
+            "MAG",
             "ME",
             "MO",
-            "PNZ",
-            "SA",
-            "SMO",
-            "VLG",
-            "AST",
-            "BU",
-            "CHU",
-            "STA",
-            "YAN",
-            "YEV",
-            "BEL",
-            "IN",
-            "KR",
-            "KRS",
-            "MOW",
-            "RYA",
-            "SAK",
-            "TA",
-            "TOM",
-            "TUL",
-            "ULY",
-            "VLA",
-            "VOR",
-            "BRY",
-            "CHE",
-            "KGN",
-            "KIR",
             "MOS",
-            "SAM",
-            "TAM",
-            "AMU",
-            "KL",
-            "KOS",
+            "MOW",
             "MUR",
-            "OMS",
-            "TY",
-            "AD",
-            "BA",
-            "KC",
-            "KLU",
-            "LEN",
+            "NEN",
+            "NGR",
+            "NIZ",
             "NVS",
+            "OMS",
+            "ORE",
+            "ORL",
             "PER",
-            "TVE",
-            "VGG",
-            "AL",
-            "ARK",
-            "CE",
-            "KB",
-            "KGD",
-            "KO",
-            "KYA",
-            "NEN",
+            "PNZ",
             "PRI",
+            "PSK",
             "ROS",
+            "RYA",
+            "SA",
+            "SAK",
+            "SAM",
             "SAR",
             "SE",
+            "SMO",
             "SPE",
+            "STA",
+            "SVE",
+            "TA",
+            "TAM",
+            "TOM",
+            "TUL",
+            "TVE",
+            "TY",
+            "TYU",
+            "UD",
+            "ULY",
+            "VGG",
+            "VLA",
+            "VLG",
+            "VOR",
+            "YAN",
+            "YAR",
+            "YEV",
+            "ZAB",
         }
         RW{
-            "03",
-            "04",
             "01",
             "02",
+            "03",
+            "04",
             "05",
         }
         SA{
+            "01",
             "02",
-            "11",
-            "12",
-            "14",
-            "08",
             "03",
             "04",
-            "10",
-            "07",
-            "01",
             "05",
             "06",
+            "07",
+            "08",
             "09",
+            "10",
+            "11",
+            "12",
+            "14",
         }
         SB{
-            "WE",
-            "IS",
             "CE",
+            "CH",
             "CT",
-            "ML",
+            "GU",
+            "IS",
             "MK",
+            "ML",
             "RB",
-            "GU",
             "TE",
-            "CH",
+            "WE",
         }
         SC{
-            "24",
+            "01",
+            "02",
+            "03",
+            "04",
             "05",
+            "06",
             "07",
+            "08",
+            "09",
             "10",
             "11",
-            "16",
-            "18",
-            "25",
-            "08",
-            "19",
             "12",
             "13",
-            "04",
-            "17",
+            "14",
             "15",
+            "16",
+            "17",
+            "18",
+            "19",
             "20",
             "21",
-            "23",
-            "01",
-            "02",
-            "09",
-            "14",
             "22",
-            "03",
-            "06",
+            "23",
+            "24",
+            "25",
         }
         SD{
-            "GD",
-            "RS",
+            "DC",
             "DE",
-            "KH",
-            "NO",
-            "DS",
-            "SI",
             "DN",
+            "DS",
             "DW",
+            "GD",
+            "GK",
             "GZ",
-            "NW",
-            "DC",
             "KA",
+            "KH",
             "KN",
             "KS",
             "NB",
+            "NO",
             "NR",
+            "NW",
+            "RS",
+            "SI",
         }
         SE{
+            "AB",
+            "AC",
+            "BD",
+            "C",
+            "D",
+            "E",
+            "F",
+            "G",
+            "H",
             "I",
+            "K",
+            "M",
             "N",
+            "O",
             "S",
             "T",
-            "O",
-            "X",
-            "K",
             "U",
             "W",
+            "X",
             "Y",
-            "E",
-            "AB",
-            "D",
-            "G",
             "Z",
-            "BD",
-            "F",
-            "AC",
-            "C",
-            "H",
-            "M",
         }
         SG{
+            "01",
             "02",
             "03",
             "04",
-            "01",
             "05",
         }
         SH{
+            "AC",
             "HL",
             "TA",
-            "AC",
         }
         SI{
+            "001",
+            "002",
             "003",
+            "004",
             "005",
+            "006",
+            "007",
             "008",
+            "009",
+            "010",
+            "011",
+            "012",
+            "013",
+            "014",
+            "015",
+            "016",
+            "017",
             "018",
+            "019",
+            "020",
+            "021",
+            "022",
+            "023",
             "024",
+            "025",
+            "026",
+            "027",
+            "028",
+            "029",
+            "030",
+            "031",
+            "032",
             "033",
+            "034",
+            "035",
+            "036",
             "037",
+            "038",
+            "039",
+            "040",
+            "041",
             "042",
+            "043",
             "044",
+            "045",
+            "046",
+            "047",
+            "048",
+            "049",
+            "050",
+            "051",
+            "052",
+            "053",
+            "054",
+            "055",
+            "056",
             "057",
+            "058",
+            "059",
+            "060",
+            "061",
+            "062",
+            "063",
+            "064",
+            "065",
+            "066",
+            "067",
+            "068",
+            "069",
             "070",
+            "071",
+            "072",
+            "073",
+            "074",
             "075",
+            "076",
+            "077",
+            "078",
+            "079",
+            "080",
             "081",
-            "094",
-            "095",
-            "111",
-            "113",
-            "114",
-            "134",
-            "143",
-            "147",
-            "151",
-            "160",
-            "168",
-            "175",
-            "187",
-            "195",
-            "210",
-            "212",
-            "007",
-            "016",
-            "022",
-            "028",
-            "045",
-            "051",
-            "065",
-            "067",
-            "068",
-            "074",
-            "079",
-            "080",
             "082",
+            "083",
+            "084",
             "085",
-            "088",
-            "109",
-            "116",
-            "125",
-            "126",
-            "142",
-            "148",
-            "153",
-            "159",
-            "162",
-            "166",
-            "174",
-            "180",
-            "199",
-            "036",
-            "047",
-            "061",
             "086",
+            "087",
+            "088",
+            "089",
+            "090",
+            "091",
             "092",
             "093",
-            "102",
-            "107",
-            "129",
-            "137",
-            "149",
-            "150",
-            "152",
-            "154",
-            "163",
-            "172",
-            "178",
-            "201",
-            "001",
-            "019",
-            "025",
-            "027",
-            "032",
-            "034",
-            "039",
-            "040",
-            "053",
-            "058",
-            "060",
-            "084",
-            "091",
-            "099",
-            "104",
-            "121",
-            "135",
-            "157",
-            "170",
-            "171",
-            "177",
-            "179",
-            "181",
-            "184",
-            "186",
-            "198",
-            "200",
-            "203",
-            "211",
-            "004",
-            "006",
-            "009",
-            "015",
-            "031",
-            "041",
-            "046",
-            "048",
-            "066",
-            "069",
-            "071",
-            "072",
-            "076",
-            "078",
-            "090",
+            "094",
+            "095",
+            "096",
             "097",
+            "098",
+            "099",
             "100",
+            "101",
+            "102",
             "103",
-            "120",
-            "136",
-            "156",
-            "161",
-            "173",
-            "182",
-            "190",
-            "192",
-            "010",
-            "011",
-            "013",
-            "020",
-            "021",
-            "023",
-            "029",
-            "038",
-            "049",
-            "052",
-            "063",
-            "073",
-            "077",
-            "083",
-            "089",
-            "096",
+            "104",
+            "105",
+            "106",
+            "107",
+            "108",
+            "109",
             "110",
+            "111",
+            "112",
+            "113",
+            "114",
             "115",
+            "116",
+            "117",
             "118",
+            "119",
+            "120",
+            "121",
+            "122",
             "123",
             "124",
+            "125",
+            "126",
+            "127",
+            "128",
+            "129",
             "130",
             "131",
             "132",
             "133",
+            "134",
+            "135",
+            "136",
+            "137",
+            "138",
+            "139",
+            "140",
+            "141",
+            "142",
+            "143",
+            "144",
             "146",
+            "147",
+            "148",
+            "149",
+            "150",
+            "151",
+            "152",
+            "153",
+            "154",
+            "155",
+            "156",
+            "157",
+            "158",
+            "159",
+            "160",
+            "161",
+            "162",
+            "163",
+            "164",
             "165",
+            "166",
+            "167",
+            "168",
+            "169",
+            "170",
+            "171",
+            "172",
+            "173",
+            "174",
+            "175",
             "176",
+            "177",
+            "178",
+            "179",
+            "180",
+            "181",
+            "182",
+            "183",
+            "184",
             "185",
+            "186",
+            "187",
             "188",
             "189",
+            "190",
             "191",
+            "192",
+            "193",
             "194",
+            "195",
             "196",
+            "197",
+            "198",
+            "199",
+            "200",
+            "201",
+            "202",
+            "203",
             "204",
             "205",
-            "208",
-            "012",
-            "014",
-            "017",
-            "030",
-            "059",
-            "087",
-            "098",
-            "101",
-            "106",
-            "108",
-            "117",
-            "119",
-            "127",
-            "138",
-            "139",
-            "140",
-            "155",
-            "158",
-            "164",
-            "183",
-            "197",
             "206",
             "207",
+            "208",
             "209",
-            "002",
-            "026",
-            "035",
-            "043",
-            "050",
-            "054",
-            "055",
-            "056",
-            "062",
-            "064",
-            "105",
-            "112",
-            "122",
-            "128",
-            "141",
-            "144",
-            "167",
-            "169",
-            "193",
-            "202",
+            "210",
+            "211",
+            "212",
         }
         SK{
-            "ZI",
-            "PV",
-            "TA",
-            "KI",
             "BC",
-            "NI",
             "BL",
+            "KI",
+            "NI",
+            "PV",
+            "TA",
             "TC",
+            "ZI",
         }
         SL{
-            "S",
-            "N",
             "E",
+            "N",
+            "S",
             "W",
         }
         SM{
             "01",
-            "05",
+            "02",
             "03",
+            "04",
+            "05",
             "06",
+            "07",
             "08",
-            "02",
-            "04",
             "09",
-            "07",
         }
         SN{
-            "TH",
-            "KL",
-            "SE",
+            "DB",
             "DK",
-            "KD",
-            "SL",
             "FK",
             "KA",
-            "ZG",
+            "KD",
             "KE",
+            "KL",
             "LG",
-            "DB",
             "MT",
+            "SE",
+            "SL",
             "TC",
+            "TH",
+            "ZG",
         }
         SO{
+            "AW",
+            "BK",
+            "BN",
+            "BR",
+            "BY",
             "GA",
+            "GE",
             "HI",
-            "SH",
-            "BY",
             "JD",
+            "JH",
             "MU",
+            "NU",
             "SA",
             "SD",
+            "SH",
             "SO",
-            "WO",
-            "BK",
-            "BR",
-            "BN",
-            "AW",
-            "GE",
-            "JH",
-            "NU",
             "TO",
+            "WO",
         }
         SR{
-            "WA",
+            "BR",
             "CM",
-            "MA",
-            "SA",
             "CR",
-            "PM",
-            "BR",
+            "MA",
             "NI",
+            "PM",
             "PR",
+            "SA",
             "SI",
+            "WA",
         }
         SS{
-            "EE",
-            "BW",
-            "NU",
-            "UY",
             "BN",
-            "WR",
+            "BW",
             "EC",
+            "EE",
             "EW",
             "JG",
             "LK",
+            "NU",
+            "UY",
+            "WR",
         }
         ST{
-            "S",
             "P",
+            "S",
         }
         SV{
-            "CU",
-            "SS",
-            "CH",
             "AH",
-            "SA",
-            "SO",
-            "PA",
-            "SM",
             "CA",
-            "UN",
+            "CH",
+            "CU",
             "LI",
-            "SV",
             "MO",
+            "PA",
+            "SA",
+            "SM",
+            "SO",
+            "SS",
+            "SV",
+            "UN",
             "US",
         }
         SY{
             "DI",
-            "ID",
-            "RD",
-            "TA",
-            "DY",
-            "LA",
-            "RA",
-            "QU",
-            "SU",
             "DR",
-            "HI",
+            "DY",
             "HA",
+            "HI",
             "HL",
             "HM",
+            "ID",
+            "LA",
+            "QU",
+            "RA",
+            "RD",
+            "SU",
+            "TA",
         }
         SZ{
-            "SH",
-            "MA",
-            "LU",
             "HH",
+            "LU",
+            "MA",
+            "SH",
         }
         TD{
-            "LC",
-            "ME",
-            "WF",
+            "BA",
+            "BG",
+            "BO",
+            "CB",
             "EE",
             "EO",
-            "KA",
-            "LR",
-            "SI",
-            "BO",
             "GR",
-            "TA",
-            "TI",
-            "BG",
-            "CB",
+            "HL",
+            "KA",
+            "LC",
             "LO",
+            "LR",
             "MA",
-            "BA",
-            "HL",
-            "MO",
             "MC",
+            "ME",
+            "MO",
             "ND",
             "OD",
             "SA",
+            "SI",
+            "TA",
+            "TI",
+            "WF",
         }
         TG{
-            "K",
             "C",
+            "K",
+            "M",
             "P",
             "S",
-            "M",
         }
         TH{
             "10",
-            "43",
-            "51",
-            "57",
-            "63",
-            "70",
-            "77",
-            "82",
-            "92",
-            "93",
+            "11",
+            "12",
+            "13",
+            "14",
+            "15",
+            "16",
+            "17",
+            "18",
+            "19",
+            "20",
             "21",
             "22",
-            "55",
-            "56",
-            "60",
-            "65",
-            "67",
-            "94",
-            "95",
-            "16",
+            "23",
             "24",
+            "25",
+            "26",
+            "27",
+            "30",
+            "31",
+            "32",
+            "33",
+            "34",
             "35",
+            "36",
+            "37",
+            "38",
             "39",
+            "40",
+            "41",
+            "42",
+            "43",
+            "44",
+            "45",
             "46",
-            "48",
-            "54",
-            "66",
-            "80",
-            "S",
-            "14",
-            "20",
             "47",
+            "48",
             "49",
+            "50",
+            "51",
             "52",
+            "53",
+            "54",
+            "55",
+            "56",
+            "57",
             "58",
+            "60",
             "61",
-            "85",
-            "23",
-            "27",
-            "37",
-            "42",
-            "45",
-            "72",
-            "74",
-            "84",
-            "13",
-            "15",
-            "18",
-            "30",
-            "32",
+            "62",
+            "63",
+            "64",
+            "65",
+            "66",
+            "67",
+            "70",
             "71",
+            "72",
             "73",
+            "74",
+            "75",
+            "76",
+            "77",
+            "80",
+            "81",
+            "82",
             "83",
+            "84",
+            "85",
             "86",
+            "90",
             "91",
-            "38",
-            "11",
-            "17",
-            "19",
-            "34",
-            "36",
-            "41",
-            "44",
-            "75",
-            "90",
+            "92",
+            "93",
+            "94",
+            "95",
             "96",
-            "12",
-            "25",
-            "26",
-            "31",
-            "33",
-            "40",
-            "50",
-            "53",
-            "62",
-            "64",
-            "76",
-            "81",
+            "S",
         }
         TJ{
             "DU",
+            "GB",
             "KT",
             "SU",
-            "GB",
         }
         TL{
             "AL",
-            "OE",
-            "VI",
-            "ER",
-            "BO",
-            "CO",
-            "MF",
             "AN",
             "BA",
-            "LA",
+            "BO",
+            "CO",
             "DI",
+            "ER",
+            "LA",
             "LI",
+            "MF",
             "MT",
+            "OE",
+            "VI",
         }
         TM{
-            "B",
             "A",
-            "S",
+            "B",
             "D",
             "L",
             "M",
+            "S",
         }
         TN{
-            "13",
-            "42",
-            "43",
-            "53",
-            "73",
+            "11",
             "12",
+            "13",
+            "14",
             "21",
-            "72",
+            "22",
+            "23",
+            "31",
+            "32",
+            "33",
             "34",
             "41",
-            "52",
-            "83",
-            "23",
+            "42",
+            "43",
             "51",
-            "71",
-            "33",
-            "11",
-            "14",
-            "31",
+            "52",
+            "53",
             "61",
+            "71",
+            "72",
+            "73",
             "81",
             "82",
-            "22",
-            "32",
+            "83",
         }
         TO{
+            "01",
             "02",
             "03",
             "04",
-            "01",
             "05",
         }
         TR{
-            "14",
-            "38",
-            "41",
-            "44",
-            "58",
-            "68",
-            "71",
-            "73",
             "01",
-            "16",
-            "19",
-            "20",
-            "34",
-            "47",
-            "49",
-            "57",
-            "66",
-            "69",
-            "75",
-            "77",
-            "78",
+            "02",
             "03",
+            "04",
+            "05",
+            "06",
+            "07",
             "08",
+            "09",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
             "15",
+            "16",
+            "17",
+            "18",
+            "19",
+            "20",
+            "21",
             "22",
+            "23",
+            "24",
             "25",
+            "26",
             "27",
+            "28",
             "29",
-            "40",
-            "45",
-            "56",
-            "67",
-            "70",
-            "02",
-            "05",
-            "11",
-            "13",
-            "17",
-            "43",
-            "52",
-            "60",
-            "61",
-            "62",
-            "80",
-            "10",
-            "18",
             "30",
             "31",
             "32",
+            "33",
+            "34",
             "35",
+            "36",
             "37",
-            "74",
-            "21",
-            "24",
-            "28",
-            "33",
-            "46",
-            "54",
-            "65",
-            "72",
+            "38",
             "39",
+            "40",
+            "41",
+            "42",
+            "43",
+            "44",
+            "45",
+            "46",
+            "47",
+            "48",
+            "49",
             "50",
+            "51",
+            "52",
             "53",
+            "54",
             "55",
+            "56",
+            "57",
+            "58",
+            "59",
+            "60",
+            "61",
+            "62",
             "63",
             "64",
+            "65",
+            "66",
+            "67",
+            "68",
+            "69",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "75",
             "76",
-            "81",
-            "04",
-            "06",
-            "07",
-            "09",
-            "12",
-            "23",
-            "26",
-            "36",
-            "42",
-            "48",
-            "51",
-            "59",
+            "77",
+            "78",
             "79",
+            "80",
+            "81",
         }
         TT{
-            "PED",
-            "SIP",
             "ARI",
-            "DMN",
-            "PTF",
-            "RCM",
-            "TUP",
-            "CTT",
-            "PRT",
-            "SJL",
             "CHA",
-            "ETO",
-            "SGE",
+            "CTT",
+            "DMN",
+            "MRC",
+            "PED",
             "POS",
+            "PRT",
+            "PTF",
             "SFO",
-            "WTO",
+            "SGE",
+            "SIP",
+            "SJL",
+            "TOB",
+            "TUP",
         }
         TV{
-            "NKF",
-            "NMG",
             "FUN",
+            "NIT",
+            "NKF",
+            "NKL",
             "NMA",
+            "NMG",
             "NUI",
-            "NIT",
             "VAI",
-            "NKL",
         }
         TW{
-            "KHH",
-            "TTT",
+            "CHA",
             "CYI",
             "CYQ",
-            "HUA",
+            "HSQ",
             "HSZ",
-            "PEN",
-            "PIF",
-            "TPE",
-            "TPQ",
-            "CHA",
+            "HUA",
             "ILA",
-            "TNN",
-            "TXQ",
-            "YUN",
+            "KEE",
+            "KHH",
+            "KIN",
+            "LIE",
+            "MIA",
             "NAN",
+            "NWT",
+            "PEN",
+            "PIF",
             "TAO",
-            "TNQ",
+            "TNN",
+            "TPE",
+            "TTT",
             "TXG",
-            "HSQ",
-            "MIA",
-            "KEE",
-            "KHQ",
+            "YUN",
         }
         TZ{
+            "01",
             "02",
+            "03",
             "04",
             "05",
+            "06",
             "07",
-            "27",
-            "28",
-            "29",
-            "30",
-            "01",
-            "12",
-            "15",
-            "23",
-            "19",
-            "25",
-            "10",
-            "17",
-            "11",
-            "21",
-            "24",
-            "03",
             "08",
             "09",
-            "16",
-            "18",
+            "10",
+            "11",
+            "12",
             "13",
-            "22",
-            "06",
             "14",
+            "15",
+            "16",
+            "17",
+            "18",
+            "19",
             "20",
+            "21",
+            "22",
+            "23",
+            "24",
+            "25",
             "26",
+            "27",
+            "28",
+            "29",
+            "30",
         }
         UA{
+            "05",
+            "07",
             "09",
+            "12",
+            "14",
+            "18",
             "21",
             "23",
+            "26",
+            "30",
             "32",
             "35",
-            "59",
-            "05",
-            "63",
-            "74",
-            "12",
-            "48",
-            "56",
-            "71",
-            "26",
-            "51",
-            "77",
             "40",
-            "53",
-            "14",
             "43",
             "46",
-            "18",
-            "30",
-            "68",
-            "07",
+            "48",
+            "51",
+            "53",
+            "56",
+            "59",
             "61",
+            "63",
             "65",
+            "68",
+            "71",
+            "74",
+            "77",
         }
         UG{
-            "W",
             "C",
             "E",
             "N",
+            "W",
         }
         UG-C{
-            "117",
-            "118",
-            "119",
-            "120",
-            "121",
-            "122",
+            "101",
             "102",
-            "123",
-            "124",
-            "104",
-            "107",
-            "116",
             "103",
-            "101",
+            "104",
+            "105",
             "106",
+            "107",
+            "108",
             "109",
             "110",
+            "111",
             "112",
             "113",
-            "105",
-            "115",
-            "108",
-            "111",
             "114",
+            "115",
+            "116",
+            "117",
+            "118",
+            "119",
+            "120",
+            "121",
+            "122",
+            "123",
+            "124",
         }
         UG-E{
-            "225",
-            "226",
-            "227",
-            "228",
-            "229",
-            "230",
-            "231",
-            "232",
-            "210",
             "201",
-            "211",
-            "217",
-            "224",
-            "204",
-            "209",
-            "212",
-            "223",
             "202",
-            "207",
-            "205",
-            "208",
-            "222",
             "203",
+            "204",
+            "205",
             "206",
+            "207",
+            "208",
+            "209",
+            "210",
+            "211",
+            "212",
             "213",
             "214",
             "215",
+            "216",
+            "217",
             "218",
             "219",
-            "221",
-            "216",
             "220",
+            "221",
+            "222",
+            "223",
+            "224",
+            "225",
+            "226",
+            "227",
+            "228",
+            "229",
+            "230",
+            "231",
+            "232",
         }
         UG-N{
-            "322",
-            "323",
-            "324",
-            "325",
-            "326",
-            "327",
-            "328",
-            "329",
-            "330",
-            "331",
+            "301",
+            "302",
+            "303",
+            "304",
+            "305",
             "306",
+            "307",
+            "308",
             "309",
             "310",
-            "313",
-            "318",
-            "302",
-            "303",
             "311",
-            "304",
             "312",
-            "319",
-            "301",
-            "308",
+            "313",
             "314",
             "315",
-            "317",
             "316",
+            "317",
+            "318",
+            "319",
             "320",
-            "305",
-            "307",
             "321",
+            "322",
+            "323",
+            "324",
+            "325",
+            "326",
+            "327",
+            "328",
+            "329",
+            "330",
+            "331",
         }
         UG-W{
-            "420",
-            "421",
-            "422",
-            "423",
-            "424",
-            "425",
             "401",
+            "402",
             "403",
-            "415",
-            "419",
             "404",
+            "405",
+            "406",
+            "407",
+            "408",
+            "409",
+            "410",
             "411",
+            "412",
             "413",
-            "416",
             "414",
+            "415",
+            "416",
             "417",
             "418",
-            "405",
-            "407",
-            "409",
-            "412",
-            "402",
-            "406",
-            "408",
-            "410",
+            "419",
+            "420",
+            "421",
+            "422",
+            "423",
+            "424",
+            "425",
         }
         UM{
+            "67",
             "71",
+            "76",
+            "79",
+            "81",
             "84",
             "86",
-            "79",
             "89",
-            "76",
-            "67",
-            "81",
             "95",
         }
         US{
-            "AS",
-            "GA",
-            "KS",
-            "MN",
-            "TX",
-            "UM",
             "AK",
             "AL",
+            "AR",
+            "AS",
+            "AZ",
+            "CA",
             "CO",
-            "KY",
-            "MP",
-            "NY",
-            "RI",
-            "SC",
-            "SD",
-            "WA",
+            "CT",
             "DC",
-            "GU",
-            "IA",
-            "OH",
-            "OR",
-            "CA",
             "DE",
+            "FL",
+            "GA",
+            "GU",
             "HI",
-            "MA",
-            "MT",
-            "NC",
-            "NE",
-            "NJ",
-            "VI",
-            "CT",
-            "FL",
-            "IN",
-            "OK",
-            "UT",
-            "WI",
-            "WV",
+            "IA",
             "ID",
             "IL",
+            "IN",
+            "KS",
+            "KY",
+            "LA",
+            "MA",
             "MD",
             "ME",
+            "MI",
+            "MN",
             "MO",
+            "MP",
             "MS",
-            "NM",
-            "PA",
-            "VT",
-            "WY",
-            "AZ",
-            "LA",
+            "MT",
+            "NC",
             "ND",
+            "NE",
             "NH",
+            "NJ",
+            "NM",
             "NV",
-            "VA",
-            "AR",
-            "MI",
+            "NY",
+            "OH",
+            "OK",
+            "OR",
+            "PA",
             "PR",
+            "RI",
+            "SC",
+            "SD",
             "TN",
+            "TX",
+            "UM",
+            "UT",
+            "VA",
+            "VI",
+            "VT",
+            "WA",
+            "WI",
+            "WV",
+            "WY",
         }
         UY{
+            "AR",
+            "CA",
+            "CL",
             "CO",
-            "LA",
-            "RN",
-            "SA",
             "DU",
             "FD",
             "FS",
-            "RV",
-            "CL",
+            "LA",
             "MA",
+            "MO",
+            "PA",
+            "RN",
             "RO",
-            "TA",
+            "RV",
+            "SA",
             "SJ",
-            "AR",
-            "PA",
             "SO",
-            "CA",
-            "MO",
+            "TA",
             "TT",
         }
         UZ{
+            "AN",
+            "BU",
+            "FA",
             "JI",
             "NG",
-            "FA",
+            "NW",
             "QA",
-            "AN",
             "QR",
             "SA",
             "SI",
             "SU",
-            "XO",
             "TK",
             "TO",
-            "BU",
-            "NW",
+            "XO",
         }
         VC{
             "01",
-            "06",
             "02",
-            "05",
             "03",
             "04",
+            "05",
+            "06",
         }
         VE{
+            "A",
+            "B",
+            "C",
             "D",
-            "P",
-            "S",
+            "E",
             "F",
+            "G",
             "H",
             "I",
-            "Z",
             "J",
             "K",
-            "O",
-            "U",
-            "C",
-            "Y",
-            "A",
-            "B",
             "L",
+            "M",
             "N",
+            "O",
+            "P",
             "R",
+            "S",
             "T",
+            "U",
+            "V",
             "W",
             "X",
-            "E",
-            "M",
-            "G",
-            "V",
+            "Y",
+            "Z",
         }
         VN{
-            "06",
-            "18",
-            "22",
-            "51",
-            "63",
-            "69",
-            "32",
-            "36",
-            "52",
-            "54",
-            "56",
-            "58",
-            "73",
+            "01",
             "02",
+            "03",
+            "04",
+            "05",
+            "06",
+            "07",
+            "09",
             "13",
+            "14",
+            "18",
             "20",
-            "29",
-            "66",
-            "68",
+            "21",
+            "22",
             "23",
+            "24",
+            "25",
             "26",
+            "27",
+            "28",
+            "29",
+            "30",
+            "31",
+            "32",
             "33",
             "34",
-            "44",
-            "45",
-            "05",
-            "14",
-            "25",
-            "47",
-            "61",
-            "67",
-            "HP",
-            "SG",
-            "09",
-            "21",
-            "24",
+            "35",
+            "36",
+            "37",
+            "39",
             "40",
+            "41",
             "43",
+            "44",
+            "45",
             "46",
+            "47",
+            "49",
             "50",
+            "51",
+            "52",
+            "53",
+            "54",
             "55",
+            "56",
+            "57",
+            "58",
             "59",
+            "61",
+            "63",
+            "66",
+            "67",
+            "68",
+            "69",
             "70",
-            "07",
-            "30",
-            "35",
-            "37",
-            "39",
-            "57",
+            "71",
             "72",
+            "73",
             "CT",
-            "HN",
-            "01",
-            "03",
-            "04",
-            "27",
-            "28",
-            "31",
-            "41",
-            "49",
-            "53",
-            "71",
             "DN",
+            "HN",
+            "HP",
+            "SG",
         }
         VU{
-            "SEE",
             "MAP",
             "PAM",
             "SAM",
-            "TOB",
+            "SEE",
             "TAE",
+            "TOB",
+        }
+        WF{
+            "AL",
+            "SG",
+            "UV",
         }
         WS{
-            "SA",
             "AA",
+            "AL",
+            "AT",
             "FA",
             "GE",
-            "AT",
+            "GI",
             "PA",
+            "SA",
             "TU",
             "VF",
-            "GI",
-            "AL",
             "VS",
         }
         YE{
-            "HD",
-            "HJ",
-            "SN",
-            "IB",
-            "MR",
+            "AB",
             "AD",
-            "DH",
-            "SA",
-            "MA",
-            "DA",
-            "SH",
             "AM",
             "BA",
-            "AB",
-            "JA",
-            "SD",
+            "DA",
+            "DH",
+            "HD",
+            "HJ",
             "HU",
+            "IB",
+            "JA",
             "LA",
+            "MA",
+            "MR",
             "MW",
             "RA",
+            "SA",
+            "SD",
+            "SH",
+            "SN",
+            "SU",
             "TA",
         }
         ZA{
-            "NL",
-            "WC",
-            "NC",
-            "GT",
             "EC",
-            "MP",
             "FS",
+            "GT",
             "LP",
+            "MP",
+            "NC",
+            "NL",
             "NW",
+            "WC",
         }
         ZM{
-            "05",
             "01",
-            "10",
             "02",
+            "03",
+            "04",
+            "05",
             "06",
             "07",
-            "04",
-            "03",
             "08",
             "09",
+            "10",
         }
         ZW{
-            "MA",
-            "MC",
-            "MS",
             "BU",
             "HA",
-            "MI",
-            "MW",
+            "MA",
+            "MC",
             "ME",
+            "MI",
             "MN",
+            "MS",
             "MV",
+            "MW",
         }
     }
     telephoneCodeData{
@@ -23783,6 +23782,7 @@ supplementalData:table(nofallback){
             "RW",
             "SC",
             "SO",
+            "SS",
             "TZ",
             "UG",
             "YT",
@@ -23796,7 +23796,6 @@ supplementalData:table(nofallback){
             "LY",
             "MA",
             "SD",
-            "SS",
             "TN",
             "EA",
             "IC",
@@ -25256,6 +25255,9 @@ supplementalData:table(nofallback){
             wuu{
                 populationShareF:int{48600000}
             }
+            yue_Hans{
+                populationShareF:int{48100000}
+            }
             za{
                 officialStatus{"official_regional"}
                 populationShareF:int{47310000}
@@ -26317,6 +26319,10 @@ supplementalData:table(nofallback){
                 49935000,
                 56711269,
             }
+            yue_Hant{
+                officialStatus{"official"}
+                populationShareF:int{49950000}
+            }
             zh_Hans{
                 populationShareF:int{48500000}
             }
@@ -28776,7 +28782,7 @@ supplementalData:table(nofallback){
             }
             territoryF:intvector{
                 60201200,
-                50191000,
+                49953000,
                 56454743,
             }
         }
@@ -30480,931 +30486,1994 @@ supplementalData:table(nofallback){
                 populationShareF:int{47640000}
             }
         }
-        ZZ{
-            territoryF:intvector{
-                0,
-                0,
-                0,
+        ZZ{
+            territoryF:intvector{
+                0,
+                0,
+                0,
+            }
+        }
+    }
+    timeData{
+        001{
+            allowed{
+                "H",
+                "h",
+            }
+            preferred{"H"}
+        }
+        AC{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AD{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AE{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
+        }
+        AF{
+            allowed{
+                "H",
+                "hb",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        AG{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        AI{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AL{
+            allowed{
+                "h",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        AM{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AO{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AR{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        AS{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        AT{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AU{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        AW{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        AX{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        AZ{
+            allowed{
+                "H",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        BA{
+            allowed{
+                "H",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        BB{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        BD{
+            allowed{
+                "h",
+                "hB",
+                "H",
+            }
+            preferred{"h"}
+        }
+        BE{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        BF{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        BG{
+            allowed{
+                "H",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        BH{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
+        }
+        BJ{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        BL{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        BM{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        BN{
+            allowed{
+                "hb",
+                "hB",
+                "H",
+                "h",
+            }
+            preferred{"h"}
+        }
+        BO{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        BQ{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        BR{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        BS{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        BT{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        BW{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        BZ{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CA{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        CC{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CD{
+            allowed{
+                "hB",
+                "H",
+            }
+            preferred{"H"}
+        }
+        CF{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CG{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CH{
+            allowed{
+                "H",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        CI{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CK{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CL{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        CM{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CN{
+            allowed{
+                "hB",
+                "hb",
+                "H",
+                "h",
+            }
+            preferred{"h"}
+        }
+        CO{
+            allowed{
+                "h",
+                "H",
+                "hB",
+                "hb",
+            }
+            preferred{"h"}
+        }
+        CP{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        CR{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        CU{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        CV{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CX{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        CY{
+            allowed{
+                "h",
+                "H",
+                "hb",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        CZ{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        DE{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        DG{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        DJ{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        DK{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        DM{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        DO{
+            allowed{
+                "h",
+                "H",
+                "hB",
+                "hb",
+            }
+            preferred{"h"}
+        }
+        DZ{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
+        }
+        EA{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        EC{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        EE{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        EG{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
+        }
+        EH{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
+        }
+        ER{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        ES{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        ET{
+            allowed{
+                "hB",
+                "hb",
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        FI{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        FJ{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        FK{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        FM{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        FR{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GA{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GB{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GD{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        GE{
+            allowed{
+                "H",
+                "hB",
+                "h",
+            }
+            preferred{"H"}
+        }
+        GF{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GG{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GH{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        GI{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GL{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        GM{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        GN{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GP{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GQ{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        GR{
+            allowed{
+                "h",
+                "H",
+                "hb",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        GT{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        GU{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        GW{
+            allowed{
+                "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        GY{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        HK{
+            allowed{
+                "hB",
+                "hb",
+                "H",
+                "h",
+            }
+            preferred{"h"}
+        }
+        HN{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
+            preferred{"H"}
+        }
+        HR{
+            allowed{
+                "H",
+                "hB",
             }
+            preferred{"H"}
         }
-    }
-    timeData{
-        001{
+        IC{
             allowed{
                 "H",
+                "hB",
                 "h",
+                "hb",
             }
             preferred{"H"}
         }
-        AD{
+        ID{
             allowed{"H"}
             preferred{"H"}
         }
-        AE{
+        IE{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        AG{
+        IL{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        AL{
+        IM{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        IN{
+            allowed{
+                "h",
+                "H",
             }
             preferred{"h"}
         }
-        AM{
-            allowed{"H"}
+        IO{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
             preferred{"H"}
         }
-        AO{
-            allowed{"H"}
-            preferred{"H"}
+        IQ{
+            allowed{
+                "h",
+                "hB",
+                "hb",
+                "H",
+            }
+            preferred{"h"}
         }
-        AS{
+        IR{
             allowed{
                 "H",
+                "hb",
+                "hB",
                 "h",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        AT{
+        IS{
             allowed{"H"}
             preferred{"H"}
         }
-        AU{
+        IT{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
-        }
-        AW{
-            allowed{"H"}
             preferred{"H"}
         }
-        AX{
-            allowed{"H"}
+        JE{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
             preferred{"H"}
         }
-        BB{
+        JM{
             allowed{
+                "h",
+                "hb",
                 "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        JO{
+            allowed{
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        BD{
+        JP{
             allowed{
                 "H",
                 "h",
+                "K",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        BE{
-            allowed{"H"}
+        KE{
+            allowed{
+                "hB",
+                "hb",
+                "h",
+                "H",
+            }
             preferred{"H"}
         }
-        BF{
-            allowed{"H"}
+        KG{
+            allowed{
+                "H",
+                "h",
+                "hB",
+                "hb",
+            }
             preferred{"H"}
         }
-        BH{
+        KH{
             allowed{
+                "hB",
+                "h",
                 "H",
+                "hb",
+            }
+            preferred{"h"}
+        }
+        KI{
+            allowed{
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        BJ{
-            allowed{"H"}
+        KM{
+            allowed{
+                "H",
+                "h",
+                "hB",
+                "hb",
+            }
             preferred{"H"}
         }
-        BL{
-            allowed{"H"}
-            preferred{"H"}
+        KN{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
         }
-        BM{
+        KP{
             allowed{
+                "h",
                 "H",
+                "hB",
+                "hb",
+            }
+            preferred{"h"}
+        }
+        KR{
+            allowed{
                 "h",
+                "H",
+                "hB",
+                "hb",
             }
             preferred{"h"}
         }
-        BN{
+        KW{
             allowed{
+                "h",
+                "hB",
+                "hb",
                 "H",
+            }
+            preferred{"h"}
+        }
+        KY{
+            allowed{
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        BQ{
-            allowed{"H"}
+        KZ{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        BR{
-            allowed{"H"}
+        LA{
+            allowed{
+                "H",
+                "hb",
+                "hB",
+                "h",
+            }
             preferred{"H"}
         }
-        BS{
+        LB{
             allowed{
+                "h",
+                "hB",
+                "hb",
                 "H",
+            }
+            preferred{"h"}
+        }
+        LC{
+            allowed{
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        BT{
+        LI{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        BW{
+        LK{
             allowed{
                 "H",
                 "h",
+                "hB",
+                "hb",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        CA{
+        LR{
             allowed{
+                "h",
+                "hb",
                 "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        LS{
+            allowed{
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        CD{
-            allowed{"H"}
+        LT{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
             preferred{"H"}
         }
-        CG{
-            allowed{"H"}
+        LU{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
             preferred{"H"}
         }
-        CI{
-            allowed{"H"}
+        LV{
+            allowed{
+                "H",
+                "hB",
+                "hb",
+                "h",
+            }
             preferred{"H"}
         }
-        CN{
+        LY{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        CO{
+        MA{
             allowed{
                 "H",
                 "h",
+                "hB",
+                "hb",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        CP{
-            allowed{"H"}
+        MC{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        CV{
-            allowed{"H"}
+        MD{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        CY{
+        ME{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
-        }
-        CZ{
-            allowed{"H"}
             preferred{"H"}
         }
-        DE{
-            allowed{"H"}
+        MF{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        DJ{
+        MH{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        DK{
+        MK{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        ML{
             allowed{"H"}
             preferred{"H"}
         }
-        DM{
+        MM{
+            allowed{
+                "hB",
+                "hb",
+                "h",
+                "H",
+            }
+            preferred{"H"}
+        }
+        MN{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        DO{
+        MO{
             allowed{
+                "hB",
+                "hb",
                 "H",
                 "h",
             }
             preferred{"h"}
         }
-        DZ{
+        MP{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        EE{
-            allowed{"H"}
+        MQ{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        EG{
+        MR{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        EH{
+        MS{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        ER{
+        MW{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        ET{
+        MX{
             allowed{
                 "H",
+                "hB",
                 "h",
+                "hb",
             }
-            preferred{"h"}
-        }
-        FI{
-            allowed{"H"}
             preferred{"H"}
         }
-        FJ{
+        MY{
             allowed{
+                "hb",
+                "hB",
                 "H",
                 "h",
             }
             preferred{"h"}
         }
-        FM{
+        MZ{
             allowed{
                 "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        NA{
+            allowed{
                 "h",
+                "H",
+                "hB",
+                "hb",
             }
             preferred{"h"}
         }
-        FR{
-            allowed{"H"}
+        NC{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        GA{
+        NE{
             allowed{"H"}
             preferred{"H"}
         }
-        GD{
+        NF{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
-        }
-        GF{
-            allowed{"H"}
             preferred{"H"}
         }
-        GH{
+        NG{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        GL{
+        NI{
             allowed{
                 "H",
+                "hB",
                 "h",
+                "hb",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        GM{
+        NL{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
-        }
-        GN{
-            allowed{"H"}
             preferred{"H"}
         }
-        GP{
-            allowed{"H"}
+        NP{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
             preferred{"H"}
         }
-        GR{
+        NR{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        GU{
+        NU{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
-        }
-        GW{
-            allowed{"H"}
             preferred{"H"}
         }
-        GY{
+        NZ{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        HK{
+        OM{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        HR{
-            allowed{"H"}
-            preferred{"H"}
+        PA{
+            allowed{
+                "h",
+                "H",
+                "hB",
+                "hb",
+            }
+            preferred{"h"}
         }
-        ID{
-            allowed{"H"}
+        PE{
+            allowed{
+                "H",
+                "hB",
+                "h",
+                "hb",
+            }
             preferred{"H"}
         }
-        IL{
-            allowed{"H"}
+        PF{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
             preferred{"H"}
         }
-        IN{
+        PG{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        IQ{
+        PH{
             allowed{
+                "h",
+                "hB",
+                "hb",
                 "H",
+            }
+            preferred{"h"}
+        }
+        PK{
+            allowed{
                 "h",
+                "hB",
+                "H",
             }
             preferred{"h"}
         }
-        IS{
-            allowed{"H"}
+        PM{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        IT{
-            allowed{"H"}
+        PN{
+            allowed{
+                "H",
+                "h",
+                "hb",
+                "hB",
+            }
             preferred{"H"}
         }
-        JM{
+        PR{
             allowed{
-                "H",
                 "h",
+                "H",
+                "hB",
+                "hb",
             }
             preferred{"h"}
         }
-        JO{
+        PS{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        JP{
+        PT{
             allowed{
                 "H",
-                "K",
-                "h",
+                "hB",
             }
             preferred{"H"}
         }
-        KH{
+        PW{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        KI{
+        QA{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        KN{
+        RE{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        KP{
+        RO{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        KR{
+        RS{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        KW{
+        RU{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        SA{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        KY{
+        SB{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        LB{
+        SC{
             allowed{
                 "H",
                 "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        LC{
+        SD{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        LR{
+        SE{
+            allowed{"H"}
+            preferred{"H"}
+        }
+        SG{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        LS{
+        SH{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        LY{
+        SI{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        MC{
+        SJ{
             allowed{"H"}
             preferred{"H"}
         }
-        MD{
+        SK{
             allowed{"H"}
             preferred{"H"}
         }
-        MF{
-            allowed{"H"}
+        SL{
+            allowed{
+                "h",
+                "hb",
+                "H",
+                "hB",
+            }
+            preferred{"h"}
+        }
+        SM{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        MH{
+        SN{
+            allowed{
+                "H",
+                "h",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        SO{
+            allowed{
+                "h",
+                "H",
+            }
+            preferred{"h"}
+        }
+        SR{
             allowed{
                 "H",
+                "hB",
+            }
+            preferred{"H"}
+        }
+        SS{
+            allowed{
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        ML{
-            allowed{"H"}
+        ST{
+            allowed{
+                "H",
+                "hB",
+            }
             preferred{"H"}
         }
-        MO{
+        SV{
             allowed{
                 "H",
+                "hB",
                 "h",
+                "hb",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        MP{
+        SX{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
-        }
-        MQ{
-            allowed{"H"}
             preferred{"H"}
         }
-        MR{
+        SY{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        MW{
+        SZ{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        MY{
+        TA{
             allowed{
                 "H",
                 "h",
+                "hb",
+                "hB",
             }
-            preferred{"h"}
-        }
-        MZ{
-            allowed{"H"}
             preferred{"H"}
         }
-        NA{
+        TC{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        NC{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        NE{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        NG{
+        TD{
             allowed{
-                "H",
                 "h",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        NL{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        NZ{
+        TF{
             allowed{
                 "H",
                 "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        OM{
+        TG{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        PA{
+        TL{
             allowed{
                 "H",
+                "hB",
+                "hb",
                 "h",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        PG{
+        TN{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        PH{
+        TO{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        PK{
+        TR{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
-        }
-        PM{
-            allowed{"H"}
             preferred{"H"}
         }
-        PR{
+        TT{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        PS{
+        TW{
             allowed{
+                "hB",
+                "hb",
                 "H",
                 "h",
             }
             preferred{"h"}
         }
-        PT{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        PW{
+        TZ{
             allowed{
-                "H",
+                "hB",
+                "hb",
                 "h",
+                "H",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        QA{
+        UA{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
-        }
-        RE{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        RO{
-            allowed{"H"}
             preferred{"H"}
         }
-        RU{
-            allowed{"H"}
+        UG{
+            allowed{
+                "hB",
+                "hb",
+                "h",
+                "H",
+            }
             preferred{"H"}
         }
-        SA{
+        UM{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        SB{
+        US{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        SD{
+        UY{
             allowed{
                 "H",
+                "hB",
                 "h",
+                "hb",
             }
-            preferred{"h"}
-        }
-        SE{
-            allowed{"H"}
             preferred{"H"}
         }
-        SG{
+        UZ{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
-        }
-        SI{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        SJ{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        SK{
-            allowed{"H"}
             preferred{"H"}
         }
-        SL{
+        VA{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
-        }
-        SM{
-            allowed{"H"}
             preferred{"H"}
         }
-        SO{
+        VC{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        SR{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        SS{
+        VE{
             allowed{
-                "H",
                 "h",
+                "H",
+                "hB",
+                "hb",
             }
             preferred{"h"}
         }
-        ST{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        SY{
+        VG{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        SZ{
+        VI{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        TC{
+        VU{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        TD{
+        WF{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
-        }
-        TG{
-            allowed{"H"}
             preferred{"H"}
         }
-        TN{
+        WS{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        TO{
+        XK{
             allowed{
                 "H",
+                "hB",
                 "h",
             }
-            preferred{"h"}
-        }
-        TR{
-            allowed{"H"}
             preferred{"H"}
         }
-        TT{
+        YE{
             allowed{
-                "H",
                 "h",
+                "hB",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        TW{
+        YT{
             allowed{
                 "H",
-                "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        UM{
+        ZA{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        US{
+        ZM{
             allowed{
-                "H",
                 "h",
+                "hb",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        VC{
+        ZW{
             allowed{
-                "H",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        VE{
+        af_ZA{
             allowed{
-                "H",
                 "h",
+                "H",
+                "hB",
+                "hb",
             }
             preferred{"h"}
         }
-        VG{
+        ca_ES{
             allowed{
                 "H",
                 "h",
+                "hB",
             }
-            preferred{"h"}
+            preferred{"H"}
         }
-        VI{
+        fr_CA{
             allowed{
-                "H",
                 "h",
+                "H",
+                "hB",
             }
             preferred{"h"}
         }
-        VU{
+        gl_ES{
             allowed{
                 "H",
                 "h",
+                "hB",
             }
-            preferred{"h"}
-        }
-        WF{
-            allowed{"H"}
             preferred{"H"}
         }
-        WS{
+        gu_IN{
             allowed{
-                "H",
+                "hB",
+                "hb",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        YE{
+        kn_IN{
             allowed{
-                "H",
+                "hB",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        YT{
-            allowed{"H"}
-            preferred{"H"}
-        }
-        ZA{
+        ml_IN{
             allowed{
+                "hB",
+                "h",
                 "H",
+            }
+            preferred{"h"}
+        }
+        mr_IN{
+            allowed{
+                "hB",
+                "hb",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
-        ZM{
+        pa_IN{
             allowed{
+                "hB",
+                "hb",
+                "h",
                 "H",
+            }
+            preferred{"h"}
+        }
+        ta_IN{
+            allowed{
+                "hB",
                 "h",
+                "hb",
+                "H",
             }
             preferred{"h"}
         }
-        ZW{
+        te_IN{
             allowed{
+                "hB",
+                "h",
                 "H",
+            }
+            preferred{"h"}
+        }
+        zu_ZA{
+            allowed{
+                "hB",
+                "hb",
                 "h",
+                "H",
             }
             preferred{"h"}
         }
diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt
index 7479817e698..e16f4231859 100644
--- a/icu4c/source/data/misc/timezoneTypes.txt
+++ b/icu4c/source/data/misc/timezoneTypes.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/bcp47/timezone.xml
diff --git a/icu4c/source/test/cintltst/uregiontest.c b/icu4c/source/test/cintltst/uregiontest.c
index d2b87f41d62..4f1f7020a32 100644
--- a/icu4c/source/test/cintltst/uregiontest.c
+++ b/icu4c/source/test/cintltst/uregiontest.c
@@ -1,5 +1,5 @@
 /********************************************************************
- * Copyright (c) 2014, International Business Machines Corporation
+ * Copyright (c) 2014-2016, International Business Machines Corporation
  * and others. All Rights Reserved.
  ********************************************************************/
 /* C API TEST FOR UREGION */
@@ -304,7 +304,7 @@ static KnownRegion knownRegions[] = {
     { "SN" , 686, "011", URGN_TERRITORY, "002" },
     { "SO" , 706, "014", URGN_TERRITORY, "002" },
     { "SR" , 740, "005", URGN_TERRITORY, "019" },
-    { "SS" , 728, "015", URGN_TERRITORY, "002" },
+    { "SS" , 728, "014", URGN_TERRITORY, "002" },
     { "ST" , 678, "017", URGN_TERRITORY, "002" },
     { "SU" , 810, NULL , URGN_DEPRECATED , NULL},
     { "SV" , 222, "013", URGN_TERRITORY, "019" },
diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp
index 2d8da5f56e4..7d2fc6762e9 100644
--- a/icu4c/source/test/intltest/dtfmttst.cpp
+++ b/icu4c/source/test/intltest/dtfmttst.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2015, International Business Machines
+ * Copyright (c) 1997-2016, International Business Machines
  * Corporation and others. All Rights Reserved.
  ********************************************************************/
 
@@ -4059,7 +4059,7 @@ void DateFormatTest::TestMonthPatterns()
         { "root@calendar=chinese",    -3,                 { UnicodeString("ren-chen-4-2"),  UnicodeString("ren-chen-4bis-2"),       UnicodeString("ren-chen-5-2") } },
         { "root@calendar=chinese",    -4,                 { UnicodeString("ren-chen M04 2"),  UnicodeString("ren-chen M04bis 2"),   UnicodeString("ren-chen M05 2") } },
         { "en@calendar=gregorian",    -3,                 { UnicodeString("2012-4-22"),     UnicodeString("2012-5-22"),             UnicodeString("2012-6-20") } },
-        { "en@calendar=chinese",      DateFormat::kLong,  { UnicodeString("Month4 2, 2012(ren-chen)"), UnicodeString("Month4bis 2, 2012(ren-chen)"), UnicodeString("Month5 2, 2012(ren-chen)") } },
+        { "en@calendar=chinese",      DateFormat::kLong,  { UnicodeString("Fourth Month 2, 2012(ren-chen)"), UnicodeString("Fourth Monthbis 2, 2012(ren-chen)"), UnicodeString("Fifth Month 2, 2012(ren-chen)") } },
         { "en@calendar=chinese",      DateFormat::kShort, { UnicodeString("4/2/2012"),      UnicodeString("4bis/2/2012"),           UnicodeString("5/2/2012") } },
         { "zh@calendar=chinese",      DateFormat::kLong,  { CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u56DB\\u6708\\u521D\\u4E8C"),
                                                             CharsToUnicodeString("2012\\u58EC\\u8FB0\\u5E74\\u95F0\\u56DB\\u6708\\u521D\\u4E8C"),
@@ -4083,7 +4083,7 @@ void DateFormatTest::TestMonthPatterns()
                                                             CharsToUnicodeString("2 s\\u00ECyu\\u00E8bis ren-chen"),
                                                             CharsToUnicodeString("2 w\\u01D4yu\\u00E8 ren-chen") } },
         { "fr@calendar=chinese",      DateFormat::kShort, { UnicodeString("2/4/29"),        UnicodeString("2/4bis/29"),             UnicodeString("2/5/29") } },
-        { "en@calendar=dangi",        DateFormat::kLong,  { UnicodeString("Month3bis 2, 2012(29)"),  UnicodeString("Month4 2, 2012(29)"),       UnicodeString("Month5 1, 2012(29)") } },
+        { "en@calendar=dangi",        DateFormat::kLong,  { UnicodeString("Third Monthbis 2, 2012(29)"),  UnicodeString("Fourth Month 2, 2012(29)"),       UnicodeString("Fifth Month 1, 2012(29)") } },
         { "en@calendar=dangi",        DateFormat::kShort, { UnicodeString("3bis/2/2012"),   UnicodeString("4/2/2012"),              UnicodeString("5/1/2012") } },
         { "en@calendar=dangi",        -2,                 { UnicodeString("78x29-3bis-2"),  UnicodeString("78x29-4-2"),             UnicodeString("78x29-5-1") } },
         { "ko@calendar=dangi",        DateFormat::kLong,  { CharsToUnicodeString("\\uC784\\uC9C4\\uB144 \\uC7243\\uC6D4 2\\uC77C"),
diff --git a/icu4c/source/test/intltest/regiontst.cpp b/icu4c/source/test/intltest/regiontst.cpp
index 7f0b9625967..9b33b52b7b7 100644
--- a/icu4c/source/test/intltest/regiontst.cpp
+++ b/icu4c/source/test/intltest/regiontst.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 2013-2015, International Business Machines Corporation
+ * Copyright (c) 2013-2016, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
  
@@ -278,7 +278,7 @@ static KnownRegion knownRegions[] = {
     { "SN" , 686, "011", URGN_TERRITORY, "002" },
     { "SO" , 706, "014", URGN_TERRITORY, "002" },
     { "SR" , 740, "005", URGN_TERRITORY, "019" },
-    { "SS" , 728, "015", URGN_TERRITORY, "002" },
+    { "SS" , 728, "014", URGN_TERRITORY, "002" },
     { "ST" , 678, "017", URGN_TERRITORY, "002" },
     { "SU" , 810, NULL , URGN_DEPRECATED , NULL},
     { "SV" , 222, "013", URGN_TERRITORY, "019" },
diff --git a/icu4c/source/test/testdata/root.txt b/icu4c/source/test/testdata/root.txt
index 5dab253afbf..9dc7f32c34e 100644
--- a/icu4c/source/test/testdata/root.txt
+++ b/icu4c/source/test/testdata/root.txt
@@ -1,6 +1,6 @@
 //*******************************************************************************
 //*
-//*   Copyright (C) 1998-2015, International Business Machines
+//*   Copyright (C) 1998-2016, International Business Machines
 //*   Corporation and others.  All Rights Reserved.
 //*
 //*******************************************************************************
@@ -11,8 +11,8 @@
 root
 {
     Version { 44.0 }
-    ExpectCLDRVersionAtLeast { 28.0 } // 'base' cldr version. Allow up to version =.=.* of this
-    CurrentCLDRVersion { 28.0 } // Current CLDR version as of the test update. Warn if not an exact match.
+    ExpectCLDRVersionAtLeast { 29.0 } // 'base' cldr version. Allow up to version =.=.* of this
+    CurrentCLDRVersion { 29.0 } // Current CLDR version as of the test update. Warn if not an exact match.
 
     ShortLanguage { xxx }
 
diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt
index d29ee80d4b3..ce1fab9c1c8 100644
--- a/icu4c/source/test/testdata/structLocale.txt
+++ b/icu4c/source/test/testdata/structLocale.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2004-2015 International Business Machines
+// * Copyright (C) 2004-2016 International Business Machines
 // * Corporation and others.  All Rights Reserved.
 // *
 // ***************************************************************************
@@ -19795,6 +19795,34 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        wide{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
+                        narrow{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
                 solarTerms{
@@ -19825,6 +19853,32 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        wide{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
                 years{
@@ -19891,6 +19945,68 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        wide{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
                 zodiacs{
@@ -19909,6 +20025,34 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        wide{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
+                        narrow{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
             }
@@ -20502,6 +20646,20 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        narrow{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
                 solarTerms{
@@ -20624,6 +20782,68 @@ structLocale:table(nofallback){
                             "",
                             "",
                         }
+                        wide{
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                            "",
+                        }
                     }
                 }
                 zodiacs{
@@ -24188,6 +24408,136 @@ structLocale:table(nofallback){
                     "",
                 }
             }
+            intervalFormats{
+                H{
+                    H{""}
+                }
+                Hm{
+                    H{""}
+                    m{""}
+                }
+                Hmv{
+                    H{""}
+                    m{""}
+                }
+                Hv{
+                    H{""}
+                }
+                M{
+                    M{""}
+                }
+                MEd{
+                    M{""}
+                    d{""}
+                }
+                MMM{
+                    M{""}
+                }
+                MMMEd{
+                    M{""}
+                    d{""}
+                }
+                MMMEEEEd{
+                    M{""}
+                    d{""}
+                }
+                MMMM{
+                    M{""}
+                }
+                MMMMEd{
+                    M{""}
+                    d{""}
+                }
+                MMMMd{
+                    M{""}
+                    d{""}
+                }
+                MMMd{
+                    M{""}
+                    d{""}
+                }
+                Md{
+                    M{""}
+                    d{""}
+                }
+                d{
+                    d{""}
+                }
+                fallback{""}
+                h{
+                    a{""}
+                    h{""}
+                }
+                hm{
+                    a{""}
+                    h{""}
+                    m{""}
+                }
+                hmv{
+                    a{""}
+                    h{""}
+                    m{""}
+                }
+                hv{
+                    a{""}
+                    h{""}
+                }
+                y{
+                    y{""}
+                }
+                yM{
+                    M{""}
+                    y{""}
+                }
+                yMEd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMM{
+                    M{""}
+                    y{""}
+                }
+                yMMMEEEEd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMMEd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMMM{
+                    M{""}
+                    y{""}
+                }
+                yMMMMEEEEd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMMMEd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMMMd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMMMd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+                yMd{
+                    M{""}
+                    d{""}
+                    y{""}
+                }
+            }
         }
         roc{
             AmPmMarkers{
-- 
2.40.0